Update gnomevfs2 2.0.4 -> 2.0.4.1.

Mostly bugfixes.

Approved by:	pat

16 files changed, 226 insertions, 226 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index bf053c61c7fb..5e0ecbaae0a7 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.4.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.0
@@ -29,7 +29,7 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
-		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
+		BSD_PTHREAD_LIB=${PTHREAD_LIBS}
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index c61a84aae67e..1a127726ae2a 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.0.4.tar.bz2) = 40ab89fa79dbb33c294b61337e54084e
+MD5 (gnome2/gnome-vfs-2.0.4.1.tar.bz2) = 1d9ef5f9570268338512f9da1e6a8c6f
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index b088829dea89..26834ee5566e 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,52 +1,47 @@
---- configure.orig	Wed Sep  4 19:19:58 2002
-+++ configure	Fri Sep  6 02:28:34 2002
-@@ -8323,6 +8323,7 @@
+--- configure.orig	Wed Nov 13 09:10:52 2002
++++ configure	Wed Nov 13 10:46:27 2002
+@@ -5726,6 +5726,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
++$ac_aux_dir/ltconfig $LIBTOOL_Deps
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -14189,8 +14190,8 @@
+@@ -9392,8 +9393,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
-@@ -14206,7 +14207,7 @@
- #endif
+-echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6
+-echo "configure:9397: checking for bzCompressInit in -lbz2" >&5
++echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6
++echo "configure:9397: 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
+@@ -9406,10 +9407,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 ();
- #ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
-@@ -14216,7 +14217,7 @@
- int
- main ()
- {
--bzCompressInit ();
-+BZ2_bzCompressInit ();
-   ;
-   return 0;
- }
-@@ -14763,7 +14764,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+     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:9416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -9704,7 +9705,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
- 		cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
+ 		cat > conftest.$ac_ext <<EOF
+ #line 9710 "configure"
  #include "confdefs.h"
-@@ -14820,9 +14821,9 @@
+@@ -9739,9 +9740,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -56,14 +51,14 @@
 -                	OPENSSL_LIBS="-lssl -lcrypto"
 +                	OPENSSL_LIBS="-lssl -lcryptofoo"
                  fi
+ 		
  
- 
-@@ -16488,7 +16489,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
+@@ -10570,7 +10571,7 @@
+ s%@ORBIT_IDL@%$ORBIT_IDL%g
+ s%@BONOBO_IDLDIR@%$BONOBO_IDLDIR%g
+ s%@WARN_CFLAGS@%$WARN_CFLAGS%g
+-s%@PTHREAD_LIB@%$PTHREAD_LIB%g
++s%@PTHREAD_LIB@%$BSD_PTHREAD_LIB%g
+ s%@GETTEXT_PACKAGE@%$GETTEXT_PACKAGE%g
+ s%@ALLOCA@%$ALLOCA%g
+ s%@USE_NLS@%$USE_NLS%g
diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab
index 5b03470242dd..2b87972bc28a 100644
--- a/devel/gnome-vfs/files/patch-ab
+++ b/devel/gnome-vfs/files/patch-ab
@@ -1,10 +1,11 @@
---- Makefile.in.orig	Fri Sep  6 02:29:04 2002
-+++ Makefile.in	Fri Sep  6 02:29:27 2002
-@@ -183,7 +183,6 @@
- 	schemas					\
- 	devel-docs				\
- 	doc					\
--	test					\
- 	monikers				\
- 	po
+--- Makefile.in.orig	Wed Nov 13 10:46:51 2002
++++ Makefile.in	Wed Nov 13 10:47:52 2002
+@@ -170,7 +170,7 @@
  
+ SUBDIRS_GNOME = monikers doc schemas
+ 
+-SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc						test						monikers					po
++SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc												monikers					po
+ 
+ 
+ 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-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
index f9b09d46b7a3..7e959d704f4c 100644
--- 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
@@ -1,8 +1,5 @@
-
-$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
+--- gnome-vfs-module-2.0.pc.in.orig	Wed Jan 30 20:28:20 2002
++++ gnome-vfs-module-2.0.pc.in	Wed Nov 13 10:49:35 2002
 @@ -8,5 +8,5 @@
  Description: The GNOME virtual file-system module include info
  Version: @VERSION@
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
index b27e7e217857..1b09b31af872 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
@@ -1,11 +1,11 @@
---- libgnomevfs/Makefile.in.orig	Fri Sep  6 02:29:53 2002
-+++ libgnomevfs/Makefile.in	Fri Sep  6 02:30:42 2002
-@@ -329,7 +329,7 @@
+--- libgnomevfs/Makefile.in.orig	Wed Nov 13 10:51:57 2002
++++ libgnomevfs/Makefile.in	Wed Nov 13 10:52:09 2002
+@@ -192,7 +192,7 @@
  
  
  # Platform specific includes
 -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
