Fix DragonFly issues by merging the pthread fix from mozilla.

WTF can't those packages use the standalone-sqlite...
Bump revision.

5 files changed, 76 insertions, 2 deletions

diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile
index bab310c3ad0..1f73241777e 100644
--- a/audio/bmpx/Makefile
+++ b/audio/bmpx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/02/09 21:04:00 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/19 08:38:48 joerg Exp $
 #
 
 DISTNAME=	bmpx-0.36.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://files.beep-media-player.org/releases/0.36/
 EXTRACT_SUFX=	.tar.bz2
@@ -23,6 +24,17 @@ CONFIGURE_ARGS+=	--with-mp4v2-dir=${LOCALBASE}
 CONFIGURE_ENV+=		BOOST_REGEX_LIBS=-lboost_regex-mt
 CPPFLAGS+=		-I${LOCALBASE}/include/cdparanoia
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
+CPPFLAGS+=		-DSQLITE_THREAD_OVERRIDE_LOCK=0
+.endif
+
+.if ${OPSYS} != "DragonFly"
+SQLITE_PTHREAD=	${PTHREAD_LIBS} ${PTHREAD_LDFLAGS}
+MAKE_ENV+=	SQLITE_PTHREAD=${SQLITE_PTHREAD:Q}
+.endif
+
 BUILDLINK_API_DEPENDS.cairomm+=		cairomm>=0.6.0
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.10.0
 BUILDLINK_API_DEPENDS.glibmm+=		glibmm>=2.8.3
@@ -57,4 +69,5 @@ BUILDLINK_API_DEPENDS.taglib+=		taglib>=1.4
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/bmpx/distinfo b/audio/bmpx/distinfo
index 1c637750e00..69338c020e4 100644
--- a/audio/bmpx/distinfo
+++ b/audio/bmpx/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/02/09 21:04:00 drochner Exp $
+$NetBSD: distinfo,v 1.2 2007/02/19 08:38:48 joerg Exp $
 
 SHA1 (bmpx-0.36.1.tar.bz2) = d1f798038add19b95f292e16cbfe88e91f02034a
 RMD160 (bmpx-0.36.1.tar.bz2) = 92acca3fd41fff77f1e8224b186ccfb6e7de6f2f
 Size (bmpx-0.36.1.tar.bz2) = 2452879 bytes
 SHA1 (patch-aa) = 9d8eb9ef61823fe1e93b2963016fcc40093fd850
+SHA1 (patch-ab) = a386c54450a03a303dea8db6baac06c97f6a6f3b
+SHA1 (patch-ac) = 66336aa81fabe140ea9698d0cada3a4273695074
+SHA1 (patch-ad) = 87c6603433349ea15c3a85637f57daa99f8f8a9d
diff --git a/audio/bmpx/patches/patch-ab b/audio/bmpx/patches/patch-ab
new file mode 100644
index 00000000000..a64bdcb92d4
--- /dev/null
+++ b/audio/bmpx/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/02/19 08:38:48 joerg Exp $
+
+--- src/memmem.h.orig	2007-02-16 15:14:24.000000000 +0000
++++ src/memmem.h
+@@ -23,6 +23,8 @@
+ #ifndef	_MEMMEM_H
+ #define	_MEMMEM_H	1
+ 
++#include <stdlib.h>
++
+ #if defined(__cplusplus)
+ extern "C" {
+ #endif
diff --git a/audio/bmpx/patches/patch-ac b/audio/bmpx/patches/patch-ac
new file mode 100644
index 00000000000..e4cfbc99e8c
--- /dev/null
+++ b/audio/bmpx/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/02/19 08:38:48 joerg Exp $
+
+--- sqlite/Makefile.in.orig	2007-02-16 15:19:28.000000000 +0000
++++ sqlite/Makefile.in
+@@ -404,7 +404,7 @@ libsqlite_la_CFLAGS = \
+     -DSQLITE_ENABLE_COLUMN_METADATA
+ 
+ libsqlite_la_LDFLAGS = \
+-    -lpthread 
++    ${SQLITE_PTHREAD}
+ 
+ libsqlite_la_SOURCES = \
+     alter.c       \
diff --git a/audio/bmpx/patches/patch-ad b/audio/bmpx/patches/patch-ad
new file mode 100644
index 00000000000..bd5a4963396
--- /dev/null
+++ b/audio/bmpx/patches/patch-ad
@@ -0,0 +1,32 @@
+$NetBSD: patch-ad,v 1.1 2007/02/19 08:38:49 joerg Exp $
+
+--- sqlite/os_unix.c.orig	2006-12-13 19:53:18.000000000 +0000
++++ sqlite/os_unix.c
+@@ -494,6 +494,7 @@ static int lockTrace(int fd, int op, str
+ #define fcntl lockTrace
+ #endif /* SQLITE_LOCK_TRACE */
+ 
++#if SQLITE_THREAD_OVERRIDE_LOCK == -1
+ /*
+ ** The testThreadLockingBehavior() routine launches two separate
+ ** threads on this routine.  This routine attempts to lock a file
+@@ -534,6 +535,7 @@ static void testThreadLockingBehavior(in
+   close(fd);
+   threadsOverrideEachOthersLocks =  d[0].result==0 && d[1].result==0;
+ }
++#endif
+ #endif /* SQLITE_UNIX_THREADS */
+ 
+ /*
+@@ -662,9 +664,11 @@ static int findLockInfo(
+   key1.dev = statbuf.st_dev;
+   key1.ino = statbuf.st_ino;
+ #ifdef SQLITE_UNIX_THREADS
++#if SQLITE_THREAD_OVERRIDE_LOCK == -1
+   if( threadsOverrideEachOthersLocks<0 ){
+     testThreadLockingBehavior(fd);
+   }
++#endif
+   key1.tid = threadsOverrideEachOthersLocks ? 0 : pthread_self();
+ #endif
+   memset(&key2, 0, sizeof(key2));