Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Oct 2013 16:00:02 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-multimedia@FreeBSD.org
Subject:   Re: ports/170517: commit references a PR
Message-ID:  <201310311600.r9VG02sf084484@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/170517; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170517: commit references a PR
Date: Thu, 31 Oct 2013 15:51:16 +0000 (UTC)

 Author: wg
 Date: Thu Oct 31 15:51:08 2013
 New Revision: 332259
 URL: http://svnweb.freebsd.org/changeset/ports/332259
 
 Log:
   audio/jack: fix readline depend and allow staging
   
   - Fix readline depend [1] (based on)
   - Allow staging
   - Use options helpers
   
   PR:		ports/170517 [1]
   Submitted by:	A.J. Kehoe IV <g5ypsazo nanoman.ca> [1]
 
 Modified:
   head/audio/jack/Makefile
   head/audio/jack/pkg-plist
 
 Modified: head/audio/jack/Makefile
 ==============================================================================
 --- head/audio/jack/Makefile	Thu Oct 31 15:44:05 2013	(r332258)
 +++ head/audio/jack/Makefile	Thu Oct 31 15:51:08 2013	(r332259)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	jackit
  PORTVERSION=	0.121.3
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	audio
  MASTER_SITES=	http://jackaudio.org/downloads/
  DISTNAME=	jack-audio-connection-kit-${PORTVERSION}
 @@ -11,14 +11,13 @@ DISTNAME=	jack-audio-connection-kit-${PO
  MAINTAINER=	multimedia@FreeBSD.org
  COMMENT=	Low latency audio server
  
 -LIB_DEPENDS=	portaudio:${PORTSDIR}/audio/portaudio \
 -		sndfile:${PORTSDIR}/audio/libsndfile \
 -		samplerate:${PORTSDIR}/audio/libsamplerate \
 -		celt0:${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_LDCONFIG=	yes
 -NO_STAGE=	yes
  USES=		gmake pathfix pkgconfig
  
  CONFIGURE_ENV=	LIBS="-pthread"
 @@ -29,30 +28,26 @@ LDFLAGS+=	-L${LOCALBASE}/lib
  
  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.port.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
  .endif
  
 -.if ${PORT_OPTIONS:MALSA}
 -LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
 -PLIST_SUB+=	ALSA=""
 -.else
 -CONFIGURE_ARGS+=	--disable-alsa
 -PLIST_SUB+=	ALSA="@comment "
 +.if ! ${PORT_OPTIONS:MREADLINE}
 +CONFIGURE_ENV+=	ac_cv_lib_readline_readline=no \
 +		ac_cv_header_readline_chardefs_h=no
  .endif
  
  post-patch:
 
 Modified: head/audio/jack/pkg-plist
 ==============================================================================
 --- head/audio/jack/pkg-plist	Thu Oct 31 15:44:05 2013	(r332258)
 +++ head/audio/jack/pkg-plist	Thu Oct 31 15:51:08 2013	(r332259)
 @@ -25,7 +25,7 @@ bin/jack_server_control
  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.la
  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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310311600.r9VG02sf084484>