diff --git a/jack/DESCR b/jack/DESCR
index 1ae37b0227..e69de29bb2 100644
--- a/jack/DESCR
+++ b/jack/DESCR
@@ -1,4 +0,0 @@
-See www.jackaudio.org or jackit.sourceforge.net.
-
-NOTE: There are no PLIST entries for the [untested] options yet.
-Danger! Danger!
diff --git a/jack/Makefile b/jack/Makefile
index 056741cd0b..55193162c4 100644
--- a/jack/Makefile
+++ b/jack/Makefile
@@ -1,28 +1,89 @@
-# $NetBSD: Makefile,v 1.3 2007/03/21 20:21:06 bsadewitz Exp $
+# $NetBSD: Makefile,v 1.4 2008/01/28 21:30:19 bsadewitz Exp $
+#
 
-DISTNAME=		jack-audio-connection-kit-0.103.0
-PKGNAME=		jack-0.103.0
-CATEGORIES=		audio
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=jackit/}
+DISTNAME=	jack-audio-connection-kit-0.109.0
+PKGNAME=	${DISTNAME:S/-audio-connection-kit//}
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jackit/}
 
-MAINTAINER=		blair.sadewitz@gmail.com
-HOMEPAGE=		http://jackaudio.org/
-COMMENT=		Low-latency audio server
+MAINTAINER=	bjs@NetBSD.org
+HOMEPAGE=	http://jackit.sourceforge.net/
+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
+GNU_CONFIGURE=	 	yes
+USE_LIBTOOL= 	 	yes
+USE_PKGLOCALEDIR= 	yes
+USE_TOOLS+= 	 	gmake perl pkg-config
 
+CONFIGURE_ENV+=         ac_cv_header_readline_chardefs_h=yes
+CONFIGURE_ENV+= 	ac_cv_lib_readline_readline=yes
+CONFIGURE_ENV+= 	ac_cv_func_pthread_create=yes
 PKGCONFIG_OVERRIDE+=	jack.pc.in
 
-CPPFLAGS+=		-DOSS_DRIVER_DEF_DEV="\"${DEVOSSAUDIO}\"" -Wall
+BROKEN_READLINE_DETECTION= 	yes
+DLOPEN_REQUIRE_PTHREADS=	yes
+
+PTHREAD_OPTS+=		require
+
+.if !exists(/dev/shm)
+CONFIGURE_ARGS+=	--with-default-tmpdir=/tmp
+.endif
+
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../mk/pthread.builtin.mk"
+
+.if !empty(BUILTIN_LIB_FOUND.rt)
+LIBS+=		-lrt
+LIBS.pc=	-lrt
+.endif
+
+.if !empty(PTHREAD_CPPFLAGS)
+CFLAGS.pc=	${PTHREAD_CPPFLAGS}
+.else
+CFLAGS.pc=	-D_REENTRANT
+.endif
+
+### XXX This conditional should evaluate as true if poll(2) behaves
+###	as it does on Linux.  At least on NetBSD, poll(2) will return
+###	POLLIN instead of POLLHUP if the socket is closed.  From FreeBSD
+###	ports.
+###
+.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
+CPPFLAGS+=	-DPOLLIN_ON_CLOSE
+.endif
+
+.if ${OPSYS} != "Linux"
+CONFIGURE_ARGS+=	--disable-alsa
+.endif
+
+CONFIGURE_ARGS+=	--disable-freebob
+CONFIGURE_ARGS+=	--disable-firewire
+###
+### XXX Code could be written for jackstart.c to use other methods
+###	to grant privileges for setting priorities ...
+###
+CONFIGURE_ARGS+=	--disable-capabilities
+
+.include "../../mk/oss.buildlink3.mk"
+
+.if defined(DEVOSSAUDIO)
+CPPFLAGS+=		-DOSS_DRIVER_DEF_DEV=\"${DEVOSSAUDIO}\"
+.endif
+
+MAKE_ENV+=		DIGEST=${TOOLS_PATH.digest:Q}
+
+SUBST_CLASSES+= 	pc
+SUBST_FILES.pc=	 	jack.pc.in
+SUBST_MESSAGE.pc= 	Adding appropriate flags to jack.pc.in.
+SUBST_STAGE.pc= 	pre-configure
+SUBST_VARS.pc= 	 	CFLAGS.pc LIBS.pc PTHREAD_LDFLAGS PTHREAD_LIBS
 
 .include "options.mk"
 
 .include "../../devel/libgetopt/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/jack/PLIST b/jack/PLIST
