Adopt patches from darwinports to make gnome-vfs2 build on OS X.

While at it also combine patch-a[fk] since they've patched the same file.

9 files changed, 154 insertions, 28 deletions

diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index 21751b3ca93..530189eeaa7 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/09/22 21:27:24 tron Exp $
+# $NetBSD: Makefile,v 1.40 2004/10/24 18:03:24 recht Exp $
 #
 
 PKGCONFIG_OVERRIDE=	gnome-vfs-2.0.pc.in
@@ -22,6 +22,8 @@ GCONF2_SCHEMAS+=	system_dns_sd.schemas
 GCONF2_SCHEMAS+=	system_http_proxy.schemas
 GCONF2_SCHEMAS+=	system_smb.schemas
 
+CFLAGS.Darwin+=		-flat_namespace -undefined suppress -lresolv
+
 .include "Makefile.common"
 
 .include "../../devel/GConf2/schemas.mk"
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index d8961712227..09936bf7ea5 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2004/09/22 08:37:27 jmmv Exp $
+$NetBSD: distinfo,v 1.25 2004/10/24 18:03:24 recht Exp $
 
 SHA1 (gnome-vfs-2.8.0.tar.bz2) = 849b8ffeae6e1595f080b4d56104ffa53e3c9aaf
 Size (gnome-vfs-2.8.0.tar.bz2) = 1860847 bytes
@@ -6,9 +6,12 @@ SHA1 (patch-aa) = 5bddba16ab0d57c48234ca427417ebf2cd563aab
 SHA1 (patch-ab) = 9fc885b1ef1e9dd05f4b3041963df298dbfba582
 SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06
 SHA1 (patch-ae) = 68d455dce03aac6d5372ae193c7cdaea3fceddbf
-SHA1 (patch-af) = 4273d773f8f9701262ab541efc43e9f7eb126001
+SHA1 (patch-af) = 8664dd65a380460ff20320d13d1cff58e42011d0
 SHA1 (patch-ag) = 0bec8918c71b2aa470c96c4512b11f42550484c4
 SHA1 (patch-ai) = 3a45cd84dfa025a52c7db3aab2cca85b540078a6
-SHA1 (patch-ak) = 08e02621ff3d619205e0ff19bfa2dcb76aeb2f09
-SHA1 (patch-am) = ce6f779e0d6eaae25fae32a6ae41914dfef0fdf2
+SHA1 (patch-am) = 3b48df60dc1cb53f45358ac47fccb62b776adfbb
 SHA1 (patch-an) = d2fab7ac496964856bfa9352c5e0ada7f406ed86
+SHA1 (patch-ao) = 38bd5859bff41642c2d1a26c16d90d780387b2d0
+SHA1 (patch-ap) = f13b6a4e0740a211e87bd820a266b2ce038f932c
+SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b
+SHA1 (patch-ar) = 99c99d0d90ed7a0d804b349f532d3a17c780d506
diff --git a/sysutils/gnome-vfs2/patches/patch-af b/sysutils/gnome-vfs2/patches/patch-af
index bfed4a82d3f..cd685f57106 100644
--- a/sysutils/gnome-vfs2/patches/patch-af
+++ b/sysutils/gnome-vfs2/patches/patch-af
@@ -1,7 +1,5 @@
-$NetBSD: patch-af,v 1.4 2004/04/23 03:29:27 minskim Exp $
-
---- libgnomevfs/gnome-vfs-cdrom.c.orig	2004-02-16 05:13:24.000000000 -0600
-+++ libgnomevfs/gnome-vfs-cdrom.c
+--- libgnomevfs/gnome-vfs-cdrom.c.orig	Sun Oct 24 16:56:46 2004
++++ libgnomevfs/gnome-vfs-cdrom.c	Sun Oct 24 16:56:17 2004
 @@ -37,6 +37,8 @@
  
  #ifdef __linux__
@@ -11,3 +9,31 @@ $NetBSD: patch-af,v 1.4 2004/04/23 03:29:27 minskim Exp $
  #endif
  
  #ifdef HAVE_SYS_CDIO_H
