[pkgsrc/trunk]: pkgsrc/filesystems/fuse-unionfs Fix build in OS X.

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9ad5a7a97d32
branches:  trunk
changeset: 570610:9ad5a7a97d32
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Feb 02 10:45:17 2010 +0000

description:
Fix build in OS X.

diffstat:

 filesystems/fuse-unionfs/Makefile         |   3 ++-
 filesystems/fuse-unionfs/distinfo         |   5 +++--
 filesystems/fuse-unionfs/patches/patch-aa |  17 +++++++++++++----
 filesystems/fuse-unionfs/patches/patch-ac |  13 +++++++++++++
 4 files changed, 31 insertions(+), 7 deletions(-)

diffs (77 lines):

diff -r dfb362c3e32d -r 9ad5a7a97d32 filesystems/fuse-unionfs/Makefile
--- a/filesystems/fuse-unionfs/Makefile Tue Feb 02 09:41:19 2010 +0000
+++ b/filesystems/fuse-unionfs/Makefile Tue Feb 02 10:45:17 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/03 19:31:31 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/02 10:45:17 jmmv Exp $
 #
 
 DISTNAME=      unionfs-fuse-0.17
@@ -14,6 +14,7 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 BUILD_TARGET=  unionfs
+USE_TOOLS+=    pkg-config
 
 INSTALLATION_DIRS=     bin
 
diff -r dfb362c3e32d -r 9ad5a7a97d32 filesystems/fuse-unionfs/distinfo
--- a/filesystems/fuse-unionfs/distinfo Tue Feb 02 09:41:19 2010 +0000
+++ b/filesystems/fuse-unionfs/distinfo Tue Feb 02 10:45:17 2010 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/08/03 13:57:14 joerg Exp $
+$NetBSD: distinfo,v 1.3 2010/02/02 10:45:17 jmmv Exp $
 
 SHA1 (unionfs-fuse-0.17.tar.bz2) = 791877d7e127c28345f3884f30b9a65032e9ca80
 RMD160 (unionfs-fuse-0.17.tar.bz2) = 020662308ea3930ed26685bcb2cdcaf08f3082f3
 Size (unionfs-fuse-0.17.tar.bz2) = 6447 bytes
-SHA1 (patch-aa) = 855c6d72e5963077ea08c5b296e9423a2c652452
+SHA1 (patch-aa) = 917a9997c5ceef0edf632b4738dd0e397c3d6705
 SHA1 (patch-ab) = fcb7ebe83f25488653ee42548c84d7709ce952d8
+SHA1 (patch-ac) = 0ce1100986d2a6e1941ebe6fb3ccca7fe54e7fee
diff -r dfb362c3e32d -r 9ad5a7a97d32 filesystems/fuse-unionfs/patches/patch-aa
--- a/filesystems/fuse-unionfs/patches/patch-aa Tue Feb 02 09:41:19 2010 +0000
+++ b/filesystems/fuse-unionfs/patches/patch-aa Tue Feb 02 10:45:17 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2009/08/03 13:57:14 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2010/02/02 10:45:17 jmmv Exp $
 
---- unionfs.c  2007/03/10 00:31:50     1.1
-+++ unionfs.c  2007/03/10 00:33:02
-@@ -10,6 +10,7 @@
+--- unionfs.c.orig     2007-02-09 16:17:37.000000000 +0000
++++ unionfs.c
+@@ -10,6 +10,7 @@ This is offered under a BSD-style licens
  #endif
  
  #include <fuse.h>
@@ -10,3 +10,12 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
+@@ -192,7 +193,7 @@ static int unionfs_fsync(const char *pat
+ 
+       int res;
+       if (isdatasync) {
+-#ifdef _POSIX_SYNCHRONIZED_IO
++#if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO != -1
+               res = fdatasync(fi->fh);
+ #else
+               res = fsync(fi->fh);
diff -r dfb362c3e32d -r 9ad5a7a97d32 filesystems/fuse-unionfs/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/filesystems/fuse-unionfs/patches/patch-ac Tue Feb 02 10:45:17 2010 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2010/02/02 10:45:18 jmmv Exp $
+
+--- Makefile.orig      2007-02-09 16:17:37.000000000 +0000
++++ Makefile
+@@ -1,6 +1,6 @@
+-CFLAGS += -Wall
++CFLAGS += -Wall $$(pkg-config --cflags fuse)
+ CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=26
+-LDFLAGS += -lfuse
++LDFLAGS += -lfuse $$(pkg-config --libs fuse)
+ 
+ UNIONFS_OBJ = unionfs.o stats.o opts.o debug.o cache.o
+