index 28038ded9f..6f35e777b1 100644
--- a/jack/PLIST
+++ b/jack/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2007/03/21 20:21:06 bsadewitz Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/01/28 21:30:19 bsadewitz Exp $
+bin/jack_alias
 bin/jack_bufsize
 bin/jack_connect
 bin/jack_disconnect
+bin/jack_evmon
 bin/jack_freewheel
 bin/jack_impulse_grabber
 bin/jack_load
@@ -12,10 +14,10 @@ bin/jack_midisine
 bin/jack_monitor_client
 bin/jack_showtime
 bin/jack_simple_client
+bin/jack_transport
 bin/jack_unload
 bin/jackd
-${SNDFILE}bin/jackrec
-${JACK_TRANS}bin/track_transport
+${LIBSNDFILE}bin/jackrec
 include/jack/intclient.h
 include/jack/jack.h
 include/jack/midiport.h
@@ -28,8 +30,7 @@ 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/jack/jack_oss.la
 lib/libjack.la
 lib/pkgconfig/jack.pc
 man/man1/jackd.1
diff --git a/jack/TODO b/jack/TODO
index 9d803a0fed..244868a7ee 100644
--- a/jack/TODO
+++ b/jack/TODO
@@ -1,11 +1,5 @@
---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?
+-- Test dynsimd option, write code for NetBSD (audio output,
+realtime stuff, etc).  Sky's the limit.
 
---Blair
+-- ...
diff --git a/jack/buildlink3.mk b/jack/buildlink3.mk
index 3dcedd8a51..4504cb6e63 100644
--- a/jack/buildlink3.mk
+++ b/jack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2007/12/13 22:21:48 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2008/01/28 21:30:19 bsadewitz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JACK_BUILDLINK3_MK:=	${JACK_BUILDLINK3_MK}+
@@ -12,8 +12,10 @@ 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?=	../../wip/jack
+BUILDLINK_API_DEPENDS.jack+=	jack>=0.109.0
+BUILDLINK_PKGSRCDIR.jack?=	../../local/jack
 .endif	# JACK_BUILDLINK3_MK
 
+.include "../../mk/dlopen.buildlink3.mk"
+
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/jack/distinfo b/jack/distinfo
index 721715f82a..2a258fb688 100644
--- a/jack/distinfo
+++ b/jack/distinfo
@@ -1,10 +1,15 @@
-$NetBSD: distinfo,v 1.3 2007/03/21 20:21:06 bsadewitz Exp $
+$NetBSD: distinfo,v 1.4 2008/01/28 21:30:19 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
+SHA1 (jack-audio-connection-kit-0.109.0.tar.gz) = dec4067ecafbb679d424fa8105560aff89afb99a
+RMD160 (jack-audio-connection-kit-0.109.0.tar.gz) = a3aa1b0f2d92f6d8099c82725f844482f61e92b9
+Size (jack-audio-connection-kit-0.109.0.tar.gz) = 830475 bytes
+SHA1 (patch-aa) = daf3ce9c902ed1ec1e0badeb36c554739f2ef170
+SHA1 (patch-ab) = e4d8e4bc3a159ae0526bb7eaf754c6cb35274873
+SHA1 (patch-ac) = 9942da2f8b5c20a5d4991cae868a6566b68f1031
+SHA1 (patch-ad) = 608e3da7f5c503b5f367ae26f69ddaabe37a735c
+SHA1 (patch-ae) = a2b4b0e262b25f5e9b2a1c48e5c8133ee83518bd
+SHA1 (patch-af) = f24ca3334af498e314628487085d037c8993f97f
+SHA1 (patch-ag) = b22be548b03f6c6ca6f10aadca19a3e9ba8f2926
+SHA1 (patch-ah) = e79522941f29589e67c3ee30c53dfe965367d95f
+SHA1 (patch-ai) = d31acf819531abb479dd8447f6cb535916c9c9c8
+SHA1 (patch-aj) = 965205f23bb4e25324f8ce498814ba909ad8cf77
diff --git a/jack/options.mk b/jack/options.mk
index 0219fff8c8..70c3fb65a5 100644
--- a/jack/options.mk
+++ b/jack/options.mk
@@ -1,81 +1,40 @@
-# $NetBSD: options.mk,v 1.3 2007/12/13 22:21:48 rillig Exp $
 PKG_OPTIONS_VAR=	PKG_OPTIONS.jack