-+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS = \
- 	gnome-vfs-file-size.h
++libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include
+ libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
+ 
  
diff --git a/devel/gnome-vfs/files/patch-modules::vfolder::Makefile.in b/devel/gnome-vfs/files/patch-modules::vfolder::Makefile.in
new file mode 100644
index 000000000000..05476dd54787
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules::vfolder::Makefile.in
@@ -0,0 +1,11 @@
+--- modules/vfolder/Makefile.in.orig	Wed Nov 13 11:05:45 2002
++++ modules/vfolder/Makefile.in	Wed Nov 13 11:06:24 2002
+@@ -221,7 +221,7 @@
+ 
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+-LIBS = @LIBS@
++LIBS = @LIBS@ @PTHREAD_LIB@
+ libvfolder_desktop_la_DEPENDENCIES =  \
+ $(top_builddir)/libgnomevfs/libgnomevfs-2.la
+ libvfolder_desktop_la_OBJECTS =  vfolder-info.lo vfolder-util.lo \
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index b038047dd1bf..ad72a874c4aa 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -1,3 +1,5 @@
+etc/gconf/gconf.xml.defaults/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/%gconf.xml
@@ -5,12 +7,12 @@ etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
 etc/gconf/schemas/system_http_proxy.schemas
 etc/gnome-vfs-2.0/modules/default-modules.conf
 etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
-etc/gnome-vfs-2.0/vfolders/applications.vfolder-info-default
 etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info
 etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info
 etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info
 etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info
 etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info
+include/gnome-vfs-2.0/include/gnome-vfs-file-size.h
 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
@@ -51,21 +53,50 @@ 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.a
+lib/bonobo/monikers/libmoniker_gnome_vfs_std.la
 lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
+lib/gnome-vfs-2.0/modules/libbzip2.a
+lib/gnome-vfs-2.0/modules/libbzip2.la
 lib/gnome-vfs-2.0/modules/libbzip2.so
+lib/gnome-vfs-2.0/modules/libextfs.a
+lib/gnome-vfs-2.0/modules/libextfs.la
 lib/gnome-vfs-2.0/modules/libextfs.so
+lib/gnome-vfs-2.0/modules/libfile.a
+lib/gnome-vfs-2.0/modules/libfile.la
 lib/gnome-vfs-2.0/modules/libfile.so
+lib/gnome-vfs-2.0/modules/libftp.a
+lib/gnome-vfs-2.0/modules/libftp.la
 lib/gnome-vfs-2.0/modules/libftp.so
+lib/gnome-vfs-2.0/modules/libgzip.a
+lib/gnome-vfs-2.0/modules/libgzip.la
 lib/gnome-vfs-2.0/modules/libgzip.so
+lib/gnome-vfs-2.0/modules/libhttp.a
+lib/gnome-vfs-2.0/modules/libhttp.la
 lib/gnome-vfs-2.0/modules/libhttp.so
+lib/gnome-vfs-2.0/modules/libnntp.a
+lib/gnome-vfs-2.0/modules/libnntp.la
 lib/gnome-vfs-2.0/modules/libnntp.so
+lib/gnome-vfs-2.0/modules/libssh.a
+lib/gnome-vfs-2.0/modules/libssh.la
 lib/gnome-vfs-2.0/modules/libssh.so
+lib/gnome-vfs-2.0/modules/libtar.a
+lib/gnome-vfs-2.0/modules/libtar.la
 lib/gnome-vfs-2.0/modules/libtar.so
+lib/gnome-vfs-2.0/modules/libvfolder-desktop.a
+lib/gnome-vfs-2.0/modules/libvfolder-desktop.la
 lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
+lib/gnome-vfs-2.0/modules/libvfs-pipe.a
+lib/gnome-vfs-2.0/modules/libvfs-pipe.la
 lib/gnome-vfs-2.0/modules/libvfs-pipe.so
+lib/gnome-vfs-2.0/modules/libvfs-test.a
+lib/gnome-vfs-2.0/modules/libvfs-test.la
 lib/gnome-vfs-2.0/modules/libvfs-test.so
