Update to 2.2.5.

6 files changed, 20 insertions, 81 deletions

diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 323a1cfc5c1d..19b32290554c 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.2.4
+PORTVERSION=	2.2.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.2
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 58fcd076cb55..8ed8f2c5e44a 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.2.4.tar.bz2) = 6f7e62ef65aa9690d25ed13e822e67d7
+MD5 (gnome2/gnome-vfs-2.2.5.tar.bz2) = 6ed2702382675c78eed6a96b2296e51d
diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab
index 3c0b987bbdb2..54f94cff127f 100644
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/files/patch-ab
@@ -1,10 +1,11 @@
---- Makefile.in.orig	Tue Jan 14 00:48:58 2003
-+++ Makefile.in	Tue Jan 14 00:50:11 2003
-@@ -177,7 +177,6 @@
- 	schemas					\
- 	devel-docs				\
- 	doc					\
--	test					\
- 	monikers				\
- 	po
+--- Makefile.in.orig	Wed May 21 12:53:27 2003
++++ Makefile.in	Wed May 21 12:53:59 2003
+@@ -173,7 +173,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-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
index 6e6adc74537d..382207e778e5 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	Tue Jan 14 00:50:29 2003
-+++ libgnomevfs/Makefile.in	Tue Jan 14 00:51:03 2003
-@@ -341,7 +341,7 @@
+--- libgnomevfs/Makefile.in.orig	Wed May 21 12:54:14 2003
++++ libgnomevfs/Makefile.in	Wed May 21 12:55:26 2003
+@@ -216,7 +216,7 @@
  # CLEANFILES = $(BUILT_SOURCES)
  
  # Platform specific includes
 -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
 +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS = \
- 	gnome-vfs-file-size.h
+ libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
+ 
  
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-magic.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-magic.c
deleted file mode 100644
index 8c6f8de03c90..000000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-magic.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomevfs/gnome-vfs-mime-magic.c.orig	Mon Mar 10 18:49:02 2003
-+++ libgnomevfs/gnome-vfs-mime-magic.c	Mon Mar 10 18:49:06 2003
-@@ -759,6 +759,9 @@
- 	
-  		if (g_utf8_get_char_validated(end, remaining_bytes) == -2)
- 			return TRUE;
-+		/* XXX This next section can't be used until FreeBSD gets a
-+		 * working wchar.h and wctype.h. */
-+#if 0
- 		else {
- 			size_t wlen;
- 			wchar_t wc;
-@@ -802,6 +805,7 @@
- 			}
- 			return TRUE;
- 		}
-+#endif
- 	} 
- }
- 
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 4d619a3f8132..6eba37334dc7 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -89,24 +89,10 @@ 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/advanced-operations.html
-share/doc/gnome-vfs-2.0/c9456.html
-share/doc/gnome-vfs-2.0/c9466.html
 share/doc/gnome-vfs-2.0/ch08.html
 share/doc/gnome-vfs-2.0/data-types.html
-share/doc/gnome-vfs-2.0/directory-operations.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-operations.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-operations.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-first-steps.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html
@@ -115,7 +101,6 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-context.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-basic-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-find-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-list-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-advanced-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-basic-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info-ops.html
@@ -123,7 +108,6 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-rw-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-size.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-trunc-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-find-directory.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-inet-connection.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-init.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-method.html
@@ -135,7 +119,6 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-shared.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-parse-ls.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-result.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket-buffer.html
@@ -146,39 +129,11 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-transform.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-uri.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html
-share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.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-writing-modules.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
@@ -204,6 +159,7 @@ share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/hi/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
 share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -224,6 +180,8 @@ 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/sr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sr@Latn/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