Update to 2.7.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2531 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 27 insertions, 65 deletions

diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index bbf927cc9..00ca678fa 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.7.3
+PORTVERSION=	2.7.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.7
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 5f6ace485..c8f2c2052 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.7.3.tar.bz2) = 5d7d6dcf7fe1cddb45938453df21651e
-SIZE (gnome2/gnome-vfs-2.7.3.tar.bz2) = 1651255
+MD5 (gnome2/gnome-vfs-2.7.4.tar.bz2) = 9c51234cfe5d6faf51fe1b5784219d01
+SIZE (gnome2/gnome-vfs-2.7.4.tar.bz2) = 1717532
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c
new file mode 100644
index 000000000..ad45385ad
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c
@@ -0,0 +1,13 @@
+--- libgnomevfs/gnome-vfs-resolve.c.orig	Thu Jul 22 11:23:42 2004
++++ libgnomevfs/gnome-vfs-resolve.c	Thu Jul 22 11:25:46 2004
+@@ -133,8 +133,10 @@
+ 	switch (error) {
+ 
+ 	case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND;
++#ifndef __FreeBSD__
+ 	case EAI_ADDRFAMILY:		
+ 	case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
++#endif
+ 	case EAI_SYSTEM: return gnome_vfs_result_from_errno ();
+ 	case EAI_FAIL:
+ 	case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER;
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
index 213ed03ec..1a5401560 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
@@ -1,11 +1,11 @@
---- libgnomevfs/xdgmime.c.orig	Wed Jun 23 20:15:25 2004
-+++ libgnomevfs/xdgmime.c	Wed Jun 23 20:15:41 2004
-@@ -97,7 +97,7 @@
+--- libgnomevfs/xdgmime.c.orig	Thu Jul 22 11:20:13 2004
++++ libgnomevfs/xdgmime.c	Thu Jul 22 11:20:52 2004
+@@ -189,7 +189,7 @@
  
-       xdg_data_dirs = getenv ("XDG_DATA_DIRS");
-       if (xdg_data_dirs == NULL)
--	xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+	xdg_data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/";
+   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+   if (xdg_data_dirs == NULL)
+-    xdg_data_dirs = "/usr/local/share/:/usr/share/";
++    xdg_data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/";
  
-       ptr = xdg_data_dirs;
+   ptr = xdg_data_dirs;
  
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 3a22c47d9..30c2b8b8a 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -30,6 +30,7 @@ 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
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h
@@ -45,11 +46,13 @@ 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-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
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-resolve.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h
@@ -116,59 +119,6 @@ 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
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
-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.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
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
-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-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/style.css
-share/doc/gnome-vfs-2.0/up.png
 @exec mkdir -p %D/share/gnome/vfolders
 %%KDEMENUS%%share/gnome/vfolders/KDE.directory
 share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -240,7 +190,6 @@ share/locale/wa/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
-@dirrm share/doc/gnome-vfs-2.0
 @dirrm share/gnome/vfolders
 @dirrm lib/vfs/2.0/extfs
 @dirrm lib/vfs/2.0