[Midnightbsd-cvs] mports [17480] trunk/audio/jack: modernize

[laffer1 at midnightbsd.org]

Revision: 17480
          http://svnweb.midnightbsd.org/mports/?rev=17480
Author:   laffer1
Date:     2014-09-24 07:54:39 -0400 (Wed, 24 Sep 2014)
Log Message:
-----------
modernize

Modified Paths:
--------------
    trunk/audio/jack/Makefile
    trunk/audio/jack/pkg-plist

Modified: trunk/audio/jack/Makefile
===================================================================
--- trunk/audio/jack/Makefile	2014-09-24 03:27:53 UTC (rev 17479)
+++ trunk/audio/jack/Makefile	2014-09-24 11:54:39 UTC (rev 17480)
@@ -2,60 +2,56 @@
 
 PORTNAME=	jackit
 PORTVERSION=	0.121.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://jackaudio.org/downloads/
 DISTNAME=	jack-audio-connection-kit-${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A low-latency audio server
+COMMENT=	Low latency audio server
 
-LICENSE=	gpl2
+LICENSE=	gpl2 lgpl2.1
+LICENSE_COMB=	multi
 
-LIB_DEPENDS=	portaudio.0:${PORTSDIR}/audio/portaudio \
-		sndfile.1:${PORTSDIR}/audio/libsndfile \
-		samplerate.1:${PORTSDIR}/audio/libsamplerate
-#		celt.0:${PORTSDIR}/audio/celt
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+		libcelt0.so:${PORTSDIR}/audio/celt
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USES=		pathfix
+USES=		gmake pathfix pkgconfig libtool:keepla
 
-CONFIGURE_ENV=	LIBS="-pthread"
 CONFIGURE_ARGS=	--enable-portaudio \
 		--with-default-tmpdir=/tmp
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 LATEST_LINK=	jack
 
-MAN1=		jackd.1 jackstart.1
+OPTIONS_DEFINE=	ALSA DOCS READLINE
+OPTIONS_DEFAULT=READLINE
+OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	ALSA DOXYGEN
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_CONFIGURE_ENABLE=	alsa
 
+READLINE_LIB_DEPENDS=	libreadline.so:${PORTSDIR}/devel/readline
+
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MDOXYGEN}
+.if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
-PLIST_SUB+=	DOCS=""
 .else
 CONFIGURE_ENV+=	ac_cv_prog_HAVE_DOXYGEN="false"
-PLIST_SUB+=	DOCS="@comment "
 .endif
 
-.if exists(${LOCALBASE}/lib/libreadline.so)
-LIB_DEPENDS+=	readline:${PORTSDIR}/devel/readline
+.if ! ${PORT_OPTIONS:MREADLINE}
+CONFIGURE_ENV+=	ac_cv_lib_readline_readline=no \
+		ac_cv_header_readline_chardefs_h=no
 .endif
 
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
-PLIST_SUB+=	ALSA=""
-.else
-CONFIGURE_ARGS+=	--disable-alsa
-PLIST_SUB+=	ALSA="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|define USE_MLOCK|undef USE_MLOCK|' \
 		${WRKSRC}/configure

Modified: trunk/audio/jack/pkg-plist
===================================================================
--- trunk/audio/jack/pkg-plist	2014-09-24 03:27:53 UTC (rev 17479)
+++ trunk/audio/jack/pkg-plist	2014-09-24 11:54:39 UTC (rev 17480)
@@ -25,7 +25,7 @@
 bin/jack_simple_session_client
 bin/jack_showtime
 bin/jack_simple_client
-bin/jack_transport
+%%READLINE%%bin/jack_transport
 bin/jack_transport_client
 bin/jack_unload
 bin/jack_wait
@@ -68,6 +68,8 @@
 lib/libjackserver.so
 lib/libjackserver.so.0
 libdata/pkgconfig/jack.pc
+man/man1/jackd.1.gz
+man/man1/jackstart.1.gz
 %%DOCS%%share/jack-audio-connection-kit/reference/html/annotated.html
 %%DOCS%%share/jack-audio-connection-kit/reference/html/classes.html
 %%DOCS%%share/jack-audio-connection-kit/reference/html/control_8h.html
@@ -82,14 +84,14 @@
 %%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_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_0x74.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x77.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_e.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_i.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_j.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_m.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_o.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_p.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_t.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_w.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
@@ -152,8 +154,3 @@
 %%DOCS%%share/jack-audio-connection-kit/reference/html/unionjackctl__parameter__value.html
 %%DOCS%%share/jack-audio-connection-kit/reference/html/weakjack_8h.html
 %%DOCS%%share/jack-audio-connection-kit/reference/html/weakjack_8h_source.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
- at dirrm lib/jack
- at dirrm include/jack