Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release

ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>

15 files changed, 575 insertions, 158 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 8d0347ed..bcaf172 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,38 +6,58 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.4.3
+PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.4
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.6
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Virtual File System
 
+RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier gnomemimedata gconf2 libbonobo
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \
+		libbonobo
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--disable-openssl \
+		--disable-gnutls \
+		--with-gtk=no
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
+OPTIONS=	KDE_MENUS "Integrated KDE menu picks" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.undef WITHOUT_CDPARANOIA
+.undef WITHOUT_SAMBA
+WITH_CDPARANOIA=	yes
+WITH_SAMBA=		yes
+.endif
+
 .if !defined(WITHOUT_KDE_MENUS)
 EXTRA_PATCHES=	${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in
+PLIST_SUB+=	KDEMENUS=""
+.else
+PLIST_SUB+=	KDEMENUS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
 WITH_CDPARANOIA=	yes
 .endif
-.if exists(${LOCALBASE}/lib/libfam.a)
-WITH_FAM=	yes
+
+.if exists(${LOCALBASE}/lib/libsmbclient.so)
+WITH_SAMBA=		yes
 .endif
 
 .if defined(WITH_CDPARANOIA)
@@ -46,16 +66,29 @@ PLIST_SUB+=	CDPARANOIA=""
 .else
 PLIST_SUB+=	CDPARANOIA="@comment "
 .endif
-.if defined(WITH_FAM)
+
+.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
+.if defined(WITH_SAMBA)
+LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+PLIST_SUB+=	SAMBA=""
+.else
+PLIST_SUB+=	SAMBA="@comment "
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in \
+		${WRKSRC}/libgnomevfs/xdgmime.c \
 		${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
+.if !defined(WITHOUT_KDE_MENUS)
+	@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
+		< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
+.endif
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \
 		${WRKSRC}/Makefile.in
 
@@ -65,4 +98,10 @@ pre-configure:
 		${FALSE}; \
 	fi
 
+post-install:
+	@${MKDIR} ${PREFIX}/share/gnome/vfolders
+.if !defined(WITHOUT_KDE_MENUS)
+	@${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 0c0b4d2..31ff337 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.4.3.tar.bz2) = d217b3c241852ccb9e9147b63f8eb6d4
-SIZE (gnome2/gnome-vfs-2.4.3.tar.bz2) = 1072724
+MD5 (gnome2/gnome-vfs-2.6.0.tar.bz2) = 4d0323cf015dd006210fcacd4bfe7420
+SIZE (gnome2/gnome-vfs-2.6.0.tar.bz2) = 1431274
diff --git a/devel/gnome-vfs/files/KDE.directory b/devel/gnome-vfs/files/KDE.directory
new file mode 100644
index 0000000..032126bb
--- /dev/null
+++ b/devel/gnome-vfs/files/KDE.directory
@@ -0,0 +1,5 @@
+[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
index 13ce783..120a890 100644
--- 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
@@ -1,11 +1,285 @@
---- modules/vfolder/applications-all-users.vfolder-info.in.orig	Sat Oct 18 19:04:37 2003
-+++ modules/vfolder/applications-all-users.vfolder-info.in	Sat Oct 18 19:05:18 2003
-@@ -19,7 +19,7 @@
+--- 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>%%LOCALBASE%%/share/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
index 303b8e8..8273ab3 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,62 +1,31 @@
---- configure.orig	Tue Mar  9 14:55:35 2004
-+++ configure	Tue Mar  9 16:41:53 2004
-@@ -19711,6 +19711,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -24792,6 +24793,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24844,6 +24846,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24918,6 +24921,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24970,6 +24974,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -25044,6 +25049,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
-@@ -25104,6 +25110,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <unistd.h>
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -26099,8 +26106,8 @@
+--- configure.orig	Sun Feb  8 16:04:02 2004
++++ configure	Sun Feb  8 16:04:36 2004
+@@ -22816,6 +22816,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
+@@ -22898,6 +22900,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
+@@ -22905,6 +22908,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++ LIBS="-lintl $LIBS"
+  have_ngettext=yes
+ fi
+ done
+@@ -26396,8 +26400,8 @@
    done
  fi
  
@@ -67,7 +36,7 @@
  if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26119,11 +26126,11 @@
+@@ -26416,11 +26420,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -81,28 +50,16 @@
    ;
    return 0;
  }
-@@ -26917,7 +26924,7 @@
+@@ -27547,7 +27551,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 -lcryptofoo -ldl"
++		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26982,9 +26989,9 @@
- 
- 		msg_openssl="yes"
-                 if test x$with_openssl_libs != x/usr/lib; then
--                        OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto"
-+                        OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo"
-                 else
--                	OPENSSL_LIBS="-lssl -lcrypto"
-+                	OPENSSL_LIBS="-lssl -lcryptofoo"
-                 fi
- 
- 
-@@ -29285,6 +29292,7 @@
+@@ -30543,6 +30547,7 @@
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
  s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
index 764a5a6..0633769 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	Mon Oct 13 10:31:12 2003
-+++ libgnomevfs/Makefile.in	Mon Oct 13 10:31:37 2003
-@@ -234,7 +234,7 @@
+--- 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
- 
+ libgnomevfsplatforminclude_HEADERS = \
+ 	gnome-vfs-file-size.h
  
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
new file mode 100644
index 0000000..21912f4
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
@@ -0,0 +1,13 @@
+--- libgnomevfs/gnome-vfs-unix-mounts.c.orig	Mon Mar  8 22:29:57 2004
++++ libgnomevfs/gnome-vfs-unix-mounts.c	Mon Mar  8 22:33:35 2004
+@@ -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
index 8f8f15b..ab74eb9 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -1,14 +1,26 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Fri Apr 25 06:52:18 2003
-+++ libgnomevfs/gnome-vfs-utils.c	Tue May  6 15:44:27 2003
-@@ -42,6 +42,7 @@
- #include <pwd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -840,7 +841,7 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig	Sat Mar 13 18:57:02 2004
++++ libgnomevfs/gnome-vfs-utils.c	Sat Mar 13 18:51:21 2004
+@@ -797,8 +797,10 @@
+ 	
+ #if HAVE_STATVFS
+ 	statfs_result = statvfs (unescaped_path, &statfs_buffer);
++#define statfs_bsize f_frsize
+ #else
+ 	statfs_result = statfs (unescaped_path, &statfs_buffer);   
++#define statfs_bsize f_bsize
+ #endif  
+ 
+ 	if (statfs_result != 0) {
+@@ -831,7 +833,7 @@
+ 		}
+ 	}
+ 
+-	block_size = statfs_buffer.f_bsize; 
++	block_size = statfs_buffer.statfs_bsize; 
+ 	free_blocks = statfs_buffer.f_bavail;
+ 
+ 	*size = block_size * free_blocks;
+@@ -859,7 +861,7 @@
  	paths = g_strsplit (gnome_var, ":", 0); 
  
  	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
diff --git a/devel/gnome-vfs/files/patch-ltmain.sh b/devel/gnome-vfs/files/patch-ltmain.sh
new file mode 100644
index 0000000..58384ee
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- 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_cdda-method.c b/devel/gnome-vfs/files/patch-modules_cdda-method.c
deleted file mode 100644
index 9725084..0000000
--- a/devel/gnome-vfs/files/patch-modules_cdda-method.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- modules/cdda-method.c.orig	Tue Jan 27 06:19:01 2004
-+++ modules/cdda-method.c	Wed Jan 28 00:21:01 2004
-@@ -623,7 +623,11 @@
- 	/* Check and see if we already have opened and stashed this drive */
- 	if (!use_base) {
- 		if (global_context != NULL) {
-+#ifdef Linux
- 			if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
-+#elif defined(__FreeBSD__)
-+			if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) {
-+#endif
- 				use_cache = TRUE;
- 				cdda_close (drive);
- 				gnome_vfs_file_info_copy (file_info, global_context->file_info);
-@@ -709,7 +713,11 @@
- 	if (!use_base) {
- 		/* Check for cache */
- 		if (global_context != NULL) {
-+#ifdef Linux
- 				if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
-+#elif defined(__FreeBSD__)
-+				if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) {
-+#endif
- 					/*	Clear old cache */
- 					cdda_context_free (global_context);
- 					global_context = cdda_context_new (drive, uri);
diff --git a/devel/gnome-vfs/files/patch-modules_pty-open.c b/devel/gnome-vfs/files/patch-modules_pty-open.c
new file mode 100644
index 0000000..2ee23b0
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_pty-open.c
@@ -0,0 +1,13 @@
+--- modules/pty-open.c.orig	Sun Apr  4 12:58:08 2004
++++ modules/pty-open.c	Sun Apr  4 12:59:30 2004
+@@ -613,6 +613,10 @@
+ 	if ((fd == -1) && (errno == ENOENT)) {
+ 		fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */
+ 	}
++
++	if ((fd == -1) && (errno == ENOENT)) {
++		fd = posix_openpt(O_RDWR);
++	}
+ #endif
+ 	/* Set it to blocking. */
+ 	flags = fcntl(fd, F_GETFL);
diff --git a/devel/gnome-vfs/files/patch-modules_sftp-method.c b/devel/gnome-vfs/files/patch-modules_sftp-method.c
new file mode 100644
index 0000000..bd08ae0
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_sftp-method.c
@@ -0,0 +1,26 @@
+--- modules/sftp-method.c.orig	Mon Mar  8 13:52:39 2004
++++ modules/sftp-method.c	Sun Apr  4 13:50:21 2004
+@@ -175,6 +175,15 @@
+ 
+ typedef ssize_t (*read_write_fn) (int, void *, size_t);
+ 
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression)				\
++	(__extension__						\
++	 ({ long int __result;					\
++	  	do __result = (long int) (expression);		\
++		while (__result == -1L && errno == EINTR);	\
++		__result; }))
++#endif
++
+ static gsize
+ atomic_io (read_write_fn f, gint fd, gpointer buffer_in, gsize size) 
+ {
+@@ -1072,6 +1081,7 @@
+ 		if (io_status == G_IO_STATUS_NORMAL) {
+ 			buffer[len] = 0;
+ 			if (g_str_has_suffix (buffer, "password: ") ||
++			    g_str_has_suffix (buffer, "Password:")  ||
+ 			    g_str_has_prefix (buffer, "Enter passphrase for key")) {
+ 				if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) {
+ 					g_io_channel_write_chars (tty_channel, password, -1, &len, NULL);
diff --git a/devel/gnome-vfs/files/patch-modules_ssh-method.c b/devel/gnome-vfs/files/patch-modules_ssh-method.c
deleted file mode 100644
index 14b2cf8..0000000
--- a/devel/gnome-vfs/files/patch-modules_ssh-method.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/ssh-method.c.orig	Mon Jun 10 13:28:42 2002
-+++ modules/ssh-method.c	Mon Jun 10 13:28:51 2002
-@@ -34,6 +34,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <signal.h>
- #include <unistd.h>
- 
- typedef struct {
diff --git a/devel/gnome-vfs/pkg-descr b/devel/gnome-vfs/pkg-descr
index 81cfcd5..03cbc07 100644
--- a/devel/gnome-vfs/pkg-descr
+++ b/devel/gnome-vfs/pkg-descr
@@ -1,14 +1,7 @@
-This is the GNOME Virtual File System.
-
-GnomeVFS is a filesystem abstraction library allowing applications
-plugable transparent access to a variety of "real" filesystems, from
-WebDAV to digital cameras, to the local filesystem. It also contains a
-number of other convenient file utilities such as a comphrehensive MIME
-database / Application registry, and a copy engine. Use of GnomeVFS
-ensures that an application or component will be usable by Nautilus or
-other GnomeVFS applications for handling the display of data from
-various URIs, as well.
-
-This is the GnomeVFS for the GNOME 2 architecture.
+The GNOME Virtual File System allows applications and users to treat
+any number of file system concepts as a part of the local filesystem.
+With GnomeVFS, filesystems across the internet, on connected devices,
+and in multiple formats are as simple to access (and write code for)
+as any directory on the local machine.
 
 WWW: http://www.gnome.org/
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 0d945ad..0354844 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -3,27 +3,52 @@ bin/gnomevfs-copy
 bin/gnomevfs-info
 bin/gnomevfs-ls
 bin/gnomevfs-mkdir
-etc/gconf/gconf.xml.defaults/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%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/schemas/system/proxy/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/smb/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/proxy/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/smb/%gconf.xml
 etc/gconf/schemas/desktop_default_applications.schemas
+etc/gconf/schemas/desktop_gnome_url_handlers.schemas
 etc/gconf/schemas/system_http_proxy.schemas
+etc/gconf/schemas/system_smb.schemas
 %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
 etc/gnome-vfs-2.0/modules/default-modules.conf
+%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf
 etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
 etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info
 etc/gnome-vfs-2.0/vfolders/network.vfolder-info
@@ -37,6 +62,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
@@ -54,6 +81,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h
@@ -72,12 +101,16 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
 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
 lib/gnome-vfs-2.0/modules/libhttp.so
+lib/gnome-vfs-2.0/modules/libnetwork.so
 lib/gnome-vfs-2.0/modules/libnntp.so
+lib/gnome-vfs-2.0/modules/libsftp.so
+%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so
 lib/gnome-vfs-2.0/modules/libssh.so
 lib/gnome-vfs-2.0/modules/libtar.so
 lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
@@ -86,7 +119,7 @@ lib/gnome-vfs-2.0/modules/libvfs-test.so
 lib/gnome-vfs-2.0/modules/libvfs-translate.so
 lib/libgnomevfs-2.a
 lib/libgnomevfs-2.so
-lib/libgnomevfs-2.so.400
+lib/libgnomevfs-2.so.600
 lib/vfs/2.0/extfs/README
 lib/vfs/2.0/extfs/a
 lib/vfs/2.0/extfs/ar
@@ -104,13 +137,16 @@ 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
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
+libexec/gnome-vfs-daemon
 share/doc/gnome-vfs-2.0/about.html
 share/doc/gnome-vfs-2.0/advanced-operations.html
 share/doc/gnome-vfs-2.0/ch08.html
 share/doc/gnome-vfs-2.0/data-types.html
+share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
@@ -150,10 +186,16 @@ share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
 share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html
 share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
 share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
+share/doc/gnome-vfs-2.0/home.png
 share/doc/gnome-vfs-2.0/index.html
 share/doc/gnome-vfs-2.0/index.sgml
+share/doc/gnome-vfs-2.0/left.png
 share/doc/gnome-vfs-2.0/mime-registry.html
 share/doc/gnome-vfs-2.0/modules.html
+share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/up.png
+@exec mkdir -p %D/share/gnome/vfolders
+%%KDEMENUS%%share/gnome/vfolders/KDE.directory
 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
@@ -167,6 +209,7 @@ share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -178,6 +221,7 @@ share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -196,6 +240,7 @@ share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -206,8 +251,10 @@ share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/th/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
 share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -216,6 +263,7 @@ 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/doc/gnome-vfs-2.0
+@dirrm share/gnome/vfolders
 @dirrm lib/vfs/2.0/extfs
 @dirrm lib/vfs/2.0
 @dirrm include/gnome-vfs-module-2.0/libgnomevfs
@@ -224,17 +272,39 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrm include/gnome-vfs-2.0/include
 @dirrm include/gnome-vfs-2.0
 @dirrm etc/gnome-vfs-2.0/vfolders
+@dirrm etc/gconf/gconf.xml.defaults/system/smb
 @dirrm etc/gconf/gconf.xml.defaults/system/proxy
 @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy
 @dirrm etc/gconf/gconf.xml.defaults/system
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/smb
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/proxy
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto
+@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers 2>/dev/null || true
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto
+@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers 2>/dev/null || true
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications