This is jack version 1.103.0. Test on, testers!

jack/DESCR

@@ -0,0 +1,4 @@
+See www.jackaudio.org or jackit.sourceforge.net.
+
+NOTE: There are no PLIST entries for the [untested] options yet.
+Danger! Danger!

jack/Makefile

@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.3 2007/03/21 20:21:06 bsadewitz Exp $
+
+DISTNAME=		jack-audio-connection-kit-0.103.0
+PKGNAME=		jack-0.103.0
+CATEGORIES=		audio
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=jackit/}
+
+MAINTAINER=		blair.sadewitz@gmail.com
+HOMEPAGE=		http://jackaudio.org/
+COMMENT=		Low-latency audio server
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_LIBTOOL=		yes
+LIBTOOLIZE_PLIST=	yes
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		perl pkg-config
+GNU_CONFIGURE=		yes
+
+PKGCONFIG_OVERRIDE+=	jack.pc.in
+
+CPPFLAGS+=		-DOSS_DRIVER_DEF_DEV="\"${DEVOSSAUDIO}\"" -Wall
+
+.include "options.mk"
+
+.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

jack/PLIST

@@ -0,0 +1,38 @@
+@comment $NetBSD: PLIST,v 1.3 2007/03/21 20:21:06 bsadewitz Exp $
+bin/jack_bufsize
+bin/jack_connect
+bin/jack_disconnect
+bin/jack_freewheel
+bin/jack_impulse_grabber
+bin/jack_load
+bin/jack_lsp
+bin/jack_metro
+bin/jack_midiseq
+bin/jack_midisine
+bin/jack_monitor_client
+bin/jack_showtime
+bin/jack_simple_client
+bin/jack_unload
+bin/jackd
+${SNDFILE}bin/jackrec
+${JACK_TRANS}bin/track_transport
+include/jack/intclient.h
+include/jack/jack.h
+include/jack/midiport.h
+include/jack/ringbuffer.h
+include/jack/statistics.h
+include/jack/thread.h
+include/jack/timestamps.h
+include/jack/transport.h
+include/jack/types.h
+lib/jack/inprocess.la
+lib/jack/intime.la
+lib/jack/jack_dummy.la
+${OSS}lib/jack/jack_oss.la
+${PORTAUDIO}lib/jack/jack_portaudio.la
+lib/libjack.la
+lib/pkgconfig/jack.pc
+man/man1/jackd.1
+man/man1/jackstart.1
+@dirrm lib/jack
+@dirrm include/jack

jack/TODO

@@ -0,0 +1,11 @@
+--add files to PLISTs for options/seperate PLISTs according to options
+--write rc.d script
+--actually test this thing
+--Handle dynamic CPU detection, etc.
+--use CONF_FILES (maybe SUBST), RCD_SCRIPTS, and user/group stuff
+--maybe even write some real NetBSD-specific code so this actually works
+as intended ...
+
+-- XXX more?
+
+--Blair

jack/buildlink3.mk

