Mon Jun 6 16:20:33 2011 UTC ()
Make sure libperfuse has -lpuffs, so that DSO will not miss it when
calling dlopen()


(manu)
diff -r1.18 -r1.19 pkgsrc/filesystems/perfuse/Makefile
diff -r1.17 -r1.18 pkgsrc/filesystems/perfuse/distinfo
diff -r1.4 -r1.5 pkgsrc/filesystems/perfuse/patches/patch-aa
cvs diff -r1.18 -r1.19 pkgsrc/filesystems/perfuse/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/perfuse/Makefile 2011/06/01 16:04:32 1.18
+++ pkgsrc/filesystems/perfuse/Makefile 2011/06/06 16:20:32 1.19
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.18 2011/06/01 16:04:32 manu Exp $ 1# $NetBSD: Makefile,v 1.19 2011/06/06 16:20:32 manu Exp $
2# 2#
3 3
4DISTNAME= perfuse-20110601 4DISTNAME= perfuse-20110601
 5PKGREVISION= 1
5CATEGORIES= filesystems 6CATEGORIES= filesystems
6MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/perfuse/ 7MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/perfuse/
7EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
8 9
9MAINTAINER= manu@NetBSD.org 10MAINTAINER= manu@NetBSD.org
10COMMENT= PUFFS Enabled Relay to FUSE 11COMMENT= PUFFS Enabled Relay to FUSE
11LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15WRKSRC= ${WRKDIR}/src/ 16WRKSRC= ${WRKDIR}/src/
16BUILD_DIRS= lib/libperfuse usr.sbin/perfused 17BUILD_DIRS= lib/libperfuse usr.sbin/perfused
17BUILDLINK_TRANSFORM= rm:-Werror 18BUILDLINK_TRANSFORM= rm:-Werror
cvs diff -r1.17 -r1.18 pkgsrc/filesystems/perfuse/distinfo (expand / switch to unified diff)

--- pkgsrc/filesystems/perfuse/distinfo 2011/06/01 16:04:32 1.17
+++ pkgsrc/filesystems/perfuse/distinfo 2011/06/06 16:20:32 1.18
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.17 2011/06/01 16:04:32 manu Exp $ 1$NetBSD: distinfo,v 1.18 2011/06/06 16:20:32 manu Exp $
2 2
3SHA1 (perfuse-20110601.tgz) = 8eaf02b36dae14d51c53b33a247cbf7406e49f71 3SHA1 (perfuse-20110601.tgz) = 8eaf02b36dae14d51c53b33a247cbf7406e49f71
4RMD160 (perfuse-20110601.tgz) = 6b422049764f14ddee03b578ff71bc95da5dce4d 4RMD160 (perfuse-20110601.tgz) = 6b422049764f14ddee03b578ff71bc95da5dce4d
5Size (perfuse-20110601.tgz) = 37545 bytes 5Size (perfuse-20110601.tgz) = 37545 bytes
6SHA1 (patch-aa) = bade77e0bc143fbb73564e2d737f6dc76bf58913 6SHA1 (patch-aa) = 77e266476421fc041bbd2d2284ef586add1c35f2
cvs diff -r1.4 -r1.5 pkgsrc/filesystems/perfuse/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/filesystems/perfuse/patches/patch-aa 2011/05/17 12:44:13 1.4
+++ pkgsrc/filesystems/perfuse/patches/patch-aa 2011/06/06 16:20:32 1.5
@@ -1,12 +1,16 @@ @@ -1,12 +1,16 @@
1$NetBSD: patch-aa,v 1.4 2011/05/17 12:44:13 wiz Exp $ 1$NetBSD: patch-aa,v 1.5 2011/06/06 16:20:32 manu Exp $
2 2--- lib/libperfuse/Makefile.orig 2011-05-26 12:56:30.000000000 +0000
3--- lib/libperfuse/Makefile.orig 2011-05-09 11:44:28.000000000 +0200 3+++ lib/libperfuse/Makefile 2011-06-06 16:13:13.000000000 +0000
4+++ lib/libperfuse/Makefile 2011-05-09 11:44:35.000000000 +0200 4@@ -2,5 +2,5 @@
5@@ -2,6 +2,6 @@ 
6  5
7 LIB= perfuse 6 LIB= perfuse
8-LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs 7-LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs
9+#LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs 8+#LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs
10  9
11 .ifdef DEBUG 10 .ifdef DEBUG
12 PERFUSE_OPT_DEBUG_FLAGS= -g -DPERFUSE_DEBUG 11@@ -13,4 +13,5 @@
 12 CPPFLAGS+= -I${.CURDIR}
 13 CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libpuffs
 14+LDADD+= -lpuffs
 15 SRCS= perfuse.c ops.c subr.c debug.c
 16 MAN= libperfuse.3