5 files changed, 18 insertions, 98 deletions

diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index c8ea7f9aeedd..e07acd7be585 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.4
@@ -51,5 +51,7 @@ post-patch:
 		's|\@datadir\@/gnome|\@datadir\@|g'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in
+	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index bddb12ef32a0..6d9fb761b6f9 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.4.0.tar.bz2) = 2c7908e98b482add387e305619cfe4aa
+MD5 (gnome2/gnome-vfs-2.4.1.tar.bz2) = cb7a36076f6a65e40c7f540be3057310
diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab
deleted file mode 100644
index 0a291f36c104..000000000000
--- a/devel/gnomevfs2/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Mon Aug 11 11:55:08 2003
-+++ Makefile.in	Mon Aug 11 12:09:13 2003
-@@ -183,7 +183,6 @@
- 	devel-docs				\
- 	doc					\
- 	programs				\
--	test					\
- 	monikers				\
- 	po
- 
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
index be72a1825d12..764a5a6f218a 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	Mon Aug 11 12:09:33 2003
-+++ libgnomevfs/Makefile.in	Mon Aug 11 12:10:10 2003
-@@ -352,7 +352,7 @@
+--- 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 @@
  # 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
++libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include
+ libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
+ 
  
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 1ec5a822ec34..0d945ad47a0b 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -16,8 +16,10 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%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/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/proxy/%gconf.xml
 etc/gconf/schemas/desktop_default_applications.schemas
 etc/gconf/schemas/system_http_proxy.schemas
 %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
@@ -29,6 +31,7 @@ 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
@@ -106,13 +109,8 @@ 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-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
@@ -148,89 +146,14 @@ share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.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
-share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-cancellation.html
-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
-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
-share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-database.html
-share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime.html
-share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback-module-api.html
-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
-share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket.html
-share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ssl.html
-share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-standard-callbacks.html
-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
@@ -267,6 +190,7 @@ share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -283,6 +207,7 @@ 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/ta/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
@@ -296,10 +221,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
 @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/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/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/applications/terminal