Move audio/jack-devel to audio/jack: jack 0.100.0 was broken on many

platforms and a hideous anachronism.  On NetBSD-current/i386 and amd64,
at least, I can say that this package works very well.  If you have issues
with the audio skipping and are running NetBSD 4.99.x, try updating to
rev. 1.241 of sys/dev/audio.c; the changes to audio_poll() and the pause
attribute handling (in large part thanks to help from jakemsr@openbsd.org)
are important for proper functioning of jack (though you may find it
works regardless, depending upon your audio driver, how demanding your
"workload" is, etc.).  I will submit a pullup request for this change
for NetBSD 4 as well.

JACK now supports both our native audio API and OSS--I recommend
trying both.

32 files changed, 299 insertions, 393 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 543251e75e4..d4f5ec79cea 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.376 2008/06/21 20:51:24 bjs Exp $
+# $NetBSD: Makefile,v 1.377 2008/07/31 03:58:05 bjs Exp $
 #
 
 COMMENT=	Audio tools
@@ -144,7 +144,6 @@ SUBDIR+=	id3lib
 SUBDIR+=	id3v2
 SUBDIR+=	ifp-line
 SUBDIR+=	jack
-SUBDIR+=	jack-devel
 SUBDIR+=	juke
 SUBDIR+=	kid3
 SUBDIR+=	kmp
