Explicitly link with pthread, when using Qt.

4 files changed, 32 insertions, 7 deletions

diff --git a/audio/madman/Makefile b/audio/madman/Makefile
index bce5bf2126f..6344eb80a8c 100644
--- a/audio/madman/Makefile
+++ b/audio/madman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/05/22 19:26:10 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/05/31 10:25:19 joerg Exp $
 
 DISTNAME=	madman-0.93
 PKGREVISION=	6
@@ -21,7 +21,7 @@ post-extract:
 	${SED} -e 's,#! /usr/bin/env python,#!${PYTHONBIN},' ${WRKSRC}/httpd/make_webdata.org > ${WRKSRC}/httpd/make_webdata
 	${CHMOD} 755 ${WRKSRC}/httpd/make_webdata
 	${MV} ${WRKSRC}/main/SConscript ${WRKSRC}/main/SConscript.org
-	${AWK} '{print} NR == 20 {print "myenv.Append(LINKFLAGS = \"-Wl,-R${X11BASE}/lib,-R${LOCALBASE}/lib,-R${LOCALBASE}${QTDIR}/lib\")"}' ${WRKSRC}/main/SConscript.org > ${WRKSRC}/main/SConscript
+	${AWK} '{print} NR == 20 {print "myenv.Append(LINKFLAGS = \"${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -Wl,-R${X11BASE}/lib,-R${LOCALBASE}/lib,-R${LOCALBASE}${QTDIR}/lib\")"}' ${WRKSRC}/main/SConscript.org > ${WRKSRC}/main/SConscript
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons -C ${WRKSRC} prefix=${PREFIX} \
@@ -42,4 +42,5 @@ do-install:
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../lang/python/extension.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/madman/distinfo b/audio/madman/distinfo
index ea5026b5510..311bfb3f81b 100644
--- a/audio/madman/distinfo
+++ b/audio/madman/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/01/05 23:21:46 wiz Exp $
+$NetBSD: distinfo,v 1.5 2006/05/31 10:25:19 joerg Exp $
 
 SHA1 (madman-0.93.tar.gz) = 61eac807b280d301c2bce574cd6c0781611530cd
 RMD160 (madman-0.93.tar.gz) = 699a5be1cf28e9e6374879713673334e2ec98fba
@@ -6,5 +6,6 @@ Size (madman-0.93.tar.gz) = 548497 bytes
 SHA1 (patch-aa) = 0c10ac7f0fa21cb2b1bd458b46278acda17cf031
 SHA1 (patch-ab) = 056252fba05db0f75891181e6093dd3ab6bd5e16
 SHA1 (patch-ac) = 860d323c498b7d01fdf12fc766a50fbc0ceead4e
-SHA1 (patch-ad) = 6c80415f847b5990343aed0f3b24b284059fd576
+SHA1 (patch-ad) = 0e55206095039c012b22053c95064ecbb271ceb3
 SHA1 (patch-ae) = d370197a5a7210bf7fc371365ca489dfca4a1a9e
+SHA1 (patch-af) = 820647180f3444163332ca37eb8408745accb46f
diff --git a/audio/madman/patches/patch-ad b/audio/madman/patches/patch-ad
index a87f737f65a..0186ca5ddfb 100644
--- a/audio/madman/patches/patch-ad
+++ b/audio/madman/patches/patch-ad
@@ -1,6 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2004/11/09 12:38:10 wiz Exp $
---- SConstruct.orig	2004-11-09 13:09:48.000000000 +0100
-+++ SConstruct	2004-11-09 13:10:06.000000000 +0100
+$NetBSD: patch-ad,v 1.3 2006/05/31 10:25:19 joerg Exp $
+
+--- SConstruct.orig	2004-05-20 14:03:14.000000000 +0000
++++ SConstruct
 @@ -1,6 +1,8 @@
  import os
  import glob
@@ -10,3 +11,12 @@ $NetBSD: patch-ad,v 1.2 2004/11/09 12:38:10 wiz Exp $
  opts = Options(	"my_options.py")
  
  opts.Add("qt_directory", "Path to Qt directory", "not specified")
+@@ -112,7 +114,7 @@ def SplitLibs(lstring):
+ def CheckForQtAt(context, qtdir):
+   context.Message('Checking for Qt at %s... ' % qtdir)
+   result = AttemptLinkWithVariables(context,
+-      { "LIBS": "qt-mt", "LIBPATH": qtdir + '/lib', "CPPPATH": qtdir + '/include' },
++      { "LIBS": "qt-mt", "LIBPATH": qtdir + '/lib', "CPPPATH": qtdir + '/include', "LINKFLAGS": os.environ.get("PTHREAD_LDFLAGS","").split() + os.environ.get("PTHREAD_LIBS", "").split()},
+       """
+ #include <qapplication.h>
+ int main(int argc, char **argv) { 
diff --git a/audio/madman/patches/patch-af b/audio/madman/patches/patch-af
new file mode 100644
index 00000000000..0c08025b642
--- /dev/null
+++ b/audio/madman/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/05/31 10:25:19 joerg Exp $
+
+--- utility/refcnt_ptr.h.orig	2006-05-31 10:09:27.000000000 +0000
++++ utility/refcnt_ptr.h
+@@ -109,7 +109,7 @@ public:
+     refcnt_ptr(const refcnt_ptr<T2>& rhs) throw()
+ 	{
+ 	object = rhs.object;
+-	refcnt = rhs.refCnt;
++	this->refcnt = rhs.refCnt;
+ 	increaseCount();
+ 	}
+