We are about to deprecate gnomevfs within the tree as it has been

superseded by gio/gvfs long time ago and isn't maintained anymore.
First move is to remove the -smb subpackage which is of no use.

ok jasper@

x11/gnome/vfs2/Makefile

@@ -1,18 +1,15 @@
-# $OpenBSD: Makefile,v 1.59 2010/07/25 13:07:16 kili Exp $
+# $OpenBSD: Makefile,v 1.60 2010/08/26 09:19:39 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
-COMMENT-main=		GNOME Virtual File System
-COMMENT-smb=		samba module for gnome-vfs2
+COMMENT=		GNOME Virtual File System
 
 GNOME_PROJECT=		gnome-vfs
 GNOME_VERSION=		2.24.3
 
-PKGNAME-main=		gnome-vfs2-${VERSION}
-PKGNAME-smb=		gnome-vfs2-smb-${VERSION}
+PKGNAME=		gnome-vfs2-${VERSION}
 
-REVISION-main=		0
-REVISION-smb=		1
+REVISION=		1
 
 SHARED_LIBS +=	gnomevfs-2           2400.0   # .2400.0
 
@@ -24,54 +21,35 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=	crypto dbus-1 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
 		m pcre ssl util z avahi-client avahi-common avahi-glib \
-		ORBit-2 xml2 dbus-glib-1
+		ORBit-2 xml2 dbus-glib-1 c asn1 gssapi krb5 pthread \
+		cdda_interface cdda_paranoia bz2 fam
 
 MODULES=		devel/gettext \
 			x11/gnome \
 			devel/gconf2
 
-BUILD_DEPENDS=		:gnome-mime-data->=2.0.0:x11/gnome/mime-data
-LIB_DEPENDS=		::devel/ORBit2 \
-			::textproc/libxml \
-			::x11/dbus-glib
-LIB_DEPENDS+=		::net/avahi
+BUILD_DEPENDS=		${RUN_DEPENDS}
 RUN_DEPENDS=		:gnome-mime-data->=2.0.0:x11/gnome/mime-data
 
-WANTLIB-main=		${WANTLIB} c asn1 gssapi krb5 pthread \
-			cdda_interface cdda_paranoia bz2 fam.>=1
-LIB_DEPENDS-main=	${LIB_DEPENDS} \
+LIB_DEPENDS=		::net/avahi \
+			::x11/dbus-glib \
 			::audio/cdparanoia \
 			::archivers/bzip2 \
 			::sysutils/gamin
 
-WANTLIB-smb+=		${WANTLIB} smbclient gnomevfs-2
-LIB_DEPENDS-smb=	${LIB_DEPENDS} \
-			::net/samba \
-			::x11/gnome/vfs2
-RUN_DEPENDS-smb=	${RUN_DEPENDS}
-
 USE_X11=		Yes
 MODGCONF2_SCHEMAS_DIR=	gnome-vfs2
 
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED} \
 			--enable-cdda \
 			--enable-avahi \
-			--disable-howl
+			--disable-howl \
+			--disable-samba
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+			LDFLAGS="-L${LOCALBASE}/lib -pthread"
 
 FAKE_FLAGS=		sysconfdir=${PREFIX}/share/examples/gnome-vfs2
 
-MULTI_PACKAGES=		-main
-PSEUDO_FLAVORS=		no_smb
-FLAVOR?=
-
-.if ${FLAVOR:L:Mno_smb}
-CONFIGURE_ARGS+=	--disable-samba
-.else
-MULTI_PACKAGES+=	-smb
-.endif
-
 post-extract:
 	${INSTALL} -m 555 ${FILESDIR}/krb5-config ${WRKDIR}/bin
 

x11/gnome/vfs2/pkg/DESCR

@@ -0,0 +1,7 @@
+GnomeVFS is a filesystem abstraction library allowing applications
+plugable transparent access to a variety of "real" filesystems, from
+WebDAV to digital cameras, to the local filesystem. It also contains a
+number of other convenient file utilities such as a comprehensive MIME
+database / Application registry, and a copy engine.
+
+Note that the GnomeVFS has been deprecated in favor of gio/gvfs.

x11/gnome/vfs2/pkg/DESCR-main

@@ -1,4 +0,0 @@
-This is the GNOME Virtual File System.
-
-GNOME VFS is currently used as one of the foundations of the Nautilus
-file manager.

x11/gnome/vfs2/pkg/DESCR-smb

@@ -1,2 +0,0 @@
-This package provides the smb module for GNOME VFS, which allows it to
-surf networks using the SMB protocol (also known as Microsoft Networks).

x11/gnome/vfs2/pkg/PLIST

@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST-main,v 1.7 2010/03/30 15:07:06 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.18 2010/08/26 09:19:39 ajacoutot Exp $
 @pkgpath x11/gnome/vfs2
+@pkgpath x11/gnome/vfs2,-main
+@pkgpath x11/gnome/vfs2,-smb
 @bin bin/gnomevfs-cat
 @bin bin/gnomevfs-copy
 @bin bin/gnomevfs-df

x11/gnome/vfs2/pkg/PLIST-smb

@@ -1,6 +0,0 @@
-@comment $OpenBSD: PLIST-smb,v 1.1 2007/11/10 14:39:26 jasper Exp $
-lib/gnome-vfs-2.0/modules/libsmb.a
-lib/gnome-vfs-2.0/modules/libsmb.la
-lib/gnome-vfs-2.0/modules/libsmb.so
-share/examples/gnome-vfs2/gnome-vfs-2.0/modules/smb-module.conf
-@sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/smb-module.conf