release/4.10.0

13 files changed, 0 insertions, 664 deletions

diff --git a/devel/gnome-vfs/files/KDE.directory b/devel/gnome-vfs/files/KDE.directory
deleted file mode 100644
index 032126bb99db..000000000000
--- a/devel/gnome-vfs/files/KDE.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=KDE
-Comment=Some comment about KDE menu
-Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png
-Type=Directory
diff --git a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
deleted file mode 100644
index 120a8906411f..000000000000
--- a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
+++ /dev/null
@@ -1,285 +0,0 @@
---- modules/vfolder/applications-all-users.vfolder-info.in.orig	Fri Oct 17 10:11:22 2003
-+++ modules/vfolder/applications-all-users.vfolder-info.in	Thu Feb 12 15:15:40 2004
-@@ -19,7 +19,14 @@
-   <MergeDir>/usr/share/gnome/apps/</MergeDir>
- 
-   <!-- Merge dirs optional -->
--  <MergeDir>/etc/X11/applnk/</MergeDir>
-+  <MergeDir>/usr/local/share/applnk/Toys/</MergeDir>
-+  <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir>
-+  <MergeDir>/usr/local/share/applnk/Internet/</MergeDir>
-+  <MergeDir>/usr/local/share/applnk/Office/</MergeDir>
-+  <MergeDir>/usr/local/share/applnk/Applications/</MergeDir>
-+  <MergeDir>/usr/local/share/applnk/Development/</MergeDir>
-+  <MergeDir>/usr/local/share/applnk/Games/</MergeDir>
-+  <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir>
- 
-   <!-- Root folder -->
-   <Folder>
-@@ -34,10 +41,12 @@
-     <Query>
-       <And>
-         <Keyword>Core</Keyword>
--	<!-- FIXME: Seth, why would this be wanted? -->
--	<!--<Not>
--	  <Keyword>Merged</Keyword>
--        </Not>-->
-+	<Not>
-+          <Or>
-+            <Keyword>Qt</Keyword>
-+            <Keyword>KDE</Keyword>
-+          </Or>
-+	</Not>
-       </And>
-     </Query>
- 
-@@ -47,6 +56,12 @@
-       <Desktop>Accessories.directory</Desktop>
-       <Query>
- 	<And>
-+	  <Not>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+	  </Not>
- 	  <Keyword>Application</Keyword>
- 	  <Keyword>Utility</Keyword>
- 	  <Not>
-@@ -63,6 +78,12 @@
-       <Desktop>Accessibility.directory</Desktop>
-       <Query>
- 	<And>
-+	  <Not>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+	  </Not>
- 	  <Keyword>Application</Keyword>
- 	  <Keyword>Accessibility</Keyword>
- 	  <Not>
-@@ -80,6 +101,12 @@
-       <OnlyUnallocated/>
-       <Query>
- 	<And>
-+	  <Not>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+	  </Not>
-           <Keyword>Application</Keyword>
-           <Not>
-             <Keyword>Settings</Keyword>
-@@ -101,6 +128,12 @@
-       <Desktop>Development.directory</Desktop>
-       <Query>
-         <And>
-+	  <Not>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+	  </Not>
-           <Keyword>Application</Keyword>
- 	  <Keyword>Development</Keyword>
-         </And>
-@@ -114,6 +147,12 @@
-       <Desktop>Games.directory</Desktop>
-       <Query>
-         <And>
-+	  <Not>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+	  </Not>
-           <Keyword>Application</Keyword>
- 	  <Keyword>Game</Keyword>
-         </And>
-@@ -127,6 +166,12 @@
-       <Desktop>Graphics.directory</Desktop>
-       <Query>
-         <And>
-+	  <Not>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+	  </Not>
-           <Keyword>Application</Keyword>
- 	  <Keyword>Graphics</Keyword>
-         </And>
-@@ -140,6 +185,12 @@
-       <Desktop>Internet.directory</Desktop>
-       <Query>
-         <And>
-+	  <Not>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+	  </Not>
-           <Keyword>Application</Keyword>
- 	  <Keyword>Network</Keyword>
-         </And>
-@@ -153,6 +204,12 @@
-       <Desktop>Multimedia.directory</Desktop>
-       <Query>
-         <And>
-+	  <Not>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+	  </Not>
-           <Keyword>Application</Keyword>
- 	  <Keyword>AudioVideo</Keyword>
-         </And>
-@@ -170,6 +227,12 @@
-       <Desktop>Office.directory</Desktop>
-       <Query>
- 	<And>
-+	  <Not>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+	  </Not>
- 	  <Keyword>Application</Keyword>
- 	  <Or>
- 	    <Keyword>Office</Keyword>
-@@ -195,6 +258,12 @@
-       <Desktop>System.directory</Desktop>
-       <Query>
-         <And>
-+	  <Not>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+	  </Not>
-           <Keyword>Application</Keyword>
-           <Not>
-             <Keyword>Settings</Keyword>
-@@ -204,6 +273,118 @@
-       </Query>
-       <DontShowIfEmpty/>
-     </Folder>
--    
-+
-+    <!-- KDE -->
-+    <Folder>
-+      <Name>KDE</Name>
-+      <Desktop>KDE.directory</Desktop>
-+
-+      <!-- KAccessories -->
-+      <Folder>
-+        <Name>Accessories</Name>
-+        <Desktop>Accessories.directory</Desktop>
-+        <Query>
-+          <And>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+            <Keyword>Utility</Keyword>
-+          </And>
-+        </Query>
-+        <DontShowIfEmpty/>
-+      </Folder>
-+
-+      <!-- KDevelopment Tools -->
-+      <Folder>
-+        <Name>Programming</Name>
-+        <Desktop>Development.directory</Desktop>
-+        <Query>
-+          <And>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+            <Keyword>Development</Keyword>
-+          </And>
-+        </Query>
-+        <DontShowIfEmpty/>
-+      </Folder>
-+
-+      <!-- KGraphics -->
-+      <Folder>
-+        <Name>Graphics</Name>
-+        <Desktop>Graphics.directory</Desktop>
-+        <Query>
-+          <And>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+            <Keyword>Graphics</Keyword>
-+          </And>
-+        </Query>
-+        <DontShowIfEmpty/>
-+      </Folder>
-+
-+      <!-- KInternet -->
-+      <Folder>
-+        <Name>Internet</Name>
-+        <Desktop>Internet.directory</Desktop>
-+        <Query>
-+          <And>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+            <Keyword>Network</Keyword>
-+          </And>
-+        </Query>
-+
-+        <Include>/usr/local/share/applnk/konqueror.desktop</Include>
-+
-+        <DontShowIfEmpty/>
-+      </Folder>
-+
-+      <!-- KMultimedia -->
-+      <Folder>
-+        <Name>Multimedia</Name>
-+        <Desktop>Multimedia.directory</Desktop>
-+        <Query>
-+          <And>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+            <Keyword>AudioVideo</Keyword>
-+          </And>
-+        </Query>
-+        <DontShowIfEmpty/>
-+      </Folder>
-+
-+      <!-- KOffice -->
-+      <Folder>
-+        <Name>Office</Name>
-+        <Desktop>Office.directory</Desktop>
-+        <Query>
-+          <And>
-+            <Or>
-+              <Keyword>Qt</Keyword>
-+              <Keyword>KDE</Keyword>
-+            </Or>
-+            <Or>
-+              <Keyword>Office</Keyword>
-+              <Keyword>Spreadsheet</Keyword>
-+              <Keyword>WordProcessor</Keyword>
-+              <Keyword>Calendar</Keyword>
-+              <Keyword>ProjectManagement</Keyword>
-+            </Or>
-+          </And>
-+        </Query>
-+        <DontShowIfEmpty/>
-+      </Folder>
-+      <DontShowIfEmpty/>
-+    </Folder> <!-- KDE -->
-+
-   </Folder>
- </VFolderInfo>
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
deleted file mode 100644
index 0bd0acf68b34..000000000000
--- a/devel/gnome-vfs/files/patch-aa
+++ /dev/null
@@ -1,158 +0,0 @@
---- configure.orig	Mon Apr 19 15:48:25 2004
-+++ configure	Mon Apr 19 16:27:55 2004
-@@ -22815,6 +22815,8 @@
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+  ac_check_lib_save_LIBS=$LIBS
-+  LIBS="-lintl  $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22897,6 +22899,7 @@
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -22904,6 +22907,7 @@
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-+ LIBS="-lintl $LIBS"
-  have_ngettext=yes
- fi
- done
-@@ -25302,7 +25306,7 @@
- 
- 
- 
--for ac_header in sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h wctype.h
-+for ac_header in sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -25463,6 +25467,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -25516,6 +25523,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -25591,6 +25601,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -25644,6 +25657,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -25720,6 +25736,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <unistd.h>
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -25780,6 +25799,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <unistd.h>
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -26788,8 +26810,8 @@
-   done
- fi
- 
--echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5
--echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:$LINENO: 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
-@@ -26808,11 +26830,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;
- }
-@@ -27943,7 +27965,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 -lcrypto"
- 		cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -29572,6 +29594,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/statfs.h>
- #include <sys/fstyp.h>
- _ACEOF
-@@ -29612,6 +29637,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/statfs.h>
- #include <sys/vmount.h>
- _ACEOF
-@@ -31250,6 +31278,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@,$BSD_PTHREAD_LIBS,;t t
- s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@USE_NLS@,$USE_NLS,;t t
- s,@MSGFMT@,$MSGFMT,;t t
diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac
deleted file mode 100644
index 9362cac1715f..000000000000
--- a/devel/gnome-vfs/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = 
- 
--module_flags = -export_dynamic -avoid-version -module -no-undefined
-+module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB)
- modulesdir = $(libdir)/gnome-vfs-2.0/modules
- 
- modules_LTLIBRARIES = \
diff --git a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in
deleted file mode 100644
index b02290aa2ebb..000000000000
--- a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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
deleted file mode 100644
index c75f0d973243..000000000000
--- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$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
deleted file mode 100644
index f9b09d46b7a3..000000000000
--- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$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-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
deleted file mode 100644
index 063376961823..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/Makefile.in.orig	Wed Oct 22 01:11:11 2003
-+++ libgnomevfs/Makefile.in	Wed Oct 22 01:12:00 2003
-@@ -429,7 +429,7 @@
- # CLEANFILES = $(BUILT_SOURCES)
- 
- # Platform specific includes
--libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
-+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include
- libgnomevfsplatforminclude_HEADERS = \
- 	gnome-vfs-file-size.h
- 
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c
deleted file mode 100644
index bd679de032d2..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c
+++ /dev/null
@@ -1,29 +0,0 @@
-
-$FreeBSD$
-
---- libgnomevfs/gnome-vfs-application-registry.c	2002/06/13 07:31:15	1.1
-+++ libgnomevfs/gnome-vfs-application-registry.c	2002/06/13 08:25:24
-@@ -940,6 +940,8 @@
- static void
- gnome_vfs_application_registry_init (void)
- {
-+	gchar *tmp;
-+
- 	if (gnome_vfs_application_registry_initialized)
- 		return;
- 
-@@ -961,6 +963,14 @@
- 	gnome_registry_dir.dirname = g_strdup (DATADIR "/application-registry");
- 	gnome_registry_dir.system_dir = TRUE;
- 	
-+	tmp = g_strconcat (g_get_home_dir(), "/.gnome", NULL);
-+	if (mkdir (tmp, 0700) &&
-+	    errno != EEXIST) {
-+		g_warning("Could not create per-user Gnome configuration directory: %s",
-+			  tmp);
-+	}
-+	g_free(tmp);
-+
- 	user_registry_dir.dirname = g_strconcat (g_get_home_dir(), "/.gnome/application-info", NULL);
- 	user_registry_dir.system_dir = FALSE;
- 
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
deleted file mode 100644
index 7028e5a91b8e..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- libgnomevfs/gnome-vfs-unix-mounts.c.orig	Mon Feb 16 06:13:27 2004
-+++ libgnomevfs/gnome-vfs-unix-mounts.c	Sat Apr 17 00:45:01 2004
-@@ -141,9 +141,9 @@
- 		FD_ZERO(&read_fds);
- 		FD_SET(pipes[0], &read_fds);
- 
--		/* Wait max half a second */
--		tv.tv_sec = 0;
--		tv.tv_usec = 500;
-+		/* Wait max one second */
-+		tv.tv_sec = 1;
-+		tv.tv_usec = 0;
- 
- 		res = select(pipes[0] + 1,
- 			     &read_fds, NULL, NULL, &tv);
-@@ -428,7 +428,7 @@
- 		mount_entry->mount_path = g_strdup (mntent[i].f_mntonname);
- 		mount_entry->device_path = g_strdup (mntent[i].f_mntfromname);
- 		mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename);
--		if (mntent[i].f_flags == MNT_RDONLY) {
-+		if (mntent[i].f_flags & MNT_RDONLY) {
- 		    	mount_entry->is_read_only = TRUE;
- 		}
- 
-@@ -857,8 +857,9 @@
- 
- #ifdef HAVE_SYS_SYSCTL_H
- 		if (usermnt != 0) {
-+			uid_t uid = getuid ();
- 			if (stat (fstab->fs_file, &sb) == 0) {
--				if (sb.st_uid != 0) {
-+				if (uid == 0 || sb.st_uid == uid) {
- 					mount_entry->is_user_mountable = TRUE;
- 				}
- 			}
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
deleted file mode 100644
index a168c6acdac8..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Fri Apr 16 06:43:05 2004
-+++ libgnomevfs/gnome-vfs-utils.c	Mon Apr 19 15:41:47 2004
-@@ -797,7 +797,9 @@
- 	
- #if HAVE_STATVFS
- 	statfs_result = statvfs (unescaped_path, &statfs_buffer);
-+#define statfs_bsize f_frsize
- #else
-+#define statfs_bsize f_bsize
- #if STATFS_ARGS == 2
- 	statfs_result = statfs (unescaped_path, &statfs_buffer);   
- #elif STATFS_ARGS == 4
-@@ -838,7 +840,7 @@
- 	}
- #endif
- 
--	block_size = statfs_buffer.f_bsize; 
-+	block_size = statfs_buffer.statfs_bsize; 
- 	free_blocks = statfs_buffer.f_bavail;
- 
- 	*size = block_size * free_blocks;
-@@ -866,7 +868,7 @@
- 	paths = g_strsplit (gnome_var, ":", 0); 
- 
- 	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
--		full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL);
-+		full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL);
- 		if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) {
- 			g_strfreev (paths);
- 			return full_filename;
diff --git a/devel/gnome-vfs/files/patch-ltmain.sh b/devel/gnome-vfs/files/patch-ltmain.sh
deleted file mode 100644
index 58384ee38d2e..000000000000
--- a/devel/gnome-vfs/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Sat Dec  6 14:47:45 2003
-+++ ltmain.sh	Tue Dec  9 14:09:01 2003
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c b/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c
deleted file mode 100644
index a07d0bc81b39..000000000000
--- a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/vfolder/vfolder-info.c.orig	Fri Nov 29 13:40:11 2002
-+++ modules/vfolder/vfolder-info.c	Fri Nov 29 13:40:19 2002
-@@ -1721,7 +1721,7 @@
- 
- 			for (i = 0; ppath[i] != NULL; i++) {
- 				dir = g_build_filename (ppath[i], 
--							"/share/applications/",
-+							"/share/gnome/applications/",
- 							NULL);
- 				id = itemdir_new (info, 
- 						  dir,