+@@ -87,8 +89,9 @@
+ 	}
+ 
+ 	return type;
+-#elif defined(HAVE_SYS_MNTCTL_H)
+-	return CDS_NO_INFO;
++#elif defined(__linux__)
++	*fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
++	return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
+ #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	struct ioc_toc_header header;
+ #if defined(__FreeBSD__) || defined(__DragonFly__)
+@@ -143,6 +146,7 @@
+ #endif /* defined(__FreeBSD__) */
+ 	return type;
+ #else
++	#if !defined(__APPLE__)
+ 	*fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
+ 	if (*fd  < 0) {
+ 		return -1;
+@@ -153,6 +157,7 @@
+ 		return -1;
+ 	}
+ 	return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
++	#endif
+ #endif
+ }
+ 
diff --git a/sysutils/gnome-vfs2/patches/patch-ak b/sysutils/gnome-vfs2/patches/patch-ak
deleted file mode 100644
index f3b9b0427c6..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.6 2004/09/21 16:45:47 jmmv Exp $
-
---- libgnomevfs/gnome-vfs-cdrom.c.orig	2004-09-02 14:34:00.000000000 +0200
-+++ libgnomevfs/gnome-vfs-cdrom.c
-@@ -89,8 +89,9 @@ _gnome_vfs_get_cdrom_type (const char *v
- 	}
- 
- 	return type;
--#elif defined(HAVE_SYS_MNTCTL_H)
--	return CDS_NO_INFO;
-+#elif defined(__linux__)
-+	*fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
-+	return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
- #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	struct ioc_toc_header header;
- #if defined(__FreeBSD__) || defined(__DragonFly__)
diff --git a/sysutils/gnome-vfs2/patches/patch-am b/sysutils/gnome-vfs2/patches/patch-am
index 89176769f0a..024b8189447 100644
--- a/sysutils/gnome-vfs2/patches/patch-am
+++ b/sysutils/gnome-vfs2/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.8 2004/09/21 16:45:47 jmmv Exp $
+$NetBSD: patch-am,v 1.9 2004/10/24 18:03:24 recht Exp $
 
 --- libgnomevfs/gnome-vfs-unix-mounts.c.orig	2004-08-25 09:37:37.000000000 +0200
 +++ libgnomevfs/gnome-vfs-unix-mounts.c
