10 files changed, 37 insertions, 366 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index a562cf3b8fe9..d5535b85750e 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.8.4
+PORTVERSION=	2.10.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.8
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.10
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -21,7 +21,7 @@ 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 gnomehier intlhack gnomemimedata gconf2 \
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
 		libbonobo
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=15
@@ -39,8 +39,6 @@ GCONF_SCHEMAS=	desktop_default_applications.schemas \
 		desktop_gnome_url_handlers.schemas system_dns_sd.schemas \
 		system_http_proxy.schemas system_smb.schemas
 
-OPTIONS=	KDE_MENUS "Integrated KDE menu picks" on
-
 .include <bsd.port.pre.mk>
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
@@ -52,13 +50,6 @@ 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
-
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
 WITH_CDPARANOIA=	yes
 .endif
@@ -98,22 +89,12 @@ LIB_DEPENDS+=	howl:${PORTSDIR}/net/howl
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\@datadir\@/gnome|\@datadir\@|g'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/libgnomevfs/Makefile.in \
-		${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
+		${WRKSRC}/libgnomevfs/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		${WRKSRC}/libgnomevfs/xdgmime.c \
-		${WRKSRC}/libgnomevfs/eggdirfuncs.c \
 		${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c
-.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
 	@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
@@ -127,9 +108,5 @@ pre-configure:
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if !defined(WITHOUT_KDE_MENUS)
-	@${MKDIR} ${PREFIX}/share/gnome/vfolders
-	@${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 505711b7dcbe..3bb839cef2ec 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.8.4.tar.bz2) = 42d3505e9ef9c26a7aae4e511b9b4c34
-SIZE (gnome2/gnome-vfs-2.8.4.tar.bz2) = 1892413
+MD5 (gnome2/gnome-vfs-2.10.0.tar.bz2) = bb9df65d6a77414bbde9f1bc429c9d97
+SIZE (gnome2/gnome-vfs-2.10.0.tar.bz2) = 1901027
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-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in
new file mode 100644
index 000000000000..8c0d2a13160c
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-Makefile.in
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	Tue Nov 30 02:05:26 2004
++++ Makefile.in	Tue Nov 30 02:05:34 2004
+@@ -230,7 +230,6 @@
+ 	devel-docs				\
+ 	doc					\
+ 	programs				\
+-	test					\
+ 	monikers				\
+ 	po
+ 
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c
deleted file mode 100644
index 82e0e5f61891..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/eggdirfuncs.c.orig	Sat Jul 24 03:08:10 2004
-+++ libgnomevfs/eggdirfuncs.c	Sat Jul 24 03:08:50 2004
-@@ -106,7 +106,7 @@
-   data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
- 
-   if (!data_dirs || !data_dirs[0])
--    data_dirs = "/usr/local/share/:/usr/share/";
-+    data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/";
- 
-   data_dir_vector = g_strsplit (data_dirs, ":", 0);
- 
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 5d37cc768ddb..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-unix-mounts.c.orig	Sun Sep  5 02:34:30 2004
-+++ libgnomevfs/gnome-vfs-unix-mounts.c	Sun Sep  5 02:35:08 2004
-@@ -43,6 +43,7 @@
- #include <errno.h>
- #include <string.h>
- #include <signal.h>
-+#include <poll.h>
- #include <libgnomevfs/gnome-vfs.h>
- 
- #include "gnome-vfs-unix-mounts.h"
diff --git a/devel/gnome-vfs/files/patch-modules_smb-method.c b/devel/gnome-vfs/files/patch-modules_smb-method.c
new file mode 100644
index 000000000000..9c7cb9232cab
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_smb-method.c
@@ -0,0 +1,11 @@
+--- modules/smb-method.c.orig	Tue Jan 11 18:24:53 2005
++++ modules/smb-method.c	Tue Jan 11 18:25:03 2005
+@@ -1345,7 +1345,7 @@
+ 	 GnomeVFSContext *context)
+ {
+ 	FileHandle *handle = (FileHandle *)method_handle;
+-	GnomeVFSResult res = GNOME_VFS_OK;;
++	GnomeVFSResult res = GNOME_VFS_OK;
+ 	SmbAuthContext actx;
+ 	ssize_t n = 0;
+ 
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, 
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index c594e7a9483b..2540d81f57e7 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -3,18 +3,12 @@ bin/gnomevfs-copy
 bin/gnomevfs-info
 bin/gnomevfs-ls
 bin/gnomevfs-mkdir
+bin/gnomevfs-mv
 bin/gnomevfs-rm
 %%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/modules/ssl-modules.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
-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-address.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
@@ -31,6 +25,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
@@ -75,13 +70,12 @@ 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/libtar.so
-lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
 lib/gnome-vfs-2.0/modules/libvfs-pipe.so
 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.800
+lib/libgnomevfs-2.so.1000
 libdata/bonobo/servers/GNOME_VFS_Daemon.server
 libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
@@ -110,6 +104,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
@@ -143,9 +138,9 @@ share/doc/gnome-vfs-2.0/mime-registry.html
 share/doc/gnome-vfs-2.0/modules.html
 share/doc/gnome-vfs-2.0/networking.html
 share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/style.css
 share/doc/gnome-vfs-2.0/up.png
 share/doc/gnome-vfs-2.0/volumes.html
-%%KDEMENUS%%share/gnome/vfolders/KDE.directory
 share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -214,18 +209,18 @@ 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
 share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo
 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
 share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso 2> /dev/null || true
 @dirrm share/doc/gnome-vfs-2.0
 @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
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true