4 files changed, 45 insertions, 24 deletions

diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index d837cb54b7c4..e608355897ea 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomevfs2
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.6
diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac
index 9362cac1715f..5a687e11a977 100644
--- a/devel/gnomevfs2/files/patch-ac
+++ b/devel/gnomevfs2/files/patch-ac
@@ -1,7 +1,16 @@
---- 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
+--- 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
  @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = 
  
 -module_flags = -export_dynamic -avoid-version -module -no-undefined
@@ -9,3 +18,22 @@
  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-modules_default-modules.conf b/devel/gnomevfs2/files/patch-modules_default-modules.conf
new file mode 100644
index 000000000000..0efb87aa888c
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules_default-modules.conf
@@ -0,0 +1,12 @@
+--- 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/pkg-plist b/devel/gnomevfs2/pkg-plist
index ea46ef2df11a..3f5cc01a3a79 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -71,7 +71,6 @@ 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/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
@@ -89,23 +88,6 @@ lib/gnome-vfs-2.0/modules/libvfs-translate.so
 lib/libgnomevfs-2.a
 lib/libgnomevfs-2.so
 lib/libgnomevfs-2.so.600
-lib/vfs/2.0/extfs/README
-lib/vfs/2.0/extfs/a
-lib/vfs/2.0/extfs/ar
-lib/vfs/2.0/extfs/arj
-lib/vfs/2.0/extfs/cpio
-lib/vfs/2.0/extfs/deb
-lib/vfs/2.0/extfs/hp48
-lib/vfs/2.0/extfs/lha
-lib/vfs/2.0/extfs/mailfs
-lib/vfs/2.0/extfs/patchfs
-lib/vfs/2.0/extfs/rar
-lib/vfs/2.0/extfs/rpm
-lib/vfs/2.0/extfs/rpms
-lib/vfs/2.0/extfs/tar
-lib/vfs/2.0/extfs/trpm
-lib/vfs/2.0/extfs/zip
-lib/vfs/2.0/extfs/zoo
 libdata/bonobo/servers/GNOME_VFS_Daemon.server
 libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
@@ -183,8 +165,6 @@ 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 lib/vfs/2.0/extfs
-@dirrm lib/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