@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.4 2007/03/21 20:21:06 bsadewitz Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+JACK_BUILDLINK3_MK:=	${JACK_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	jack
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njack}
+BUILDLINK_PACKAGES+=	jack
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jack
+
+.if ${JACK_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.jack+=	jack>=0.103.0
+BUILDLINK_PKGSRCDIR.jack?=	../../local/jack-latest
+.endif	# JACK_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}

jack/distinfo

@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.3 2007/03/21 20:21:06 bsadewitz Exp $
+
+SHA1 (jack-audio-connection-kit-0.103.0.tar.gz) = e804189f3dc024dad37da4afb66a30fd9c92b2bf
+RMD160 (jack-audio-connection-kit-0.103.0.tar.gz) = 72e47ada90b3d2c391c2e712316a975ae2a13ece
+Size (jack-audio-connection-kit-0.103.0.tar.gz) = 763244 bytes
+SHA1 (patch-aa) = 50ed60960ccbd692db05682589c24b9961074979
+SHA1 (patch-ab) = 3f26521a67928e3e195195a1e1bef024ee38723d
+SHA1 (patch-ac) = edb69f78d830e07130897636eba302893fb173d2
+SHA1 (patch-ad) = ec9b0983098e1fce2ebbcc2f724099d79cde057a
+SHA1 (patch-af) = fb4ca3996e50c97b81854cced447a62cf8990b80

jack/options.mk

@@ -0,0 +1,80 @@
+# $NetBSD: options.mk,v 1.1 2007/03/21 20:21:07 bsadewitz Exp $
+PKG_OPTIONS_VAR=	PKG_OPTIONS.jack
+PKG_SUPPORTED_OPTIONS=	sndfile portaudio readline
+PKG_SUGGESTED_OPTIONS=	sndfile
+
+CHECK_BUILTIN.readline:= yes
+.include "../../devel/readline/builtin.mk"
+CHECK_BUILTIN.readline:= no
+
+.if defined(USE_BUILTIN.readline) && !empty(USE_BUILTIN.readline:M[Yy][Ee][Ss])
+PKG_SUGGESTED_OPTIONS+=	readline
+.endif
+
+CHECK_BUILTIN.oss:= yes
+.include "../../mk/oss.builtin.mk"
+CHECK_BUILTIN.oss:= no
+
+.if defined(USE_BUILTIN.oss)
+PKG_SUPPORTED_OPTIONS+= oss
+PKG_SUGGESTED_OPTIONS+= oss
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if (PKG_SUPPORTED_OPTIONS:Moss) && !empty(PKG_OPTIONS:Moss)
+CONFIGURE_ARGS+= --enable-oss
+LIBS+=		${LIBOSSAUDIO}
+PLIST_SUBST+=	OSS=""
+CPPFLAGS+= -DOSS_DRIVER_DEF_DEV="\"${DEVOSSAUDIO}\""
+
+.include "../../mk/oss.buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-oss
+PLIST_SUBST+=	OSS="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Msndfile)
+CONFIGURE_ARGS+= --enable-sndfile
+PLIST_SUBST+=	SNDFILE=""
+
+.include "../../audio/libsndfile/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-sndfile
+PLIST_SUBST+=	SNDFILE="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mportaudio)
+CONFIGURE_ARGS+= --enable-portaudio
+PLIST_SUBST+=	PORTAUDIO=""
+
+.include "../../audio/portaudio/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-portaudio
+PLIST_SUBST+=	PORTAUDIO="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mreadline)
+PLIST_SUBST+=	JACK_TRANS=""
+BROKEN_READLINE_DETECTION=	yes
+
+.include "../../devel/readline/buildlink3.mk"
+.else
+PLIST_SUBST+=	JACK_TRANS="@comment "
+.endif
+
+#.if !empty(PKG_OPTIONS:Mfreebob)
+#CONFIGURE_ARGS+= --enable-freebob
+
+#.include "../../audio/freebob/buildlink3.mk"
+#.else
+CONFIGURE_ARGS+= --disable-freebob	# XXX disable for now
+#.endif
+
+#.if !empty(PKG_OPTIONS:Malsa)
+CONFIGURE_ARGS+= --enable-alsa
+
+#.include "../../audio/alsa/buildlink3.mk"
+#.else
+CONFIGURE_ARGS+= --disable-alsa		# XXX disable for now
+#.endif

jack/patches/patch-aa

@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2007/03/21 20:21:07 bsadewitz Exp $
+
+--- config/os/generic/time.h.orig	2006-05-25 22:45:16.000000000 -0400
++++ config/os/generic/time.h
+@@ -24,7 +24,9 @@
+ 
+ #include <jack/internal.h>
+ 
+-inline jack_time_t
++jack_time_t jack_get_microseconds_from_system (void);
++
++static inline jack_time_t
+ jack_get_microseconds (void) {
+ 	return jack_get_microseconds_from_system ();
+ }

jack/patches/patch-ab

@@ -0,0 +1,74 @@
+$NetBSD: patch-ab,v 1.1 2007/03/21 20:21:07 bsadewitz Exp $
+
+--- configure.orig	2007-03-18 18:33:01.000000000 -0400
++++ configure
+@@ -21019,13 +21019,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
+@@ -21085,7 +21085,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
+@@ -21949,7 +21949,7 @@ fi
+ 
+ 
+ JACK_CORE_CFLAGS="-I\$(top_srcdir)/config -I\$(top_srcdir) \
+--I\$(top_srcdir) -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall -g"
++-I\$(top_srcdir) ${PTHREAD_CFLAGS} -Wall -g"
+ JACK_OPT_CFLAGS="$JACK_CORE_CFLAGS -march=pentium2 -mcpu=pentium4 -O3 \
+ -ffast-math -funroll-loops -fprefetch-loop-arrays"
+ JACK_CFLAGS="$JACK_CORE_CFLAGS $CFLAGS"
+@@ -22033,7 +22033,7 @@ rm -f core conftest.err conftest.$ac_obj
+     fi
+ 
+ 
+-    JACK_OPT_CFLAGS="-D_REENTRANT -O2 -mcpu=7400 $ALTIVEC_OPT_FLAGS_FLAGS -mhard-float -mpowerpc-gfxopt"
++    JACK_OPT_CFLAGS="${PTHREAD_CFLAGS} -O2 -mcpu=7400 $ALTIVEC_OPT_FLAGS_FLAGS -mhard-float -mpowerpc-gfxopt"
+ 
+ elif echo $target_cpu | egrep '(i.86|x86_64)' >/dev/null; then
+ 
+@@ -22205,7 +22205,7 @@ cat >>confdefs.h <<\_ACEOF
+ #define x86 1
+ _ACEOF
+ 
+-    COMMON_X86_OPT_FLAGS="-DREENTRANT -O3 -fomit-frame-pointer -ffast-math -funroll-loops"
++    COMMON_X86_OPT_FLAGS="${PTHREAD_CFLAGS} -O3 -fomit-frame-pointer -ffast-math -funroll-loops"
+ 
+     if test "$target_cpu" = "i586"; then
+ 	JACK_OPT_CFLAGS="-march=i586 "
+@@ -22727,13 +22727,13 @@ if test "${with_barrier+set}" = set; the
+ 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

jack/patches/patch-ac

@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2007/03/21 20:21:07 bsadewitz Exp $
+
+--- example-clients/lsp.c.orig	2006-12-16 07:50:12.000000000 -0500
++++ example-clients/lsp.c
+@@ -119,10 +119,10 @@ main (int argc, char *argv[])
+ 	ports = jack_get_ports (client, NULL, NULL, 0);
+ 
+ 	for (i = 0; ports[i]; ++i) {
+-		printf ("%s\n", ports[i]);
+-
+ 		jack_port_t *port = jack_port_by_name (client, ports[i]);
+ 
++		printf ("%s\n", ports[i]);
++
+ 		if (show_con) {
+ 			if ((connections = jack_port_get_all_connections (client, jack_port_by_name(client, ports[i]))) != 0) {
+ 				for (j = 0; connections[j]; j++) {

jack/patches/patch-ad

@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2007/03/21 20:21:07 bsadewitz Exp $
+
+--- drivers/oss/oss_driver.h.orig	2006-05-25 22:45:26.000000000 -0400
++++ drivers/oss/oss_driver.h
+@@ -34,7 +34,6 @@
+ #include <jack/jack.h>
+ 
+ 
+-#define OSS_DRIVER_DEF_DEV	"/dev/dsp"
+ #define OSS_DRIVER_DEF_FS	48000
+ #define OSS_DRIVER_DEF_BLKSIZE	1024
+ #define OSS_DRIVER_DEF_NPERIODS	2

jack/patches/patch-af

@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2007/03/21 20:21:07 bsadewitz Exp $
+
+--- libjack/midiport.c.orig	2006-12-16 07:50:17.000000000 -0500
++++ libjack/midiport.c
+@@ -77,7 +77,7 @@ jack_midi_event_get(jack_midi_event_t *e
+ 		(jack_midi_port_info_private_t *) port_buffer;
+ 	
+ 	if (event_idx >= info->event_count)
+-		return ENODATA;
++		return ENOMSG;
+ 	
+ 	port_event = (jack_midi_port_internal_event_t *) (info + 1);
+ 	port_event += event_idx;