From 96c2dc940c4babcaa2ed812c87abba3e2cdc7241 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 19 Apr 2006 15:25:09 +0000
Subject: Add libtool dependency. Add readline dependency for jack_transport.
 Fix pthread detection. Bump revision.

---
 audio/jack/Makefile         |  6 +++++-
 audio/jack/PLIST            |  3 ++-
 audio/jack/distinfo         |  3 ++-
 audio/jack/patches/patch-aa | 47 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 audio/jack/patches/patch-aa

(limited to 'audio/jack')

diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index c19cd9438bd..1d1bd353226 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/04/12 20:43:27 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2006/04/19 15:25:09 joerg Exp $
 #
 
 DISTNAME=		jack-audio-connection-kit-0.100.0
 PKGNAME=		jack-0.100.0
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=jackit/}
 
@@ -10,10 +11,13 @@ MAINTAINER=		chriswareham@chriswareham.demon.co.uk
 HOMEPAGE=		http://jackit.sourceforge.net/
 COMMENT=		Low-latency audio server
 
+USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=	jack.pc.in
 
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/jack/PLIST b/audio/jack/PLIST
index 8b02cc73984..07d81596a39 100644
--- a/audio/jack/PLIST
+++ b/audio/jack/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/04/12 20:43:27 rillig Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/19 15:25:09 joerg Exp $
 bin/jack_bufsize
 bin/jack_connect
 bin/jack_disconnect
@@ -10,6 +10,7 @@ bin/jack_metro
 bin/jack_monitor_client
 bin/jack_showtime
 bin/jack_simple_client
+bin/jack_transport
 bin/jack_unload
 bin/jackd
 include/jack/intclient.h
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index a348ff3746a..6a86f6e64d8 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/12 20:43:27 rillig Exp $
+$NetBSD: distinfo,v 1.2 2006/04/19 15:25:09 joerg Exp $
 
 SHA1 (jack-audio-connection-kit-0.100.0.tar.gz) = 431ab7647f694d57bc697d150742d70cccdcd43b
 RMD160 (jack-audio-connection-kit-0.100.0.tar.gz) = 31548d58e545cb117428ca72e256a395363ff9b6
 Size (jack-audio-connection-kit-0.100.0.tar.gz) = 682799 bytes
+SHA1 (patch-aa) = 537836a22c61534595dacd2afe69488b4b70e6b1
diff --git a/audio/jack/patches/patch-aa b/audio/jack/patches/patch-aa
new file mode 100644
index 00000000000..4b4ab40c8a9
--- /dev/null
+++ b/audio/jack/patches/patch-aa
@@ -0,0 +1,47 @@
+$NetBSD: patch-aa,v 1.1 2006/04/19 15:25:09 joerg Exp $
+
+--- configure.orig	2006-04-19 15:06:18.000000000 +0000
++++ configure
+@@ -21428,13 +21428,13 @@ if test $ac_cv_func_pthread_create = yes
+   :
+ else
+ 
+-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21497,7 +21497,7 @@ if test $ac_cv_lib_pthread_pthread_creat
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+ 
+-  LIBS="-lpthread $LIBS"
++  LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ 
+ else
+   { { echo "$as_me:$LINENO: error: *** JACK requires POSIX threads support" >&5
+@@ -22981,13 +22981,13 @@ if test "${with_barrier+set}" = set; the
+    USE_BARRIER=$withval
+ fi;
+ if test "x$USE_BARRIER" = "xyes"; then
+-	echo "$as_me:$LINENO: checking for pthread_barrier_init in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_barrier_init in -lpthread... $ECHO_C" >&6
++	echo "$as_me:$LINENO: checking for pthread_barrier_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_barrier_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_barrier_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
-- 
cgit v1.2.3