diff --git a/audio/jack-devel/DESCR b/audio/jack-devel/DESCR
deleted file mode 100644
index f3b11443581..00000000000
--- a/audio/jack-devel/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-JACK is a low-latency audio server, written for POSIX conformant
-operating systems such as GNU/Linux and Apple's OS X. It can connect a
-number of different applications to an audio device, as well as allowing
-them to share audio between themselves. Its clients can run in their own
-processes (ie. as normal applications), or can they can run within the
-JACK server (ie. as a "plugin").
diff --git a/audio/jack-devel/Makefile b/audio/jack-devel/Makefile
deleted file mode 100644
index b8ca3a0e535..00000000000
--- a/audio/jack-devel/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2008/05/04 01:02:07 bjs Exp $
-#
-
-DISTNAME=	jack-audio-connection-kit-${JACK_VERSION}
-PKGNAME=	jack-${JACK_VERSION}
-CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	.tar.bz2
-
-JACK_VERSION=	0.111.5
-
-MAINTAINER=	bjs@NetBSD.org
-HOMEPAGE=	http://www.jackaudio.org/
-COMMENT=	JACK audio connection kit
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		pkg-config
-USE_LIBTOOL=		yes
-
-PKGCONFIG_OVERRIDE+=	jack.pc.in
-
-PTHREAD_OPTS+=		require native
-
-CONFIGURE_ARGS+=	--disable-alsa
-CONFIGURE_ARGS+=	--disable-freebob
-CONFIGURE_ARGS+=	--disable-coreaudio
-CONFIGURE_ARGS+=	--disable-firewire
-CONFIGURE_ARGS+=	--disable-optimize
-CONFIGURE_ARGS+=	--enable-resize
-CONFIGURE_ARGS+=	--enable-timestamps
-
-CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
-
-CONFIGURE_ENV+=         ac_cv_header_readline_chardefs_h=yes
- 
-JACKD_DEFAULT_TMPDIR?=	/tmp
-JACKD_PROCFS_PATH?=	/proc
-
-.include "../../mk/bsd.prefs.mk"
-
-.if "${OPSYS:M*BSD}" != "" || ${OPSYS} == "Darwin"
-CFLAGS+=		-DJACK_HOST_HAS_BSD_POLL
-.endif
-
-.if exists(/dev/shm) && ${OPSYS} == "Linux"
-CONFIGURE_ARGS+=	--with-default-tmpdir=/dev/shm
-.else
-CONFIGURE_ARGS+=	--with-default-tmpdir=${JACKD_DEFAULT_TMPDIR:Q}
-.endif
-
-PLIST_VARS=		oss sunaudio
-
-###
-### XXX The sun driver is buggy on NetBSD right now.  I hope to remedy
-###	this shortly.
-###
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Solaris"
-CONFIGURE_ARGS+=	--enable-sun
-PLIST.sunaudio=		yes
-.else
-CONFIGURE_ARGS+=	--disable-sun
-.endif
-
-.include "../../mk/oss.buildlink3.mk"
-
-.if ${OSS_TYPE} != "none"
-CONFIGURE_ARGS+= 	--enable-oss
-PLIST.oss=		yes
-MAKE_ENV+=		LIBOSSAUDIO=${LIBOSSAUDIO:Q}
-CFLAGS+=		-DDEVOSSAUDIO=\"${DEVOSSAUDIO:U/dev/dsp}\"
-.else
-CONFIGURE_ARGS+= 	--disable-oss
-.endif
-
-
-SUBST_CLASSES+=	jacksrc
-SUBST_FILES.jacksrc=	libjack/unlock.c
-SUBST_MESSAGE.jacksrc=	Peforming substitutions in JACK sources.
-SUBST_STAGE.jacksrc=	pre-build
-SUBST_VARS.jacksrc=	PREFIX JACKD_PROCFS_PATH
-
-post-extract:
-	${RUN} \
-	    ${MKDIR} ${WRKSRC}/config/os/netbsd && \
-		${CP} ${FILESDIR}/atomicity.h \
-		    ${WRKSRC}/config/os/netbsd
-
-.include "../../audio/libsamplerate/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/jack-devel/PLIST b/audio/jack-devel/PLIST
deleted file mode 100644
index 9713e67b1b8..00000000000
--- a/audio/jack-devel/PLIST
+++ /dev/null
@@ -1,42 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2008/05/04 01:02:07 bjs Exp $
-bin/jack_alias
-bin/jack_connect
-bin/jack_disconnect
-bin/jack_evmon
-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_netsource
-bin/jack_showtime
-bin/jack_simple_client
-bin/jack_transport
-bin/jack_unload
-bin/jackd
-bin/jackrec
-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
-lib/jack/jack_net.la
-${PLIST.oss}lib/jack/jack_oss.la
-${PLIST.sunaudio}lib/jack/jack_sun.la
-lib/libjack.la
-lib/libjackserver.la
-lib/pkgconfig/jack.pc
-man/man1/jackd.1
-man/man1/jackstart.1
-@dirrm lib/jack
-@dirrm include/jack
diff --git a/audio/jack-devel/buildlink3.mk b/audio/jack-devel/buildlink3.mk
deleted file mode 100644
index f2227520fee..00000000000
--- a/audio/jack-devel/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/06/21 20:37:40 bjs 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.110.0
-BUILDLINK_PKGSRCDIR.jack?=	../../audio/jack-devel
-.endif	# JACK_BUILDLINK3_MK
-
-.include "../../audio/libsamplerate/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/jack-devel/distinfo b/audio/jack-devel/distinfo
deleted file mode 100644
index d08d81d8cec..00000000000
--- a/audio/jack-devel/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.4 2008/05/04 01:02:07 bjs Exp $
-
-SHA1 (jack-audio-connection-kit-0.111.5.tar.bz2) = b6efab7e206762a60e092d8dbe70001bd996d44f
-RMD160 (jack-audio-connection-kit-0.111.5.tar.bz2) = 3af9409582da307b98317add7ebfe60d8204dd44
-Size (jack-audio-connection-kit-0.111.5.tar.bz2) = 508591 bytes
-SHA1 (patch-aa) = 169403b0eacff27b6f77f714b07eab571c0e6455
-SHA1 (patch-ab) = b201a2a4db7c7d1565049e5d3534cee9a0ccbd20
-SHA1 (patch-ac) = 7bde8dcf5bf4b6f946c3eb6a568f7d66c1c69c35
-SHA1 (patch-ad) = 9632ad3a03015688f02bc4b715d74e21ae293c8f
-SHA1 (patch-ae) = 7fb1deae5473cc9df556176c878610805baf66dc
-SHA1 (patch-af) = 446bbcb0a835279c7821bcebfd6eec04a0fd7870
-SHA1 (patch-ag) = e7a5e878cdd47355f8d6213163b8560939708f32
-SHA1 (patch-ah) = d5dd0c8718b6f07277444d0cce02340eb849e092
-SHA1 (patch-ai) = 89817ae9c013d0da37307f9bc673bf370784e869
-SHA1 (patch-aj) = 478c44fc5a82b2ffa108e985baae49765c793828
-SHA1 (patch-ak) = 334e03bc426034c0c231af40b48ee43717c1bed8
-SHA1 (patch-am) = c4d1d5562dace10971ef7fba37ddfcf07ad2fdb5
-SHA1 (patch-ao) = 88f0e4bf223db31375c7b3b2f0ef152d5cadf374
-SHA1 (patch-ap) = 1e15592658714da73ebceb695000cd636ea9b871
diff --git a/audio/jack-devel/patches/patch-aa b/audio/jack-devel/patches/patch-aa
deleted file mode 100644
index b39c8dc33ef..00000000000
--- a/audio/jack-devel/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2008/04/08 01:44:47 bjs Exp $
-
---- config/sysdeps/atomicity.h.orig	2006-05-15 13:12:44.000000000 -0400
-+++ config/sysdeps/atomicity.h
-@@ -1,7 +1,11 @@
- #ifndef _jack_sysdep_atomicity_h_
- #define _jack_sysdep_atomicity_h_
- 
--#if defined(__i386__)
-+#if defined(HAVE_NETBSD_ATOMIC_OPS)
-+
-+#include <config/os/netbsd/atomicity.h>
-+
-+#elif defined(__i386__)
- 
- #include <config/cpu/i386/atomicity.h>
- 
-@@ -15,6 +19,10 @@
- 
- #include <config/cpu/powerpc/atomicity.h>
- 
-+#elif defined(__mips__) || defined(__mips64__)
-+
-+#include <config/cpu/mips/atomicity.h>
-+
- #else
- 
- #include <config/cpu/generic/atomicity.h>
diff --git a/audio/jack-devel/patches/patch-ab b/audio/jack-devel/patches/patch-ab
deleted file mode 100644
index 816b7ee63ac..00000000000
--- a/audio/jack-devel/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2008/05/04 01:02:07 bjs Exp $
-
-The default watchdog timeout is 10 seconds, which is too much for
-usleep().  Let's nanosleep if it's available.
-
---- jackd/engine.c.orig	2008-03-17 18:26:49.000000000 -0400
-+++ jackd/engine.c
-@@ -1468,7 +1480,7 @@ jack_server_thread (void *arg)
- 				    (engine, pfd[i].fd)) {
- 					jack_error ("could not handle external"
- 						    " client request");
--#ifdef JACK_USE_MACH_THREADS
-+#ifdef JACK_HOST_HAS_BSD_POLL
-                                     /* poll is implemented using
- 				       select (see the macosx/fakepoll
- 				       code). When the socket is closed
-@@ -1481,7 +1493,7 @@ jack_server_thread (void *arg)
- 				       and remove the client.
-                                     */
-                                     jack_client_disconnect(engine, pfd[i].fd);
--#endif /* JACK_USE_MACH_THREADS */
-+#endif /* JACK_HOST_HAS_BSD_POLL */
- 				}
- 			}
- 		}
diff --git a/audio/jack-devel/patches/patch-ai b/audio/jack-devel/patches/patch-ai
deleted file mode 100644
index 11c0557a3f0..00000000000
--- a/audio/jack-devel/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2008/04/08 01:44:47 bjs Exp $
-
---- libjack/client.c.orig	2008-03-17 07:30:44.000000000 -0400
-+++ libjack/client.c
-@@ -1533,7 +1533,9 @@ jack_wake_next_client (jack_client_t* cl
- 		jack_error ("cannot complete execution of the "
- 			    "processing graph (%s)",
- 			    strerror(errno));
-+#ifndef JACK_HOST_HAS_BSD_POLL
- 		return -1;
-+#endif
- 	}
- 	
- 	return 0;
diff --git a/audio/jack-devel/MESSAGE b/audio/jack/MESSAGE
index 283e506481c..8e7908f9eea 100644
--- a/audio/jack-devel/MESSAGE
+++ b/audio/jack/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2008/05/07 12:15:02 bjs Exp $
+$NetBSD: MESSAGE,v 1.1 2008/07/31 03:58:05 bjs Exp $
 
 NOTE:  Unfortunately, JACK wants to use a linux /proc filesystem to
 perform shared memory housekeeping tasks.  Therefore, if your platform
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 7f48e2acb49..15441d36bcf 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,28 +1,94 @@
-# $NetBSD: Makefile,v 1.10 2007/03/18 21:19:09 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2008/07/31 03:58:05 bjs Exp $
 #
 
