From fe824624ad6e970372c9ca9fd1563a87073e55db Mon Sep 17 00:00:00 2001 From: xtraeme Date: Wed, 16 May 2007 11:02:12 +0000 Subject: Now that pooka@ fixed the libpthread problem, remove the hack to not link it to libpthread. Also disable debugging output... too verbose, and it works well enough. --- filesystems/fuse-obexfs/Makefile | 9 +-------- filesystems/fuse-obexfs/distinfo | 4 ++-- filesystems/fuse-obexfs/patches/patch-aa | 14 +++++++++++--- 3 files changed, 14 insertions(+), 13 deletions(-) (limited to 'filesystems/fuse-obexfs') diff --git a/filesystems/fuse-obexfs/Makefile b/filesystems/fuse-obexfs/Makefile index 4b977315d63..034b30d2e10 100644 --- a/filesystems/fuse-obexfs/Makefile +++ b/filesystems/fuse-obexfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/05/16 10:32:52 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2007/05/16 11:02:12 xtraeme Exp $ # DISTNAME= obexfs-0.8 @@ -16,13 +16,6 @@ USE_TOOLS+= autoconf gmake pkg-config pre-configure: cd ${WRKSRC} && autoconf -.include "../../mk/bsd.prefs.mk" - -# puffs does not play well with libpthread, disable it. -.if ${OPSYS} == "NetBSD" -BUILDLINK_TRANSFORM+= rm:-lpthread -.endif - .include "../../comms/obexftp/buildlink3.mk" .include "../../comms/openobex/buildlink3.mk" .include "../../mk/fuse.buildlink3.mk" diff --git a/filesystems/fuse-obexfs/distinfo b/filesystems/fuse-obexfs/distinfo index 7848ba49316..a3599d552b4 100644 --- a/filesystems/fuse-obexfs/distinfo +++ b/filesystems/fuse-obexfs/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/05/16 10:32:52 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2007/05/16 11:02:12 xtraeme Exp $ SHA1 (obexfs-0.8.tar.gz) = 99c0c54212a2fc874107efbc9ad2ba7ad2b7ab37 RMD160 (obexfs-0.8.tar.gz) = a3440c923c5f371261fffec91be2c909571ced1e Size (obexfs-0.8.tar.gz) = 76393 bytes -SHA1 (patch-aa) = f2251b42fbb811deb842ec87d50d8d59fed5ca39 +SHA1 (patch-aa) = beef802678c5839fe37fa84288bb545934001ef2 SHA1 (patch-ab) = 63936898afa0cbf1c2e972d9aef9a6681de65f20 SHA1 (patch-ac) = 42a1f77900e49f7e3afc9b3e935d66443b92ad69 diff --git a/filesystems/fuse-obexfs/patches/patch-aa b/filesystems/fuse-obexfs/patches/patch-aa index 4eaa0320778..0e130cb2e15 100644 --- a/filesystems/fuse-obexfs/patches/patch-aa +++ b/filesystems/fuse-obexfs/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/05/16 10:32:52 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2007/05/16 11:02:12 xtraeme Exp $ --- fuse/obexfs.c.orig 2006-01-19 15:46:43.000000000 +0100 -+++ fuse/obexfs.c 2007-05-14 09:28:37.000000000 +0200 ++++ fuse/obexfs.c 2007-05-16 12:52:58.000000000 +0200 @@ -26,6 +26,8 @@ /* strndup */ #define _GNU_SOURCE @@ -23,7 +23,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/05/16 10:32:52 xtraeme Exp $ #include #include #include -@@ -412,12 +418,20 @@ +@@ -49,7 +55,6 @@ + + #define UNUSED(x) x __attribute__((unused)) + +-#define DEBUGOUPUT + #ifdef DEBUGOUPUT + #define DEBUG(...) fprintf(stderr, __VA_ARGS__) + #else +@@ -412,12 +417,20 @@ return 0; } -- cgit v1.2.3