From 9552c49c66510fc3edf2da8f51daaa3604cb939a Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Sat, 6 May 2006 13:48:02 +0000
Subject: Fix pthread linkage.

---
 ham/linpsk/Makefile         |  5 +++--
 ham/linpsk/distinfo         |  3 ++-
 ham/linpsk/patches/patch-aa | 13 +++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 ham/linpsk/patches/patch-aa

(limited to 'ham')

diff --git a/ham/linpsk/Makefile b/ham/linpsk/Makefile
index ed8867b90bc..504e9f95d29 100644
--- a/ham/linpsk/Makefile
+++ b/ham/linpsk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/05/06 13:48:02 joerg Exp $
 #
 
 DISTNAME=	linpsk-0.8.1
@@ -19,7 +19,7 @@ USE_LANGUAGES=	c c++
 
 .include "../../mk/bsd.prefs.mk"
 
-LDFLAGS+= ${LIBOSSAUDIO} -lqt-mt
+LDFLAGS+= ${LIBOSSAUDIO} -lqt-mt ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
 
 CONFIGURE_ARGS+="--with-fftw-dir=${LOCALBASE}"
 
@@ -29,4 +29,5 @@ post-configure:
 .include "../../mk/oss.buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/linpsk/distinfo b/ham/linpsk/distinfo
index bbdc26461ba..54ea68ad5c0 100644
--- a/ham/linpsk/distinfo
+++ b/ham/linpsk/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2006/04/09 16:08:06 rillig Exp $
+$NetBSD: distinfo,v 1.6 2006/05/06 13:48:02 joerg Exp $
 
 SHA1 (linpsk-0.8.1.tar.gz) = d55d8c793ecd3a4395603ebdd8e795f1dc4d20f9
 RMD160 (linpsk-0.8.1.tar.gz) = 975bbdfc0b63e516f1d5fdfe6baf10fa12899219
 Size (linpsk-0.8.1.tar.gz) = 435463 bytes
+SHA1 (patch-aa) = c1526a2b7e443ced400970d32313247a7f382dd9
 SHA1 (patch-ab) = 0cc21222e30d9122657e5c373b19af15c39eb883
 SHA1 (patch-ac) = 5be307963474f6879490185b47bed6e50dd51ffe
 SHA1 (patch-ad) = d9a62afada11b17730e4457e73fef7e21b8bee62
diff --git a/ham/linpsk/patches/patch-aa b/ham/linpsk/patches/patch-aa
new file mode 100644
index 00000000000..c060093f2e3
--- /dev/null
+++ b/ham/linpsk/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2006/05/06 13:48:02 joerg Exp $
+
+--- configure.orig	2006-05-06 13:21:48.000000000 +0000
++++ configure
+@@ -4270,7 +4270,7 @@ fi
+ QT_LDADD="-L$QTDIR/lib $QT_LIB"
+ if test x"$QT_IS_MT" = "xyes" ; then
+         QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
+-	QT_LDADD="${QT_LDADD} -lpthread"
++	QT_LDADD="${QT_LDADD} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ 	echo "$as_me:$LINENO: checking QT_LDADD" >&5
+ echo $ECHO_N "checking QT_LDADD... $ECHO_C" >&6
+ 	echo "$as_me:$LINENO: result: $QT_LDADD" >&5
-- 
cgit v1.2.3