3 files changed, 35 insertions, 14 deletions

diff --git a/devel/gnomevfs/files/patch-aa b/devel/gnomevfs/files/patch-aa
index a84dfa92912f..743135715f12 100644
--- a/devel/gnomevfs/files/patch-aa
+++ b/devel/gnomevfs/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Feb 22 01:04:03 2000
-+++ configure	Wed Jun 28 16:08:33 2000
-@@ -2120,7 +2120,7 @@
+--- configure.orig	Mon Jul  3 19:03:42 2000
++++ configure	Wed Jul  5 14:42:17 2000
+@@ -2204,7 +2204,7 @@
  # Check whether --enable-gconf or --disable-gconf was given.
  if test "${enable_gconf+set}" = set; then
    enableval="$enable_gconf"
@@ -8,8 +8,8 @@
 +  gconf_enabled="$enableval"
  fi
  
- # Check whether --with-default-backend or --without-default-backend was given.
-@@ -4772,7 +4772,7 @@
+ # Check whether --enable-libefs or --disable-libefs was given.
+@@ -4862,7 +4862,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -18,24 +18,24 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -5545,7 +5545,7 @@
+@@ -5924,7 +5924,7 @@
  VFSPTHREAD_LIBDIR='-L${libdir}'
- VFSPTHREAD_INCLUDEDIR='-I${includedir}'
+ VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'
  VFSPTHREAD_INCLUDEDIR="$VFSPTHREAD_INCLUDEDIR `gnome-config --cflags gnome`"
 -VFSPTHREAD_LIBS="-lgnomevfs -lgnomevfs-pthread `gnome-config --libs gnome` `glib-config --libs gthread`"
 +VFSPTHREAD_LIBS="-lgnomevfs -lgnomevfs-pthread `gnome-config --libs gnome` `$GLIB_CONFIG --libs gthread`"
  
  
  
-@@ -5558,9 +5558,9 @@
+@@ -5937,9 +5937,9 @@
  EOF
  
  
 -VFS_LIBS="-lgnomevfs `glib-config --libs gthread gmodule`"
 +VFS_LIBS="-lgnomevfs `$GLIB_CONFIG --libs gthread gmodule`"
  VFS_LIBDIR='-L${libdir}'
--VFS_INCLUDEDIR='-I${includedir}'" `glib-config --cflags gthread gmodule`"
-+VFS_INCLUDEDIR='-I${includedir}'" `$GLIB_CONFIG --cflags gthread gmodule`"
+-VFS_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'" `glib-config --cflags gthread gmodule`"
++VFS_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'" `$GLIB_CONFIG --cflags gthread gmodule`"
  
  
  
diff --git a/devel/gnomevfs/files/patch-ab b/devel/gnomevfs/files/patch-ab
index 5dacf4ba5702..5163e15edf51 100644
--- a/devel/gnomevfs/files/patch-ab
+++ b/devel/gnomevfs/files/patch-ab
@@ -1,7 +1,14 @@
---- Makefile.in.orig	Tue Feb 22 01:45:45 2000
-+++ Makefile.in	Wed Jun 28 14:08:43 2000
-@@ -143,7 +143,7 @@
- EXTRA_DIST =  	HACKING						TODO						autogen.sh					vfsConf.sh.in					vfscorbaConf.sh.in				vfspthreadConf.sh.in
+--- Makefile.in.orig	Mon Jul  3 19:33:07 2000
++++ Makefile.in	Wed Jul  5 15:43:12 2000
+@@ -162,13 +162,13 @@
+ @HAVE_GCONF_TRUE@SUBDIRS_GCONF = mime-type-capplet
+ @HAVE_GCONF_FALSE@SUBDIRS_GCONF = 
+ 
+-SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				$(SUBDIRS_OAF)					idl						modules						data						man						devel-docs					$(SUBDIRS_GCONF)				test						po
++SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				$(SUBDIRS_OAF)					idl						modules						data						man										$(SUBDIRS_GCONF)				test						po
+ 
+ 
+ EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					vfsConf.sh.in					vfscorbaConf.sh.in				vfspthreadConf.sh.in
  
  
 -confexecdir = $(libdir)
diff --git a/devel/gnomevfs/files/patch-ae b/devel/gnomevfs/files/patch-ae
new file mode 100644
index 000000000000..246e180a7598
--- /dev/null
+++ b/devel/gnomevfs/files/patch-ae
@@ -0,0 +1,14 @@
+--- mime-type-capplet/nautilus-mime-type-capplet.c.orig	Wed Jun 21 20:48:29 2000
++++ mime-type-capplet/nautilus-mime-type-capplet.c	Wed Jul  5 15:17:57 2000
+@@ -28,7 +28,11 @@
+ #include <config.h>
+ #include <ctype.h>
+ #include <dirent.h>
++#ifdef	__FreeBSD__
++#include <gnuregex.h>
++#else
+ #include <regex.h>
++#endif
+ #include <string.h>
+ #include <sys/types.h>
+