-PKG_SUPPORTED_OPTIONS=	sndfile portaudio readline
-PKG_SUGGESTED_OPTIONS=	sndfile portaudio
-# the above line will be changed when the package is ready.
+PKG_SUPPORTED_OPTIONS=	portaudio sndfile
+PKG_SUGGESTED_OPTIONS=	sndfile
 
-CHECK_BUILTIN.readline:= yes
-.include "../../devel/readline/builtin.mk"
-CHECK_BUILTIN.readline:= no
+.include "../../mk/bsd.fast.prefs.mk"
 
-.if defined(USE_BUILTIN.readline) && !empty(USE_BUILTIN.readline:M[Yy][Ee][Ss])
-PKG_SUGGESTED_OPTIONS+=	readline
-.endif
+PKG_OPTIONS_OPTIONAL_GROUPS=	${MACHINE_ARCH}
 
-CHECK_BUILTIN.oss:= yes
-.include "../../mk/oss.builtin.mk"
-CHECK_BUILTIN.oss:= no
+PKG_OPTIONS_GROUP.powerpc= 	altivec
+PKG_OPTIONS_GROUP.i386= 	simd
 
-.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"
+.if !empty(PKG_OPTIONS:Mportaudio)
+.  include "../../audio/portaudio-devel/buildlink3.mk"
 .else
-CONFIGURE_ARGS+= --disable-oss
-PLIST_SUBST+=	OSS="@comment "
+CONFIGURE_ARGS+=	--disable-portaudio
 .endif
 
 .if !empty(PKG_OPTIONS:Msndfile)
-CONFIGURE_ARGS+= --enable-sndfile
-PLIST_SUBST+=	SNDFILE=""
-
-.include "../../audio/libsndfile/buildlink3.mk"
+PLIST_SUBST+=	LIBSNDFILE=""
+.  include "../../audio/libsndfile/buildlink3.mk"
 .else
-CONFIGURE_ARGS+= --disable-sndfile
-PLIST_SUBST+=	SNDFILE="@comment "
+PLIST_SUBST+=	LIBSNDFILE="@comment "
 .endif
 
-.if !empty(PKG_OPTIONS:Mportaudio)
-CONFIGURE_ARGS+= --enable-portaudio
-PLIST_SUBST+=	PORTAUDIO=""
-
-.include "../../audio/portaudio/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Msimd)
+CONFIGURE_ARGS+=	--enable-dynsimd
 .else
-CONFIGURE_ARGS+= --disable-portaudio
-PLIST_SUBST+=	PORTAUDIO="@comment "
+CONFIGURE_ARGS+=	--disable-dynsimd
+CONFIGURE_ARGS+=	--disable-mmx
+CONFIGURE_ARGS+=	--disable-sse
 .endif
 
