From owner-svn-ports-all@FreeBSD.ORG Sun Apr 6 18:14:33 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 70E24D90; Sun, 6 Apr 2014 18:14:33 +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 5D9E0C30; Sun, 6 Apr 2014 18:14:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s36IEXZL018553; Sun, 6 Apr 2014 18:14:33 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s36IEXFw018551; Sun, 6 Apr 2014 18:14:33 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404061814.s36IEXFw018551@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 6 Apr 2014 18:14:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350396 - head/audio/harp 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: Sun, 06 Apr 2014 18:14:33 -0000 Author: bapt Date: Sun Apr 6 18:14:32 2014 New Revision: 350396 URL: http://svnweb.freebsd.org/changeset/ports/350396 QAT: https://qat.redports.org/buildarchive/r350396/ Log: Support stage Use options helpers Strip binaries Modified: head/audio/harp/Makefile head/audio/harp/pkg-plist Modified: head/audio/harp/Makefile ============================================================================== --- head/audio/harp/Makefile Sun Apr 6 18:10:39 2014 (r350395) +++ head/audio/harp/Makefile Sun Apr 6 18:14:32 2014 (r350396) @@ -15,68 +15,36 @@ LICENSE= GPLv3 GNU_CONFIGURE= yes USE_SQLITE= yes -NO_STAGE= yes USE_LDCONFIG= yes OPTIONS_DEFINE= AAC FLAC MP3 SHOUTCAST VORBIS JACK OPTIONS_DEFAULT= AAC FLAC MP3 SHOUTCAST VORBIS +OPTIONS_SUB= yes -MAN1= harp.1 PORTDOCS= README -.include +INSTALL_TARGET= install-strip -.if ${PORT_OPTIONS:MAAC} -LIB_DEPENDS+= libfaad.so:${PORTSDIR}/audio/faad -PLIST_SUB+= AAC="" -.else -CONFIGURE_ARGS+= --without-aac -PLIST_SUB+= AAC="@comment " -.endif - -.if ${PORT_OPTIONS:MFLAC} -LIB_DEPENDS+= libFLAC.so:${PORTSDIR}/audio/flac -PLIST_SUB+= FLAC="" -.else -CONFIGURE_ARGS+= --without-flac -PLIST_SUB+= FLAC="@comment " -.endif - -.if ${PORT_OPTIONS:MMP3} -LIB_DEPENDS+= libmpg123.so:${PORTSDIR}/audio/mpg123 -PLIST_SUB+= MP3="" -.else -CONFIGURE_ARGS+= --without-mp3 -PLIST_SUB+= MP3="@comment " -.endif - -.if ${PORT_OPTIONS:MSHOUTCAST} -PLIST_SUB+= STREAM="" -.else -CONFIGURE_ARGS+= --without-stream -PLIST_SUB+= STREAM="@comment " -.endif - -.if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= libvorbisfile.so:${PORTSDIR}/audio/libvorbis -PLIST_SUB+= VORBIS="" -.else -CONFIGURE_ARGS+= --without-vorbis -PLIST_SUB+= VORBIS="@comment " -.endif - -.if ${PORT_OPTIONS:MJACK} -CONFIGURE_ARGS+= --with-jack -LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack -.else -CONFIGURE_ARGS+= --without-jack -.endif +AAC_LIB_DEPENDS= libfaad.so:${PORTSDIR}/audio/faad +AAC_CONFIGURE_WITH= aac + +FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac +FLAC_CONFIGURE_WITH= flac + +MP3_LIB_DEPENDS+= libmpg123.so:${PORTSDIR}/audio/mpg123 +MP3_CONFIGURE_WITH= mp3 + +SHOUTCAST_CONFIGURE_WITH= stream + +VORBIS_LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis +VORBIS_CONFIGURE_ARGS= vorbis + +JACK_CONFIGURE_WITH= jack +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: head/audio/harp/pkg-plist ============================================================================== --- head/audio/harp/pkg-plist Sun Apr 6 18:10:39 2014 (r350395) +++ head/audio/harp/pkg-plist Sun Apr 6 18:14:32 2014 (r350396) @@ -8,17 +8,18 @@ bin/harp %%MP3%%lib/libharpmp3.a %%MP3%%lib/libharpmp3.la %%MP3%%lib/libharpmp3.so -%%STREAM%%lib/libharpstream.a -%%STREAM%%lib/libharpstream.la -%%STREAM%%lib/libharpstream.so +%%SHOUTCAST%%lib/libharpstream.a +%%SHOUTCAST%%lib/libharpstream.la +%%SHOUTCAST%%lib/libharpstream.so %%VORBIS%%lib/libharpvorbis.a %%VORBIS%%lib/libharpvorbis.la %%VORBIS%%lib/libharpvorbis.so %%AAC%%%%DATADIR%%/libharpaac.sql %%FLAC%%%%DATADIR%%/libharpflac.sql %%MP3%%%%DATADIR%%/libharpmp3.sql -%%STREAM%%%%DATADIR%%/libharpstream.sql +%%SHOUTCAST%%%%DATADIR%%/libharpstream.sql %%VORBIS%%%%DATADIR%%/libharpvorbis.sql +man/man1/harp.1.gz %%DATADIR%%/create.sql %%DATADIR%%/defaults.conf @dirrm %%DATADIR%%