#undef truncate and tell in appropriate places. Workaround for Solaris

redefining them in unistd.h. Also reorder two includes to allow building on
Solaris.

5 files changed, 66 insertions, 1 deletions

diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index e1d75191f2f..c63a6194712 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2003/04/17 23:09:52 nathanw Exp $
+$NetBSD: distinfo,v 1.13 2003/12/30 12:18:56 gavan Exp $
 
 SHA1 (gnome-vfs-1.0.5.tar.gz) = 41156323969d44e3f14ce481b81bfdb5d1deba49
 Size (gnome-vfs-1.0.5.tar.gz) = 1048954 bytes
@@ -7,3 +7,8 @@ SHA1 (patch-ac) = 4da6d9b46d059710dcd8248dd9d23cb79e5253e1
 SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
 SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
 SHA1 (patch-ag) = a9560b6a284abaafd6793a899da15c7fcdf4dd95
+SHA1 (patch-ah) = dfc086dd0bb5123179317b873fc616d20c53f9bb
+SHA1 (patch-ai) = 43c4bf209541816e804b628c9a1cba68327c3b7b
+SHA1 (patch-aj) = 0adb274d6deae3522e5f194ceae08aab452ca3f1
+SHA1 (patch-ak) = 1c99154076a6e69a5951348449e49ede797345d7
+SHA1 (patch-al) = b4346af92d7b69b05f142c67213b3c7623431f2d
diff --git a/sysutils/gnome-vfs/patches/patch-ah b/sysutils/gnome-vfs/patches/patch-ah
new file mode 100644
index 00000000000..c6668b6056c
--- /dev/null
+++ b/sysutils/gnome-vfs/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.3 2003/12/30 12:18:56 gavan Exp $
+
+--- libgnomevfs/gnome-vfs-cancellable-ops.c.orig	2001-07-16 19:21:06.000000000 +0100
++++ libgnomevfs/gnome-vfs-cancellable-ops.c
+@@ -32,6 +32,8 @@
+ #include "gnome-vfs.h"
+ #include "gnome-vfs-private.h"
+ 
++#undef truncate
++
+ GnomeVFSResult
+ gnome_vfs_open_uri_cancellable (GnomeVFSHandle **handle,
+ 				GnomeVFSURI *uri,
diff --git a/sysutils/gnome-vfs/patches/patch-ai b/sysutils/gnome-vfs/patches/patch-ai
new file mode 100644
index 00000000000..7181124ed23
--- /dev/null
+++ b/sysutils/gnome-vfs/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2003/12/30 12:18:56 gavan Exp $
+
+--- libgnomevfs/gnome-vfs-handle.c.orig	2001-07-16 19:21:06.000000000 +0100
++++ libgnomevfs/gnome-vfs-handle.c
+@@ -27,6 +27,8 @@
+ #include "gnome-vfs.h"
+ #include "gnome-vfs-private.h"
+ 
++#undef tell
++
+ 
+ struct GnomeVFSHandle {
+ 	/* URI of the file being accessed through the handle.  */
diff --git a/sysutils/gnome-vfs/patches/patch-ak b/sysutils/gnome-vfs/patches/patch-ak
new file mode 100644
index 00000000000..999038671e9
--- /dev/null
+++ b/sysutils/gnome-vfs/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2003/12/30 12:18:56 gavan Exp $
+
+--- libgnomevfs/gnome-vfs-seekable.c.orig	2002-03-15 03:33:01.000000000 +0000
++++ libgnomevfs/gnome-vfs-seekable.c
+@@ -34,6 +34,8 @@
+ #include <string.h>
+ #include <unistd.h> /* for close */
+ 
++#undef tell
++
+ static GnomeVFSResult	do_open		(GnomeVFSMethod *method,
+ 					 GnomeVFSMethodHandle **method_handle,
+ 					 GnomeVFSURI *uri,
diff --git a/sysutils/gnome-vfs/patches/patch-al b/sysutils/gnome-vfs/patches/patch-al
new file mode 100644
index 00000000000..f93636a0b67
--- /dev/null
+++ b/sysutils/gnome-vfs/patches/patch-al
@@ -0,0 +1,21 @@
+$NetBSD: patch-al,v 1.1 2003/12/30 12:18:56 gavan Exp $
+
+--- libgnomevfs/gnome-vfs-parse-ls.c.orig	2003-12-23 18:41:32.816550000 +0000
++++ libgnomevfs/gnome-vfs-parse-ls.c
+@@ -26,7 +26,6 @@
+    finduid, findgid are from GNU tar.  */
+ 
+ #include <config.h>
+-#include "gnome-vfs-parse-ls.h"
+ 
+ #include "gnome-vfs-private.h"
+ #include "gnome-vfs.h"
+@@ -42,6 +41,8 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
++#include "gnome-vfs-parse-ls.h"
++
+ #ifndef TUNMLEN 
+ #define TUNMLEN 256
+ #endif