Tue Feb 2 10:45:18 2010 UTC ()
Fix build in OS X.


(jmmv)
diff -r1.2 -r1.3 pkgsrc/filesystems/fuse-unionfs/Makefile
diff -r1.2 -r1.3 pkgsrc/filesystems/fuse-unionfs/distinfo
diff -r1.2 -r1.3 pkgsrc/filesystems/fuse-unionfs/patches/patch-aa
diff -r0 -r1.1 pkgsrc/filesystems/fuse-unionfs/patches/patch-ac
cvs diff -r1.2 -r1.3 pkgsrc/filesystems/fuse-unionfs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-unionfs/Makefile 2008/03/03 19:31:31 1.2
+++ pkgsrc/filesystems/fuse-unionfs/Makefile 2010/02/02 10:45:17 1.3
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile,v 1.2 2008/03/03 19:31:31 jlam Exp $ 1# $NetBSD: Makefile,v 1.3 2010/02/02 10:45:17 jmmv Exp $
2# 2#
3 3
4DISTNAME= unionfs-fuse-0.17 4DISTNAME= unionfs-fuse-0.17
5PKGNAME= fuse-unionfs-0.17 5PKGNAME= fuse-unionfs-0.17
6CATEGORIES= filesystems 6CATEGORIES= filesystems
7MASTER_SITES= http://podgorny.cz/unionfs-fuse/releases/ 7MASTER_SITES= http://podgorny.cz/unionfs-fuse/releases/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://podgorny.cz/unionfs-fuse/ 11HOMEPAGE= http://podgorny.cz/unionfs-fuse/
12COMMENT= FUSE-based union filesystem 12COMMENT= FUSE-based union filesystem
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16BUILD_TARGET= unionfs 16BUILD_TARGET= unionfs
 17USE_TOOLS+= pkg-config
17 18
18INSTALLATION_DIRS= bin 19INSTALLATION_DIRS= bin
19 20
20do-install: 21do-install:
21 ${INSTALL_PROGRAM} ${WRKSRC}/unionfs \ 22 ${INSTALL_PROGRAM} ${WRKSRC}/unionfs \
22 ${DESTDIR}${PREFIX}/bin/fuse-unionfs 23 ${DESTDIR}${PREFIX}/bin/fuse-unionfs
23 24
24.include "../../mk/fuse.buildlink3.mk" 25.include "../../mk/fuse.buildlink3.mk"
25.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/filesystems/fuse-unionfs/distinfo (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-unionfs/distinfo 2009/08/03 13:57:14 1.2
+++ pkgsrc/filesystems/fuse-unionfs/distinfo 2010/02/02 10:45:17 1.3
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.2 2009/08/03 13:57:14 joerg Exp $ 1$NetBSD: distinfo,v 1.3 2010/02/02 10:45:17 jmmv Exp $
2 2
3SHA1 (unionfs-fuse-0.17.tar.bz2) = 791877d7e127c28345f3884f30b9a65032e9ca80 3SHA1 (unionfs-fuse-0.17.tar.bz2) = 791877d7e127c28345f3884f30b9a65032e9ca80
4RMD160 (unionfs-fuse-0.17.tar.bz2) = 020662308ea3930ed26685bcb2cdcaf08f3082f3 4RMD160 (unionfs-fuse-0.17.tar.bz2) = 020662308ea3930ed26685bcb2cdcaf08f3082f3
5Size (unionfs-fuse-0.17.tar.bz2) = 6447 bytes 5Size (unionfs-fuse-0.17.tar.bz2) = 6447 bytes
6SHA1 (patch-aa) = 855c6d72e5963077ea08c5b296e9423a2c652452 6SHA1 (patch-aa) = 917a9997c5ceef0edf632b4738dd0e397c3d6705
7SHA1 (patch-ab) = fcb7ebe83f25488653ee42548c84d7709ce952d8 7SHA1 (patch-ab) = fcb7ebe83f25488653ee42548c84d7709ce952d8
 8SHA1 (patch-ac) = 0ce1100986d2a6e1941ebe6fb3ccca7fe54e7fee
cvs diff -r1.2 -r1.3 pkgsrc/filesystems/fuse-unionfs/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-unionfs/patches/Attic/patch-aa 2009/08/03 13:57:14 1.2
+++ pkgsrc/filesystems/fuse-unionfs/patches/Attic/patch-aa 2010/02/02 10:45:17 1.3
@@ -1,12 +1,21 @@ @@ -1,12 +1,21 @@
1$NetBSD: patch-aa,v 1.2 2009/08/03 13:57:14 joerg Exp $ 1$NetBSD: patch-aa,v 1.3 2010/02/02 10:45:17 jmmv Exp $
2 2
3--- unionfs.c 2007/03/10 00:31:50 1.1 3--- unionfs.c.orig 2007-02-09 16:17:37.000000000 +0000
4+++ unionfs.c 2007/03/10 00:33:02 4+++ unionfs.c
5@@ -10,6 +10,7 @@ 5@@ -10,6 +10,7 @@ This is offered under a BSD-style licens
6 #endif 6 #endif
7  7
8 #include <fuse.h> 8 #include <fuse.h>
9+#include <fuse_opt.h> 9+#include <fuse_opt.h>
10 #include <stdio.h> 10 #include <stdio.h>
11 #include <stdlib.h> 11 #include <stdlib.h>
12 #include <string.h> 12 #include <string.h>
 13@@ -192,7 +193,7 @@ static int unionfs_fsync(const char *pat
 14
 15 int res;
 16 if (isdatasync) {
 17-#ifdef _POSIX_SYNCHRONIZED_IO
 18+#if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO != -1
 19 res = fdatasync(fi->fh);
 20 #else
 21 res = fsync(fi->fh);
File Added: pkgsrc/filesystems/fuse-unionfs/patches/Attic/patch-ac
$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