From owner-svn-ports-all@FreeBSD.ORG Fri Apr 4 23:07:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 41F71371; Fri, 4 Apr 2014 23:07:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1516DDDE; Fri, 4 Apr 2014 23:07:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s34N7aTi045108; Fri, 4 Apr 2014 23:07:36 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s34N7aKW045106; Fri, 4 Apr 2014 23:07:36 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404042307.s34N7aKW045106@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 4 Apr 2014 23:07:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350184 - head/audio/aqualung X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Apr 2014 23:07:37 -0000 Author: bapt Date: Fri Apr 4 23:07:36 2014 New Revision: 350184 URL: http://svnweb.freebsd.org/changeset/ports/350184 QAT: https://qat.redports.org/buildarchive/r350184/ Log: Support stage Specify the port uses nested function (fix build on freebsd 10 and 11) Use options helpers (this fix inverted option checking) Modified: head/audio/aqualung/Makefile head/audio/aqualung/pkg-plist Modified: head/audio/aqualung/Makefile ============================================================================== --- head/audio/aqualung/Makefile Fri Apr 4 23:03:36 2014 (r350183) +++ head/audio/aqualung/Makefile Fri Apr 4 23:07:36 2014 (r350184) @@ -3,7 +3,7 @@ PORTNAME= aqualung DISTVERSION= 0.9beta11 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \ http://wickedmachine.net/mirror/ @@ -32,33 +32,24 @@ LIB_DEPENDS= libsamplerate.so:${PORTSDIR libcddb.so:${PORTSDIR}/audio/libcddb \ libstrfunc.so:${PORTSDIR}/devel/libstrfunc -NO_STAGE= yes -USES= gmake pkgconfig gettext +USES= gmake pkgconfig gettext compiler:nestedfct USE_GNOME= gtk20 libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-transform-name="" --with-alsa=no --with-ifp=no \ --with-cdda=no CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lstrfunc -MAN1= ${PORTNAME}.1 OPTIONS_DEFINE= JACK PULSEAUDIO DOCS -.include +JACK_CONFIGURE_OFF= --with-jack=no +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack +JACK_CONFIGURE_ON= --with-jack=yes + +PULSEAUDIO_CONFIGURE_OFF= --with-pulse=no +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CONFIGURE_ON= --with-pulse=yes -.if ${PORT_OPTIONS:MJACK} -CONFIGURE_ARGS+= --with-jack=no -.else -LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack -CONFIGURE_ARGS+= --with-jack=yes -.endif - -.if ${PORT_OPTIONS:MPULSEAUDIO} -CONFIGURE_ARGS+= --with-pulse=no -.else -LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio -CONFIGURE_ARGS+= --with-pulse=yes -.endif post-patch: @${REINPLACE_CMD} -e '/^docdir/s!=.*!= ${DOCSDIR}!'\ ${WRKSRC}/doc/Makefile.in @@ -66,9 +57,5 @@ post-patch: # ${WRKSRC}/configure @${ECHO_CMD} "#include " >> ${WRKSRC}/src/common.h @${ECHO_CMD} "#include " >> ${WRKSRC}/src/common.h -.if ! ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e '/^install-data-am/s!install-docDATA!!'\ - ${WRKSRC}/doc/Makefile.in -.endif .include Modified: head/audio/aqualung/pkg-plist ============================================================================== --- head/audio/aqualung/pkg-plist Fri Apr 4 23:03:36 2014 (r350183) +++ head/audio/aqualung/pkg-plist Fri Apr 4 23:07:36 2014 (r350184) @@ -1,4 +1,5 @@ bin/aqualung +man/man1/aqualung.1.gz %%DATADIR%%/appearance.png %%DATADIR%%/cdda.png %%DATADIR%%/cddb.png