-.if !empty(PKG_OPTIONS:Mreadline)
-PLIST_SUBST+=	JACK_TRANS=""
-BROKEN_READLINE_DETECTION=	yes
-
-.include "../../devel/readline/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Maltivec)
+CONFIGURE_ARGS+=	--enable-altivec
 .else
-PLIST_SUBST+=	JACK_TRANS="@comment "
+CONFIGURE_ARGS+=	--disable-altivec
 .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
diff --git a/jack/patches/patch-aa b/jack/patches/patch-aa
index 5d55d32c49..38508cc345 100644
--- a/jack/patches/patch-aa
+++ b/jack/patches/patch-aa
@@ -1,15 +1,68 @@
-$NetBSD: patch-aa,v 1.1 2007/03/21 20:21:07 bsadewitz Exp $
+$NetBSD: patch-aa,v 1.2 2008/01/28 21:30:19 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 @@
+--- configure.orig	2008-01-12 09:13:14.000000000 -0500
++++ configure
+@@ -21236,13 +21236,15 @@ if test $ac_cv_func_pthread_create = yes
+   :
+ else
  
- #include <jack/internal.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_CFLAGS=$CFLAGS
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++CFLAGS="${PTHREAD_CFLAGS} $CFLAGS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21293,6 +21295,7 @@ fi
  
