[pkgsrc/trunk]: pkgsrc/audio/lmms Fix hard-coded -lpthread.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fb9e503fab63
branches:  trunk
changeset: 517747:fb9e503fab63
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Aug 22 14:29:07 2006 +0000

description:
Fix hard-coded -lpthread.

diffstat:

 audio/lmms/Makefile         |   3 ++-
 audio/lmms/distinfo         |   4 +++-
 audio/lmms/patches/patch-ae |  13 +++++++++++++
 audio/lmms/patches/patch-af |  22 ++++++++++++++++++++++
 4 files changed, 40 insertions(+), 2 deletions(-)

diffs (73 lines):

diff -r bd9c24b50a5d -r fb9e503fab63 audio/lmms/Makefile
--- a/audio/lmms/Makefile       Tue Aug 22 14:06:32 2006 +0000
+++ b/audio/lmms/Makefile       Tue Aug 22 14:29:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/07/26 18:26:49 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2006/08/22 14:29:07 joerg Exp $
 #
 
 DISTNAME=              lmms-0.2.0
@@ -31,4 +31,5 @@
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../x11/Xfixes/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r bd9c24b50a5d -r fb9e503fab63 audio/lmms/distinfo
--- a/audio/lmms/distinfo       Tue Aug 22 14:06:32 2006 +0000
+++ b/audio/lmms/distinfo       Tue Aug 22 14:29:07 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/07/23 11:50:25 rillig Exp $
+$NetBSD: distinfo,v 1.2 2006/08/22 14:29:07 joerg Exp $
 
 SHA1 (lmms-0.2.0.tar.bz2) = 410647c860d140769ed1c56bb8a794cb2594658b
 RMD160 (lmms-0.2.0.tar.bz2) = c3e44e018303ed40d048542a8f66fbb785ea11f2
@@ -7,3 +7,5 @@
 SHA1 (patch-ab) = 8a598eed529d609272419283e382ad2223dfe4d6
 SHA1 (patch-ac) = f9be78b4c606e80c8b0bad78fafbd8ee07f2e65e
 SHA1 (patch-ad) = b62e49823415530354a01c43fc588338212aaf68
+SHA1 (patch-ae) = de50ed87888b74a0d3ed0158dda3291af54595c9
+SHA1 (patch-af) = acb2752b501d3d286028ab85eae474759d921924
diff -r bd9c24b50a5d -r fb9e503fab63 audio/lmms/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/lmms/patches/patch-ae       Tue Aug 22 14:29:07 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/08/22 14:29:07 joerg Exp $
+
+--- plugins/vestige/Makefile.in.orig   2006-08-22 16:13:41.000000000 +0000
++++ plugins/vestige/Makefile.in
+@@ -241,7 +241,7 @@ EXTRA_DIST = $(EMBEDDED_RESOURCES)
+ pkglib_LTLIBRARIES = libvestige.la
+ libvestige_la_SOURCES = vestige.cpp vestige.h lvsl_client.cpp lvsl_client.h
+ lvsl_server_SOURCES = lvsl_server.c communication.h
+-lvsl_server_LDFLAGS = -mwindows -L/usr/X11R6/lib -lX11 -lpthread -o $(pkglib_PROGRAMS)
++lvsl_server_LDFLAGS = -mwindows -L/usr/X11R6/lib -lX11 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -o $(pkglib_PROGRAMS)
+ lvsl_server_LINK = wineg++
+ nobase_pkglib_DATA = $(pkglib_PROGRAMS).exe.so
+ CLEANFILES = $(MOC_FILES) ./embedded_resources.h $(nobase_pkglib_DATA)
diff -r bd9c24b50a5d -r fb9e503fab63 audio/lmms/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/lmms/patches/patch-af       Tue Aug 22 14:29:07 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2006/08/22 14:29:07 joerg Exp $
+
+--- configure.orig     2006-08-22 16:22:55.000000000 +0000
++++ configure
+@@ -21822,7 +21822,7 @@ fi
+ 
+ if test x"$QT_IS_MT" = "xyes" ; then
+         QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
+-      QT_LIBS="$QT_LIBS -lpthread"
++      QT_LIBS="$QT_LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ fi
+ 
+ if test x"$QT_TRANSLATIONS" != x ; then
+@@ -24717,7 +24717,7 @@ done
+ 
+ 
+ OLD_LIBS="$LIBS"
+-LIBS="$LIBS -lpthread"
++LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ 
+ # check for SDL-lib
+