diff --git a/x11/gnome/gvfs/Makefile b/x11/gnome/gvfs/Makefile index 2579bfb6ea4..074cf569379 100644 --- a/x11/gnome/gvfs/Makefile +++ b/x11/gnome/gvfs/Makefile @@ -1,16 +1,16 @@ -# $OpenBSD: Makefile,v 1.24 2010/04/20 20:11:53 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.25 2010/04/22 20:27:05 ajacoutot Exp $ COMMENT-main= GNOME virtual file system COMMENT-smb= samba module for GVFS GNOME_PROJECT= gvfs -GNOME_VERSION= 1.4.3 +GNOME_VERSION= 1.6.0 -PKGNAME-main= ${DISTNAME}p1 -PKGNAME-smb= ${GNOME_PROJECT}-smb-${GNOME_VERSION}p0 +PKGNAME-main= ${DISTNAME} +PKGNAME-smb= ${GNOME_PROJECT}-smb-${GNOME_VERSION} -SHARED_LIBS += gvfscommon 2.0 # .0.0 -SHARED_LIBS += gvfscommon-dnssd 0.0 # .0.0 +SHARED_LIBS += gvfscommon 3.0 # .0.0 +SHARED_LIBS += gvfscommon-dnssd 1.0 # .0.0 # LGPLv2 PERMIT_PACKAGE_CDROM= Yes @@ -25,12 +25,13 @@ MODULES= devel/gettext \ WANTLIB += ORBit-2 c dbus-1 dbus-glib-1 gconf-2 gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 pcre pthread util +WANTLIB += eggdbus-1 expat gpg-error z gcrypt LIB_DEPENDS= gnome-keyring.>=6:libgnome-keyring-*:x11/gnome/libgnome-keyring WANTLIB-main += ${WANTLIB} -WANTLIB-main += bz2 crypto gcrypt gnutls gpg-error lzma m proxy soup-2.4 -WANTLIB-main += sqlite3 tasn1 xml2 z +WANTLIB-main += bz2 gnutls lzma m proxy soup-2.4 sqlite3 +WANTLIB-main += tasn1 xml2 DESKTOP_FILES= Yes @@ -44,10 +45,12 @@ LIB_DEPENDS-smb= ${LIB_DEPENDS} \ gvfscommon.>=2::${BASE_PKGPATH},-main \ smbclient::net/samba -CONFIGURE_ARGS= --disable-gtk-doc \ +CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --disable-gtk-doc \ --disable-cdda \ --disable-fuse \ --disable-hal \ + --disable-afc \ --disable-obexftp \ --disable-gphoto2 \ --disable-gudev \ diff --git a/x11/gnome/gvfs/distinfo b/x11/gnome/gvfs/distinfo index 4fb8973103d..c6b96afa0dd 100644 --- a/x11/gnome/gvfs/distinfo +++ b/x11/gnome/gvfs/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/gvfs-1.4.3.tar.bz2) = JiTl59Re/Wt0LpC/3iTNIA== -RMD160 (gnome/gvfs-1.4.3.tar.bz2) = 2hRYEBJX9UlrRGmst7x8ZG/ZxlI= -SHA1 (gnome/gvfs-1.4.3.tar.bz2) = PChRaJPWgps7uuF2j7ROikBcROc= -SHA256 (gnome/gvfs-1.4.3.tar.bz2) = PKnMqy77Jpm3Kh80bTUz/HJ7XqJpKvbIat/ZUy1roV0= -SIZE (gnome/gvfs-1.4.3.tar.bz2) = 1263024 +MD5 (gnome/gvfs-1.6.0.tar.bz2) = +1MwR93YlOxcgRsAXLiKBw== +RMD160 (gnome/gvfs-1.6.0.tar.bz2) = iryS0/m+T7qEDZ08kbIC3TQVSrI= +SHA1 (gnome/gvfs-1.6.0.tar.bz2) = ImT1BLBPqBDb4XnmIdI0n8ZsvXw= +SHA256 (gnome/gvfs-1.6.0.tar.bz2) = LkyXPnXHr40tiCMs13QpcfZV/b1/W2h0ULhYSE2IoNM= +SIZE (gnome/gvfs-1.6.0.tar.bz2) = 1352935 diff --git a/x11/gnome/gvfs/patches/patch-daemon_gvfsftpdircache_c b/x11/gnome/gvfs/patches/patch-daemon_gvfsftpdircache_c index a2794139b03..ef777b9dfa6 100644 --- a/x11/gnome/gvfs/patches/patch-daemon_gvfsftpdircache_c +++ b/x11/gnome/gvfs/patches/patch-daemon_gvfsftpdircache_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-daemon_gvfsftpdircache_c,v 1.1 2009/10/11 13:32:27 ajacoutot Exp $ ---- daemon/gvfsftpdircache.c.orig Sun Oct 11 11:57:49 2009 -+++ daemon/gvfsftpdircache.c Sun Oct 11 12:02:41 2009 -@@ -586,7 +586,7 @@ g_vfs_ftp_dir_cache_funcs_process (GInputStream * +$OpenBSD: patch-daemon_gvfsftpdircache_c,v 1.2 2010/04/22 20:27:05 ajacoutot Exp $ +--- daemon/gvfsftpdircache.c.orig Mon Feb 22 10:57:39 2010 ++++ daemon/gvfsftpdircache.c Thu Apr 22 21:56:56 2010 +@@ -595,7 +595,7 @@ g_vfs_ftp_dir_cache_funcs_process (GInputStream * type == 'l' ? G_FILE_TYPE_SYMBOLIC_LINK : G_FILE_TYPE_DIRECTORY); diff --git a/x11/gnome/gvfs/patches/patch-daemon_gvfswritechannel_c b/x11/gnome/gvfs/patches/patch-daemon_gvfswritechannel_c new file mode 100644 index 00000000000..094870b5dc1 --- /dev/null +++ b/x11/gnome/gvfs/patches/patch-daemon_gvfswritechannel_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-daemon_gvfswritechannel_c,v 1.1 2010/04/22 20:27:05 ajacoutot Exp $ +--- daemon/gvfswritechannel.c.orig Tue Jul 14 13:07:59 2009 ++++ daemon/gvfswritechannel.c Thu Apr 22 22:10:34 2010 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/x11/gnome/gvfs/patches/patch-metadata_metatree_c b/x11/gnome/gvfs/patches/patch-metadata_metatree_c index af1614dbcb0..7111e38c841 100644 --- a/x11/gnome/gvfs/patches/patch-metadata_metatree_c +++ b/x11/gnome/gvfs/patches/patch-metadata_metatree_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-metadata_metatree_c,v 1.2 2009/11/30 12:35:29 ajacoutot Exp $ ---- metadata/metatree.c.orig Fri Nov 27 15:14:35 2009 -+++ metadata/metatree.c Mon Nov 30 12:57:51 2009 -@@ -304,7 +304,7 @@ is_on_nfs (char *filename) +$OpenBSD: patch-metadata_metatree_c,v 1.3 2010/04/22 20:27:05 ajacoutot Exp $ +--- metadata/metatree.c.orig Mon Feb 22 10:57:39 2010 ++++ metadata/metatree.c Thu Apr 22 21:56:56 2010 +@@ -303,7 +303,7 @@ is_on_nfs (char *filename) sizeof (statfs_buffer), 0); # endif if (statfs_result == 0) diff --git a/x11/gnome/gvfs/pkg/PLIST-main b/x11/gnome/gvfs/pkg/PLIST-main index 097d34cf693..32611dae996 100644 --- a/x11/gnome/gvfs/pkg/PLIST-main +++ b/x11/gnome/gvfs/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.8 2009/12/21 18:03:18 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.9 2010/04/22 20:27:05 ajacoutot Exp $ @pkgpath ${BASE_PKGPATH} %%SHARED%% @bin bin/gvfs-cat @@ -77,6 +77,9 @@ share/locale/ar/LC_MESSAGES/gvfs.mo share/locale/as/ share/locale/as/LC_MESSAGES/ share/locale/as/LC_MESSAGES/gvfs.mo +share/locale/ast/ +share/locale/ast/LC_MESSAGES/ +share/locale/ast/LC_MESSAGES/gvfs.mo share/locale/be@latin/ share/locale/be@latin/LC_MESSAGES/ share/locale/be@latin/LC_MESSAGES/gvfs.mo @@ -95,6 +98,9 @@ share/locale/cs/LC_MESSAGES/gvfs.mo share/locale/da/LC_MESSAGES/gvfs.mo share/locale/de/LC_MESSAGES/gvfs.mo share/locale/el/LC_MESSAGES/gvfs.mo +share/locale/en@shaw/ +share/locale/en@shaw/LC_MESSAGES/ +share/locale/en@shaw/LC_MESSAGES/gvfs.mo share/locale/en_GB/ share/locale/en_GB/LC_MESSAGES/ share/locale/en_GB/LC_MESSAGES/gvfs.mo @@ -139,6 +145,9 @@ share/locale/mr/ share/locale/mr/LC_MESSAGES/ share/locale/mr/LC_MESSAGES/gvfs.mo share/locale/nb/LC_MESSAGES/gvfs.mo +share/locale/nds/ +share/locale/nds/LC_MESSAGES/ +share/locale/nds/LC_MESSAGES/gvfs.mo share/locale/nl/LC_MESSAGES/gvfs.mo share/locale/nn/LC_MESSAGES/gvfs.mo share/locale/or/