18 files changed, 324 insertions, 330 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 40b90d917fc3..660383dc4c34 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -1,48 +1,45 @@
-# New ports collection makefile for:	gnomevfs
+# New ports collection makefile for:	gnomevfs2
 # Date created:				28th June 2000
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnomevfs
-PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTNAME=	gnomevfs2
+PORTVERSION=	1.9.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/gnome-vfs
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-alpha2
 DISTNAME=	gnome-vfs-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	msgfmt-new:${PORTSDIR}/devel/gettext-devel \
-		${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
-LIB_DEPENDS=	gconf-1.1:${PORTSDIR}/devel/gconf
-.if !exists(/usr/bin/bzip2)
-LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
-.endif
-RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
+		${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata \
+		pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS=	gconf-2.3:${PORTSDIR}/devel/gconf2 \
+		bonobo-2.0:${PORTSDIR}/devel/libbonobo
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata \
+		pkg-config:${PORTSDIR}/devel/pkgconfig
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOMELIBS=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
 		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
 		XGETTEXT=${LOCALBASE}/bin/xgettext-new \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
-
-MAN5=		gnome-vfs-mime.5
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-	@find ${WRKSRC} -name 'xml-i18n-*' | xargs ${PERL} -pi -e \
-		's|/usr/local/bin/perl|${PERL}|g'
+		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
+                 s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g'
 
 .include <bsd.port.mk>
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 7969fdefa4d4..f91ac99d125f 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome-vfs-1.0.4.tar.gz) = d3dd15715da9671813805674cafa0dc8
+MD5 (gnome2/gnome-vfs-1.9.5.tar.bz2) = 6187575b3cd890fed78c805659455057
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 430f97e1c0d7..a5963d2046f2 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,65 +1,57 @@
 
 $FreeBSD$
 
---- configure.orig	Thu Jan 24 10:25:14 2002
-+++ configure	Thu Jan 24 10:38:00 2002
-@@ -5949,7 +5949,7 @@
- VFS_GNOMEUI_LIBS="`gnome-config --libs gnome gnomeui`"
- VFS_GNOMEGNORBA_LIBS="`gnome-config --libs gnome gnomeui gnorba`"
- VFS_CAPPLET_LIBS="`gnome-config --libs gnome gnomeui capplet`"
--VFS_GLIB_CONFIG="glib-config"
-+VFS_GLIB_CONFIG="$GLIB_CONFIG"
- 
- 
- 
-@@ -9854,8 +9854,8 @@
+--- configure	2002/02/16 13:00:43	1.1
++++ configure	2002/02/16 13:03:25
+@@ -12056,8 +12056,8 @@
    done
  fi
  
--echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6
--echo "configure:9859: checking for bzCompressInit in -lbz2" >&5
-+echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6
-+echo "configure:9859: checking for BZ2_bzCompressInit in -lbz2" >&5
- ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -9868,10 +9868,10 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
+-echo "$as_me:12059: checking for bzCompressInit in -lbz2" >&5
+-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
++echo "$as_me:12059: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
+ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -12073,11 +12073,11 @@
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char bzCompressInit();
-+char BZ2_bzCompressInit();
- 
- int main() {
--bzCompressInit()
-+BZ2_bzCompressInit()
- ; return 0; }
- EOF
- if { (eval echo configure:9878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -10101,7 +10101,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
+    builtin and then its argument prototype would still apply.  */
+-char bzCompressInit ();
++char BZ2_bzCompressInit ();
+ int
+ main ()
+ {
+-bzCompressInit ();
++BZ2_bzCompressInit ();
+   ;
+   return 0;
+ }
+@@ -12336,7 +12336,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   
+ 
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
-+		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo"
- 		cat > conftest.$ac_ext <<EOF
- #line 10107 "configure"
++		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
+ 		cat >conftest.$ac_ext <<_ACEOF
+ #line 12341 "configure"
  #include "confdefs.h"
-@@ -10135,7 +10135,7 @@
+@@ -12386,7 +12386,7 @@
  EOF
  
  		msg_openssl="yes"
--		OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcrypto -ldl"
+-		OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcrypto"
 +		OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcryptofoo"
- 		
  
  if true; then
-@@ -10594,7 +10594,7 @@
- s%@GTK_CFLAGS@%$GTK_CFLAGS%g
- s%@GTK_LIBS@%$GTK_LIBS%g
- s%@cflags_set@%$cflags_set%g
--s%@PTHREAD_LIB@%$PTHREAD_LIB%g
-+s%@PTHREAD_LIB@%$BSD_PTHREAD_LIBS%g
- s%@ALLOCA@%$ALLOCA%g
- s%@USE_NLS@%$USE_NLS%g
- s%@MSGFMT@%$MSGFMT%g
+   HAVE_SSL_TRUE=
+@@ -13170,7 +13170,7 @@
+ s,@ORBIT_IDL@,$ORBIT_IDL,;t t
+ s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
+ s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+-s,@PTHREAD_LIB@,$PTHREAD_LIB,;t t
++s,@PTHREAD_LIB@,$BSD_PTHREAD_LIB,;t t
+ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
+ s,@ALLOCA@,$ALLOCA,;t t
+ s,@USE_NLS@,$USE_NLS,;t t
diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab
index 5c79863db926..3e204f19a3ef 100644
--- a/devel/gnome-vfs/files/patch-ab
+++ b/devel/gnome-vfs/files/patch-ab
@@ -1,40 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Tue Jan 22 11:51:36 2002
-+++ Makefile.in	Tue Jan 22 11:53:19 2002
-@@ -186,9 +186,9 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
- @PLATFORM_GNOME_2_TRUE@SUBDIRS_GNOME = doc
--@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = doc test
-+@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = doc
+--- Makefile.in	2002/02/16 13:04:16	1.1
++++ Makefile.in	2002/02/16 13:09:12
+@@ -165,7 +165,7 @@
  
--SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				idl						modules						man						devel-docs					$(SUBDIRS_GNOME)				po
-+SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				idl						modules						man						$(SUBDIRS_GNOME)				po
+ SUBDIRS_GNOME = monikers doc
  
+-SUBDIRS =  	libgnomevfs					modules						devel-docs					doc						test						monikers					po
++SUBDIRS =  	libgnomevfs					modules						devel-docs					doc						monikers					po
  
- EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					vfsConf.sh.in					xml-i18n-extract.in				xml-i18n-merge.in				xml-i18n-update.in				gnome-vfs-config.in
-@@ -196,7 +196,7 @@
  
- bin_SCRIPTS = $(top_builddir)/gnome-vfs-config
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA =  	vfsConf.sh
- 
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -535,11 +535,13 @@
- 	    -e 's?\@VFS_INCLUDEDIR\@?$(VFS_INCLUDEDIR)?g' \
- 	    -e 's?\@VERSION\@?$(VERSION)?g' \
- 	    -e 's?\@VFS_LIBS\@?$(VFS_LIBS)?g' \
-+	    -e 's?\@PTHREAD_LIB\@?$(PTHREAD_LIB)?g' \
- 	      < $(srcdir)/vfsConf.sh.in > vfsConf.tmp \
- 	  && mv vfsConf.tmp vfsConf.sh
- 
- gnome-vfs-config: gnome-vfs-config.in Makefile
- 	sed -e 's?\@LIBDIR\@?$(libdir)?g' \
-+	    -e 's?\@SYSCONFDIR\@?$(sysconfdir)?g' \
- 	    -e 's?\@VFS_LIBDIR\@?$(VFS_LIBDIR)?g' \
- 	    -e 's?\@VFS_INCLUDEDIR\@?$(VFS_INCLUDEDIR)?g' \
- 	    -e 's?\@VERSION\@?$(VERSION)?g' \
+ EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					gnome-vfs-2.0.pc.in				gnome-vfs-module-2.0.pc.in			intltool-extract.in				intltool-merge.in				intltool-update.in
diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac
index 03b8559abc77..85e9fc54a6c5 100644
--- a/devel/gnome-vfs/files/patch-ac
+++ b/devel/gnome-vfs/files/patch-ac
@@ -1,44 +1,14 @@
 
 $FreeBSD$
 
---- modules/Makefile.in.orig	Thu Jan 24 10:25:14 2002
-+++ modules/Makefile.in	Thu Jan 24 10:45:26 2002
-@@ -197,7 +197,7 @@
+--- modules/Makefile.in	2002/02/16 13:09:49	1.1
++++ modules/Makefile.in	2002/02/16 13:10:49
+@@ -174,7 +174,7 @@
  @HAVE_CDDA_TRUE@CDDA_LTLIBS = libcdda.la
  @HAVE_CDDA_FALSE@CDDA_LTLIBS = 
  
 -module_flags = -export_dynamic -avoid-version
 +module_flags = -export_dynamic -avoid-version -module $(PTHREAD_LIB)
- modulesdir = $(libdir)/vfs/modules
+ modulesdir = $(libdir)/gnome-vfs-2.0/modules
  
- modules_LTLIBRARIES =  	$(CDDA_LTLIBS)					libextfs.la					libfile.la					libvfs-test.la					$(HTTP_LTLIBS)					libbzip2.la					libgzip.la					libftp.la					libnntp.la					libvfs-pipe.la					libvfs-translate.la				libdesktop.la					$(NULL)
-@@ -216,7 +216,6 @@
- 
- libcdda_la_SOURCES =  	cdda-method.c 					cdda-method.h					cdda-cddb.c 					cdda-cddb.h					cdda-cdrom-extensions.h
- 
--
- libcdda_la_LDFLAGS = $(module_flags)
- libcdda_la_LIBADD = -L/gnome/lib -lcdda_paranoia -lcdda_interface
- 
-@@ -311,7 +310,7 @@
- libextfs_la_OBJECTS =  extfs-method.lo
- libfile_la_LIBADD = 
- libfile_la_OBJECTS =  file-method.lo
--libvfs_test_la_LDFLAGS = 
-+libvfs_test_la_LDFLAGS = $(module_flags)
- libvfs_test_la_DEPENDENCIES = 
- libvfs_test_la_OBJECTS =  test-method.lo
- libhttp_la_DEPENDENCIES = 
-@@ -320,10 +319,10 @@
- libbzip2_la_OBJECTS =  bzip2-method.lo
- libgzip_la_DEPENDENCIES = 
- libgzip_la_OBJECTS =  gzip-method.lo
--libftp_la_LDFLAGS = 
-+libftp_la_LDFLAGS = $(module_flags)
- libftp_la_LIBADD = 
- libftp_la_OBJECTS =  ftp-method.lo
--libnntp_la_LDFLAGS = 
-+libnntp_la_LDFLAGS = $(module_flags)
- libnntp_la_LIBADD = 
- libnntp_la_OBJECTS =  nntp-method.lo
- libvfs_pipe_la_DEPENDENCIES = 
+ modules_LTLIBRARIES =  	$(CDDA_LTLIBS)					libdesktop.la					libvfolder-desktop.la				libextfs.la					libfile.la					libnntp.la					libvfs-test.la					$(HTTP_LTLIBS)					libbzip2.la					libgzip.la					libftp.la					libvfs-pipe.la					libvfs-translate.la				libssh.la					$(NULL)
diff --git a/devel/gnome-vfs/files/patch-ag b/devel/gnome-vfs/files/patch-ag
deleted file mode 100644
index da795f940c50..000000000000
--- a/devel/gnome-vfs/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-vfs-config.in.orig	Thu Aug 31 14:32:38 2000
-+++ gnome-vfs-config.in	Wed Nov 29 15:04:43 2000
-@@ -3,7 +3,7 @@
- usage="\
-     Usage: gnome-vfs-config [--version] [--config] [--cflags] [--libs]"
- 
--config_file="@LIBDIR@/vfsConf.sh"
-+config_file="@SYSCONFDIR@/vfsConf.sh"
- . $config_file
- 
- if test $# -eq 0; then
diff --git a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in
new file mode 100644
index 000000000000..b02290aa2ebb
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- devel-docs/Makefile.in	2002/02/16 16:44:53	1.1
++++ devel-docs/Makefile.in	2002/02/16 16:45:47
+@@ -168,7 +168,7 @@
+ TEXT_FILES =  	gnome-vfs-mime-type-handling.txt
+ 
+ 
+-docdir = $(prefix)/doc
++docdir = $(prefix)/share/doc
+ doc_DATA = 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
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
new file mode 100644
index 000000000000..c75f0d973243
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
@@ -0,0 +1,12 @@
+
+$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
+@@ -8,5 +8,5 @@
+ Description: The GNOME virtual file-system libraries
+ Version: @VERSION@
+ Requires: bonobo-activation-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-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
new file mode 100644
index 000000000000..f9b09d46b7a3
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
@@ -0,0 +1,12 @@
+
+$FreeBSD$
+
+--- gnome-vfs-module-2.0.pc.in	2002/02/16 13:07:42	1.1
++++ gnome-vfs-module-2.0.pc.in	2002/02/16 13:07:51
+@@ -8,5 +8,5 @@
+ Description: The GNOME virtual file-system module include info
+ Version: @VERSION@
+ Requires: bonobo-activation-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${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnome-vfs/files/patch-intltool-merge.in b/devel/gnome-vfs/files/patch-intltool-merge.in
new file mode 100644
index 000000000000..1b5a09da7f27
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-intltool-merge.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- intltool-merge.in	2002/02/16 12:59:40	1.1
++++ intltool-merge.in	2002/02/16 12:59:59
+@@ -269,7 +269,7 @@
+ 
+         if ($UTF8_ARG) {
+             my $encoding = get_po_encoding ($po_file);
+-            open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";	
++            open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";	
+         } else {
+             open PO_FILE, "<$po_file";	
+         }
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs-pthread::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs-pthread::Makefile.in
deleted file mode 100644
index 715ae45928ec..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs-pthread::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- libgnomevfs-pthread/Makefile.in	2002/01/24 08:42:41	1.1
-+++ libgnomevfs-pthread/Makefile.in	2002/01/24 08:43:37
-@@ -207,7 +207,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
- LIBS = @LIBS@
--libgnomevfs_pthread_la_LIBADD = 
-+libgnomevfs_pthread_la_LIBADD = $(PTHREAD_LIB)
- libgnomevfs_pthread_la_OBJECTS =  gnome-vfs-pthread.lo \
- gnome-vfs-thread-pool.lo gnome-vfs-async-job-map.lo \
- gnome-vfs-async-ops.lo gnome-vfs-job-slave.lo gnome-vfs-job.lo
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
index c8ca73f68d60..0ab33d483231 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- libgnomevfs/Makefile.in	2001/09/17 14:32:27	1.1
-+++ libgnomevfs/Makefile.in	2001/09/17 14:33:02
-@@ -202,7 +202,7 @@
+--- libgnomevfs/Makefile.in	2002/02/16 13:12:02	1.1
++++ libgnomevfs/Makefile.in	2002/02/16 13:13:00
+@@ -190,7 +190,7 @@
  
  
  # Platform specific includes
--libgnomevfsplatofrmincludedir = $(libdir)/gnome-vfs-1.0/include
-+libgnomevfsplatofrmincludedir = $(includedir)/gnome-vfs-1.0/libgnomevfs
- libgnomevfsplatofrminclude_HEADERS =  	gnome-vfs-file-size.h
+-libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
++libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
+ libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
+ 
  
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/devel/gnome-vfs/files/patch-modules::extfs-method.c b/devel/gnome-vfs/files/patch-modules::extfs-method.c
new file mode 100644
index 000000000000..2cc08f2ddc95
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules::extfs-method.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- modules/extfs-method.c	2002/02/16 16:49:13	1.1
++++ modules/extfs-method.c	2002/02/16 16:52:11
+@@ -52,7 +52,7 @@
+ ssize_t getdelim (char **lineptr, size_t *n, int terminator, FILE *stream);
+ #endif
+ 
+-#define EXTFS_COMMAND_DIR	PREFIX "/lib/vfs/extfs"
++#define EXTFS_COMMAND_DIR	PREFIX "/lib/vfs2/extfs"
+ 
+ /* Our private handle struct.  */
+ struct _ExtfsHandle {
diff --git a/devel/gnome-vfs/files/patch-modules::extfs::Makefile.in b/devel/gnome-vfs/files/patch-modules::extfs::Makefile.in
new file mode 100644
index 000000000000..c2d45c8d6f5b
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules::extfs::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- modules/extfs/Makefile.in	2002/02/16 16:49:13	1.1
++++ modules/extfs/Makefile.in	2002/02/16 16:52:26
+@@ -163,7 +163,7 @@
+ XML_REQUIRED = @XML_REQUIRED@
+ cxxflags_set = @cxxflags_set@
+ 
+-extfsdir = $(prefix)/lib/vfs/extfs
++extfsdir = $(prefix)/lib/vfs2/extfs
+ 
+ extfs_DATA =  	README
+ 
diff --git a/devel/gnome-vfs/files/patch-modules::file-method.c b/devel/gnome-vfs/files/patch-modules::file-method.c
deleted file mode 100644
index 1786e41ad2f0..000000000000
--- a/devel/gnome-vfs/files/patch-modules::file-method.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/file-method.c.orig	Fri Nov  9 12:02:38 2001
-+++ modules/file-method.c	Fri Nov  9 12:02:52 2001
-@@ -46,7 +46,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
diff --git a/devel/gnome-vfs/files/patch-po::Makefile.in.in b/devel/gnome-vfs/files/patch-po::Makefile.in.in
deleted file mode 100644
index bbdedf273594..000000000000
--- a/devel/gnome-vfs/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2001/09/17 14:26:57	1.1
-+++ po/Makefile.in.in	2001/09/17 14:27:14
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/devel/gnome-vfs/files/patch-vfsConf.sh.in b/devel/gnome-vfs/files/patch-vfsConf.sh.in
deleted file mode 100644
index a38a6ca21262..000000000000
--- a/devel/gnome-vfs/files/patch-vfsConf.sh.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- vfsConf.sh.in	2001/09/28 11:13:40	1.1
-+++ vfsConf.sh.in	2001/09/28 11:15:11
-@@ -2,6 +2,6 @@
- #  Configuration file for using the gnome-vfs library
- #
- VFS_LIBDIR="@VFS_LIBDIR@"
--VFS_LIBS="@VFS_LIBS@"
-+VFS_LIBS="@VFS_LIBS@ @PTHREAD_LIB@"
- VFS_INCLUDEDIR="@VFS_INCLUDEDIR@"
- MODULE_VERSION="gnome-vfs-@VERSION@"
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index ff09a8d244e3..d2264681ee4c 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -1,121 +1,165 @@
-bin/gnome-vfs-config
-etc/vfs/modules/default-modules.conf
-etc/vfsConf.sh
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-application-registry.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-async-ops.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-backend.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-cancellable-ops.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-cancellation.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-configuration.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-context.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-directory-filter.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-directory.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-file-info.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-file-size.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-find-directory.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-handle.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-inet-connection.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-init.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-iobuf.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-messages.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-method.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-handlers.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-info.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-magic.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-monitor.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-callback.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-shared.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ops.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-parse-ls.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-private-utils.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-private.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-regexp-filter.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-result.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-seekable.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-shellpattern-filter.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-socket-buffer.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-socket.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ssl-private.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ssl.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-standard-callbacks.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-transform.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-types.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-uri.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-utils.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-xfer.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs.h
-lib/libgnomevfs-pthread.so
-lib/libgnomevfs.a
-lib/libgnomevfs.so
-lib/libgnomevfs.so.0
-lib/vfs/extfs/README
-lib/vfs/extfs/a
-lib/vfs/extfs/ar
-lib/vfs/extfs/arj
-lib/vfs/extfs/cpio
-lib/vfs/extfs/deb
-lib/vfs/extfs/hp48
-lib/vfs/extfs/lha
-lib/vfs/extfs/mailfs
-lib/vfs/extfs/patchfs
-lib/vfs/extfs/rar
-lib/vfs/extfs/rpm
-lib/vfs/extfs/rpms
-lib/vfs/extfs/tar
-lib/vfs/extfs/trpm
-lib/vfs/extfs/zip
-lib/vfs/extfs/zoo
-lib/vfs/modules/libbzip2.so
-lib/vfs/modules/libdesktop.so
-lib/vfs/modules/libextfs.so
-lib/vfs/modules/libfile.so
-lib/vfs/modules/libftp.so
-lib/vfs/modules/libgzip.so
-lib/vfs/modules/libhttp.so
-lib/vfs/modules/libnntp.so
-lib/vfs/modules/libvfs-pipe.so
-lib/vfs/modules/libvfs-test.so
-lib/vfs/modules/libvfs-translate.so
-share/locale/az/LC_MESSAGES/gnome-vfs.mo
-share/locale/ca/LC_MESSAGES/gnome-vfs.mo
-share/locale/da/LC_MESSAGES/gnome-vfs.mo
-share/locale/de/LC_MESSAGES/gnome-vfs.mo
-share/locale/el/LC_MESSAGES/gnome-vfs.mo
-share/locale/es/LC_MESSAGES/gnome-vfs.mo
-share/locale/eu/LC_MESSAGES/gnome-vfs.mo
-share/locale/fi/LC_MESSAGES/gnome-vfs.mo
-share/locale/fr/LC_MESSAGES/gnome-vfs.mo
-share/locale/ga/LC_MESSAGES/gnome-vfs.mo
-share/locale/gl/LC_MESSAGES/gnome-vfs.mo
-share/locale/hu/LC_MESSAGES/gnome-vfs.mo
-share/locale/it/LC_MESSAGES/gnome-vfs.mo
-share/locale/ja/LC_MESSAGES/gnome-vfs.mo
-share/locale/ko/LC_MESSAGES/gnome-vfs.mo
-share/locale/lt/LC_MESSAGES/gnome-vfs.mo
-share/locale/nl/LC_MESSAGES/gnome-vfs.mo
-share/locale/nn/LC_MESSAGES/gnome-vfs.mo
-share/locale/no/LC_MESSAGES/gnome-vfs.mo
-share/locale/pl/LC_MESSAGES/gnome-vfs.mo
-share/locale/pt/LC_MESSAGES/gnome-vfs.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-vfs.mo
-share/locale/ro/LC_MESSAGES/gnome-vfs.mo
-share/locale/ru/LC_MESSAGES/gnome-vfs.mo
-share/locale/sk/LC_MESSAGES/gnome-vfs.mo
-share/locale/sl/LC_MESSAGES/gnome-vfs.mo
-share/locale/sv/LC_MESSAGES/gnome-vfs.mo
-share/locale/tr/LC_MESSAGES/gnome-vfs.mo
-share/locale/uk/LC_MESSAGES/gnome-vfs.mo
-share/locale/wa/LC_MESSAGES/gnome-vfs.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-vfs.mo
-@dirrm share/gnome/gtk-doc/html/gnome-vfs
-@dirrm lib/vfs/modules
-@dirrm lib/vfs/extfs
-@dirrm lib/vfs
-@dirrm include/gnome-vfs-1.0/libgnomevfs
-@dirrm include/gnome-vfs-1.0
-@dirrm etc/vfs/modules
-@dirrm etc/vfs
+etc/gnome-vfs-2.0/modules/default-modules.conf
+etc/gnome-vfs-2.0/vfolders/applications.vfolder-info
+etc/gnome-vfs-2.0/vfolders/preferences.vfolder-info
+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-file-info.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
+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-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-result.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-iobuf.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-magic.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
+lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
+lib/gnome-vfs-2.0/modules/libbzip2.so
+lib/gnome-vfs-2.0/modules/libdesktop.so
+lib/gnome-vfs-2.0/modules/libextfs.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
+lib/gnome-vfs-2.0/modules/libhttp.so
+lib/gnome-vfs-2.0/modules/libnntp.so
+lib/gnome-vfs-2.0/modules/libssh.so
+lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
+lib/gnome-vfs-2.0/modules/libvfs-pipe.so
+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.0
+lib/vfs2/extfs/README
+lib/vfs2/extfs/a
+lib/vfs2/extfs/ar
+lib/vfs2/extfs/arj
+lib/vfs2/extfs/cpio
+lib/vfs2/extfs/deb
+lib/vfs2/extfs/hp48
+lib/vfs2/extfs/lha
+lib/vfs2/extfs/mailfs
+lib/vfs2/extfs/patchfs
+lib/vfs2/extfs/rar
+lib/vfs2/extfs/rpm
+lib/vfs2/extfs/rpms
+lib/vfs2/extfs/tar
+lib/vfs2/extfs/trpm
+lib/vfs2/extfs/zip
+lib/vfs2/extfs/zoo
+libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
+libdata/pkgconfig/gnome-vfs-2.0.pc
+libdata/pkgconfig/gnome-vfs-module-2.0.pc
+share/doc/gnome-vfs/about.html
+share/doc/gnome-vfs/data-types.html
+share/doc/gnome-vfs/everything-else.html
+share/doc/gnome-vfs/file-operations.html
+share/doc/gnome-vfs/gnome-vfs-application-registry.html
+share/doc/gnome-vfs/gnome-vfs-asynchronous-operations.html
+share/doc/gnome-vfs/gnome-vfs-cancellation.html
+share/doc/gnome-vfs/gnome-vfs-configuration.html
+share/doc/gnome-vfs/gnome-vfs-context.html
+share/doc/gnome-vfs/gnome-vfs-directory.html
+share/doc/gnome-vfs/gnome-vfs-file-info.html
+share/doc/gnome-vfs/gnome-vfs-file-size.html
+share/doc/gnome-vfs/gnome-vfs-finding-special-directories.html
+share/doc/gnome-vfs/gnome-vfs-inet-connection.html
+share/doc/gnome-vfs/gnome-vfs-initialization.html
+share/doc/gnome-vfs/gnome-vfs-iobuf.html
+share/doc/gnome-vfs/gnome-vfs-method.html
+share/doc/gnome-vfs/gnome-vfs-mime-handlers.html
+share/doc/gnome-vfs/gnome-vfs-mime-info.html
+share/doc/gnome-vfs/gnome-vfs-mime-magic.html
+share/doc/gnome-vfs/gnome-vfs-mime-monitor.html
+share/doc/gnome-vfs/gnome-vfs-mime-sniff-buffer.html
+share/doc/gnome-vfs/gnome-vfs-mime.html
+share/doc/gnome-vfs/gnome-vfs-module-callback-module-api.html
+share/doc/gnome-vfs/gnome-vfs-module-callbacks.html
+share/doc/gnome-vfs/gnome-vfs-module-shared.html
+share/doc/gnome-vfs/gnome-vfs-module.html
+share/doc/gnome-vfs/gnome-vfs-ops.html
+share/doc/gnome-vfs/gnome-vfs-parse-ls.html
+share/doc/gnome-vfs/gnome-vfs-process.html
+share/doc/gnome-vfs/gnome-vfs-result.html
+share/doc/gnome-vfs/gnome-vfs-ssl.html
+share/doc/gnome-vfs/gnome-vfs-standard-callbacks.html
+share/doc/gnome-vfs/gnome-vfs-types.html
+share/doc/gnome-vfs/gnome-vfs-uri.html
+share/doc/gnome-vfs/gnome-vfs-utils.html
+share/doc/gnome-vfs/gnome-vfs-xfer.html
+share/doc/gnome-vfs/index.html
+share/doc/gnome-vfs/index.sgml
+share/doc/gnome-vfs/mime-registry.html
+share/doc/gnome-vfs/modules.html
+share/doc/gnome-vfs/writing-modules.html
+share/doc/gnome-vfs/x27.html
+share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/lt/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
+share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ro/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ru/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/wa/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/doc/gnome-vfs
+@dirrm lib/vfs2/extfs
+@dirrm lib/vfs2
+@dirrm lib/gnome-vfs-2.0/modules
+@dirrm lib/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
+@dirrm include/gnome-vfs-2.0
+@dirrm etc/gnome-vfs-2.0/vfolders
+@dirrm etc/gnome-vfs-2.0/modules
+@dirrm etc/gnome-vfs-2.0