- Update to 0.102.20

PR:		ports/106410
Submitted by:	trasz
Approved by:	Multimedia Team (ahze on irc)

6 files changed, 66 insertions, 7 deletions

diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 0491dc167a78..de7221739d54 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	jackit
-PORTVERSION=	0.101.1
-PORTREVISION=	1
+PORTVERSION=	0.102.20
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jackit
@@ -16,7 +15,8 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	A low-latency audio server
 
 LIB_DEPENDS=	portaudio.0:${PORTSDIR}/audio/portaudio \
-		sndfile.1:${PORTSDIR}/audio/libsndfile
+		sndfile.1:${PORTSDIR}/audio/libsndfile \
+		FLAC.7:${PORTSDIR}/audio/flac
 
 OPTIONS=	DOCS "Build HTML documentation. Requires doxygen/TeX." off
 
@@ -26,7 +26,7 @@ CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}" LDFLAGS="-L${LOCALBASE}/lib" \
 		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
 GNU_CONFIGURE=	yes
 USE_GETOPT_LONG=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig gnometarget gnomehack
 
 MAN1=		jackd.1 jackstart.1
@@ -50,6 +50,10 @@ PLIST_SUB+=	DOCS="@comment "
 BROKEN=		Does not compile
 .endif
 
+.if ${OSVERSION} < 500018 || exists(${LOCALBASE}/lib/libreadline.so.5)
+LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
+.endif
+
 pre-everything::
 .if defined(DOCS_OVERRIDE)
 	@${ECHO_MSG}
@@ -73,4 +77,8 @@ post-patch:
 post-build:
 	@${RM} -f ${WRKSRC}/doc/reference/html/dir__2F*
 
+.if ${OSVERSION} < 500000
+BROKEN=		Does not compile on 4.x
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index 01c1c4081087..1c7008da913f 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,3 +1,3 @@
-MD5 (jack-audio-connection-kit-0.101.1.tar.gz) = bb25f7c1da5d488b70edcf39ff5a39b2
-SHA256 (jack-audio-connection-kit-0.101.1.tar.gz) = 4f0e89a83aaaf5b125389135ee4f321b22ffef19003749c138eb54974e2f5533
-SIZE (jack-audio-connection-kit-0.101.1.tar.gz) = 724598
+MD5 (jack-audio-connection-kit-0.102.20.tar.gz) = d6881555a8b4c923b4ec706832f0d776
+SHA256 (jack-audio-connection-kit-0.102.20.tar.gz) = e4506a9f46cd6fa4896e76482f17b7bddeeda3eb35add176d6db479e5c4f8530
+SIZE (jack-audio-connection-kit-0.102.20.tar.gz) = 761792
diff --git a/audio/jack/files/patch-config-os-generic-time.h b/audio/jack/files/patch-config-os-generic-time.h
new file mode 100644
index 000000000000..41f57053a2ce
--- /dev/null
+++ b/audio/jack/files/patch-config-os-generic-time.h
@@ -0,0 +1,13 @@
+--- config/os/generic/time.h.orig	Fri May 26 04:45:16 2006
++++ config/os/generic/time.h	Wed Dec  6 08:22:45 2006
+@@ -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 ();
+ }
diff --git a/audio/jack/files/patch-configure b/audio/jack/files/patch-configure
new file mode 100644
index 000000000000..f7dff60dd2d2
--- /dev/null
+++ b/audio/jack/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Dec  6 08:33:37 2006
++++ configure	Wed Dec  6 08:35:19 2006
+@@ -23296,7 +23296,7 @@
+ # the cached result to work around this problem.
+ 
+ READLINE_DEPS=""
+-HAVE_READLINE="false"
++HAVE_READLINE="true"
+ #AC_CHECK_LIB(readline, readline, [:],
+ #    [unset ac_cv_lib_readline_readline
+ #     AC_CHECK_LIB(readline, readline, [READLINE_DEPS="-ltermcap"],
diff --git a/audio/jack/files/patch-libjack-midiport.c b/audio/jack/files/patch-libjack-midiport.c
new file mode 100644
index 000000000000..8bc629bd6406
--- /dev/null
+++ b/audio/jack/files/patch-libjack-midiport.c
@@ -0,0 +1,11 @@
+--- libjack/midiport.c.orig	Wed Dec  6 08:05:17 2006
++++ libjack/midiport.c	Wed Dec  6 08:05:56 2006
+@@ -72,7 +72,7 @@
+ 		(jack_midi_port_info_private_t *) port_buffer;
+ 	
+ 	if (event_idx >= info->info.event_count)
+-		return ENODATA;
++		return ENOMSG;
+ 	
+ 	port_event = (jack_midi_port_internal_event_t *) (info + 1);
+ 	port_event += event_idx;
diff --git a/audio/jack/pkg-plist b/audio/jack/pkg-plist
index 65d3599b7cde..f156f93a8adb 100644
--- a/audio/jack/pkg-plist
+++ b/audio/jack/pkg-plist
@@ -6,6 +6,8 @@ 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
@@ -15,6 +17,7 @@ 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
@@ -79,6 +82,19 @@ libdata/pkgconfig/jack.pc
 %%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/globals_0x65.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x69.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6a.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6d.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6f.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x70.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x72.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x73.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x74.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/struct__jack__midi__event.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