-DISTNAME=		jack-audio-connection-kit-0.100.0
-PKGNAME=		jack-0.100.0
-PKGREVISION=		3
-CATEGORIES=		audio
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=jackit/}
+DISTNAME=	jack-audio-connection-kit-${JACK_VERSION}
+PKGNAME=	jack-${JACK_VERSION}
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		chriswareham@chriswareham.demon.co.uk
-HOMEPAGE=		http://jackaudio.org/
-COMMENT=		Low-latency audio server
+JACK_VERSION=	0.112.1
+
+MAINTAINER=	bjs@NetBSD.org
+HOMEPAGE=	http://www.jackaudio.org/
+COMMENT=	JACK audio connection kit
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		perl pkg-config
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		ac_cv_header_readline_chardefs_h=yes
+USE_TOOLS+=		pkg-config
+USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE+=	jack.pc.in
 
-LIBS+=			${LIBOSSAUDIO}
+PTHREAD_OPTS+=		require native
+
+CONFIGURE_ARGS+=	--disable-alsa
+CONFIGURE_ARGS+=	--disable-freebob
+CONFIGURE_ARGS+=	--disable-coreaudio
+CONFIGURE_ARGS+=	--disable-firewire
+CONFIGURE_ARGS+=	--disable-optimize
+CONFIGURE_ARGS+=	--enable-resize
+CONFIGURE_ARGS+=	--enable-timestamps
+
+CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
+
+CONFIGURE_ENV+=		ac_cv_header_readline_chardefs_h=yes
+
+JACKD_DEFAULT_TMPDIR?=	/tmp
+JACKD_PROCFS_PATH?=	/proc
+
+.include "../../mk/bsd.prefs.mk"
 
