2 files changed, 53 insertions, 49 deletions

diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index d2bb9ab771a3..423feef33f4c 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -65,6 +65,8 @@ pre-everything::
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|define USE_MLOCK|undef USE_MLOCK|' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},"  \
 		${WRKSRC}/configure ${WRKSRC}/libjack/Makefile.in \
 		${WRKSRC}/jackd/Makefile.in \
diff --git a/audio/jack/pkg-plist b/audio/jack/pkg-plist
index 7312eb30e208..a7d43d5b9177 100644
--- a/audio/jack/pkg-plist
+++ b/audio/jack/pkg-plist
@@ -37,54 +37,56 @@ lib/libjack.la
 lib/libjack.so
 lib/libjack.so.0
 libdata/pkgconfig/jack.pc
-%%DOCS%%share/jack/reference/html/annotated.html
-%%DOCS%%share/jack/reference/html/deprecated.html
-%%DOCS%%share/jack/reference/html/files.html
-%%DOCS%%share/jack/reference/html/functions.html
-%%DOCS%%share/jack/reference/html/functions_vars.html
-%%DOCS%%share/jack/reference/html/globals.html
-%%DOCS%%share/jack/reference/html/globals_defs.html
-%%DOCS%%share/jack/reference/html/globals_enum.html
-%%DOCS%%share/jack/reference/html/globals_eval.html
-%%DOCS%%share/jack/reference/html/globals_func.html
-%%DOCS%%share/jack/reference/html/globals_type.html
-%%DOCS%%share/jack/reference/html/globals_vars.html
-%%DOCS%%share/jack/reference/html/index.html
-%%DOCS%%share/jack/reference/html/inprocess_8c.html
-%%DOCS%%share/jack/reference/html/intclient_8h-source.html
-%%DOCS%%share/jack/reference/html/intclient_8h.html
-%%DOCS%%share/jack/reference/html/jack_8h-source.html
-%%DOCS%%share/jack/reference/html/jack_8h.html
-%%DOCS%%share/jack/reference/html/mainpage_8dox.html
-%%DOCS%%share/jack/reference/html/midiport_8h-source.html
-%%DOCS%%share/jack/reference/html/midiport_8h.html
-%%DOCS%%share/jack/reference/html/pages.html
-%%DOCS%%share/jack/reference/html/porting-guide.html
-%%DOCS%%share/jack/reference/html/porting_8dox.html
-%%DOCS%%share/jack/reference/html/ringbuffer_8h-source.html
-%%DOCS%%share/jack/reference/html/ringbuffer_8h.html
-%%DOCS%%share/jack/reference/html/simple__client_8c.html
-%%DOCS%%share/jack/reference/html/statistics_8h-source.html
-%%DOCS%%share/jack/reference/html/statistics_8h.html
-%%DOCS%%share/jack/reference/html/struct__jack__midi__event.html
-%%DOCS%%share/jack/reference/html/structjack__position__t.html
-%%DOCS%%share/jack/reference/html/structjack__ringbuffer__data__t.html
-%%DOCS%%share/jack/reference/html/structjack__ringbuffer__t.html
-%%DOCS%%share/jack/reference/html/doxygen.png
-%%DOCS%%share/jack/reference/html/structjack__transport__info__t.html
-%%DOCS%%share/jack/reference/html/structport__pair__t.html
-%%DOCS%%share/jack/reference/html/thread_8h-source.html
-%%DOCS%%share/jack/reference/html/thread_8h.html
-%%DOCS%%share/jack/reference/html/transport-design.html
-%%DOCS%%share/jack/reference/html/transport_8dox.html
-%%DOCS%%share/jack/reference/html/transport_8h-source.html
-%%DOCS%%share/jack/reference/html/transport_8h.html
-%%DOCS%%share/jack/reference/html/types_8h-source.html
-%%DOCS%%share/jack/reference/html/types_8h.html
-%%DOCS%%share/jack/reference/html/fsm.png
-%%DOCS%%share/jack/reference/html/doxygen.css
-%%DOCS%%@dirrm share/jack/reference/html
-%%DOCS%%@dirrm share/jack/reference
-%%DOCS%%@dirrm share/jack
+%%DOCS%%share/jack-audio-connection-kit/reference/html/annotated.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/deprecated.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/files.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/functions.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/functions_vars.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_defs.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_enum.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_eval.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_func.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_type.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_vars.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/index.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/inprocess_8c.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/intclient_8h-source.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/intclient_8h.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/jack_8h-source.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/jack_8h.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/mainpage_8dox.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h-source.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/pages.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/porting-guide.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/porting_8dox.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h-source.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/simple__client_8c.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h-source.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__event.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__position__t.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__data__t.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__t.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/doxygen.png
+%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__transport__info__t.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/structport__pair__t.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/thread_8h-source.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/thread_8h.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/transport-design.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8dox.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8h-source.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8h.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h-source.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/fsm.png
+%%DOCS%%share/jack-audio-connection-kit/reference/html/doxygen.css
+%%DOCS%%share/jack-audio-connection-kit/reference/html/hierarchy.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__port__info.html
+%%DOCS%%@dirrm share/jack-audio-connection-kit/reference/html
+%%DOCS%%@dirrm share/jack-audio-connection-kit/reference
+%%DOCS%%@dirrm share/jack-audio-connection-kit
 @dirrm lib/jack
 @dirrm include/jack