+lib/gnome-vfs-2.0/modules/libvfs-translate.a
+lib/gnome-vfs-2.0/modules/libvfs-translate.la
 lib/gnome-vfs-2.0/modules/libvfs-translate.so
 lib/libgnomevfs-2.a
+lib/libgnomevfs-2.la
 lib/libgnomevfs-2.so
 lib/libgnomevfs-2.so.0
 lib/vfs/2.0/extfs/README
@@ -88,51 +119,10 @@ lib/vfs/2.0/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-2.0/about.html
-share/doc/gnome-vfs-2.0/data-types.html
-share/doc/gnome-vfs-2.0/everything-else.html
-share/doc/gnome-vfs-2.0/file-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html
-share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html
-share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html
-share/doc/gnome-vfs-2.0/gnome-vfs-context.html
-share/doc/gnome-vfs-2.0/gnome-vfs-directory.html
-share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html
-share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html
-share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html
-share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html
-share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html
-share/doc/gnome-vfs-2.0/gnome-vfs-method.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime.html
-share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html
-share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html
-share/doc/gnome-vfs-2.0/gnome-vfs-module.html
-share/doc/gnome-vfs-2.0/gnome-vfs-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html
-share/doc/gnome-vfs-2.0/gnome-vfs-process.html
-share/doc/gnome-vfs-2.0/gnome-vfs-result.html
-share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html
-share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html
-share/doc/gnome-vfs-2.0/gnome-vfs-types.html
-share/doc/gnome-vfs-2.0/gnome-vfs-uri.html
-share/doc/gnome-vfs-2.0/gnome-vfs-utils.html
-share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html
-share/doc/gnome-vfs-2.0/index.html
-share/doc/gnome-vfs-2.0/index.sgml
-share/doc/gnome-vfs-2.0/mime-registry.html
-share/doc/gnome-vfs-2.0/modules.html
-share/doc/gnome-vfs-2.0/writing-modules.html
-share/doc/gnome-vfs-2.0/x27.html
+share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -164,6 +154,7 @@ 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/sq/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
@@ -171,14 +162,19 @@ share/locale/vi/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-2.0
+@dirrm lib/gnome-vfs-2.0/modules
+@dirrm lib/gnome-vfs-2.0
 @dirrm lib/vfs/2.0/extfs
 @dirrm lib/vfs/2.0
+@dirrm lib/vfs
 @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/include
 @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
 @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy
 @dirrm etc/gconf/gconf.xml.defaults/system
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index bf053c61c7fb..5e0ecbaae0a7 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.4.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.0
@@ -29,7 +29,7 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
-		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
+		BSD_PTHREAD_LIB=${PTHREAD_LIBS}
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index c61a84aae67e..1a127726ae2a 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.0.4.tar.bz2) = 40ab89fa79dbb33c294b61337e54084e
+MD5 (gnome2/gnome-vfs-2.0.4.1.tar.bz2) = 1d9ef5f9570268338512f9da1e6a8c6f
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index b088829dea89..26834ee5566e 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,52 +1,47 @@
---- configure.orig	Wed Sep  4 19:19:58 2002
-+++ configure	Fri Sep  6 02:28:34 2002
-@@ -8323,6 +8323,7 @@
+--- configure.orig	Wed Nov 13 09:10:52 2002
++++ configure	Wed Nov 13 10:46:27 2002
+@@ -5726,6 +5726,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
++$ac_aux_dir/ltconfig $LIBTOOL_Deps
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -14189,8 +14190,8 @@
+@@ -9392,8 +9393,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
-@@ -14206,7 +14207,7 @@
- #endif
+-echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6
+-echo "configure:9397: checking for bzCompressInit in -lbz2" >&5
++echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6
++echo "configure:9397: 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
+@@ -9406,10 +9407,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 ();
- #ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
-@@ -14216,7 +14217,7 @@
- int
- main ()
- {
--bzCompressInit ();
-+BZ2_bzCompressInit ();
-   ;
-   return 0;
- }
-@@ -14763,7 +14764,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+     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:9416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -9704,7 +9705,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
- 		cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
+ 		cat > conftest.$ac_ext <<EOF
+ #line 9710 "configure"
  #include "confdefs.h"
-@@ -14820,9 +14821,9 @@
+@@ -9739,9 +9740,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -56,14 +51,14 @@
 -                	OPENSSL_LIBS="-lssl -lcrypto"
 +                	OPENSSL_LIBS="-lssl -lcryptofoo"
                  fi
+ 		
  
