From 6090a7399f2b1cbc81d032c63f2a8d1b22e67cee Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 24 Nov 2008 16:15:42 +0000 Subject: [PATCH] - minor update to version 1.0.3 fixes some mem leak and bugs - also subpackage this port the same way gnome-vfs2 is (i.e. samba is no longer a requirement for the main package) - explicitely depends on latest glib2 (requested by jasper@) ok jasper@ --- x11/gnome/gvfs/Makefile | 35 ++++++++++++------- x11/gnome/gvfs/distinfo | 10 +++--- x11/gnome/gvfs/pkg/{DESCR => DESCR-main} | 0 x11/gnome/gvfs/pkg/DESCR-smb | 4 +++ .../pkg/{PFRAG.shared => PFRAG.shared-main} | 2 +- x11/gnome/gvfs/pkg/{PLIST => PLIST-main} | 7 ++-- x11/gnome/gvfs/pkg/PLIST-smb | 5 +++ 7 files changed, 40 insertions(+), 23 deletions(-) rename x11/gnome/gvfs/pkg/{DESCR => DESCR-main} (100%) create mode 100644 x11/gnome/gvfs/pkg/DESCR-smb rename x11/gnome/gvfs/pkg/{PFRAG.shared => PFRAG.shared-main} (66%) rename x11/gnome/gvfs/pkg/{PLIST => PLIST-main} (95%) create mode 100644 x11/gnome/gvfs/pkg/PLIST-smb diff --git a/x11/gnome/gvfs/Makefile b/x11/gnome/gvfs/Makefile index d1c40d36373..193d93d2ece 100644 --- a/x11/gnome/gvfs/Makefile +++ b/x11/gnome/gvfs/Makefile @@ -1,30 +1,41 @@ -# $OpenBSD: Makefile,v 1.5 2008/11/22 18:57:57 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2008/11/24 16:15:42 ajacoutot Exp $ -COMMENT= GNOME virtual file system +COMMENT-main= GNOME virtual file system +COMMENT-smb= samba module for GVFS GNOME_PROJECT= gvfs -GNOME_VERSION= 1.0.2 -PKGNAME= ${DISTNAME}p1 +GNOME_VERSION= 1.0.3 SHARED_LIBS += gvfscommon 1.0 # .0.0 +PKGNAME-main= ${DISTNAME} +PKGNAME-smb= ${GNOME_PROJECT}-smb-${GNOME_VERSION} + # LGPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +MULTI_PACKAGES= -main -smb + MODULES= devel/gettext \ x11/gnome -WANTLIB= ORBit-2 bz2 c dbus-1 dbus-glib-1 gconf-2 gio-2.0 glib-2.0 \ - gmodule-2.0 gobject-2.0 gthread-2.0 m pcre pthread \ - util xml2 z +WANTLIB= ORBit-2 c dbus-1 dbus-glib-1 gconf-2 gio-2.0 glib-2.0 \ + gmodule-2.0 gobject-2.0 gthread-2.0 pcre pthread \ + util -LIB_DEPENDS= archive::archivers/libarchive \ - soup-2.4.>=1::devel/libsoup \ - smbclient::net/samba \ - gnome-keyring::x11/gnome/keyring -RUN_DEPENDS= :glib2-fam-*:devel/glib2,-fam +LIB_DEPENDS= gnome-keyring::x11/gnome/keyring + +WANTLIB-main= ${WANTLIB} bz2 m xml2 z +LIB_DEPENDS-main= ${LIB_DEPENDS} \ + archive::archivers/libarchive \ + soup-2.4.>=1::devel/libsoup +RUN_DEPENDS-main= :glib2-fam->=2.18.3:devel/glib2,-fam + +LIB_DEPENDS-smb= ${LIB_DEPENDS} \ + gvfscommon.>=1::${BASE_PKGPATH},-main \ + smbclient::net/samba CONFIGURE_ARGS+= --disable-gtk-doc \ --disable-avahi \ diff --git a/x11/gnome/gvfs/distinfo b/x11/gnome/gvfs/distinfo index d80fb1c8577..297d2764150 100644 --- a/x11/gnome/gvfs/distinfo +++ b/x11/gnome/gvfs/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/gvfs-1.0.2.tar.bz2) = BMRHV6Jl94fWYGZVtrvFkw== -RMD160 (gnome/gvfs-1.0.2.tar.bz2) = uPahB5I/rhwHUu5+tKHCfFDjyT0= -SHA1 (gnome/gvfs-1.0.2.tar.bz2) = fwBcxXlTK4IHImitOZorxew1MAA= -SHA256 (gnome/gvfs-1.0.2.tar.bz2) = 82BtwosfoUDH0BkUeAl6iffvejGDqBGhQQojAFK3HrQ= -SIZE (gnome/gvfs-1.0.2.tar.bz2) = 918268 +MD5 (gnome/gvfs-1.0.3.tar.bz2) = pB6LfZnjkM74MS985fMSpQ== +RMD160 (gnome/gvfs-1.0.3.tar.bz2) = LRLh9mkHc+Oq1dWcgmxQn6QKlEM= +SHA1 (gnome/gvfs-1.0.3.tar.bz2) = K+tzasx7OOmcn8sFhd5pGPrV57c= +SHA256 (gnome/gvfs-1.0.3.tar.bz2) = F+zN7W4JYggYHix2JYAlJhEq8j9bLHsqZyq5zP86Vf0= +SIZE (gnome/gvfs-1.0.3.tar.bz2) = 920742 diff --git a/x11/gnome/gvfs/pkg/DESCR b/x11/gnome/gvfs/pkg/DESCR-main similarity index 100% rename from x11/gnome/gvfs/pkg/DESCR rename to x11/gnome/gvfs/pkg/DESCR-main diff --git a/x11/gnome/gvfs/pkg/DESCR-smb b/x11/gnome/gvfs/pkg/DESCR-smb new file mode 100644 index 00000000000..b3deb606f70 --- /dev/null +++ b/x11/gnome/gvfs/pkg/DESCR-smb @@ -0,0 +1,4 @@ +GVFS is a replacement for GnomeVFS, the GNOME Virtual File System. + +This package provides the smb module for GVFS, which allows it to browse +networks using the SMB/CIFS protocols (a.k.a. Microsoft Networks). diff --git a/x11/gnome/gvfs/pkg/PFRAG.shared b/x11/gnome/gvfs/pkg/PFRAG.shared-main similarity index 66% rename from x11/gnome/gvfs/pkg/PFRAG.shared rename to x11/gnome/gvfs/pkg/PFRAG.shared-main index dac3c05b2dc..e1e0de397a0 100644 --- a/x11/gnome/gvfs/pkg/PFRAG.shared +++ b/x11/gnome/gvfs/pkg/PFRAG.shared-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2008/11/12 22:45:26 jasper Exp $ +@comment $OpenBSD: PFRAG.shared-main,v 1.1 2008/11/24 16:15:42 ajacoutot Exp $ lib/gio/modules/libgiogconf.so lib/gio/modules/libgioremote-volume-monitor.so lib/gio/modules/libgvfsdbus.so diff --git a/x11/gnome/gvfs/pkg/PLIST b/x11/gnome/gvfs/pkg/PLIST-main similarity index 95% rename from x11/gnome/gvfs/pkg/PLIST rename to x11/gnome/gvfs/pkg/PLIST-main index eb3ee9c513f..6f174a6c3dc 100644 --- a/x11/gnome/gvfs/pkg/PLIST +++ b/x11/gnome/gvfs/pkg/PLIST-main @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.5 2008/11/22 18:57:57 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.1 2008/11/24 16:15:42 ajacoutot Exp $ +@pkgpath ${BASE_PKGPATH} %%SHARED%% @bin bin/gvfs-cat @bin bin/gvfs-copy @@ -40,8 +41,6 @@ lib/libgvfscommon.la @bin libexec/gvfsd-localtest @bin libexec/gvfsd-network @bin libexec/gvfsd-sftp -@bin libexec/gvfsd-smb -@bin libexec/gvfsd-smb-browse @bin libexec/gvfsd-trash share/dbus-1/ share/dbus-1/services/ @@ -60,8 +59,6 @@ share/gvfs/mounts/http.mount share/gvfs/mounts/localtest.mount share/gvfs/mounts/network.mount share/gvfs/mounts/sftp.mount -share/gvfs/mounts/smb-browse.mount -share/gvfs/mounts/smb.mount share/gvfs/mounts/trash.mount share/gvfs/remote-volume-monitors/ share/locale/ar/ diff --git a/x11/gnome/gvfs/pkg/PLIST-smb b/x11/gnome/gvfs/pkg/PLIST-smb new file mode 100644 index 00000000000..40c50b19738 --- /dev/null +++ b/x11/gnome/gvfs/pkg/PLIST-smb @@ -0,0 +1,5 @@ +@comment $OpenBSD: PLIST-smb,v 1.1 2008/11/24 16:15:42 ajacoutot Exp $ +@bin libexec/gvfsd-smb +@bin libexec/gvfsd-smb-browse +share/gvfs/mounts/smb-browse.mount +share/gvfs/mounts/smb.mount