7 files changed, 128 insertions, 17 deletions

diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 9db3569cb11c..0ed5968bc6fc 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,18 +1,31 @@
---- configure.orig	Mon May  7 18:12:27 2001
-+++ configure	Thu May 10 13:24:14 2001
-@@ -2365,3 +2365,3 @@
-   VFS_CAPPLET_LIBS="`gnome-config --libs gnome gnomeui capplet`"
--  VFS_GLIB_CONFIG="glib-config"
-+  VFS_GLIB_CONFIG="$GLIB_CONFIG"
- else
-@@ -6924,4 +6924,4 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon Sep 17 17:07:27 2001
++++ configure	Mon Sep 17 17:08:56 2001
+@@ -5868,7 +5868,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"
+ 
+ 
+ 
+@@ -10472,8 +10472,8 @@
+   done
+ fi
  
 -echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6
--echo "configure:6927: checking for bzCompressInit in -lbz2" >&5
+-echo "configure:10477: checking for bzCompressInit in -lbz2" >&5
 +echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6
-+echo "configure:6927: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "configure:10477: checking for BZ2_bzCompressInit in -lbz2" >&5
  ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'`
-@@ -6938,6 +6938,6 @@
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -10486,10 +10486,10 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* 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();
@@ -21,3 +34,5 @@
 -bzCompressInit()
 +BZ2_bzCompressInit()
  ; return 0; }
+ EOF
+ if { (eval echo configure:10496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab
index e33154e73cf8..baeff1eceb82 100644
--- a/devel/gnome-vfs/files/patch-ab
+++ b/devel/gnome-vfs/files/patch-ab
@@ -1,16 +1,40 @@
---- Makefile.in.orig	Mon May  7 18:12:50 2001
-+++ Makefile.in	Thu May 10 13:25:48 2001
-@@ -174,3 +174,3 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Fri Sep 28 11:17:29 2001
++++ Makefile.in	Fri Sep 28 11:22:06 2001
+@@ -177,9 +177,9 @@
+ l = @l@
+ need_gnome_support = @need_gnome_support@
+ @PLATFORM_GNOME_2_TRUE@SUBDIRS_GNOME = doc
+-@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = doc test
++@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = doc
  
 -SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				idl						modules						data						man						devel-docs					$(SUBDIRS_GNOME)				po
 +SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				idl						modules						data						man						$(SUBDIRS_GNOME)				po
  
-@@ -182,3 +182,3 @@
+ 
+ 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
+@@ -187,7 +187,7 @@
+ 
+ bin_SCRIPTS = $(top_builddir)/gnome-vfs-config
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
- confexec_DATA =  	vfsConf.sh					vfspthreadConf.sh
-@@ -534,2 +534,3 @@
+ confexec_DATA =  	vfsConf.sh
+ 
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -526,11 +526,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' \
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
new file mode 100644
index 000000000000..c8ca73f68d60
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
@@ -0,0 +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 @@
+ 
+ 
+ # Platform specific includes
+-libgnomevfsplatofrmincludedir = $(libdir)/gnome-vfs-1.0/include
++libgnomevfsplatofrmincludedir = $(includedir)/gnome-vfs-1.0/libgnomevfs
+ libgnomevfsplatofrminclude_HEADERS =  	gnome-vfs-file-size.h
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-mime.h b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-mime.h
new file mode 100644
index 000000000000..5dcbb6b3b5e6
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-mime.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- libgnomevfs/gnome-vfs-mime.h	2001/09/17 14:13:01	1.1
++++ libgnomevfs/gnome-vfs-mime.h	2001/09/17 14:13:16
+@@ -27,6 +27,7 @@
+ #include <ctype.h>
+ #include <dirent.h>
+ #include <libgnomevfs/gnome-vfs-uri.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/devel/gnome-vfs/files/patch-ltmain.sh b/devel/gnome-vfs/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,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-po::Makefile.in.in b/devel/gnome-vfs/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..bbdedf273594
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$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
new file mode 100644
index 000000000000..a38a6ca21262
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-vfsConf.sh.in
@@ -0,0 +1,13 @@
+
+$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@"