-.include "../../devel/libgetopt/buildlink3.mk"
+.if "${OPSYS:M*BSD}" != "" || ${OPSYS} == "Darwin"
+CFLAGS+=		-DJACK_HOST_HAS_BSD_POLL
+.endif
+
+.if exists(/dev/shm) && ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=	--with-default-tmpdir=/dev/shm
+.else
+CONFIGURE_ARGS+=	--with-default-tmpdir=${JACKD_DEFAULT_TMPDIR:Q}
+.endif
+
+PLIST_VARS=		oss sunaudio
+
+###
+### XXX The sun driver is buggy on NetBSD right now.  I hope to remedy
+###	this shortly.
+###
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Solaris"
+CONFIGURE_ARGS+=	--enable-sun
+PLIST.sunaudio=		yes
+.else
+CONFIGURE_ARGS+=	--disable-sun
+.endif
+
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OSS_TYPE} != "none"
+CONFIGURE_ARGS+=	--enable-oss
+PLIST.oss=		yes
+MAKE_ENV+=		LIBOSSAUDIO=${LIBOSSAUDIO:Q}
+CFLAGS+=		-DDEVOSSAUDIO=\"${DEVOSSAUDIO:U/dev/dsp}\"
+.else
+CONFIGURE_ARGS+=	--disable-oss
+.endif
+
+
+SUBST_CLASSES+=	jacksrc
+SUBST_FILES.jacksrc=	libjack/unlock.c
+SUBST_MESSAGE.jacksrc=	Peforming substitutions in JACK sources.
+SUBST_STAGE.jacksrc=	pre-build
+SUBST_VARS.jacksrc=	PREFIX JACKD_PROCFS_PATH
+
+post-extract:
+	${RUN} \
+	    ${MKDIR} ${WRKSRC}/config/os/netbsd && \
+		${CP} ${FILESDIR}/atomicity.h \
+		    ${WRKSRC}/config/os/netbsd
+
+.include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/jack/PLIST b/audio/jack/PLIST
index 07d81596a39..52d60445a33 100644
--- a/audio/jack/PLIST
+++ b/audio/jack/PLIST
@@ -1,20 +1,26 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/19 15:25:09 joerg Exp $
-bin/jack_bufsize
+@comment $NetBSD: PLIST,v 1.3 2008/07/31 03:58:05 bjs Exp $
+bin/jack_alias
 bin/jack_connect
 bin/jack_disconnect
+bin/jack_evmon
 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_netsource
 bin/jack_showtime
 bin/jack_simple_client
 bin/jack_transport
 bin/jack_unload
 bin/jackd
+bin/jackrec
 include/jack/intclient.h
 include/jack/jack.h
+include/jack/midiport.h
 include/jack/ringbuffer.h
 include/jack/statistics.h
 include/jack/thread.h
@@ -24,8 +30,11 @@ include/jack/types.h
 lib/jack/inprocess.la
 lib/jack/intime.la
 lib/jack/jack_dummy.la
-lib/jack/jack_oss.la
+lib/jack/jack_net.la
+${PLIST.oss}lib/jack/jack_oss.la
+${PLIST.sunaudio}lib/jack/jack_sun.la
 lib/libjack.la
+lib/libjackserver.la
 lib/pkgconfig/jack.pc
 man/man1/jackd.1
 man/man1/jackstart.1
diff --git a/audio/jack/buildlink3.mk b/audio/jack/buildlink3.mk
index 025cac90a2d..b2d21d14629 100644
--- a/audio/jack/buildlink3.mk
+++ b/audio/jack/buildlink3.mk
@@ -1,10 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:36 jlam Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.4 2008/07/31 03:58:05 bjs Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JACK_BUILDLINK3_MK:=	${JACK_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	jack
 .endif
 
@@ -12,9 +11,13 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njack}
 BUILDLINK_PACKAGES+=	jack
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jack
 