@@ -6,7 +6,7 @@ $NetBSD: patch-am,v 1.8 2004/09/21 16:45:47 jmmv Exp $
  gboolean
  _gnome_vfs_get_current_unix_mounts (GList **return_list)
  {
-+#ifdef HAVE_STATVFS
++#if defined(HAVE_STATVFS) && !defined(__APPLE__)
 +    	struct statvfs *mntent = NULL;
 +#else
      	struct statfs *mntent = NULL;
@@ -18,7 +18,7 @@ $NetBSD: patch-am,v 1.8 2004/09/21 16:45:47 jmmv 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);
-+#ifdef HAVE_STATVFS
++#if defined(HAVE_STATVFS) && !defined(__APPLE__)
 +		if (mntent[i].f_flag & MNT_RDONLY) {
 +#else
  		if (mntent[i].f_flags & MNT_RDONLY) {
diff --git a/sysutils/gnome-vfs2/patches/patch-ao b/sysutils/gnome-vfs2/patches/patch-ao
new file mode 100644
index 00000000000..2867f11961d
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ao
@@ -0,0 +1,18 @@
+$NetBSD: patch-ao,v 1.1 2004/10/24 18:03:24 recht Exp $
+
+--- libgnomevfs/gnome-vfs-utils.c.orig	Sun Oct 24 17:36:16 2004
++++ libgnomevfs/gnome-vfs-utils.c	Sun Oct 24 17:37:27 2004
+@@ -46,6 +46,13 @@
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++
++#ifdef __APPLE__
++#include <sys/param.h>
++#include <sys/mount.h>
++#define HAVE_STATVFS 0
++#endif
++
+ #include <unistd.h>
+ 
+ #if HAVE_SYS_STATVFS_H
diff --git a/sysutils/gnome-vfs2/patches/patch-ap b/sysutils/gnome-vfs2/patches/patch-ap
new file mode 100644
index 00000000000..fd24613f588
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ap
@@ -0,0 +1,20 @@
+$NetBSD: patch-ap,v 1.1 2004/10/24 18:03:24 recht Exp $
+
+--- modules/file-method.c.orig	Sun Oct 24 18:55:16 2004
++++ modules/file-method.c	Sun Oct 24 18:56:12 2004
+@@ -94,13 +94,13 @@
+ }
+ #endif
+ 
+-#ifdef HAVE_OPEN64
++#if defined(HAVE_OPEN64) && !defined(__APPLE__)
+ #define OPEN open64
+ #else
+ #define OPEN open
+ #endif
+ 
+-#if defined(HAVE_LSEEK64) && defined(HAVE_OFF64_T)
++#if (defined(HAVE_LSEEK64) && defined(HAVE_OFF64_T)) && !defined(__APPLE__)
+ #define LSEEK lseek64
+ #define OFF_T off64_t
+ #else
diff --git a/sysutils/gnome-vfs2/patches/patch-aq b/sysutils/gnome-vfs2/patches/patch-aq
new file mode 100644
index 00000000000..164c352de14
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2004/10/24 18:03:24 recht Exp $
+
+--- modules/bzip2-method.c.orig	Sun Oct 24 19:01:44 2004
++++ modules/bzip2-method.c	Sun Oct 24 19:02:28 2004
+@@ -37,7 +37,7 @@
+ 
+ #include <bzlib.h>
+ 
+-#ifdef HAVE_OLDER_BZIP2
++#if defined(HAVE_OLDER_BZIP2) && !defined(__APPLE__)
+ #define BZ2_bzDecompressInit  bzDecompressInit
+ #define BZ2_bzCompressInit    bzCompressInit
+ #define BZ2_bzDecompress      bzDecompress
diff --git a/sysutils/gnome-vfs2/patches/patch-ar b/sysutils/gnome-vfs2/patches/patch-ar
new file mode 100644
index 00000000000..21a1839cb4f
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ar
@@ -0,0 +1,60 @@
+$NetBSD: patch-ar,v 1.1 2004/10/24 18:03:24 recht Exp $
+
+--- modules/pty-open.c.orig	Sun Oct 24 19:06:16 2004
++++ modules/pty-open.c	Sun Oct 24 19:17:26 2004
+@@ -554,6 +554,7 @@
+ static char *
+ _gnome_vfs_pty_ptsname(int master)
+ {
++#ifndef __APPLE__
+ #if defined(HAVE_PTSNAME_R)
+ 	gsize len = 1024;
+ 	char *buf = NULL;
+@@ -599,6 +600,7 @@
+ 		return g_strdup_printf("/dev/pts/%d", pty);
+ 	}
+ #endif
++#endif /* __APPLE__ */
+ 	return NULL;
+ }
+ 
+@@ -606,10 +608,10 @@
+ _gnome_vfs_pty_getpt(void)
+ {
+ 	int fd, flags;
+-#ifdef HAVE_GETPT
++#if defined(HAVE_GETPT) && !defined(__APPLE__)
+ 	/* Call the system's function for allocating a pty. */
+ 	fd = getpt();
+-#elif defined(HAVE_POSIX_OPENPT)
++#elif defined(HAVE_POSIX_OPENPT) && !defined(__APPLE__)
+ 	fd = posix_openpt(O_RDWR | O_NOCTTY);
+ #else
+ 	/* Try to allocate a pty by accessing the pty master multiplex. */
+@@ -628,7 +630,7 @@
+ static int
+ _gnome_vfs_pty_grantpt(int master)
+ {
+-#ifdef HAVE_GRANTPT
++#if defined(HAVE_GRANTPT) && !defined(__APPLE__)
+ 	return grantpt(master);
+ #else
+ 	return 0;
+@@ -638,6 +640,9 @@
+ static int
+ _gnome_vfs_pty_unlockpt(int fd)
+ {
++#ifdef __APPLE__
++	return -1;
++#else
+ #ifdef HAVE_UNLOCKPT
+ 	return unlockpt(fd);
+ #elif defined(TIOCSPTLCK)
+@@ -645,6 +650,7 @@
+ 	return ioctl(fd, TIOCSPTLCK, &zero);
+ #else
+ 	return -1;
++#endif
+ #endif
+ }
+