- 
-@@ -16488,7 +16489,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
+@@ -10570,7 +10571,7 @@
+ s%@ORBIT_IDL@%$ORBIT_IDL%g
+ s%@BONOBO_IDLDIR@%$BONOBO_IDLDIR%g
+ s%@WARN_CFLAGS@%$WARN_CFLAGS%g
+-s%@PTHREAD_LIB@%$PTHREAD_LIB%g
++s%@PTHREAD_LIB@%$BSD_PTHREAD_LIB%g
+ s%@GETTEXT_PACKAGE@%$GETTEXT_PACKAGE%g
+ s%@ALLOCA@%$ALLOCA%g
+ s%@USE_NLS@%$USE_NLS%g
diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab
index 5b03470242dd..2b87972bc28a 100644
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/files/patch-ab
@@ -1,10 +1,11 @@
---- Makefile.in.orig	Fri Sep  6 02:29:04 2002
-+++ Makefile.in	Fri Sep  6 02:29:27 2002
-@@ -183,7 +183,6 @@
- 	schemas					\
- 	devel-docs				\
- 	doc					\
--	test					\
- 	monikers				\
- 	po
+--- Makefile.in.orig	Wed Nov 13 10:46:51 2002
++++ Makefile.in	Wed Nov 13 10:47:52 2002
+@@ -170,7 +170,7 @@
  
+ SUBDIRS_GNOME = monikers doc schemas
+ 
+-SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc						test						monikers					po
++SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc												monikers					po
+ 
+ 
+ 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/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in
index f9b09d46b7a3..7e959d704f4c 100644
--- a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in
+++ b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in
@@ -1,8 +1,5 @@
-
-$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
+--- gnome-vfs-module-2.0.pc.in.orig	Wed Jan 30 20:28:20 2002
++++ gnome-vfs-module-2.0.pc.in	Wed Nov 13 10:49:35 2002
 @@ -8,5 +8,5 @@
  Description: The GNOME virtual file-system module include info
  Version: @VERSION@
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
index b27e7e217857..1b09b31af872 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
@@ -1,11 +1,11 @@
---- libgnomevfs/Makefile.in.orig	Fri Sep  6 02:29:53 2002
-+++ libgnomevfs/Makefile.in	Fri Sep  6 02:30:42 2002
-@@ -329,7 +329,7 @@
+--- libgnomevfs/Makefile.in.orig	Wed Nov 13 10:51:57 2002
++++ libgnomevfs/Makefile.in	Wed Nov 13 10:52:09 2002
+@@ -192,7 +192,7 @@
  
  
  # Platform specific includes
 -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
-+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS = \
- 	gnome-vfs-file-size.h
++libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include
+ libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
+ 
  
diff --git a/devel/gnomevfs2/files/patch-modules::vfolder::Makefile.in b/devel/gnomevfs2/files/patch-modules::vfolder::Makefile.in
new file mode 100644
index 000000000000..05476dd54787
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules::vfolder::Makefile.in
@@ -0,0 +1,11 @@
+--- modules/vfolder/Makefile.in.orig	Wed Nov 13 11:05:45 2002
++++ modules/vfolder/Makefile.in	Wed Nov 13 11:06:24 2002
+@@ -221,7 +221,7 @@
+ 
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+-LIBS = @LIBS@
++LIBS = @LIBS@ @PTHREAD_LIB@
+ libvfolder_desktop_la_DEPENDENCIES =  \
+ $(top_builddir)/libgnomevfs/libgnomevfs-2.la
+ libvfolder_desktop_la_OBJECTS =  vfolder-info.lo vfolder-util.lo \
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index b038047dd1bf..ad72a874c4aa 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -1,3 +1,5 @@
+etc/gconf/gconf.xml.defaults/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/%gconf.xml
@@ -5,12 +7,12 @@ etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
 etc/gconf/schemas/system_http_proxy.schemas
 etc/gnome-vfs-2.0/modules/default-modules.conf
 etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
-etc/gnome-vfs-2.0/vfolders/applications.vfolder-info-default
 etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info
 etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info
 etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info
 etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info
 etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info
+include/gnome-vfs-2.0/include/gnome-vfs-file-size.h
 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
@@ -51,21 +53,50 @@ 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.a
+lib/bonobo/monikers/libmoniker_gnome_vfs_std.la
 lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
+lib/gnome-vfs-2.0/modules/libbzip2.a
+lib/gnome-vfs-2.0/modules/libbzip2.la
 lib/gnome-vfs-2.0/modules/libbzip2.so
+lib/gnome-vfs-2.0/modules/libextfs.a
+lib/gnome-vfs-2.0/modules/libextfs.la
 lib/gnome-vfs-2.0/modules/libextfs.so
