diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-11-07 22:24:32 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-11-07 22:24:32 +0000 |
| commit | 58406bee8938178fc317574c4236434b0dd11a25 (patch) | |
| tree | b4fa34eca69e23769c548b4436cbf65d765e5fe2 /devel | |
| parent | 98eb5c95a29c8dd1a76435744e5316092835f696 (diff) | |
Notes
Diffstat (limited to 'devel')
66 files changed, 701 insertions, 709 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 43916eadff12..a801a0e9ea4c 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ORBit2 -PORTVERSION= 2.10.4 +PORTVERSION= 2.12.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index cc35867b6227..d71eaba0cfa7 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/ORBit2-2.10.4.tar.bz2) = 5f65c08f101c8b5e3706ec9d491f332c -SIZE (gnome2/ORBit2-2.10.4.tar.bz2) = 644357 +MD5 (gnome2/ORBit2-2.12.0.tar.bz2) = d7f0c2b9bee73b89978a9968c10f81fe +SIZE (gnome2/ORBit2-2.12.0.tar.bz2) = 666898 diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index 48c28cd3c8a2..41bfc92d7cc5 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -66,7 +66,6 @@ libdata/pkgconfig/ORBit-imodule-2.0.pc share/aclocal/ORBit2.m4 share/idl/orbit-2.0/CosNaming.idl @dirrm share/idl/orbit-2.0 -@dirrm %%DOCSDIR%% @unexec /bin/rmdir %D/share/idl 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/lib/orbit-2.0 2>/dev/null || /usr/bin/true @dirrm include/orbit-2.0/orbit/util diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile index 0abee6dfdfe0..83f0bfc0892d 100644 --- a/devel/bugbuddy2/Makefile +++ b/devel/bugbuddy2/Makefile @@ -6,10 +6,11 @@ # PORTNAME= bugbuddy2 -PORTVERSION= 2.6.1 +PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.6 +MASTER_SITE_SUBDIR= sources/bug-buddy/2.8 DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,12 +21,13 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER=13 -USE_GNOME= gnomeprefix gnomehack intlhack lthack gnomedesktop +USE_LIBTOOL_VER=15 +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= bug-buddy.1 +MAN1= bug-buddy.1 +GCONF_SCHEMAS= bug-buddy.schemas .include <bsd.port.mk> diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo index 76da9191bb27..0b776637feb8 100644 --- a/devel/bugbuddy2/distinfo +++ b/devel/bugbuddy2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/bug-buddy-2.6.1.tar.bz2) = a9a8fb40fc762fb09ab587c2e0460653 -SIZE (gnome2/bug-buddy-2.6.1.tar.bz2) = 858940 +MD5 (gnome2/bug-buddy-2.8.0.tar.bz2) = b4c90bb9e1762803d083026b000349ea +SIZE (gnome2/bug-buddy-2.8.0.tar.bz2) = 711303 diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist index 47734bac3ca0..5e430bc98565 100644 --- a/devel/bugbuddy2/pkg-plist +++ b/devel/bugbuddy2/pkg-plist @@ -1,8 +1,6 @@ bin/bug-buddy -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/bug-buddy.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/bug-buddy.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/bug-buddy.schemas > /dev/null || /usr/bin/true share/gnome/application-registry/bug-buddy.applications +share/gnome/applications/bug-buddy-core.desktop share/gnome/applications/bug-buddy.desktop share/gnome/bug-buddy/bug-buddy.glade share/gnome/bug-buddy/bug-buddy.png @@ -19,59 +17,9 @@ share/gnome/bug-buddy/gnome.png share/gnome/bug-buddy/ximian.png share/gnome/help/bug-buddy/C/bug-buddy.xml share/gnome/help/bug-buddy/C/legal.xml -share/gnome/help/bug-buddy/de/bug-buddy.xml -share/gnome/help/bug-buddy/de/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/de/legal.xml -share/gnome/help/bug-buddy/es/bug-buddy.xml -share/gnome/help/bug-buddy/es/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/es/legal.xml -share/gnome/help/bug-buddy/fr/bug-buddy.xml -share/gnome/help/bug-buddy/fr/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/fr/legal.xml -share/gnome/help/bug-buddy/it/bug-buddy.xml -share/gnome/help/bug-buddy/it/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/it/legal.xml -share/gnome/help/bug-buddy/ja/bug-buddy.xml -share/gnome/help/bug-buddy/ja/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/ja/legal.xml -share/gnome/help/bug-buddy/ko/bug-buddy.xml -share/gnome/help/bug-buddy/ko/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/ko/legal.xml -share/gnome/help/bug-buddy/sv/bug-buddy.xml -share/gnome/help/bug-buddy/sv/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/sv/legal.xml -share/gnome/help/bug-buddy/zh_CN/bug-buddy.xml -share/gnome/help/bug-buddy/zh_CN/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/zh_CN/legal.xml -share/gnome/help/bug-buddy/zh_HK/bug-buddy.xml -share/gnome/help/bug-buddy/zh_HK/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/zh_HK/legal.xml -share/gnome/help/bug-buddy/zh_TW/bug-buddy.xml -share/gnome/help/bug-buddy/zh_TW/figures/bug-buddy_window.png -share/gnome/help/bug-buddy/zh_TW/legal.xml share/gnome/mime-info/bug-buddy.keys share/gnome/omf/bug-buddy/bug-buddy-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-de.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-de.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-es.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-es.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-fr.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-fr.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-it.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-it.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-ja.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-ja.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-ko.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-ko.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-sv.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-sv.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-zh_CN.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_CN.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-zh_HK.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_HK.omf 2>/dev/null || /usr/bin/true -share/gnome/omf/bug-buddy/bug-buddy-zh_TW.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_TW.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/bug-buddy.png share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo @@ -79,6 +27,7 @@ share/locale/az/LC_MESSAGES/bug-buddy.mo share/locale/be/LC_MESSAGES/bug-buddy.mo share/locale/bg/LC_MESSAGES/bug-buddy.mo share/locale/bn/LC_MESSAGES/bug-buddy.mo +share/locale/bs/LC_MESSAGES/bug-buddy.mo share/locale/ca/LC_MESSAGES/bug-buddy.mo share/locale/cs/LC_MESSAGES/bug-buddy.mo share/locale/cy/LC_MESSAGES/bug-buddy.mo @@ -111,9 +60,11 @@ share/locale/mk/LC_MESSAGES/bug-buddy.mo share/locale/ml/LC_MESSAGES/bug-buddy.mo share/locale/mn/LC_MESSAGES/bug-buddy.mo share/locale/ms/LC_MESSAGES/bug-buddy.mo +share/locale/nb/LC_MESSAGES/bug-buddy.mo share/locale/nl/LC_MESSAGES/bug-buddy.mo share/locale/nn/LC_MESSAGES/bug-buddy.mo share/locale/no/LC_MESSAGES/bug-buddy.mo +share/locale/or/LC_MESSAGES/bug-buddy.mo share/locale/pa/LC_MESSAGES/bug-buddy.mo share/locale/pl/LC_MESSAGES/bug-buddy.mo share/locale/pt/LC_MESSAGES/bug-buddy.mo @@ -135,26 +86,6 @@ share/locale/wa/LC_MESSAGES/bug-buddy.mo share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrm share/gnome/omf/bug-buddy -@dirrm share/gnome/help/bug-buddy/zh_TW/figures -@dirrm share/gnome/help/bug-buddy/zh_TW -@dirrm share/gnome/help/bug-buddy/zh_HK/figures -@dirrm share/gnome/help/bug-buddy/zh_HK -@dirrm share/gnome/help/bug-buddy/zh_CN/figures -@dirrm share/gnome/help/bug-buddy/zh_CN -@dirrm share/gnome/help/bug-buddy/sv/figures -@dirrm share/gnome/help/bug-buddy/sv -@dirrm share/gnome/help/bug-buddy/ko/figures -@dirrm share/gnome/help/bug-buddy/ko -@dirrm share/gnome/help/bug-buddy/ja/figures -@dirrm share/gnome/help/bug-buddy/ja -@dirrm share/gnome/help/bug-buddy/it/figures -@dirrm share/gnome/help/bug-buddy/it -@dirrm share/gnome/help/bug-buddy/fr/figures -@dirrm share/gnome/help/bug-buddy/fr -@dirrm share/gnome/help/bug-buddy/es/figures -@dirrm share/gnome/help/bug-buddy/es -@dirrm share/gnome/help/bug-buddy/de/figures -@dirrm share/gnome/help/bug-buddy/de @dirrm share/gnome/help/bug-buddy/C @dirrm share/gnome/help/bug-buddy @dirrm share/gnome/bug-buddy/bugzilla/ximian @@ -162,13 +93,3 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrm share/gnome/bug-buddy/bugzilla @dirrm share/gnome/bug-buddy @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-de.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-es.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-fr.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-it.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-ja.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-ko.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-sv.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_CN.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_HK.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_TW.omf 2>/dev/null || /usr/bin/true diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile index 763a4e32fd96..708aee02b218 100644 --- a/devel/desktop-file-utils/Makefile +++ b/devel/desktop-file-utils/Makefile @@ -6,8 +6,7 @@ # PORTNAME= desktop-file-utils -PORTVERSION= 0.7 -PORTREVISION= 1 +PORTVERSION= 0.9 CATEGORIES= devel MASTER_SITES= http://freedesktop.org/Software/desktop-file-utils/releases/ diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo index 264c66a82a05..a68f8fb01aba 100644 --- a/devel/desktop-file-utils/distinfo +++ b/devel/desktop-file-utils/distinfo @@ -1,2 +1,2 @@ -MD5 (desktop-file-utils-0.7.tar.gz) = 32b948c2676170dc01ac4849c00bc5d6 -SIZE (desktop-file-utils-0.7.tar.gz) = 415348 +MD5 (desktop-file-utils-0.9.tar.gz) = d1f3e0ff6681dba1624b3c57a2d60d38 +SIZE (desktop-file-utils-0.9.tar.gz) = 424432 diff --git a/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c b/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c index 13db021e7ba8..291b9ecef923 100644 --- a/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c +++ b/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c @@ -1,11 +1,11 @@ ---- src/eggdirfuncs.c.orig Sat Jul 24 01:53:05 2004 -+++ src/eggdirfuncs.c Sat Jul 24 01:53:31 2004 +--- src/eggdirfuncs.c.orig Thu Sep 2 15:44:39 2004 ++++ src/eggdirfuncs.c Tue Sep 21 01:24:07 2004 @@ -106,7 +106,7 @@ data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); if (!data_dirs || !data_dirs[0]) -- data_dirs = (char *) "/usr/local/share/:/usr/share/"; -+ data_dirs = (char *) "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/"; +- data_dirs = "/usr/local/share/:/usr/share/"; ++ data_dirs = "%%X11BASE%%/share/:/usr/local/share/:/usr/share/:%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:/usr/share/gnome/"; data_dir_vector = g_strsplit (data_dirs, ":", 0); diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index e4bfe7a9efdb..23495787a660 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gconf2 -PORTVERSION= 2.6.4 +PORTVERSION= 2.8.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/2.6 +MASTER_SITE_SUBDIR= sources/GConf/2.8 DISTNAME= GConf-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,9 +19,9 @@ COMMENT= A configuration database system for GNOME USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomehack lthack gnomehier orbit2 gtk20 libxml2 linc +USE_GNOME= gnomehack gnomehier orbit2 gtk20 libxml2 linc INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index fb77307a65fe..aca3f01b6deb 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/GConf-2.6.4.tar.bz2) = 7a24af8dd5f3e810a7f8cc21a7c88ded -SIZE (gnome2/GConf-2.6.4.tar.bz2) = 1524559 +MD5 (gnome2/GConf-2.8.1.tar.bz2) = b1173cbe33404bcbcc15710ce2a28f67 +SIZE (gnome2/GConf-2.8.1.tar.bz2) = 1730812 diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 35f210be5fae..eb4b1a71a6a9 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -20,19 +20,7 @@ libexec/gconf-sanity-check-2 libexec/gconfd-2 share/aclocal/gconf-2.m4 share/doc/gconf/ch01.html -share/doc/gconf/ch01s02.html -share/doc/gconf/ch02.html -share/doc/gconf/ch02s02.html -share/doc/gconf/ch02s03.html -share/doc/gconf/ch02s04.html -share/doc/gconf/ch06.html -share/doc/gconf/ch06s02.html -share/doc/gconf/ch06s03.html -share/doc/gconf/ch07.html -share/doc/gconf/conventions.html share/doc/gconf/gconf-GConfClient.html -share/doc/gconf/gconf-client-reference.html -share/doc/gconf/gconf-client.html share/doc/gconf/gconf-gconf-backend.html share/doc/gconf/gconf-gconf-changeset.html share/doc/gconf/gconf-gconf-engine.html @@ -44,10 +32,7 @@ share/doc/gconf/gconf-gconf-schema.html share/doc/gconf/gconf-gconf-sources.html share/doc/gconf/gconf-gconf-value.html share/doc/gconf/gconf-gconf.html -share/doc/gconf/gconf-internals-reference.html -share/doc/gconf/gconf-reference.html share/doc/gconf/gconf.devhelp -share/doc/gconf/gconftool.html share/doc/gconf/home.png share/doc/gconf/index.html share/doc/gconf/index.sgml @@ -61,6 +46,7 @@ share/locale/az/LC_MESSAGES/GConf2.mo share/locale/be/LC_MESSAGES/GConf2.mo share/locale/bg/LC_MESSAGES/GConf2.mo share/locale/bn/LC_MESSAGES/GConf2.mo +share/locale/bs/LC_MESSAGES/GConf2.mo share/locale/ca/LC_MESSAGES/GConf2.mo share/locale/cs/LC_MESSAGES/GConf2.mo share/locale/cy/LC_MESSAGES/GConf2.mo @@ -90,6 +76,8 @@ share/locale/mk/LC_MESSAGES/GConf2.mo share/locale/ml/LC_MESSAGES/GConf2.mo share/locale/mn/LC_MESSAGES/GConf2.mo share/locale/ms/LC_MESSAGES/GConf2.mo +share/locale/nb/LC_MESSAGES/GConf2.mo +share/locale/ne/LC_MESSAGES/GConf2.mo share/locale/nl/LC_MESSAGES/GConf2.mo share/locale/nn/LC_MESSAGES/GConf2.mo share/locale/no/LC_MESSAGES/GConf2.mo diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index e608355897ea..bbdac7cff117 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.6.2 -PORTREVISION= 1 +PORTVERSION= 2.8.3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.6 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.8 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,13 +26,17 @@ USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ USE_REINPLACE= yes USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --disable-openssl \ +CONFIGURE_ARGS= --enable-openssl \ --disable-gnutls \ --with-gtk=no CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +GCONF_SCHEMAS= desktop_default_applications.schemas \ + desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ + system_http_proxy.schemas system_smb.schemas + OPTIONS= KDE_MENUS "Integrated KDE menu picks" on .include <bsd.port.pre.mk> @@ -41,6 +44,8 @@ OPTIONS= KDE_MENUS "Integrated KDE menu picks" on .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) .undef WITHOUT_CDPARANOIA .undef WITHOUT_SAMBA +.undef WITHOUT_MDNS +WITH_MDNS= yes WITH_CDPARANOIA= yes WITH_SAMBA= yes .endif @@ -60,6 +65,10 @@ WITH_CDPARANOIA= yes WITH_SAMBA= yes .endif +.if exists(${LOCALBASE}/lib/libhowl.so) +WITH_MDNS= yes +.endif + .if defined(WITH_CDPARANOIA) LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia PLIST_SUB+= CDPARANOIA="" @@ -67,10 +76,14 @@ PLIST_SUB+= CDPARANOIA="" PLIST_SUB+= CDPARANOIA="@comment " .endif -.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM) +.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif +.if exists(${LOCALBASE}/lib/libkrb5.so) +LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal +.endif + .if defined(WITH_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient PLIST_SUB+= SAMBA="" @@ -78,6 +91,10 @@ PLIST_SUB+= SAMBA="" PLIST_SUB+= SAMBA="@comment " .endif +.if defined(WITH_MDNS) +LIB_DEPENDS+= howl:${PORTSDIR}/net/howl +.endif + post-patch: @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' @@ -86,7 +103,9 @@ post-patch: ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/libgnomevfs/xdgmime.c + ${WRKSRC}/libgnomevfs/xdgmime.c \ + ${WRKSRC}/libgnomevfs/eggdirfuncs.c \ + ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c .if !defined(WITHOUT_KDE_MENUS) @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index d88c0954602a..026296e07214 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.6.2.tar.bz2) = 61bf3e145652089c63edd423ecbc9eba -SIZE (gnome2/gnome-vfs-2.6.2.tar.bz2) = 1372181 +MD5 (gnome2/gnome-vfs-2.8.3.tar.bz2) = 5484694e7250c80a231cfc525d924cc3 +SIZE (gnome2/gnome-vfs-2.8.3.tar.bz2) = 1907154 diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa index f7ec12a89ea7..caf6411ffeaa 100644 --- a/devel/gnome-vfs/files/patch-aa +++ b/devel/gnome-vfs/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Thu Aug 12 19:59:11 2004 -+++ configure Thu Aug 12 19:59:11 2004 -@@ -22922,6 +22922,8 @@ +--- configure.orig Tue Jun 1 03:53:13 2004 ++++ configure Tue Jun 1 03:53:13 2004 +@@ -22815,6 +22815,8 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9,7 +9,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23004,6 +23006,7 @@ +@@ -22897,6 +22899,7 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -17,7 +17,7 @@ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -23011,6 +23014,7 @@ +@@ -22904,6 +22907,7 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -25,7 +25,7 @@ have_ngettext=yes else echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -@@ -26981,8 +26985,8 @@ +@@ -26876,8 +26880,8 @@ done fi @@ -36,7 +36,7 @@ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -27001,11 +27005,11 @@ +@@ -26896,11 +26900,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -50,7 +50,7 @@ ; return 0; } -@@ -28136,7 +28140,7 @@ +@@ -28031,7 +28035,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -59,7 +59,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29765,6 +29769,9 @@ +@@ -29660,6 +29664,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -69,7 +69,7 @@ #include <sys/statfs.h> #include <sys/fstyp.h> _ACEOF -@@ -29805,6 +29812,9 @@ +@@ -29700,6 +29707,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -79,7 +79,7 @@ #include <sys/statfs.h> #include <sys/vmount.h> _ACEOF -@@ -31432,6 +31442,7 @@ +@@ -31338,6 +31348,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac index 5a687e11a977..9362cac1715f 100644 --- a/devel/gnome-vfs/files/patch-ac +++ b/devel/gnome-vfs/files/patch-ac @@ -1,16 +1,7 @@ ---- modules/Makefile.in.orig Thu Aug 26 20:51:38 2004 -+++ modules/Makefile.in Thu Aug 26 21:00:56 2004 -@@ -195,7 +195,7 @@ - am__quote = @am__quote@ - install_sh = @install_sh@ - NULL = --SUBDIRS = extfs vfolder -+SUBDIRS = vfolder - - INCLUDES = \ - -I$(top_srcdir) \ -@@ -240,13 +240,12 @@ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la +--- modules/Makefile.in.orig Tue May 6 15:39:48 2003 ++++ modules/Makefile.in Tue May 6 15:41:28 2003 +@@ -210,7 +210,7 @@ + @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = -module_flags = -export_dynamic -avoid-version -module -no-undefined @@ -18,22 +9,3 @@ modulesdir = $(libdir)/gnome-vfs-2.0/modules modules_LTLIBRARIES = \ - $(CDDA_LTLIBS) \ - libcomputer.la \ -- libextfs.la \ - libfile.la \ - libnetwork.la \ - libnntp.la \ -@@ -292,12 +291,6 @@ - libcomputer_la_SOURCES = computer-method.c - libcomputer_la_LDFLAGS = $(module_flags) - libcomputer_la_LIBADD = $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la -- -- --### `extfs' method --libextfs_la_SOURCES = extfs-method.c --libextfs_la_LDFLAGS = $(module_flags) --libextfs_la_LIBADD = $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la - - - ### `file' method diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in index c75f0d973243..4acd9a1bc552 100644 --- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in +++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in @@ -1,12 +1,13 @@ $FreeBSD$ ---- gnome-vfs-2.0.pc.in 2002/02/16 13:07:24 1.1 -+++ gnome-vfs-2.0.pc.in 2002/02/16 13:07:38 +--- gnome-vfs-2.0.pc.in.orig Thu Oct 28 13:25:35 2004 ++++ gnome-vfs-2.0.pc.in Thu Oct 28 13:25:51 2004 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system libraries Version: @VERSION@ - Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0 + Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-2.0 -Libs: -L${libdir} -lgnomevfs-2 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include + diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c new file mode 100644 index 000000000000..82e0e5f61891 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c @@ -0,0 +1,11 @@ +--- libgnomevfs/eggdirfuncs.c.orig Sat Jul 24 03:08:10 2004 ++++ libgnomevfs/eggdirfuncs.c Sat Jul 24 03:08:50 2004 +@@ -106,7 +106,7 @@ + data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); + + if (!data_dirs || !data_dirs[0]) +- data_dirs = "/usr/local/share/:/usr/share/"; ++ data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/"; + + data_dir_vector = g_strsplit (data_dirs, ":", 0); + diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c new file mode 100644 index 000000000000..a61e83417651 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c @@ -0,0 +1,11 @@ +--- libgnomevfs/gnome-vfs-mime-info.c.orig Wed Aug 4 13:41:52 2004 ++++ libgnomevfs/gnome-vfs-mime-info.c Wed Aug 4 13:42:10 2004 +@@ -149,7 +149,7 @@ + + xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); + if (!xdg_data_dirs) { +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + } + + split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c new file mode 100644 index 000000000000..c58be91fa94b --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c @@ -0,0 +1,13 @@ +--- libgnomevfs/gnome-vfs-resolve.c.orig Sat Jul 31 17:52:23 2004 ++++ libgnomevfs/gnome-vfs-resolve.c Sat Jul 31 17:52:45 2004 +@@ -171,8 +171,10 @@ + switch (error) { + + case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND; ++#if defined(EAI_ADDRFAMILY) && defined(EAI_NODATA) + case EAI_ADDRFAMILY: + case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; ++#endif + case EAI_SYSTEM: return gnome_vfs_result_from_errno (); + case EAI_FAIL: + case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER; diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c index 7028e5a91b8e..5d37cc768ddb 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c @@ -1,35 +1,10 @@ ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Feb 16 06:13:27 2004 -+++ libgnomevfs/gnome-vfs-unix-mounts.c Sat Apr 17 00:45:01 2004 -@@ -141,9 +141,9 @@ - FD_ZERO(&read_fds); - FD_SET(pipes[0], &read_fds); - -- /* Wait max half a second */ -- tv.tv_sec = 0; -- tv.tv_usec = 500; -+ /* Wait max one second */ -+ tv.tv_sec = 1; -+ tv.tv_usec = 0; - - res = select(pipes[0] + 1, - &read_fds, NULL, NULL, &tv); -@@ -428,7 +428,7 @@ - mount_entry->mount_path = g_strdup (mntent[i].f_mntonname); - mount_entry->device_path = g_strdup (mntent[i].f_mntfromname); - mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename); -- if (mntent[i].f_flags == MNT_RDONLY) { -+ if (mntent[i].f_flags & MNT_RDONLY) { - mount_entry->is_read_only = TRUE; - } - -@@ -857,8 +857,9 @@ - - #ifdef HAVE_SYS_SYSCTL_H - if (usermnt != 0) { -+ uid_t uid = getuid (); - if (stat (fstab->fs_file, &sb) == 0) { -- if (sb.st_uid != 0) { -+ if (uid == 0 || sb.st_uid == uid) { - mount_entry->is_user_mountable = TRUE; - } - } +--- libgnomevfs/gnome-vfs-unix-mounts.c.orig Sun Sep 5 02:34:30 2004 ++++ libgnomevfs/gnome-vfs-unix-mounts.c Sun Sep 5 02:35:08 2004 +@@ -43,6 +43,7 @@ + #include <errno.h> + #include <string.h> + #include <signal.h> ++#include <poll.h> + #include <libgnomevfs/gnome-vfs.h> + + #include "gnome-vfs-unix-mounts.h" diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c index a168c6acdac8..9788a89f060e 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,25 +1,6 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Fri Apr 16 06:43:05 2004 -+++ libgnomevfs/gnome-vfs-utils.c Mon Apr 19 15:41:47 2004 -@@ -797,7 +797,9 @@ - - #if HAVE_STATVFS - statfs_result = statvfs (unescaped_path, &statfs_buffer); -+#define statfs_bsize f_frsize - #else -+#define statfs_bsize f_bsize - #if STATFS_ARGS == 2 - statfs_result = statfs (unescaped_path, &statfs_buffer); - #elif STATFS_ARGS == 4 -@@ -838,7 +840,7 @@ - } - #endif - -- block_size = statfs_buffer.f_bsize; -+ block_size = statfs_buffer.statfs_bsize; - free_blocks = statfs_buffer.f_bavail; - - *size = block_size * free_blocks; -@@ -866,7 +868,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Mon Aug 16 11:11:09 2004 ++++ libgnomevfs/gnome-vfs-utils.c Mon Aug 16 11:11:16 2004 +@@ -871,7 +871,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c index 0c6c3d28ad0a..472a4b5f6c19 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c @@ -1,11 +1,11 @@ ---- libgnomevfs/xdgmime.c.orig Wed Jun 23 20:15:25 2004 -+++ libgnomevfs/xdgmime.c Wed Jun 23 20:15:41 2004 -@@ -97,7 +97,7 @@ +--- libgnomevfs/xdgmime.c.orig Thu Jul 22 11:20:13 2004 ++++ libgnomevfs/xdgmime.c Thu Jul 22 11:20:52 2004 +@@ -189,7 +189,7 @@ - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + xdg_data_dirs = getenv ("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - ptr = xdg_data_dirs; + ptr = xdg_data_dirs; diff --git a/devel/gnome-vfs/files/patch-modules_default-modules.conf b/devel/gnome-vfs/files/patch-modules_default-modules.conf deleted file mode 100644 index 0efb87aa888c..000000000000 --- a/devel/gnome-vfs/files/patch-modules_default-modules.conf +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/default-modules.conf.orig Thu Aug 26 21:01:12 2004 -+++ modules/default-modules.conf Thu Aug 26 21:01:22 2004 -@@ -38,9 +38,6 @@ - - ssh: ssh - --# The various access methods implemented by the extfs system. --a ar arj cpio deb hp48 lha mailfs patchfs rar rpm rpms trpm zip zoo: extfs -- - # vfolder desktop method - applications: vfolder-desktop - applications-all-users: vfolder-desktop diff --git a/devel/gnome-vfs/files/patch-modules_extfs-method.c b/devel/gnome-vfs/files/patch-modules_extfs-method.c deleted file mode 100644 index 129e9c4e131e..000000000000 --- a/devel/gnome-vfs/files/patch-modules_extfs-method.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/extfs-method.c.orig Thu Aug 12 20:04:05 2004 -+++ modules/extfs-method.c Thu Aug 12 20:06:20 2004 -@@ -61,7 +61,7 @@ - - - static ssize_t --getdelim (char **lineptr, size_t n, int terminator, FILE *stream) -+getdelim (char **lineptr, size_t *n, int terminator, FILE *stream) - { - char *line, *p; - size_t size, copy; diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 3f5cc01a3a79..7bec57259d84 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -3,21 +3,11 @@ bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_default_applications.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_default_applications.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_default_applications.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_url_handlers.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_url_handlers.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_url_handlers.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/system_http_proxy.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/system_http_proxy.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_http_proxy.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/system_smb.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/system_smb.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_smb.schemas > /dev/null || /usr/bin/true +bin/gnomevfs-rm %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf +etc/gnome-vfs-2.0/modules/ssl-modules.conf etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info etc/gnome-vfs-2.0/vfolders/network.vfolder-info @@ -26,11 +16,13 @@ etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info include/gnome-vfs-2.0/include/gnome-vfs-file-size.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-dns-sd.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h @@ -40,11 +32,13 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-resolve.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h @@ -71,6 +65,7 @@ lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.so %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so lib/gnome-vfs-2.0/modules/libcomputer.so +lib/gnome-vfs-2.0/modules/libdns-sd.so lib/gnome-vfs-2.0/modules/libfile.so lib/gnome-vfs-2.0/modules/libftp.so lib/gnome-vfs-2.0/modules/libgzip.so @@ -79,7 +74,6 @@ lib/gnome-vfs-2.0/modules/libnetwork.so lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so %%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so -lib/gnome-vfs-2.0/modules/libssh.so lib/gnome-vfs-2.0/modules/libtar.so lib/gnome-vfs-2.0/modules/libvfolder-desktop.so lib/gnome-vfs-2.0/modules/libvfs-pipe.so @@ -87,12 +81,71 @@ lib/gnome-vfs-2.0/modules/libvfs-test.so lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.600 +lib/libgnomevfs-2.so.800 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc libexec/gnome-vfs-daemon +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/home.png +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/left.png +share/doc/gnome-vfs-2.0/mime-registry.html +share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/networking.html +share/doc/gnome-vfs-2.0/right.png +share/doc/gnome-vfs-2.0/style.css +share/doc/gnome-vfs-2.0/up.png +share/doc/gnome-vfs-2.0/volumes.html @exec mkdir -p %D/share/gnome/vfolders %%KDEMENUS%%share/gnome/vfolders/KDE.directory share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo @@ -138,6 +191,7 @@ share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo @@ -165,6 +219,7 @@ share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/gnome/vfolders +@dirrm share/doc/gnome-vfs-2.0 @dirrm include/gnome-vfs-module-2.0/libgnomevfs @dirrm include/gnome-vfs-module-2.0 @dirrm include/gnome-vfs-2.0/libgnomevfs diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile index 4e141049c3b7..6d1c8352901e 100644 --- a/devel/gnome2-hacker-tools/Makefile +++ b/devel/gnome2-hacker-tools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2-hacker-tools -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.1 CATEGORIES= devel gnome MASTER_SITES= # empty DISTFILES= # empty @@ -22,18 +22,12 @@ RUN_DEPENDS= mlv:${PORTSDIR}/editors/mlview \ gob2:${PORTSDIR}/devel/gob2 \ conglomerate:${PORTSDIR}/editors/conglomerate \ meld:${PORTSDIR}/textproc/meld \ - gtranslator:${PORTSDIR}/devel/gtranslator -# not yet buildable under GNOME 2.5 -# regexxer:${PORTSDIR}/devel/regexxer - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -RUN_DEPENDS+= anjuta:${PORTSDIR}/devel/anjuta -.endif + gtranslator:${PORTSDIR}/devel/gtranslator \ + regexxer:${PORTSDIR}/devel/regexxer \ + anjuta:${PORTSDIR}/devel/anjuta NO_BUILD= yes do-install: # empty -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index e608355897ea..bbdac7cff117 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.6.2 -PORTREVISION= 1 +PORTVERSION= 2.8.3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.6 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.8 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,13 +26,17 @@ USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ USE_REINPLACE= yes USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --disable-openssl \ +CONFIGURE_ARGS= --enable-openssl \ --disable-gnutls \ --with-gtk=no CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +GCONF_SCHEMAS= desktop_default_applications.schemas \ + desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ + system_http_proxy.schemas system_smb.schemas + OPTIONS= KDE_MENUS "Integrated KDE menu picks" on .include <bsd.port.pre.mk> @@ -41,6 +44,8 @@ OPTIONS= KDE_MENUS "Integrated KDE menu picks" on .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) .undef WITHOUT_CDPARANOIA .undef WITHOUT_SAMBA +.undef WITHOUT_MDNS +WITH_MDNS= yes WITH_CDPARANOIA= yes WITH_SAMBA= yes .endif @@ -60,6 +65,10 @@ WITH_CDPARANOIA= yes WITH_SAMBA= yes .endif +.if exists(${LOCALBASE}/lib/libhowl.so) +WITH_MDNS= yes +.endif + .if defined(WITH_CDPARANOIA) LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia PLIST_SUB+= CDPARANOIA="" @@ -67,10 +76,14 @@ PLIST_SUB+= CDPARANOIA="" PLIST_SUB+= CDPARANOIA="@comment " .endif -.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM) +.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif +.if exists(${LOCALBASE}/lib/libkrb5.so) +LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal +.endif + .if defined(WITH_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient PLIST_SUB+= SAMBA="" @@ -78,6 +91,10 @@ PLIST_SUB+= SAMBA="" PLIST_SUB+= SAMBA="@comment " .endif +.if defined(WITH_MDNS) +LIB_DEPENDS+= howl:${PORTSDIR}/net/howl +.endif + post-patch: @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' @@ -86,7 +103,9 @@ post-patch: ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/libgnomevfs/xdgmime.c + ${WRKSRC}/libgnomevfs/xdgmime.c \ + ${WRKSRC}/libgnomevfs/eggdirfuncs.c \ + ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c .if !defined(WITHOUT_KDE_MENUS) @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index d88c0954602a..026296e07214 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.6.2.tar.bz2) = 61bf3e145652089c63edd423ecbc9eba -SIZE (gnome2/gnome-vfs-2.6.2.tar.bz2) = 1372181 +MD5 (gnome2/gnome-vfs-2.8.3.tar.bz2) = 5484694e7250c80a231cfc525d924cc3 +SIZE (gnome2/gnome-vfs-2.8.3.tar.bz2) = 1907154 diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa index f7ec12a89ea7..caf6411ffeaa 100644 --- a/devel/gnomevfs2/files/patch-aa +++ b/devel/gnomevfs2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Thu Aug 12 19:59:11 2004 -+++ configure Thu Aug 12 19:59:11 2004 -@@ -22922,6 +22922,8 @@ +--- configure.orig Tue Jun 1 03:53:13 2004 ++++ configure Tue Jun 1 03:53:13 2004 +@@ -22815,6 +22815,8 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9,7 +9,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23004,6 +23006,7 @@ +@@ -22897,6 +22899,7 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -17,7 +17,7 @@ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -23011,6 +23014,7 @@ +@@ -22904,6 +22907,7 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -25,7 +25,7 @@ have_ngettext=yes else echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -@@ -26981,8 +26985,8 @@ +@@ -26876,8 +26880,8 @@ done fi @@ -36,7 +36,7 @@ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -27001,11 +27005,11 @@ +@@ -26896,11 +26900,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -50,7 +50,7 @@ ; return 0; } -@@ -28136,7 +28140,7 @@ +@@ -28031,7 +28035,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -59,7 +59,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29765,6 +29769,9 @@ +@@ -29660,6 +29664,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -69,7 +69,7 @@ #include <sys/statfs.h> #include <sys/fstyp.h> _ACEOF -@@ -29805,6 +29812,9 @@ +@@ -29700,6 +29707,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -79,7 +79,7 @@ #include <sys/statfs.h> #include <sys/vmount.h> _ACEOF -@@ -31432,6 +31442,7 @@ +@@ -31338,6 +31348,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac index 5a687e11a977..9362cac1715f 100644 --- a/devel/gnomevfs2/files/patch-ac +++ b/devel/gnomevfs2/files/patch-ac @@ -1,16 +1,7 @@ ---- modules/Makefile.in.orig Thu Aug 26 20:51:38 2004 -+++ modules/Makefile.in Thu Aug 26 21:00:56 2004 -@@ -195,7 +195,7 @@ - am__quote = @am__quote@ - install_sh = @install_sh@ - NULL = --SUBDIRS = extfs vfolder -+SUBDIRS = vfolder - - INCLUDES = \ - -I$(top_srcdir) \ -@@ -240,13 +240,12 @@ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la +--- modules/Makefile.in.orig Tue May 6 15:39:48 2003 ++++ modules/Makefile.in Tue May 6 15:41:28 2003 +@@ -210,7 +210,7 @@ + @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = -module_flags = -export_dynamic -avoid-version -module -no-undefined @@ -18,22 +9,3 @@ modulesdir = $(libdir)/gnome-vfs-2.0/modules modules_LTLIBRARIES = \ - $(CDDA_LTLIBS) \ - libcomputer.la \ -- libextfs.la \ - libfile.la \ - libnetwork.la \ - libnntp.la \ -@@ -292,12 +291,6 @@ - libcomputer_la_SOURCES = computer-method.c - libcomputer_la_LDFLAGS = $(module_flags) - libcomputer_la_LIBADD = $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la -- -- --### `extfs' method --libextfs_la_SOURCES = extfs-method.c --libextfs_la_LDFLAGS = $(module_flags) --libextfs_la_LIBADD = $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la - - - ### `file' method diff --git a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in index c75f0d973243..4acd9a1bc552 100644 --- a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in +++ b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in @@ -1,12 +1,13 @@ $FreeBSD$ ---- gnome-vfs-2.0.pc.in 2002/02/16 13:07:24 1.1 -+++ gnome-vfs-2.0.pc.in 2002/02/16 13:07:38 +--- gnome-vfs-2.0.pc.in.orig Thu Oct 28 13:25:35 2004 ++++ gnome-vfs-2.0.pc.in Thu Oct 28 13:25:51 2004 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system libraries Version: @VERSION@ - Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0 + Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-2.0 -Libs: -L${libdir} -lgnomevfs-2 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include + diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c new file mode 100644 index 000000000000..82e0e5f61891 --- /dev/null +++ b/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c @@ -0,0 +1,11 @@ +--- libgnomevfs/eggdirfuncs.c.orig Sat Jul 24 03:08:10 2004 ++++ libgnomevfs/eggdirfuncs.c Sat Jul 24 03:08:50 2004 +@@ -106,7 +106,7 @@ + data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); + + if (!data_dirs || !data_dirs[0]) +- data_dirs = "/usr/local/share/:/usr/share/"; ++ data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/"; + + data_dir_vector = g_strsplit (data_dirs, ":", 0); + diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c new file mode 100644 index 000000000000..a61e83417651 --- /dev/null +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c @@ -0,0 +1,11 @@ +--- libgnomevfs/gnome-vfs-mime-info.c.orig Wed Aug 4 13:41:52 2004 ++++ libgnomevfs/gnome-vfs-mime-info.c Wed Aug 4 13:42:10 2004 +@@ -149,7 +149,7 @@ + + xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); + if (!xdg_data_dirs) { +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + } + + split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c new file mode 100644 index 000000000000..c58be91fa94b --- /dev/null +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c @@ -0,0 +1,13 @@ +--- libgnomevfs/gnome-vfs-resolve.c.orig Sat Jul 31 17:52:23 2004 ++++ libgnomevfs/gnome-vfs-resolve.c Sat Jul 31 17:52:45 2004 +@@ -171,8 +171,10 @@ + switch (error) { + + case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND; ++#if defined(EAI_ADDRFAMILY) && defined(EAI_NODATA) + case EAI_ADDRFAMILY: + case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; ++#endif + case EAI_SYSTEM: return gnome_vfs_result_from_errno (); + case EAI_FAIL: + case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER; diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c index 7028e5a91b8e..5d37cc768ddb 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c @@ -1,35 +1,10 @@ ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Feb 16 06:13:27 2004 -+++ libgnomevfs/gnome-vfs-unix-mounts.c Sat Apr 17 00:45:01 2004 -@@ -141,9 +141,9 @@ - FD_ZERO(&read_fds); - FD_SET(pipes[0], &read_fds); - -- /* Wait max half a second */ -- tv.tv_sec = 0; -- tv.tv_usec = 500; -+ /* Wait max one second */ -+ tv.tv_sec = 1; -+ tv.tv_usec = 0; - - res = select(pipes[0] + 1, - &read_fds, NULL, NULL, &tv); -@@ -428,7 +428,7 @@ - mount_entry->mount_path = g_strdup (mntent[i].f_mntonname); - mount_entry->device_path = g_strdup (mntent[i].f_mntfromname); - mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename); -- if (mntent[i].f_flags == MNT_RDONLY) { -+ if (mntent[i].f_flags & MNT_RDONLY) { - mount_entry->is_read_only = TRUE; - } - -@@ -857,8 +857,9 @@ - - #ifdef HAVE_SYS_SYSCTL_H - if (usermnt != 0) { -+ uid_t uid = getuid (); - if (stat (fstab->fs_file, &sb) == 0) { -- if (sb.st_uid != 0) { -+ if (uid == 0 || sb.st_uid == uid) { - mount_entry->is_user_mountable = TRUE; - } - } +--- libgnomevfs/gnome-vfs-unix-mounts.c.orig Sun Sep 5 02:34:30 2004 ++++ libgnomevfs/gnome-vfs-unix-mounts.c Sun Sep 5 02:35:08 2004 +@@ -43,6 +43,7 @@ + #include <errno.h> + #include <string.h> + #include <signal.h> ++#include <poll.h> + #include <libgnomevfs/gnome-vfs.h> + + #include "gnome-vfs-unix-mounts.h" diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c index a168c6acdac8..9788a89f060e 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,25 +1,6 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Fri Apr 16 06:43:05 2004 -+++ libgnomevfs/gnome-vfs-utils.c Mon Apr 19 15:41:47 2004 -@@ -797,7 +797,9 @@ - - #if HAVE_STATVFS - statfs_result = statvfs (unescaped_path, &statfs_buffer); -+#define statfs_bsize f_frsize - #else -+#define statfs_bsize f_bsize - #if STATFS_ARGS == 2 - statfs_result = statfs (unescaped_path, &statfs_buffer); - #elif STATFS_ARGS == 4 -@@ -838,7 +840,7 @@ - } - #endif - -- block_size = statfs_buffer.f_bsize; -+ block_size = statfs_buffer.statfs_bsize; - free_blocks = statfs_buffer.f_bavail; - - *size = block_size * free_blocks; -@@ -866,7 +868,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Mon Aug 16 11:11:09 2004 ++++ libgnomevfs/gnome-vfs-utils.c Mon Aug 16 11:11:16 2004 +@@ -871,7 +871,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c index 0c6c3d28ad0a..472a4b5f6c19 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c @@ -1,11 +1,11 @@ ---- libgnomevfs/xdgmime.c.orig Wed Jun 23 20:15:25 2004 -+++ libgnomevfs/xdgmime.c Wed Jun 23 20:15:41 2004 -@@ -97,7 +97,7 @@ +--- libgnomevfs/xdgmime.c.orig Thu Jul 22 11:20:13 2004 ++++ libgnomevfs/xdgmime.c Thu Jul 22 11:20:52 2004 +@@ -189,7 +189,7 @@ - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + xdg_data_dirs = getenv ("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - ptr = xdg_data_dirs; + ptr = xdg_data_dirs; diff --git a/devel/gnomevfs2/files/patch-modules_default-modules.conf b/devel/gnomevfs2/files/patch-modules_default-modules.conf deleted file mode 100644 index 0efb87aa888c..000000000000 --- a/devel/gnomevfs2/files/patch-modules_default-modules.conf +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/default-modules.conf.orig Thu Aug 26 21:01:12 2004 -+++ modules/default-modules.conf Thu Aug 26 21:01:22 2004 -@@ -38,9 +38,6 @@ - - ssh: ssh - --# The various access methods implemented by the extfs system. --a ar arj cpio deb hp48 lha mailfs patchfs rar rpm rpms trpm zip zoo: extfs -- - # vfolder desktop method - applications: vfolder-desktop - applications-all-users: vfolder-desktop diff --git a/devel/gnomevfs2/files/patch-modules_extfs-method.c b/devel/gnomevfs2/files/patch-modules_extfs-method.c deleted file mode 100644 index 129e9c4e131e..000000000000 --- a/devel/gnomevfs2/files/patch-modules_extfs-method.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/extfs-method.c.orig Thu Aug 12 20:04:05 2004 -+++ modules/extfs-method.c Thu Aug 12 20:06:20 2004 -@@ -61,7 +61,7 @@ - - - static ssize_t --getdelim (char **lineptr, size_t n, int terminator, FILE *stream) -+getdelim (char **lineptr, size_t *n, int terminator, FILE *stream) - { - char *line, *p; - size_t size, copy; diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index 3f5cc01a3a79..7bec57259d84 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -3,21 +3,11 @@ bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_default_applications.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_default_applications.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_default_applications.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_url_handlers.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/desktop_gnome_url_handlers.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_url_handlers.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/system_http_proxy.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/system_http_proxy.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_http_proxy.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/system_smb.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/system_smb.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_smb.schemas > /dev/null || /usr/bin/true +bin/gnomevfs-rm %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf +etc/gnome-vfs-2.0/modules/ssl-modules.conf etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info etc/gnome-vfs-2.0/vfolders/network.vfolder-info @@ -26,11 +16,13 @@ etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info include/gnome-vfs-2.0/include/gnome-vfs-file-size.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-dns-sd.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h @@ -40,11 +32,13 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-resolve.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h @@ -71,6 +65,7 @@ lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.so %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so lib/gnome-vfs-2.0/modules/libcomputer.so +lib/gnome-vfs-2.0/modules/libdns-sd.so lib/gnome-vfs-2.0/modules/libfile.so lib/gnome-vfs-2.0/modules/libftp.so lib/gnome-vfs-2.0/modules/libgzip.so @@ -79,7 +74,6 @@ lib/gnome-vfs-2.0/modules/libnetwork.so lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so %%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so -lib/gnome-vfs-2.0/modules/libssh.so lib/gnome-vfs-2.0/modules/libtar.so lib/gnome-vfs-2.0/modules/libvfolder-desktop.so lib/gnome-vfs-2.0/modules/libvfs-pipe.so @@ -87,12 +81,71 @@ lib/gnome-vfs-2.0/modules/libvfs-test.so lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.600 +lib/libgnomevfs-2.so.800 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc libexec/gnome-vfs-daemon +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/home.png +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/left.png +share/doc/gnome-vfs-2.0/mime-registry.html +share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/networking.html +share/doc/gnome-vfs-2.0/right.png +share/doc/gnome-vfs-2.0/style.css +share/doc/gnome-vfs-2.0/up.png +share/doc/gnome-vfs-2.0/volumes.html @exec mkdir -p %D/share/gnome/vfolders %%KDEMENUS%%share/gnome/vfolders/KDE.directory share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo @@ -138,6 +191,7 @@ share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo @@ -165,6 +219,7 @@ share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/gnome/vfolders +@dirrm share/doc/gnome-vfs-2.0 @dirrm include/gnome-vfs-module-2.0/libgnomevfs @dirrm include/gnome-vfs-module-2.0 @dirrm include/gnome-vfs-2.0/libgnomevfs diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 1b12fc015d5a..5d83c592f8e3 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -6,10 +6,11 @@ # PORTNAME= libbonobo -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,7 +20,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 USE_PERL5= yes USE_GNOME= gnomehack intlhack libxml2 orbit2 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 6157d89bd62e..d84072b69b8b 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libbonobo-2.6.2.tar.bz2) = d99ababb4569c66c3002cba97b076c31 -SIZE (gnome2/libbonobo-2.6.2.tar.bz2) = 1055680 +MD5 (gnome2/libbonobo-2.8.0.tar.bz2) = e3358680e50e69779535d126b1c56ee7 +SIZE (gnome2/libbonobo-2.8.0.tar.bz2) = 1460478 diff --git a/devel/libbonobo/files/patch-ltmain.sh b/devel/libbonobo/files/patch-ltmain.sh deleted file mode 100644 index 2719aeb6ca5a..000000000000 --- a/devel/libbonobo/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Thu Jun 5 08:09:04 2003 -+++ ltmain.sh Sat Jun 14 01:36:34 2003 -@@ -1280,7 +1280,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1290,8 +1290,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3000,6 +3008,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5428,10 +5439,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index d3888990a606..a3d113f0d6fc 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -88,12 +88,102 @@ share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl +share/doc/bonobo-activation/api-reference.html +share/doc/bonobo-activation/architecture.html +share/doc/bonobo-activation/async-activation.html +share/doc/bonobo-activation/attribute-tag.html +share/doc/bonobo-activation/bonobo-activation-Debugging.html +share/doc/bonobo-activation/bonobo-activation-Initialization.html +share/doc/bonobo-activation/bonobo-activation-Query-and-Activation.html +share/doc/bonobo-activation/bonobo-activation-Registration.html +share/doc/bonobo-activation/bonobo-activation-Utilities.html +share/doc/bonobo-activation/bonobo-activation.devhelp +share/doc/bonobo-activation/bonobo-activation.png +share/doc/bonobo-activation/checklist.html +share/doc/bonobo-activation/configuring.html +share/doc/bonobo-activation/home.png +share/doc/bonobo-activation/index.html +share/doc/bonobo-activation/index.sgml +share/doc/bonobo-activation/left.png +share/doc/bonobo-activation/lgpl.html +share/doc/bonobo-activation/migrating.html +share/doc/bonobo-activation/query-langage.html +share/doc/bonobo-activation/query-syntax.html +share/doc/bonobo-activation/right.png +share/doc/bonobo-activation/server-arch.html +share/doc/bonobo-activation/server-xml-reference.html +share/doc/bonobo-activation/style.css +share/doc/bonobo-activation/terms.html +share/doc/bonobo-activation/tutorial.html +share/doc/bonobo-activation/up.png +share/doc/libbonobo/debugging.html +share/doc/libbonobo/factories.html +share/doc/libbonobo/general.html +share/doc/libbonobo/home.png +share/doc/libbonobo/index.html +share/doc/libbonobo/index.sgml +share/doc/libbonobo/left.png +share/doc/libbonobo/libbonobo-bonobo-app-client.html +share/doc/libbonobo/libbonobo-bonobo-application.html +share/doc/libbonobo/libbonobo-bonobo-arg.html +share/doc/libbonobo/libbonobo-bonobo-config-database.html +share/doc/libbonobo/libbonobo-bonobo-context.html +share/doc/libbonobo/libbonobo-bonobo-event-source.html +share/doc/libbonobo/libbonobo-bonobo-exception.html +share/doc/libbonobo/libbonobo-bonobo-generic-factory.html +share/doc/libbonobo/libbonobo-bonobo-i18n.html +share/doc/libbonobo/libbonobo-bonobo-item-container.html +share/doc/libbonobo/libbonobo-bonobo-item-handler.html +share/doc/libbonobo/libbonobo-bonobo-listener.html +share/doc/libbonobo/libbonobo-bonobo-main.html +share/doc/libbonobo/libbonobo-bonobo-moniker-context.html +share/doc/libbonobo/libbonobo-bonobo-moniker-extender.html +share/doc/libbonobo/libbonobo-bonobo-moniker-simple.html +share/doc/libbonobo/libbonobo-bonobo-moniker-util.html +share/doc/libbonobo/libbonobo-bonobo-moniker.html +share/doc/libbonobo/libbonobo-bonobo-object.html +share/doc/libbonobo/libbonobo-bonobo-persist-client.html +share/doc/libbonobo/libbonobo-bonobo-persist-file.html +share/doc/libbonobo/libbonobo-bonobo-persist-stream.html +share/doc/libbonobo/libbonobo-bonobo-persist.html +share/doc/libbonobo/libbonobo-bonobo-property-bag-client.html +share/doc/libbonobo/libbonobo-bonobo-property-bag.html +share/doc/libbonobo/libbonobo-bonobo-running-context.html +share/doc/libbonobo/libbonobo-bonobo-shlib-factory.html +share/doc/libbonobo/libbonobo-bonobo-shutdown.html +share/doc/libbonobo/libbonobo-bonobo-storage-memory.html +share/doc/libbonobo/libbonobo-bonobo-storage.html +share/doc/libbonobo/libbonobo-bonobo-stream-client.html +share/doc/libbonobo/libbonobo-bonobo-stream-memory.html +share/doc/libbonobo/libbonobo-bonobo-types.html +share/doc/libbonobo/libbonobo-faq.html +share/doc/libbonobo/libbonobo.devhelp +share/doc/libbonobo/misc.html +share/doc/libbonobo/monikers-overview.html +share/doc/libbonobo/monikers.html +share/doc/libbonobo/persist-file.png +share/doc/libbonobo/persist-storage.png +share/doc/libbonobo/persist-stream.png +share/doc/libbonobo/persist.html +share/doc/libbonobo/persist.png +share/doc/libbonobo/properties.html +share/doc/libbonobo/property-bags.html +share/doc/libbonobo/refcounting.html +share/doc/libbonobo/right.png +share/doc/libbonobo/running-context.png +share/doc/libbonobo/storage.png +share/doc/libbonobo/stream.png +share/doc/libbonobo/streams.html +share/doc/libbonobo/style.css +share/doc/libbonobo/unknown.png +share/doc/libbonobo/up.png share/locale/am/LC_MESSAGES/libbonobo-2.0.mo share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo share/locale/az/LC_MESSAGES/libbonobo-2.0.mo share/locale/be/LC_MESSAGES/libbonobo-2.0.mo share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo share/locale/bn/LC_MESSAGES/libbonobo-2.0.mo +share/locale/bs/LC_MESSAGES/libbonobo-2.0.mo share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo share/locale/cy/LC_MESSAGES/libbonobo-2.0.mo @@ -127,6 +217,8 @@ share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo share/locale/ml/LC_MESSAGES/libbonobo-2.0.mo share/locale/mn/LC_MESSAGES/libbonobo-2.0.mo share/locale/ms/LC_MESSAGES/libbonobo-2.0.mo +share/locale/nb/LC_MESSAGES/libbonobo-2.0.mo +share/locale/ne/LC_MESSAGES/libbonobo-2.0.mo share/locale/nl/LC_MESSAGES/libbonobo-2.0.mo share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo share/locale/no/LC_MESSAGES/libbonobo-2.0.mo diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 53854f7d9a69..4a3196dd9851 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -6,11 +6,11 @@ # PORTNAME= libgtop2 -PORTVERSION= 2.6.0 +PORTVERSION= 2.8.1 PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 DISTNAME= libgtop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,7 +26,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack glib20 USE_REINPLACE= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo index 5f14e960bd87..50d3ac436835 100644 --- a/devel/libgtop2/distinfo +++ b/devel/libgtop2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgtop-2.6.0.tar.bz2) = 5d0ec207842b54d2f2d04c99af7c98b9 -SIZE (gnome2/libgtop-2.6.0.tar.bz2) = 946822 +MD5 (gnome2/libgtop-2.8.1.tar.bz2) = 5d191cbf2b5b2a84dfee1972c99b1a78 +SIZE (gnome2/libgtop-2.8.1.tar.bz2) = 1046174 diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah index e270a82213e8..3728441bebb7 100644 --- a/devel/libgtop2/files/patch-ah +++ b/devel/libgtop2/files/patch-ah @@ -1,5 +1,5 @@ ---- sysdeps/freebsd/procmap.c.orig Wed Mar 10 06:18:59 2004 -+++ sysdeps/freebsd/procmap.c Thu Oct 28 21:08:55 2004 +--- sysdeps/freebsd/procmap.c.orig Fri Sep 24 18:49:06 2004 ++++ sysdeps/freebsd/procmap.c Thu Oct 28 15:42:58 2004 @@ -47,7 +47,13 @@ #endif #endif @@ -35,7 +35,7 @@ /* Now we get the memory maps. */ -@@ -280,13 +288,9 @@ +@@ -278,13 +286,9 @@ &inode, sizeof (inode)) != sizeof (inode)) glibtop_error_io_r (server, "kvm_read (inode)"); diff --git a/devel/libgtop2/files/patch-lib::command.c b/devel/libgtop2/files/patch-lib::command.c deleted file mode 100644 index 4bb3aefb1b9a..000000000000 --- a/devel/libgtop2/files/patch-lib::command.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/command.c.orig Tue Sep 9 09:47:58 2003 -+++ lib/command.c Tue Sep 9 08:14:33 2003 -@@ -38,6 +38,7 @@ - glibtop_init_r (&server, 0, 0); - - memset (&cmnd, 0, sizeof (glibtop_command)); -+ memset (&response, 0, sizeof (glibtop_response)); - - cmnd.command = command; - diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop2/files/patch-lib::read.c index 38583f8766a9..53d091a32b04 100644 --- a/devel/libgtop2/files/patch-lib::read.c +++ b/devel/libgtop2/files/patch-lib::read.c @@ -1,14 +1,14 @@ ---- lib/read.c.orig Mon Oct 20 11:19:41 2003 -+++ lib/read.c Fri Nov 14 14:37:00 2003 +--- lib/read.c.orig Fri Jun 18 04:03:55 2004 ++++ lib/read.c Sat Aug 7 16:05:41 2004 @@ -22,6 +22,7 @@ */ #include <config.h> +#include <errno.h> #include <glibtop/read.h> - #include <libgnome/gnome-i18n.h> + #include "libgtop-i18n.h" -@@ -68,12 +69,16 @@ +@@ -56,14 +57,18 @@ fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size); #endif @@ -16,13 +16,15 @@ if (server->socket) { do_read (server->socket, buf, size); } else { - ret = read (server->input [0], buf, size); +- if(read (server->input [0], buf, size) < 0) ++ if(read (server->input [0], buf, size) < 0) { ++ if (errno == EINTR) ++ goto retry; + glibtop_error_io_r ( + server, + ngettext ("read %d byte", + "read %d bytes", size), + size); ++ } } - -- if (ret < 0) -+ if (ret < 0) { -+ if (errno == EINTR) -+ goto retry; - glibtop_error_io_r (server, _("read %d bytes"), size); -+ } } diff --git a/devel/libgtop2/files/patch-ltmain.sh b/devel/libgtop2/files/patch-ltmain.sh deleted file mode 100644 index 54bbcbc5777e..000000000000 --- a/devel/libgtop2/files/patch-ltmain.sh +++ /dev/null @@ -1,42 +0,0 @@ ---- ltmain.sh.orig Sun Aug 24 18:53:15 2003 -+++ ltmain.sh Sun Aug 24 18:57:42 2003 -@@ -1060,8 +1060,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_command="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2444,6 +2452,9 @@ - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4210,10 +4221,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c index e61274b13864..0713da61925e 100644 --- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c +++ b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c @@ -1,5 +1,5 @@ ---- sysdeps/freebsd/procmem.c.orig Wed Mar 10 21:23:52 2004 -+++ sysdeps/freebsd/procmem.c Thu Mar 11 15:46:05 2004 +--- sysdeps/freebsd/procmem.c.orig Mon Jul 19 02:07:03 2004 ++++ sysdeps/freebsd/procmem.c Tue Jul 20 22:03:29 2004 @@ -125,7 +125,7 @@ #else struct vm_object object; @@ -17,14 +17,14 @@ - (unsigned long) pinfo [0].PROC_VMSPACE, - (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) { - glibtop_warn_io_r (server, "kvm_read (plimit)"); -+ if (getrlimit (RLIMIT_RSS, &rlimit) < 0) { -+ glibtop_warn_io_r (server, "getrlimit"); ++ if (getrlimit (RLIMIT_RSS, &rlimit) < 0) { ++ glibtop_warn_io_r (server, "getrlimit"); return; } -- buf->rss_rlim = (guint64) +- buf->rss_rlim = (guint64) - (plimit.pl_rlimit [RLIMIT_RSS].rlim_cur); + buf->rss_rlim = (u_int64_t) (rlimit.rlim_cur); - + vms = &pinfo [0].kp_eproc.e_vm; diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c new file mode 100644 index 000000000000..de564dcfd5f6 --- /dev/null +++ b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c @@ -0,0 +1,14 @@ +--- sysdeps/common/fsusage.c.orig Sun Oct 17 00:51:26 2004 ++++ sysdeps/common/fsusage.c Sun Oct 17 00:52:07 2004 +@@ -253,8 +253,9 @@ + if (statvfs (path, &fsd) < 0) + return; + +-#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) +- /* Solaris but not SunOS */ ++#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \ ++ || defined(__FreeBSD__) ++ /* Solaris but not SunOS and FreeBSD */ + buf->block_size = fsd.f_frsize; + #else + /* else, including Linux */ diff --git a/devel/libgtop2/files/patch-sysdeps_common_mountlist.c b/devel/libgtop2/files/patch-sysdeps_common_mountlist.c deleted file mode 100644 index 62269380b46b..000000000000 --- a/devel/libgtop2/files/patch-sysdeps_common_mountlist.c +++ /dev/null @@ -1,20 +0,0 @@ ---- sysdeps/common/mountlist.c.orig Mon Dec 1 13:59:28 2003 -+++ sysdeps/common/mountlist.c Mon Dec 1 16:13:15 2003 -@@ -127,7 +127,7 @@ - } - #endif /* MOUNTED_GETMNTENT1. */ - --#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__) -+#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__) && !defined(__FreeBSD__) - static char * - fstype_to_string (t) - short t; -@@ -345,7 +345,7 @@ - me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry)); - me->me_devname = g_strdup (fsp->f_mntfromname); - me->me_mountdir = g_strdup (fsp->f_mntonname); --#if defined(__NetBSD__) || defined(__OpenBSD__) -+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) - me->me_type = g_strdup (fsp->f_fstypename); - #else - me->me_type = g_strdup (fstype_to_string (fsp->f_type)); diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c b/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c deleted file mode 100644 index 7dbba8c37ab1..000000000000 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c +++ /dev/null @@ -1,13 +0,0 @@ ---- sysdeps/freebsd/uptime.c.orig Thu Mar 11 15:59:16 2004 -+++ sysdeps/freebsd/uptime.c Thu Mar 11 15:59:38 2004 -@@ -68,9 +68,8 @@ - buf->flags = _glibtop_sysdeps_uptime; - } - #else -- buf->flags = _glibtop_sysdeps_uptime; -- - glibtop_cpu cpu; -+ buf->flags = _glibtop_sysdeps_uptime; - - glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0); - diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist index 4c48f567fd7e..cc1d2ecda163 100644 --- a/devel/libgtop2/pkg-plist +++ b/devel/libgtop2/pkg-plist @@ -53,6 +53,7 @@ share/locale/az/LC_MESSAGES/libgtop-2.0.mo share/locale/be/LC_MESSAGES/libgtop-2.0.mo share/locale/bg/LC_MESSAGES/libgtop-2.0.mo share/locale/bn/LC_MESSAGES/libgtop-2.0.mo +share/locale/bs/LC_MESSAGES/libgtop-2.0.mo share/locale/ca/LC_MESSAGES/libgtop-2.0.mo share/locale/cs/LC_MESSAGES/libgtop-2.0.mo share/locale/cy/LC_MESSAGES/libgtop-2.0.mo @@ -63,11 +64,13 @@ share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo share/locale/es/LC_MESSAGES/libgtop-2.0.mo share/locale/et/LC_MESSAGES/libgtop-2.0.mo +share/locale/eu/LC_MESSAGES/libgtop-2.0.mo share/locale/fa/LC_MESSAGES/libgtop-2.0.mo share/locale/fi/LC_MESSAGES/libgtop-2.0.mo share/locale/fr/LC_MESSAGES/libgtop-2.0.mo share/locale/ga/LC_MESSAGES/libgtop-2.0.mo share/locale/gl/LC_MESSAGES/libgtop-2.0.mo +share/locale/gu/LC_MESSAGES/libgtop-2.0.mo share/locale/he/LC_MESSAGES/libgtop-2.0.mo share/locale/hi/LC_MESSAGES/libgtop-2.0.mo share/locale/hr/LC_MESSAGES/libgtop-2.0.mo @@ -78,13 +81,16 @@ share/locale/ja/LC_MESSAGES/libgtop-2.0.mo share/locale/ko/LC_MESSAGES/libgtop-2.0.mo share/locale/lt/LC_MESSAGES/libgtop-2.0.mo share/locale/lv/LC_MESSAGES/libgtop-2.0.mo +share/locale/mi/LC_MESSAGES/libgtop-2.0.mo share/locale/mk/LC_MESSAGES/libgtop-2.0.mo share/locale/ml/LC_MESSAGES/libgtop-2.0.mo share/locale/mn/LC_MESSAGES/libgtop-2.0.mo share/locale/ms/LC_MESSAGES/libgtop-2.0.mo +share/locale/nb/LC_MESSAGES/libgtop-2.0.mo share/locale/nl/LC_MESSAGES/libgtop-2.0.mo share/locale/nn/LC_MESSAGES/libgtop-2.0.mo share/locale/no/LC_MESSAGES/libgtop-2.0.mo +share/locale/or/LC_MESSAGES/libgtop-2.0.mo share/locale/pa/LC_MESSAGES/libgtop-2.0.mo share/locale/pl/LC_MESSAGES/libgtop-2.0.mo share/locale/pt/LC_MESSAGES/libgtop-2.0.mo diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index bd7a1bacb36d..c4709713daad 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libsoup -PORTVERSION= 1.99.28 -PORTREVISION= 1 +PORTVERSION= 2.2.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.99 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,14 +18,27 @@ COMMENT= A SOAP (Simple Object Access Protocol) implementation in C LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes -USE_GNOME= gnomehack lthack glib20 +USE_GNOME= gnomehack glib20 libxml2 INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER= 13 -USE_OPENSSL= yes +USE_LIBTOOL_VER=15 +USE_GMAKE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --with-gnutls-includes=${FALSE} \ - --with-gnutls-libs=${FALSE} + --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS+= -L${LOCALBASE}/lib +PLIST_SUB= VERSION="2.2" + +.if !defined(WITHOUT_SSL) +LIB_DEPENDS+= gnutls.12:${PORTSDIR}/security/gnutls +.else +CONFIGURE_ARGS+=--disable-ssl +.endif + +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "libsoup has the following configurable option(s):" + @${ECHO_MSG} " WITHOUT_SSL Disable GnuTLS SSL support" + @${ECHO_MSG} "" + .include <bsd.port.mk> diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index 87c1098922f8..902a0436e7cf 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libsoup-1.99.28.tar.bz2) = c33f1cb5697ef9b9ad6cd8482c4c2abb -SIZE (gnome2/libsoup-1.99.28.tar.bz2) = 233412 +MD5 (gnome2/libsoup-2.2.1.tar.bz2) = 8132b0bce469affed688c4863702aa41 +SIZE (gnome2/libsoup-2.2.1.tar.bz2) = 403907 diff --git a/devel/libsoup/files/patch-configure b/devel/libsoup/files/patch-configure deleted file mode 100644 index 85f964458b26..000000000000 --- a/devel/libsoup/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Tue Apr 6 17:08:05 2004 -+++ configure Tue Apr 6 17:10:47 2004 -@@ -9520,7 +9521,7 @@ - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $gnutls_inc_prefix" - --for ac_header in gnutls/gnutls.h -+for ac_header in gnutls/xxxgnutls.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/devel/libsoup/pkg-descr b/devel/libsoup/pkg-descr index 423bf5cfc4f6..1ec2bfea440f 100644 --- a/devel/libsoup/pkg-descr +++ b/devel/libsoup/pkg-descr @@ -1,17 +1,16 @@ Soup is a SOAP (Simple Object Access Protocol) implementation in C. -It provides an queued asynchronous callback-based mechanism for sending and -servicing SOAP requests, and a WSDL (Web Service Definition Language) to C -compiler which generates client stubs and server skeletons for easily calling -and implementing SOAP methods. - -It uses the GLib main loop and is designed to work well with GTK applications. +It provides a queued asynchronous callback-based mechanism for sending and +servicing SOAP requests, and a WSDL (Web Service Definition Language) for C +compilers which generates client stubs and server skeletons for easily +calling and implementing SOAP methods. It uses GLib and is designed to work +well with GTK applications. Features: * Completely Asynchronous * Connection cache * HTTP chunked transfer and persistent connections - * authenticated HTTP, SOCKS4, and SOCKS5 proxy support + * Authenticated HTTP, SOCKS4, and SOCKS5 proxy support * SSL Support using OpenSSL * Apache module server support * Client digest authentication diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index 1ef3a47265a0..debbbf1a8694 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -1,20 +1,60 @@ -include/soup-2.0/libsoup/soup-address.h -include/soup-2.0/libsoup/soup-context.h -include/soup-2.0/libsoup/soup-error.h -include/soup-2.0/libsoup/soup-headers.h -include/soup-2.0/libsoup/soup-message.h -include/soup-2.0/libsoup/soup-method.h -include/soup-2.0/libsoup/soup-misc.h -include/soup-2.0/libsoup/soup-ntlm.h -include/soup-2.0/libsoup/soup-server-auth.h -include/soup-2.0/libsoup/soup-server.h -include/soup-2.0/libsoup/soup-socket.h -include/soup-2.0/libsoup/soup-uri.h -include/soup-2.0/libsoup/soup.h -lib/libsoup-2.0.a -lib/libsoup-2.0.so -lib/libsoup-2.0.so.0 -libdata/pkgconfig/soup-2.0.pc -libexec/libsoup-ssl-proxy -@dirrm include/soup-2.0/libsoup -@dirrm include/soup-2.0 +include/libsoup-%%VERSION%%/libsoup/soup-address.h +include/libsoup-%%VERSION%%/libsoup/soup-connection.h +include/libsoup-%%VERSION%%/libsoup/soup-headers.h +include/libsoup-%%VERSION%%/libsoup/soup-message-filter.h +include/libsoup-%%VERSION%%/libsoup/soup-message-queue.h +include/libsoup-%%VERSION%%/libsoup/soup-message.h +include/libsoup-%%VERSION%%/libsoup/soup-method.h +include/libsoup-%%VERSION%%/libsoup/soup-misc.h +include/libsoup-%%VERSION%%/libsoup/soup-server-auth.h +include/libsoup-%%VERSION%%/libsoup/soup-server-message.h +include/libsoup-%%VERSION%%/libsoup/soup-server.h +include/libsoup-%%VERSION%%/libsoup/soup-session-async.h +include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h +include/libsoup-%%VERSION%%/libsoup/soup-session.h +include/libsoup-%%VERSION%%/libsoup/soup-soap-message.h +include/libsoup-%%VERSION%%/libsoup/soup-soap-response.h +include/libsoup-%%VERSION%%/libsoup/soup-socket.h +include/libsoup-%%VERSION%%/libsoup/soup-status.h +include/libsoup-%%VERSION%%/libsoup/soup-types.h +include/libsoup-%%VERSION%%/libsoup/soup-uri.h +include/libsoup-%%VERSION%%/libsoup/soup.h +lib/libsoup-%%VERSION%%.a +lib/libsoup-%%VERSION%%.so +lib/libsoup-%%VERSION%%.so.7 +libdata/pkgconfig/libsoup-%%VERSION%%.pc +%%DOCSDIR%%/SoupAuth.html +%%DOCSDIR%%/SoupAuthBasic.html +%%DOCSDIR%%/SoupAuthDigest.html +%%DOCSDIR%%/SoupConnection.html +%%DOCSDIR%%/SoupConnectionNTLM.html +%%DOCSDIR%%/SoupMessage.html +%%DOCSDIR%%/SoupSoapMessage.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libsoup-SoupAddress.html +%%DOCSDIR%%/libsoup-SoupServer.html +%%DOCSDIR%%/libsoup-SoupServerMessage.html +%%DOCSDIR%%/libsoup-SoupSession.html +%%DOCSDIR%%/libsoup-SoupSocket.html +%%DOCSDIR%%/libsoup-soup-dns.html +%%DOCSDIR%%/libsoup-soup-headers.html +%%DOCSDIR%%/libsoup-soup-md5-utils.html +%%DOCSDIR%%/libsoup-soup-message-private.html +%%DOCSDIR%%/libsoup-soup-message-queue.html +%%DOCSDIR%%/libsoup-soup-method.html +%%DOCSDIR%%/libsoup-soup-misc.html +%%DOCSDIR%%/libsoup-soup-server-auth.html +%%DOCSDIR%%/libsoup-soup-ssl.html +%%DOCSDIR%%/libsoup-soup-status.html +%%DOCSDIR%%/libsoup-soup-uri.html +%%DOCSDIR%%/libsoup.devhelp +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png +@dirrm %%DOCSDIR%% +@dirrm include/libsoup-%%VERSION%%/libsoup +@dirrm include/libsoup-%%VERSION%% diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile index bd7a1bacb36d..c4709713daad 100644 --- a/devel/libsoup22/Makefile +++ b/devel/libsoup22/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libsoup -PORTVERSION= 1.99.28 -PORTREVISION= 1 +PORTVERSION= 2.2.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.99 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,14 +18,27 @@ COMMENT= A SOAP (Simple Object Access Protocol) implementation in C LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes -USE_GNOME= gnomehack lthack glib20 +USE_GNOME= gnomehack glib20 libxml2 INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER= 13 -USE_OPENSSL= yes +USE_LIBTOOL_VER=15 +USE_GMAKE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --with-gnutls-includes=${FALSE} \ - --with-gnutls-libs=${FALSE} + --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS+= -L${LOCALBASE}/lib +PLIST_SUB= VERSION="2.2" + +.if !defined(WITHOUT_SSL) +LIB_DEPENDS+= gnutls.12:${PORTSDIR}/security/gnutls +.else +CONFIGURE_ARGS+=--disable-ssl +.endif + +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "libsoup has the following configurable option(s):" + @${ECHO_MSG} " WITHOUT_SSL Disable GnuTLS SSL support" + @${ECHO_MSG} "" + .include <bsd.port.mk> diff --git a/devel/libsoup22/distinfo b/devel/libsoup22/distinfo index 87c1098922f8..902a0436e7cf 100644 --- a/devel/libsoup22/distinfo +++ b/devel/libsoup22/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libsoup-1.99.28.tar.bz2) = c33f1cb5697ef9b9ad6cd8482c4c2abb -SIZE (gnome2/libsoup-1.99.28.tar.bz2) = 233412 +MD5 (gnome2/libsoup-2.2.1.tar.bz2) = 8132b0bce469affed688c4863702aa41 +SIZE (gnome2/libsoup-2.2.1.tar.bz2) = 403907 diff --git a/devel/libsoup22/files/patch-configure b/devel/libsoup22/files/patch-configure deleted file mode 100644 index 85f964458b26..000000000000 --- a/devel/libsoup22/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Tue Apr 6 17:08:05 2004 -+++ configure Tue Apr 6 17:10:47 2004 -@@ -9520,7 +9521,7 @@ - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $gnutls_inc_prefix" - --for ac_header in gnutls/gnutls.h -+for ac_header in gnutls/xxxgnutls.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/devel/libsoup22/pkg-descr b/devel/libsoup22/pkg-descr index 423bf5cfc4f6..1ec2bfea440f 100644 --- a/devel/libsoup22/pkg-descr +++ b/devel/libsoup22/pkg-descr @@ -1,17 +1,16 @@ Soup is a SOAP (Simple Object Access Protocol) implementation in C. -It provides an queued asynchronous callback-based mechanism for sending and -servicing SOAP requests, and a WSDL (Web Service Definition Language) to C -compiler which generates client stubs and server skeletons for easily calling -and implementing SOAP methods. - -It uses the GLib main loop and is designed to work well with GTK applications. +It provides a queued asynchronous callback-based mechanism for sending and +servicing SOAP requests, and a WSDL (Web Service Definition Language) for C +compilers which generates client stubs and server skeletons for easily +calling and implementing SOAP methods. It uses GLib and is designed to work +well with GTK applications. Features: * Completely Asynchronous * Connection cache * HTTP chunked transfer and persistent connections - * authenticated HTTP, SOCKS4, and SOCKS5 proxy support + * Authenticated HTTP, SOCKS4, and SOCKS5 proxy support * SSL Support using OpenSSL * Apache module server support * Client digest authentication diff --git a/devel/libsoup22/pkg-plist b/devel/libsoup22/pkg-plist index 1ef3a47265a0..debbbf1a8694 100644 --- a/devel/libsoup22/pkg-plist +++ b/devel/libsoup22/pkg-plist @@ -1,20 +1,60 @@ -include/soup-2.0/libsoup/soup-address.h -include/soup-2.0/libsoup/soup-context.h -include/soup-2.0/libsoup/soup-error.h -include/soup-2.0/libsoup/soup-headers.h -include/soup-2.0/libsoup/soup-message.h -include/soup-2.0/libsoup/soup-method.h -include/soup-2.0/libsoup/soup-misc.h -include/soup-2.0/libsoup/soup-ntlm.h -include/soup-2.0/libsoup/soup-server-auth.h -include/soup-2.0/libsoup/soup-server.h -include/soup-2.0/libsoup/soup-socket.h -include/soup-2.0/libsoup/soup-uri.h -include/soup-2.0/libsoup/soup.h -lib/libsoup-2.0.a -lib/libsoup-2.0.so -lib/libsoup-2.0.so.0 -libdata/pkgconfig/soup-2.0.pc -libexec/libsoup-ssl-proxy -@dirrm include/soup-2.0/libsoup -@dirrm include/soup-2.0 +include/libsoup-%%VERSION%%/libsoup/soup-address.h +include/libsoup-%%VERSION%%/libsoup/soup-connection.h +include/libsoup-%%VERSION%%/libsoup/soup-headers.h +include/libsoup-%%VERSION%%/libsoup/soup-message-filter.h +include/libsoup-%%VERSION%%/libsoup/soup-message-queue.h +include/libsoup-%%VERSION%%/libsoup/soup-message.h +include/libsoup-%%VERSION%%/libsoup/soup-method.h +include/libsoup-%%VERSION%%/libsoup/soup-misc.h +include/libsoup-%%VERSION%%/libsoup/soup-server-auth.h +include/libsoup-%%VERSION%%/libsoup/soup-server-message.h +include/libsoup-%%VERSION%%/libsoup/soup-server.h +include/libsoup-%%VERSION%%/libsoup/soup-session-async.h +include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h +include/libsoup-%%VERSION%%/libsoup/soup-session.h +include/libsoup-%%VERSION%%/libsoup/soup-soap-message.h +include/libsoup-%%VERSION%%/libsoup/soup-soap-response.h +include/libsoup-%%VERSION%%/libsoup/soup-socket.h +include/libsoup-%%VERSION%%/libsoup/soup-status.h +include/libsoup-%%VERSION%%/libsoup/soup-types.h +include/libsoup-%%VERSION%%/libsoup/soup-uri.h +include/libsoup-%%VERSION%%/libsoup/soup.h +lib/libsoup-%%VERSION%%.a +lib/libsoup-%%VERSION%%.so +lib/libsoup-%%VERSION%%.so.7 +libdata/pkgconfig/libsoup-%%VERSION%%.pc +%%DOCSDIR%%/SoupAuth.html +%%DOCSDIR%%/SoupAuthBasic.html +%%DOCSDIR%%/SoupAuthDigest.html +%%DOCSDIR%%/SoupConnection.html +%%DOCSDIR%%/SoupConnectionNTLM.html +%%DOCSDIR%%/SoupMessage.html +%%DOCSDIR%%/SoupSoapMessage.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libsoup-SoupAddress.html +%%DOCSDIR%%/libsoup-SoupServer.html +%%DOCSDIR%%/libsoup-SoupServerMessage.html +%%DOCSDIR%%/libsoup-SoupSession.html +%%DOCSDIR%%/libsoup-SoupSocket.html +%%DOCSDIR%%/libsoup-soup-dns.html +%%DOCSDIR%%/libsoup-soup-headers.html +%%DOCSDIR%%/libsoup-soup-md5-utils.html +%%DOCSDIR%%/libsoup-soup-message-private.html +%%DOCSDIR%%/libsoup-soup-message-queue.html +%%DOCSDIR%%/libsoup-soup-method.html +%%DOCSDIR%%/libsoup-soup-misc.html +%%DOCSDIR%%/libsoup-soup-server-auth.html +%%DOCSDIR%%/libsoup-soup-ssl.html +%%DOCSDIR%%/libsoup-soup-status.html +%%DOCSDIR%%/libsoup-soup-uri.html +%%DOCSDIR%%/libsoup.devhelp +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png +@dirrm %%DOCSDIR%% +@dirrm include/libsoup-%%VERSION%%/libsoup +@dirrm include/libsoup-%%VERSION%% |