summaryrefslogtreecommitdiff
path: root/filesystems/fuse-unionfs
diff options
context:
space:
mode:
authorjmmv <jmmv>2010-02-02 10:45:17 +0000
committerjmmv <jmmv>2010-02-02 10:45:17 +0000
commit7aa12f1556de80b77e6679860e61cf9e15fc5292 (patch)
tree41ec3aa37f92922b9f7e8c5465e184769b8590f5 /filesystems/fuse-unionfs
parent19e928ec52e07493d95d3cb7bd8b80cb6a148ecd (diff)
downloadpkgsrc-7aa12f1556de80b77e6679860e61cf9e15fc5292.tar.gz
Fix build in OS X.
Diffstat (limited to 'filesystems/fuse-unionfs')
-rw-r--r--filesystems/fuse-unionfs/Makefile3
-rw-r--r--filesystems/fuse-unionfs/distinfo5
-rw-r--r--filesystems/fuse-unionfs/patches/patch-aa17
-rw-r--r--filesystems/fuse-unionfs/patches/patch-ac13
4 files changed, 31 insertions, 7 deletions
diff --git a/filesystems/fuse-unionfs/Makefile b/filesystems/fuse-unionfs/Makefile
index 84f2ee425d8..381c3a789de 100644
--- a/filesystems/fuse-unionfs/Makefile
+++ b/filesystems/fuse-unionfs/Makefile
@@ -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 @@ COMMENT= FUSE-based union filesystem
PKG_DESTDIR_SUPPORT= user-destdir
BUILD_TARGET= unionfs
+USE_TOOLS+= pkg-config
INSTALLATION_DIRS= bin
diff --git a/filesystems/fuse-unionfs/distinfo b/filesystems/fuse-unionfs/distinfo
index 14805914298..619d3e8735c 100644
--- a/filesystems/fuse-unionfs/distinfo
+++ b/filesystems/fuse-unionfs/distinfo
@@ -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 --git a/filesystems/fuse-unionfs/patches/patch-aa b/filesystems/fuse-unionfs/patches/patch-aa
index c9336d6dbca..eed19b412a5 100644
--- a/filesystems/fuse-unionfs/patches/patch-aa
+++ b/filesystems/fuse-unionfs/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.2 2009/08/03 13:57:14 joerg Exp $
#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 --git a/filesystems/fuse-unionfs/patches/patch-ac b/filesystems/fuse-unionfs/patches/patch-ac
new file mode 100644
index 00000000000..bab9faa55f8
--- /dev/null
+++ b/filesystems/fuse-unionfs/patches/patch-ac
@@ -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
+