+lib/gnome-vfs-2.0/modules/libfile.a
+lib/gnome-vfs-2.0/modules/libfile.la
 lib/gnome-vfs-2.0/modules/libfile.so
+lib/gnome-vfs-2.0/modules/libftp.a
+lib/gnome-vfs-2.0/modules/libftp.la
 lib/gnome-vfs-2.0/modules/libftp.so
+lib/gnome-vfs-2.0/modules/libgzip.a
+lib/gnome-vfs-2.0/modules/libgzip.la
 lib/gnome-vfs-2.0/modules/libgzip.so
+lib/gnome-vfs-2.0/modules/libhttp.a
+lib/gnome-vfs-2.0/modules/libhttp.la
 lib/gnome-vfs-2.0/modules/libhttp.so
+lib/gnome-vfs-2.0/modules/libnntp.a
+lib/gnome-vfs-2.0/modules/libnntp.la
 lib/gnome-vfs-2.0/modules/libnntp.so
+lib/gnome-vfs-2.0/modules/libssh.a
+lib/gnome-vfs-2.0/modules/libssh.la
 lib/gnome-vfs-2.0/modules/libssh.so
+lib/gnome-vfs-2.0/modules/libtar.a
+lib/gnome-vfs-2.0/modules/libtar.la
 lib/gnome-vfs-2.0/modules/libtar.so
+lib/gnome-vfs-2.0/modules/libvfolder-desktop.a
+lib/gnome-vfs-2.0/modules/libvfolder-desktop.la
 lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
+lib/gnome-vfs-2.0/modules/libvfs-pipe.a
+lib/gnome-vfs-2.0/modules/libvfs-pipe.la
 lib/gnome-vfs-2.0/modules/libvfs-pipe.so
+lib/gnome-vfs-2.0/modules/libvfs-test.a
+lib/gnome-vfs-2.0/modules/libvfs-test.la
 lib/gnome-vfs-2.0/modules/libvfs-test.so
+lib/gnome-vfs-2.0/modules/libvfs-translate.a
+lib/gnome-vfs-2.0/modules/libvfs-translate.la
 lib/gnome-vfs-2.0/modules/libvfs-translate.so
 lib/libgnomevfs-2.a
+lib/libgnomevfs-2.la
 lib/libgnomevfs-2.so
 lib/libgnomevfs-2.so.0
 lib/vfs/2.0/extfs/README
@@ -88,51 +119,10 @@ lib/vfs/2.0/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-2.0/about.html
-share/doc/gnome-vfs-2.0/data-types.html
-share/doc/gnome-vfs-2.0/everything-else.html
-share/doc/gnome-vfs-2.0/file-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html
-share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html
-share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html
-share/doc/gnome-vfs-2.0/gnome-vfs-context.html
-share/doc/gnome-vfs-2.0/gnome-vfs-directory.html
-share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html
-share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html
-share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html
-share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html
-share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html
-share/doc/gnome-vfs-2.0/gnome-vfs-method.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-mime.html
-share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html
-share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html
-share/doc/gnome-vfs-2.0/gnome-vfs-module.html
-share/doc/gnome-vfs-2.0/gnome-vfs-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html
-share/doc/gnome-vfs-2.0/gnome-vfs-process.html
-share/doc/gnome-vfs-2.0/gnome-vfs-result.html
-share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html
-share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html
-share/doc/gnome-vfs-2.0/gnome-vfs-types.html
-share/doc/gnome-vfs-2.0/gnome-vfs-uri.html
-share/doc/gnome-vfs-2.0/gnome-vfs-utils.html
-share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html
-share/doc/gnome-vfs-2.0/index.html
-share/doc/gnome-vfs-2.0/index.sgml
-share/doc/gnome-vfs-2.0/mime-registry.html
-share/doc/gnome-vfs-2.0/modules.html
-share/doc/gnome-vfs-2.0/writing-modules.html
-share/doc/gnome-vfs-2.0/x27.html
+share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -164,6 +154,7 @@ 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/sq/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
@@ -171,14 +162,19 @@ share/locale/vi/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-2.0
+@dirrm lib/gnome-vfs-2.0/modules
+@dirrm lib/gnome-vfs-2.0
 @dirrm lib/vfs/2.0/extfs
 @dirrm lib/vfs/2.0
+@dirrm lib/vfs
 @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/include
 @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
 @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy
 @dirrm etc/gconf/gconf.xml.defaults/system
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy