Darwin fixes (revert some of the earlier fixes, add a patch from GNOME

CVS, and fix a really confused #ifdef)

7 files changed, 53 insertions, 50 deletions

diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index 2ad59f75497..f80c838db9b 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2004/04/23 03:29:27 minskim Exp $
+$NetBSD: distinfo,v 1.18 2004/04/24 21:00:07 danw Exp $
 
 SHA1 (gnome-vfs-2.6.0.tar.bz2) = a5cfea7568259fc6fe98322a7a01eb70d8f5f615
 Size (gnome-vfs-2.6.0.tar.bz2) = 1431274 bytes
@@ -8,7 +8,7 @@ SHA1 (patch-ac) = 6790f1ee67f12690bd648d258e87456c2639b560
 SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06
 SHA1 (patch-ae) = 5e52bb80ce3070d04c85c363c0ba1360ab7edb37
 SHA1 (patch-af) = 4273d773f8f9701262ab541efc43e9f7eb126001
-SHA1 (patch-ag) = 2d502c6a8550cca7fe8c45969e874d05328dec7e
-SHA1 (patch-ah) = 0b4d5ef53d47a0be87a6b1b529b65fd186525a72
-SHA1 (patch-ai) = 5aebccc7769917d0a9d17136946dbfbfa71d9a06
-SHA1 (patch-aj) = 54c8b54edb456687b7c79ec94d0e3951c1c5f8fe
+SHA1 (patch-ag) = 0bec8918c71b2aa470c96c4512b11f42550484c4
+SHA1 (patch-ai) = 3a45cd84dfa025a52c7db3aab2cca85b540078a6
+SHA1 (patch-ak) = 83694081f9484c3f71fd1867007652eff6e26f93
+SHA1 (patch-al) = e0f4727c0c0415f5e0bc182b0ae94093d45b4cd0
diff --git a/sysutils/gnome-vfs2/patches/patch-ag b/sysutils/gnome-vfs2/patches/patch-ag
index 7b6120b5374..c9560f47886 100644
--- a/sysutils/gnome-vfs2/patches/patch-ag
+++ b/sysutils/gnome-vfs2/patches/patch-ag
@@ -1,16 +1,7 @@
-$NetBSD: patch-ag,v 1.6 2004/04/15 06:25:12 adam Exp $
+$NetBSD: patch-ag,v 1.7 2004/04/24 21:00:07 danw Exp $
 
 --- modules/Makefile.in.orig	Mon Mar 22 13:47:17 2004
 +++ modules/Makefile.in
-@@ -242,7 +242,7 @@ EXTRA_DIST = \
- @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la
- @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = 
- 
--module_flags = -export_dynamic -avoid-version -module -no-undefined
-+module_flags = -export_dynamic -avoid-version -module
- modulesdir = $(libdir)/gnome-vfs-2.0/modules
- 
- modules_LTLIBRARIES = \
 @@ -270,7 +270,7 @@ modules_LTLIBRARIES = \
  
  # Not currently supported
diff --git a/sysutils/gnome-vfs2/patches/patch-ah b/sysutils/gnome-vfs2/patches/patch-ah
deleted file mode 100644
index fa8288760b3..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2004/04/15 06:25:12 adam Exp $
-
---- libgnomevfs/Makefile.in.orig	Thu Apr 15 07:48:59 2004
-+++ libgnomevfs/Makefile.in
-@@ -284,7 +284,6 @@ libgnomevfs_2_la_LIBADD = \
- libgnomevfs_2_la_LDFLAGS = \
- 	-version-info $(LIBGNOMEVFS_CURRENT):$(LIBGNOMEVFS_REVISION):$(LIBGNOMEVFS_AGE) \
- 	-export-symbols-regex "^[^_].*" \
--	-no-undefined \
- 	$(NULL)
- 
- 
diff --git a/sysutils/gnome-vfs2/patches/patch-ai b/sysutils/gnome-vfs2/patches/patch-ai
index 729714351aa..037c62880f9 100644
--- a/sysutils/gnome-vfs2/patches/patch-ai
+++ b/sysutils/gnome-vfs2/patches/patch-ai
@@ -1,16 +1,7 @@
-$NetBSD: patch-ai,v 1.7 2004/04/15 06:25:12 adam Exp $
+$NetBSD: patch-ai,v 1.8 2004/04/24 21:00:07 danw Exp $
 
 --- modules/vfolder/Makefile.in.orig	Mon Mar 22 13:47:18 2004
 +++ modules/vfolder/Makefile.in
-@@ -235,7 +235,7 @@ EXTRA_DIST = \
- 
- 
- ###  Module setup
--module_flags = -export_dynamic -avoid-version -module -no-undefined
-+module_flags = -export_dynamic -avoid-version -module
- modulesdir = $(libdir)/gnome-vfs-2.0/modules
- 
- modules_LTLIBRARIES = libvfolder-desktop.la
 @@ -259,7 +259,7 @@ libvfolder_desktop_la_LIBADD = \
  
  
diff --git a/sysutils/gnome-vfs2/patches/patch-aj b/sysutils/gnome-vfs2/patches/patch-aj
deleted file mode 100644
index 08db735dfde..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2004/04/15 06:25:12 adam Exp $
-
---- monikers/Makefile.in.orig	Thu Apr 15 08:20:36 2004
-+++ monikers/Makefile.in
-@@ -239,7 +239,7 @@ libmoniker_gnome_vfs_std_la_LIBADD = \
- 
- 
- libmoniker_gnome_vfs_std_la_LDFLAGS = \
--	-module -avoid-version -no-undefined
-+	-module -avoid-version
- 
- subdir = monikers
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/sysutils/gnome-vfs2/patches/patch-ak b/sysutils/gnome-vfs2/patches/patch-ak
new file mode 100644
index 00000000000..6dc3b084531
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ak
@@ -0,0 +1,26 @@
+$NetBSD: patch-ak,v 1.5 2004/04/24 21:00:07 danw Exp $
+
+--- libgnomevfs/gnome-vfs-cdrom.c.orig	Sun Apr 11 09:43:13 2004
++++ libgnomevfs/gnome-vfs-cdrom.c
+@@ -87,8 +87,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__)
+ 	struct ioc_toc_header header;
+ #if defined(__FreeBSD__)
+@@ -143,8 +144,7 @@ _gnome_vfs_get_cdrom_type (const char *v
+ #endif /* defined(__FreeBSD__) */
+ 	return type;
+ #else
+-	*fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
+-	return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
++	return CDS_NO_INFO;
+ #endif
+ }
+ 
diff --git a/sysutils/gnome-vfs2/patches/patch-al b/sysutils/gnome-vfs2/patches/patch-al
new file mode 100644
index 00000000000..c90f2b5895e
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-al
@@ -0,0 +1,20 @@
+$NetBSD: patch-al,v 1.6 2004/04/24 21:00:07 danw Exp $
+
+--- modules/sftp-method.c.orig	Sat Apr 24 15:37:26 2004
++++ modules/sftp-method.c
+@@ -175,6 +175,15 @@ typedef struct
+ 
+ typedef ssize_t (*read_write_fn) (int, void *, size_t);
+ 
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression)				\
++	(__extension__						\
++	 ({ long int __result;					\
++	  	do __result = (long int) (expression);		\
++		while (__result == -1L && errno == EINTR);	\
++		__result; }))
++#endif
++
+ static gsize
+ atomic_io (read_write_fn f, gint fd, gpointer buffer_in, gsize size) 
+ {