Add support for FreeBSD.

patch-ah -- only use EAI_ADDRFAMILY or EAI_NODATA if defined.
(Check for EAI_NODATA also because it is deprecated by FreeBSD.)
patch-am -- add checks for not FreeBSD related to statfs.

Okay'd by jmmv.

3 files changed, 26 insertions, 7 deletions

diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index 34d3fc6d7e8..597e237ecb2 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2005/06/02 17:10:10 jmmv Exp $
+$NetBSD: distinfo,v 1.40 2005/07/06 06:36:03 reed Exp $
 
 SHA1 (gnome-vfs-2.10.1.tar.bz2) = e5dc34cc9ea4a570c1fda31e0adadfa2271a5aaa
 RMD160 (gnome-vfs-2.10.1.tar.bz2) = 4336a26eab0558759b0b099ed8bb2c7f3342b0d4
@@ -10,7 +10,8 @@ SHA1 (patch-ad) = 2e8159aa2fdf6a01ee46a450054dd329669af0b5
 SHA1 (patch-ae) = 32fe1a4e82d96bf80f3364704e7369a4ee778e0f
 SHA1 (patch-af) = ebbd81c92403cd429a807f9a89c81971d1c4fb88
 SHA1 (patch-ag) = 78f7d50beaeab8b33c554e6cfaf510cdba3b00ba
-SHA1 (patch-am) = 95dac9be508330e58da933b6dc745fceb51135c0
+SHA1 (patch-ah) = 8bd1ead2097c8e65fd1e83b62ff976052c72a793
+SHA1 (patch-am) = 297ba457a059a808418ab15c14e3bad0a582c047
 SHA1 (patch-ao) = 38bd5859bff41642c2d1a26c16d90d780387b2d0
 SHA1 (patch-ap) = f13b6a4e0740a211e87bd820a266b2ce038f932c
 SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b
diff --git a/sysutils/gnome-vfs2/patches/patch-ah b/sysutils/gnome-vfs2/patches/patch-ah
new file mode 100644
index 00000000000..70d1d7d55b1
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ah
@@ -0,0 +1,18 @@
+$NetBSD: patch-ah,v 1.5 2005/07/06 06:36:03 reed Exp $
+
+--- libgnomevfs/gnome-vfs-resolve.c.orig	Fri May  6 18:06:26 2005
++++ libgnomevfs/gnome-vfs-resolve.c	Fri May  6 18:15:23 2005
+@@ -172,8 +172,12 @@
+ 	   switch (error) {
+ 			 
+ 	   case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND;
+-	   case EAI_ADDRFAMILY:		
++#ifdef EAI_ADDRFAMILY
++	   case EAI_ADDRFAMILY: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;	
++#endif
++#ifdef EAI_NODATA
+ 	   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/sysutils/gnome-vfs2/patches/patch-am b/sysutils/gnome-vfs2/patches/patch-am
index 279d6c2b021..2ec9a06f582 100644
--- a/sysutils/gnome-vfs2/patches/patch-am
+++ b/sysutils/gnome-vfs2/patches/patch-am
@@ -1,12 +1,12 @@
-$NetBSD: patch-am,v 1.10 2004/11/28 13:00:17 recht Exp $
+$NetBSD: patch-am,v 1.11 2005/07/06 06:36:03 reed Exp $
 
---- libgnomevfs/gnome-vfs-unix-mounts.c.orig	Fri Oct 15 10:00:02 2004
-+++ libgnomevfs/gnome-vfs-unix-mounts.c	Sat Nov 27 20:53:08 2004
+--- libgnomevfs/gnome-vfs-unix-mounts.c.orig	Fri Dec 10 13:33:53 2004
++++ libgnomevfs/gnome-vfs-unix-mounts.c	Fri May  6 18:32:49 2005
 @@ -475,7 +475,11 @@
  gboolean
  _gnome_vfs_get_current_unix_mounts (GList **return_list)
  {
-+#if defined(HAVE_STATVFS) && !defined(__APPLE__)
++#if defined(HAVE_STATVFS) && !defined(__APPLE__) && !defined(__FreeBSD__)
 +    	struct statvfs *mntent = NULL;
 +#else
      	struct statfs *mntent = NULL;
@@ -18,7 +18,7 @@ $NetBSD: patch-am,v 1.10 2004/11/28 13:00:17 recht Exp $
  		mount_entry->mount_path = g_strdup (mntent[i].f_mntonname);
  		mount_entry->device_path = g_strdup (mntent[i].f_mntfromname);
  		mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename);
-+#if defined(HAVE_STATVFS) && !defined(__APPLE__)
++#if defined(HAVE_STATVFS) && !defined(__APPLE__) && !defined(__FreeBSD__)
 +		if (mntent[i].f_flag & MNT_RDONLY) {
 +#else
  		if (mntent[i].f_flags & MNT_RDONLY) {