--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 ();
- }
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_CFLAGS
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+@@ -21301,8 +21304,8 @@ if test $ac_cv_lib_pthread_pthread_creat
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+-
+-  LIBS="-lpthread $LIBS"
++  CFLAGS="${PTHREAD_CFLAGS} $CFLAGS"
++  LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ 
+ else
+   { { echo "$as_me:$LINENO: error: *** JACK requires POSIX threads support" >&5
+@@ -21658,7 +21661,7 @@ if test $ac_cv_func_clock_gettime = yes;
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CLOCK_GETTIME 0
++#define HAVE_CLOCK_GETTIME 1
+ _ACEOF
+ 
+ 
+@@ -22946,13 +22949,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="-lpthread  $LIBS" NOTE: these flags were already added
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/jack/patches/patch-ab b/jack/patches/patch-ab
index c31b72f489..17a2640525 100644
--- a/jack/patches/patch-ab
+++ b/jack/patches/patch-ab
@@ -1,74 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2007/03/21 20:21:07 bsadewitz Exp $
+$NetBSD: patch-ab,v 1.2 2008/01/28 21:30:19 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
+--- example-clients/transport.c.orig	2008-01-12 09:12:43.000000000 -0500
++++ example-clients/transport.c
+@@ -29,6 +29,10 @@
+ #include <jack/jack.h>
+ #include <jack/transport.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
-@@ -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
++#ifndef whitespace
++#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
++#endif
++
+ char *package;				/* program name */
+ int done = 0;
+ jack_client_t *client;
diff --git a/jack/patches/patch-ac b/jack/patches/patch-ac
index c752bcb88f..1a4c2df6fa 100644
--- a/jack/patches/patch-ac
+++ b/jack/patches/patch-ac
@@ -1,17 +1,43 @@
-$NetBSD: patch-ac,v 1.1 2007/03/21 20:21:07 bsadewitz Exp $
+$NetBSD: patch-ac,v 1.2 2008/01/28 21:30:19 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);
+--- jackd/engine.c.orig	2008-01-12 09:12:44.000000000 -0500
++++ jackd/engine.c
+@@ -474,7 +474,7 @@ jack_resize_port_segment (jack_engine_t 
  
- 	for (i = 0; ports[i]; ++i) {
--		printf ("%s\n", ports[i]);
--
- 		jack_port_t *port = jack_port_by_name (client, ports[i]);
+ 	jack_engine_place_port_buffers (engine, ptid, one_buffer, size, nports, engine->control->buffer_size);
  
-+		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++) {
+-#ifdef USE_MLOCK
++#if defined(USE_MLOCK) && defined(__gnu_linux__)
+ 	if (engine->control->real_time) {
+ 
+ 	/* Although we've called mlockall(CURRENT|FUTURE), the
+@@ -934,7 +934,11 @@ static int
+ jack_start_watchdog (jack_engine_t *engine)
+ {
+ 	int watchdog_priority = engine->rtpriority + 10;
++#ifndef __OpenBSD__
+ 	int max_priority = sched_get_priority_max (SCHED_FIFO);
++#else
++	int max_priority = -1;
++#endif
+ 
+ 	if ((max_priority != -1) &&
+ 	    (max_priority < watchdog_priority))
+@@ -1462,7 +1466,7 @@ jack_server_thread (void *arg)
+ 				    (engine, pfd[i].fd)) {
+ 					jack_error ("could not handle external"
+ 						    " client request");
+-#ifdef JACK_USE_MACH_THREADS
++#if defined(POLLIN_ON_CLOSE)
+                                     /* poll is implemented using
+ 				       select (see the macosx/fakepoll
+ 				       code). When the socket is closed
+@@ -1475,7 +1479,7 @@ jack_server_thread (void *arg)
+ 				       and remove the client.
+                                     */
+                                     jack_client_disconnect(engine, pfd[i].fd);
+-#endif /* JACK_USE_MACH_THREADS */
++#endif /* POLLIN_ON_CLOSE */
+ 				}
+ 			}
+ 		}
diff --git a/jack/patches/patch-ad b/jack/patches/patch-ad
index 3684eb3de2..4c5ae4c642 100644
--- a/jack/patches/patch-ad
+++ b/jack/patches/patch-ad
@@ -1,12 +1,20 @@
-$NetBSD: patch-ad,v 1.1 2007/03/21 20:21:07 bsadewitz Exp $
+$NetBSD: patch-ad,v 1.2 2008/01/28 21:30:19 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>
+--- libjack/client.c.orig	2008-01-12 09:12:43.000000000 -0500
++++ libjack/client.c
+@@ -1731,6 +1731,7 @@ jack_activate (jack_client_t *client)
+ {
+ 	jack_request_t req;
  
++#if defined(__gnu_linux__)
+ 	/* we need to scribble on our stack to ensure that its memory
+ 	 * pages are actually mapped (more important for mlockall(2)
+ 	 * usage in jack_start_thread())
+@@ -1742,6 +1743,7 @@ jack_activate (jack_client_t *client)
+ 	for (i = 0; i < JACK_THREAD_STACK_TOUCH; i++) {
+ 		buf[i] = (char) (i & 0xff);
+ 	}
++#endif
  
--#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
+ 	if (client->control->type == ClientInternal ||
+ 	    client->control->type == ClientDriver) {
diff --git a/jack/patches/patch-ae b/jack/patches/patch-ae
new file mode 100644
index 0000000000..b661a62b5c
--- /dev/null
+++ b/jack/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2008/01/28 21:30:19 bsadewitz Exp $
+
+--- drivers/oss/oss_driver.h.orig	2008-01-12 09:12:44.000000000 -0500
++++ 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
diff --git a/jack/patches/patch-af b/jack/patches/patch-af
index 96688d817d..c7317ead27 100644
--- a/jack/patches/patch-af
+++ b/jack/patches/patch-af
@@ -1,13 +1,16 @@
-$NetBSD: patch-af,v 1.1 2007/03/21 20:21:07 bsadewitz Exp $
+$NetBSD: patch-af,v 1.2 2008/01/28 21:30:19 bsadewitz Exp $
 
---- libjack/midiport.c.orig	2006-12-16 07:50:17.000000000 -0500
+--- libjack/midiport.c.orig	2008-01-12 09:12:43.000000000 -0500
 +++ libjack/midiport.c
-@@ -77,7 +77,7 @@ jack_midi_event_get(jack_midi_event_t *e
+@@ -78,7 +78,11 @@ 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;
++#if defined(__NetBSD__) || defined(__OpenBSD__)
 +		return ENOMSG;
++#else
+ 		return ENODATA;
++#endif
  	
  	port_event = (jack_midi_port_internal_event_t *) (info + 1);
  	port_event += event_idx;
diff --git a/jack/patches/patch-ag b/jack/patches/patch-ag
new file mode 100644
index 0000000000..98ae19ce52
--- /dev/null
+++ b/jack/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2008/01/28 21:30:19 bsadewitz Exp $
+
+--- drivers/oss/Makefile.in.orig	2008-01-12 09:13:19.000000000 -0500
++++ drivers/oss/Makefile.in
+@@ -58,7 +58,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.
+ am__installdirs = "$(DESTDIR)$(plugindir)"
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+-jack_oss_la_LIBADD =
++jack_oss_la_LIBADD = ${LIBOSSAUDIO}
+ am_jack_oss_la_OBJECTS = oss_driver.lo
+ jack_oss_la_OBJECTS = $(am_jack_oss_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
diff --git a/jack/patches/patch-ah b/jack/patches/patch-ah
new file mode 100644
index 0000000000..24934429df
--- /dev/null
+++ b/jack/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2008/01/28 21:30:19 bsadewitz Exp $
+
+--- jackd/Makefile.in.orig	2008-01-12 09:13:19.000000000 -0500
++++ jackd/Makefile.in
+@@ -616,7 +616,7 @@ uninstall-man: uninstall-man1
+ 
+ jack_md5.h: jackd
+ @STRIPPED_JACKD_TRUE@	strip -R .note -R .comment .libs/jackd
+-	echo "#define JACKD_MD5_SUM \"`md5sum .libs/jackd | awk '{print $$1}'`\"" > jack_md5.h
++	echo "#define JACKD_MD5_SUM \"`${DIGEST} md5 .libs/jackd | awk '{print $$4}'`\"" > jack_md5.h
+ 
+ dist-hook:
+ 	rm -f $(distdir)/jack_md5.h
diff --git a/jack/patches/patch-ai b/jack/patches/patch-ai
new file mode 100644
index 0000000000..1af1d1c0a4
--- /dev/null
+++ b/jack/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 2008/01/28 21:30:19 bsadewitz Exp $
+
+--- drivers/oss/oss_driver.c.orig	2008-01-12 09:12:44.000000000 -0500
++++ drivers/oss/oss_driver.c
+@@ -440,7 +440,9 @@ static int oss_driver_detach (oss_driver
+ 
+ static int oss_driver_start (oss_driver_t *driver)
+ {
++#ifndef OSS_NO_COOKED_MODE
+ 	int flags = 0;
++#endif
+ 	int format;
+ 	int channels;
+ 	int samplerate;
diff --git a/jack/patches/patch-aj b/jack/patches/patch-aj
new file mode 100644
index 0000000000..a8d6cb0811
--- /dev/null
+++ b/jack/patches/patch-aj
@@ -0,0 +1,18 @@
+$NetBSD: patch-aj,v 1.1 2008/01/28 21:30:20 bsadewitz Exp $
+
+--- jack.pc.in.orig	2008-01-12 09:12:45.000000000 -0500
++++ jack.pc.in
+@@ -3,8 +3,11 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
++JACKTHREADLIB=	@PTHREAD_LDFLAGS@ @PTHREAD_LIBS@
++
+ Name: jack
+ Description: the Jack Audio Connection Kit: a low-latency synchronous callback-based media server
+ Version: @JACK_VERSION@
+-Libs: -L${libdir} -ljack -lpthread @OS_LDFLAGS@
+-Cflags: -I${includedir}
++Libs: -L${libdir} -ljack @LIBS.pc@
++Libs.private: @PTHREAD_LDFLAGS@ @PTHREAD_LIBS@
++Cflags: -I${includedir} @CFLAGS.pc@