-.if !empty(JACK_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.jack=	jack>=0.100.0
+.if ${JACK_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.jack+=	jack>=0.110.0
 BUILDLINK_PKGSRCDIR.jack?=	../../audio/jack
+DLOPEN_REQUIRE_PTHREADS=	yes
 .endif	# JACK_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index 34de9b3d04f..e1c7c963991 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,7 +1,22 @@
-$NetBSD: distinfo,v 1.3 2006/06/23 14:44:03 jlam Exp $
+$NetBSD: distinfo,v 1.4 2008/07/31 03:58:05 bjs 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
-SHA1 (patch-ab) = 288aed771bad16d068ad7f78435e09aca7e10535
+SHA1 (jack-audio-connection-kit-0.112.1.tar.bz2) = 9b0d5e33098873d92dcfac82bdf5cc4ec9821c91
+RMD160 (jack-audio-connection-kit-0.112.1.tar.bz2) = b7fe0d94314a298031dbb57ceefbbfc917ef4a13
+Size (jack-audio-connection-kit-0.112.1.tar.bz2) = 603111 bytes
+SHA1 (patch-aa) = 56b3efc83cd989670bdbdcaa45c72ed3b92ea731
+SHA1 (patch-ab) = 2babb8a6ecfa61ca3c1c244155cc89ffb2264fa8
+SHA1 (patch-ac) = f4e5a43544f07118acb26aac3f402566ab6193ee
+SHA1 (patch-ad) = 7323270fdf527836bd5ceda4da7f6a4997b52fc5
+SHA1 (patch-ae) = ca18877262357a3e0d503b171fe42708b59ecec6
+SHA1 (patch-af) = 37d0895a253caed41332f4fb17e90677dfe8055f
+SHA1 (patch-ag) = 04d4ad14874c11dbd3d7c0cb2cf488c5bd6da583
+SHA1 (patch-ah) = ef3f960cb95ac13f3227d918be0b80acd5f90d48
+SHA1 (patch-ai) = 49a2d37005252714cad85609765cb1a57c8f23de
+SHA1 (patch-aj) = 2e3c4255c0400bf3999ee67ef116cf10beb8931e
+SHA1 (patch-ak) = 2309246e48a6d616a481f3bc2dda8e4644ca4adc
+SHA1 (patch-am) = 3626473f43d8169be5014b64071dc8c9c3f213c9
+SHA1 (patch-ao) = 8073ed54210ff5a75696e6b677e2eb3e48078d3d
+SHA1 (patch-ap) = 0d84a4237948573635ceb02bf70ca1568ffb423d
+SHA1 (patch-aq) = a352510f40f1fdec31af3fab3d4c034b5f115a4a
+SHA1 (patch-ar) = 128c12fcd98decd7fc626e5bf24e6ab6f4e55c38
+SHA1 (patch-as) = 1a5f7ca7cc8488a8eefaa306bd60efb2c415cce8
diff --git a/audio/jack-devel/files/atomicity.h b/audio/jack/files/atomicity.h
index e13582e0b6a..b63af9d4b7b 100644
--- a/audio/jack-devel/files/atomicity.h
+++ b/audio/jack/files/atomicity.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atomicity.h,v 1.2 2008/03/17 02:33:17 bjs Exp $ */
+/* $NetBSD: atomicity.h,v 1.1 2008/07/31 03:58:05 bjs Exp $ */
 
 #ifndef _NETBSD_ATOMICITY_H
 #define _NETBSD_ATOMICITY_H       1
diff --git a/audio/jack/patches/patch-aa b/audio/jack/patches/patch-aa
index 4b4ab40c8a9..521e57f24b2 100644
--- a/audio/jack/patches/patch-aa
+++ b/audio/jack/patches/patch-aa
@@ -1,47 +1,28 @@
-$NetBSD: patch-aa,v 1.1 2006/04/19 15:25:09 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2008/07/31 03:58:05 bjs 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
+--- config/sysdeps/atomicity.h.orig	2008-07-27 08:50:27.000000000 -0400
++++ config/sysdeps/atomicity.h
+@@ -1,7 +1,11 @@
+ #ifndef _jack_sysdep_atomicity_h_
+ #define _jack_sysdep_atomicity_h_
  
--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
+-#if defined(__i386__)
++#if defined(HAVE_NETBSD_ATOMIC_OPS)
++
++#include <config/os/netbsd/atomicity.h>
++
++#elif defined(__i386__)
  
--  LIBS="-lpthread $LIBS"
-+  LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ #include <config/cpu/i386/atomicity.h>
  
- 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
+@@ -15,6 +19,10 @@
+ 
+ #include <config/cpu/powerpc/atomicity.h>
+ 
++#elif defined(__mips__) || defined(__mips64__)
++
++#include <config/cpu/mips/atomicity.h>
++
+ #else
+ 
+ #include <config/cpu/generic/atomicity.h>
diff --git a/audio/jack/patches/patch-ab b/audio/jack/patches/patch-ab
index 935638797ef..3e270b54a32 100644
--- a/audio/jack/patches/patch-ab
+++ b/audio/jack/patches/patch-ab
@@ -1,15 +1,25 @@
-$NetBSD: patch-ab,v 1.1 2006/06/23 14:44:04 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2008/07/31 03:58:05 bjs Exp $
 
---- example-clients/transport.c.orig	2005-06-02 14:31:18.000000000 -0400
-+++ example-clients/transport.c
-@@ -29,6 +29,10 @@
- #include <jack/jack.h>
- #include <jack/transport.h>
- 
-+#ifndef whitespace
-+#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
-+#endif
-+
- char *package;				/* program name */
- int done = 0;
- jack_client_t *client;
+The default watchdog timeout is 10 seconds, which is too much for
+usleep().  Let's nanosleep if it's available.
+
+--- jackd/engine.c.orig	2008-07-27 08:50:30.000000000 -0400
++++ jackd/engine.c
+@@ -1383,7 +1383,7 @@ handle_external_client_request (jack_eng
+ 	if ((r = read (client->request_fd, &req, sizeof (req)))
+ 	    < (ssize_t) sizeof (req)) {
+ 		if (r == 0) {
+-#ifdef JACK_USE_MACH_THREADS
++#if defined(JACK_HOST_HAS_BSD_POLL) || defined(JACK_USE_MACH_THREADS)
+ 			/* poll is implemented using
+ 			   select (see the macosx/fakepoll
+ 			   code). When the socket is closed
+@@ -1396,7 +1396,7 @@ handle_external_client_request (jack_eng
+ 			   and remove the client.
+ 			*/
+ 			jack_mark_client_socket_error (engine, fd);
+-#endif /* JACK_USE_MACH_THREADS */
++#endif /* JACK_HOST_HAS_BSD_POLL | JACK_USE_MACH_THREADS */
+ 			return 1;
+ 		} else {
+ 			jack_error ("cannot read request from client (%d/%d/%s)",
diff --git a/audio/jack-devel/patches/patch-ac b/audio/jack/patches/patch-ac
index 997bc7fe83a..999e5990982 100644
--- a/audio/jack-devel/patches/patch-ac
+++ b/audio/jack/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2008/05/04 01:02:07 bjs Exp $
+$NetBSD: patch-ac,v 1.1 2008/07/31 03:58:05 bjs Exp $
 
---- tools/netsource.c.orig	2008-03-17 10:06:55.000000000 -0400
+--- tools/netsource.c.orig	2008-07-27 22:17:58.000000000 -0400
 +++ tools/netsource.c
-@@ -8,10 +8,14 @@
+@@ -31,10 +31,14 @@ Foundation, Inc., 675 Mass Ave, Cambridg
  #include <stdlib.h>
  #include <string.h>
  
diff --git a/audio/jack-devel/patches/patch-ad b/audio/jack/patches/patch-ad
index c354f688e72..f2a5ff28d72 100644
--- a/audio/jack-devel/patches/patch-ad
+++ b/audio/jack/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/03/16 09:26:46 bjs Exp $
+$NetBSD: patch-ad,v 1.1 2008/07/31 03:58:05 bjs Exp $
 
---- drivers/oss/oss_driver.h.orig	2007-06-12 16:46:40.000000000 -0400
+--- drivers/oss/oss_driver.h.orig	2008-07-27 08:50:33.000000000 -0400
 +++ drivers/oss/oss_driver.h
 @@ -34,7 +34,11 @@
  #include <jack/jack.h>
diff --git a/audio/jack-devel/patches/patch-ae b/audio/jack/patches/patch-ae
index 6bf303f88b2..69e4c127c13 100644
--- a/audio/jack-devel/patches/patch-ae
+++ b/audio/jack/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.2 2008/04/08 01:44:47 bjs Exp $
+$NetBSD: patch-ae,v 1.1 2008/07/31 03:58:05 bjs Exp $
 
 I'm not quite sure what's going on here, but I don't think res
 should be a pointer (quells a warning, has no ill effects that
 I can detect).
 
---- libjack/intclient.c.orig	2008-03-13 05:05:16.000000000 -0400
+--- libjack/intclient.c.orig	2008-07-27 08:50:23.000000000 -0400
 +++ libjack/intclient.c
 @@ -167,7 +167,7 @@ jack_internal_client_load (jack_client_t
  {
diff --git a/audio/jack-devel/patches/patch-af b/audio/jack/patches/patch-af
index 1f4f8124dd0..bb3b6c4a83b 100644
--- a/audio/jack-devel/patches/patch-af
+++ b/audio/jack/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2008/04/08 01:44:47 bjs Exp $
+$NetBSD: patch-af,v 1.1 2008/07/31 03:58:05 bjs Exp $
 
---- tools/transport.c.orig	2008-04-02 17:53:12.000000000 -0400
+--- tools/transport.c.orig	2008-07-27 08:50:24.000000000 -0400
 +++ tools/transport.c
 @@ -29,6 +29,10 @@
  #include <jack/jack.h>
diff --git a/audio/jack-devel/patches/patch-ag b/audio/jack/patches/patch-ag
index f8ad0ed88c5..4d8833920b0 100644
--- a/audio/jack-devel/patches/patch-ag
+++ b/audio/jack/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1.1.1 2008/03/16 09:26:46 bjs Exp $
+$NetBSD: patch-ag,v 1.1 2008/07/31 03:58:05 bjs Exp $
 
---- jack.pc.in.orig	2007-02-23 18:49:09.000000000 -0500
+--- jack.pc.in.orig	2008-07-27 08:50:34.000000000 -0400
 +++ jack.pc.in
 @@ -6,5 +6,5 @@ includedir=@includedir@
  Name: jack
diff --git a/audio/jack-devel/patches/patch-ah b/audio/jack/patches/patch-ah
index 41a44bf71aa..66a6281d9a7 100644
--- a/audio/jack-devel/patches/patch-ah
+++ b/audio/jack/patches/patch-ah
@@ -1,17 +1,19 @@
-$NetBSD: patch-ah,v 1.2 2008/04/08 01:44:47 bjs Exp $
+$NetBSD: patch-ah,v 1.1 2008/07/31 03:58:05 bjs Exp $
 
 Allow overriding the watchdog timeout.
 
---- jack/engine.h.orig	2008-01-10 16:34:30.000000000 -0500
+--- jack/engine.h.orig	2008-07-27 08:50:29.000000000 -0400
 +++ jack/engine.h
-@@ -51,8 +51,9 @@ typedef struct _jack_port_buffer_list {
+@@ -51,8 +51,12 @@ typedef struct _jack_port_buffer_list {
      jack_port_buffer_info_t *info;	/* jack_buffer_info_t array */
  } jack_port_buffer_list_t;
  
 +#ifndef JACKD_WATCHDOG_TIMEOUT
  #define JACKD_WATCHDOG_TIMEOUT 10000
--
 +#endif
++#ifndef JACKD_CLIENT_EVENT_TIMEOUT
+ #define JACKD_CLIENT_EVENT_TIMEOUT 2000
++#endif
+ 
  /* The main engine structure in local memory. */
  struct _jack_engine {
-     jack_control_t        *control;
diff --git a/audio/jack/patches/patch-ai b/audio/jack/patches/patch-ai
new file mode 100644
index 00000000000..6b4525ae817
--- /dev/null
+++ b/audio/jack/patches/patch-ai
@@ -0,0 +1,39 @@
+$NetBSD: patch-ai,v 1.1 2008/07/31 03:58:05 bjs Exp $
+
+--- libjack/client.c.orig	2008-07-27 08:50:23.000000000 -0400
++++ libjack/client.c
+@@ -969,10 +969,7 @@ jack_client_open_aux (const char *client
+ 	}
+ 
+ 	/* parse variable arguments */
+-	if (ap)
+         jack_varargs_parse(options, ap, &va);
+-    else
+-        jack_varargs_init(&va);
+ 
+ 	/* External clients need to know where the tmpdir used for
+ 	   communication with the server lives
+@@ -1114,10 +1111,12 @@ jack_client_t* jack_client_open(const ch
+ jack_client_t *
+ jack_client_new (const char *client_name)
+ {
++	va_list ap;
++
+ 	jack_options_t options = JackUseExactName;
+ 	if (getenv("JACK_START_SERVER") == NULL)
+ 		options |= JackNoStartServer;
+-	return jack_client_open_aux (client_name, options, NULL, NULL);
++	return jack_client_open_aux (client_name, options, NULL, ap);
+ }
+ 
+ char *
+@@ -1529,7 +1528,9 @@ jack_wake_next_client (jack_client_t* cl
+ 		jack_error ("cannot continue execution of the "
+ 			    "processing graph (%s)",
+ 			    strerror(errno));
++#ifndef JACK_HOST_HAS_BSD_POLL
+ 		return -1;
++#endif
+ 	}
+ 	
+ 	DEBUG ("client sent message to next stage by %" PRIu64 "",
diff --git a/audio/jack-devel/patches/patch-aj b/audio/jack/patches/patch-aj
index ee1c65ac9ef..d4dc59ebafd 100644
--- a/audio/jack-devel/patches/patch-aj
+++ b/audio/jack/patches/patch-aj
@@ -1,42 +1,20 @@
-$NetBSD: patch-aj,v 1.3 2008/04/08 01:44:47 bjs Exp $
+$NetBSD: patch-aj,v 1.1 2008/07/31 03:58:05 bjs Exp $
 
 Kill all of the overzealous optimization; if the user wants this,
 there is devel/cpuflags and mk.conf.
 
---- configure.orig	2008-04-07 17:42:32.000000000 -0400
+--- configure.orig	2008-07-27 09:01:02.000000000 -0400
 +++ configure
-@@ -22915,9 +22915,9 @@ fi
- 
- 
- JACK_CORE_CFLAGS="-I\$(top_srcdir)/config -I\$(top_srcdir) \
---I\$(top_srcdir) -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall -g"
--JACK_OPT_CFLAGS="$JACK_CORE_CFLAGS -march=pentium2 -mcpu=pentium4 -O3 \
---ffast-math -funroll-loops -fprefetch-loop-arrays"
-+-I\$(top_srcdir) -Wall -g"
-+JACK_OPT_CFLAGS="$JACK_CORE_CFLAGS -ffast-math -funroll-loops \
-+-fprefetch-loop-arrays"
- JACK_CFLAGS="$JACK_CORE_CFLAGS $CFLAGS"
- 
- 
-@@ -22999,7 +22999,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="$ALTIVEC_OPT_FLAGS_FLAGS -mhard-float -mpowerpc-gfxopt"
- 
- elif echo $target_cpu | egrep '(i.86|x86_64)' >/dev/null; then
- 
-@@ -23171,7 +23171,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -23713,7 +23713,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="-fomit-frame-pointer -ffast-math -funroll-loops"
  
-     if test "$target_cpu" = "i586"; then
- 	JACK_OPT_CFLAGS="-march=i586 "
-@@ -25491,7 +25491,7 @@ else
+     if test x$with_cpu_target != x ; then
+         JACK_OPT_CFLAGS="-march=$with_cpu_target"
+@@ -26081,7 +26081,7 @@ else
  fi
  
  
diff --git a/audio/jack-devel/patches/patch-ak b/audio/jack/patches/patch-ak
index 0441cf54b70..0b1aec7534d 100644
--- a/audio/jack-devel/patches/patch-ak
+++ b/audio/jack/patches/patch-ak
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.2 2008/04/08 01:44:47 bjs Exp $
+$NetBSD: patch-ak,v 1.1 2008/07/31 03:58:05 bjs Exp $
 
 Yuck.  At least let's attempt to make this somewhat sane.
 When I have the time and figure out the Right Thing(tm)
 to do, perhaps I'll rewrite some of the shm code.
 
---- libjack/unlock.c.orig	2008-03-04 07:20:10.000000000 -0500
+--- libjack/unlock.c.orig	2008-07-27 08:50:23.000000000 -0400
 +++ libjack/unlock.c
 @@ -48,6 +48,7 @@ static char* library_roots[] = {
  	"/usr/X11R6/lib",
diff --git a/audio/jack-devel/patches/patch-am b/audio/jack/patches/patch-am
index 74f36a1efc4..fabb6439a41 100644
--- a/audio/jack-devel/patches/patch-am
+++ b/audio/jack/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.1.1.1 2008/03/16 09:26:46 bjs Exp $
+$NetBSD: patch-am,v 1.1 2008/07/31 03:58:05 bjs Exp $
 
---- drivers/oss/Makefile.in.orig	2008-03-15 02:20:35.000000000 -0400
+--- drivers/oss/Makefile.in.orig	2008-07-27 09:01:08.000000000 -0400
 +++ drivers/oss/Makefile.in
 @@ -54,7 +54,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.
  am__installdirs = "$(DESTDIR)$(plugindir)"
diff --git a/audio/jack-devel/patches/patch-ao b/audio/jack/patches/patch-ao
index e297316e63b..ec4ca49ae3f 100644
--- a/audio/jack-devel/patches/patch-ao
+++ b/audio/jack/patches/patch-ao
@@ -1,9 +1,9 @@
-$NetBSD: patch-ao,v 1.1 2008/04/08 01:44:47 bjs Exp $
+$NetBSD: patch-ao,v 1.1 2008/07/31 03:58:05 bjs Exp $
 
 We want to make sure there's no garbage in the output buffer, otherwise
 untoward stuff can happen.
 
---- drivers/oss/oss_driver.c.orig	2008-03-04 07:20:10.000000000 -0500
+--- drivers/oss/oss_driver.c.orig	2008-07-27 08:50:33.000000000 -0400
 +++ drivers/oss/oss_driver.c
 @@ -1042,6 +1042,7 @@ static void *io_thread (void *param)
  			pthread_mutex_lock(&driver->mutex_out);
diff --git a/audio/jack-devel/patches/patch-ap b/audio/jack/patches/patch-ap
index 2d4c8a7993d..c1c4129aa1f 100644
--- a/audio/jack-devel/patches/patch-ap
+++ b/audio/jack/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.2 2008/04/08 01:44:47 bjs Exp $
+$NetBSD: patch-ap,v 1.1 2008/07/31 03:58:05 bjs Exp $
 
---- jack/types.h.orig	2008-03-12 10:36:07.000000000 -0400
+--- jack/types.h.orig	2008-07-27 08:50:29.000000000 -0400
 +++ jack/types.h
 @@ -23,7 +23,7 @@
  
diff --git a/audio/jack/patches/patch-aq b/audio/jack/patches/patch-aq
new file mode 100644
index 00000000000..14484feca01
--- /dev/null
+++ b/audio/jack/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2008/07/31 03:58:05 bjs Exp $
+
+--- Makefile.in.orig	2008-07-27 09:01:05.000000000 -0400
++++ Makefile.in
+@@ -233,7 +233,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+                        stamp-h.in config.log config.cache config.status
+ 
+ @HAVE_DOXYGEN_FALSE@DOC_DIR = 
+-@HAVE_DOXYGEN_TRUE@DOC_DIR = doc
++@HAVE_DOXYGEN_TRUE@DOC_DIR = 
+ SUBDIRS = jack libjack jackd drivers example-clients tools config $(DOC_DIR)
+ DIST_SUBDIRS = config jack libjack jackd drivers example-clients tools doc
+ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/audio/jack/patches/patch-ar b/audio/jack/patches/patch-ar
new file mode 100644
index 00000000000..7a7f23f0956
--- /dev/null
+++ b/audio/jack/patches/patch-ar
@@ -0,0 +1,17 @@
+$NetBSD: patch-ar,v 1.1 2008/07/31 03:58:05 bjs Exp $
+
+--- config/sysdeps/cycles.h.orig	2008-07-27 08:50:27.000000000 -0400
++++ config/sysdeps/cycles.h
+@@ -1,7 +1,11 @@
+ #ifndef _jack_sysdep_cycles_h_
+ #define _jack_sysdep_cycles_h_
+ 
+-#if defined(__i386__)
++#ifdef __alpha__
++
++#include <config/cpu/alpha/cycles.h>
++
++#elif defined(__i386__)
+     
+ /* technically, i386 doesn't have a cycle counter, but
+    running JACK on a real i386 seems like a ridiculuous
diff --git a/audio/jack/patches/patch-as b/audio/jack/patches/patch-as
new file mode 100644
index 00000000000..f5b5edccd82
--- /dev/null
+++ b/audio/jack/patches/patch-as
@@ -0,0 +1,23 @@
+$NetBSD: patch-as,v 1.1 2008/07/31 03:58:05 bjs Exp $
+
+--- drivers/dummy/dummy_driver.c.orig	2008-07-27 08:50:34.000000000 -0400
++++ drivers/dummy/dummy_driver.c
+@@ -109,6 +109,7 @@ dummy_driver_wait (dummy_driver_t *drive
+ {
+ 	jack_nframes_t nframes = driver->period_size;
+ 	struct timespec now;
++	struct timespec ts;
+ 
+ 	*status = 0;
+ 	/* this driver doesn't work so well if we report a delay */
+@@ -133,7 +134,9 @@ dummy_driver_wait (dummy_driver_t *drive
+ 		}
+ 		driver->next_wakeup = add_ts(driver->next_wakeup, driver->wait_time);
+ 	} else {
+-		if(clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, &driver->next_wakeup, NULL)) {
++		ts.tv_sec = 0;
++		ts.tv_nsec = ts_to_nsec(driver->next_wakeup) - ts_to_nsec(now);
++		if(nanosleep(&ts, NULL)) {
+ 			jack_error("error while sleeping");
+ 			*status = -1;
+ 		} else {