From owner-svn-ports-all@FreeBSD.ORG Sat Jan 18 14:49:42 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 74D37F75; Sat, 18 Jan 2014 14:49:42 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 54B4C16A5; Sat, 18 Jan 2014 14:49:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0IEngHg095655; Sat, 18 Jan 2014 14:49:42 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0IEnfBH095653; Sat, 18 Jan 2014 14:49:41 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401181449.s0IEnfBH095653@svn.freebsd.org> From: Antoine Brodin Date: Sat, 18 Jan 2014 14:49:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340172 - head/audio/terminatorx 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: Sat, 18 Jan 2014 14:49:42 -0000 Author: antoine Date: Sat Jan 18 14:49:41 2014 New Revision: 340172 URL: http://svnweb.freebsd.org/changeset/ports/340172 QAT: https://qat.redports.org/buildarchive/r340172/ Log: - Stage support - Use OPTIONS helpers Modified: head/audio/terminatorx/Makefile head/audio/terminatorx/pkg-plist Modified: head/audio/terminatorx/Makefile ============================================================================== --- head/audio/terminatorx/Makefile Sat Jan 18 14:39:44 2014 (r340171) +++ head/audio/terminatorx/Makefile Sat Jan 18 14:49:41 2014 (r340172) @@ -26,7 +26,6 @@ SOX_DESC= sox (.au) support MPG123_DESC= mpg123 support USE_BZIP2= yes -NO_STAGE= yes USE_XORG= x11 xext xi xxf86dga ice sm USES= gmake pathfix pkgconfig USE_GNOME= gnomehier gtk20 libxml2 @@ -37,49 +36,22 @@ CONFIGURE_ARGS= --disable-alsamidi \ --disable-scheduler INSTALLS_OMF= yes -MAN1= terminatorX.1 - CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include - -.if ${PORT_OPTIONS:MALSA} -CONFIGURE_ARGS+= --disable-alsa -.else -LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib -.endif - -.if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack -.else -CONFIGURE_ARGS+= --disable-jack -.endif - -.if ${PORT_OPTIONS:MMPG123} -BUILD_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123 -.else -CONFIGURE_ARGS+= --disable-mpg123 -.endif - -.if ${PORT_OPTIONS:MSOX} -BUILD_DEPENDS+= sox:${PORTSDIR}/audio/sox -.else -CONFIGURE_ARGS+= --disable-sox -.endif - -.if ${PORT_OPTIONS:MVORBIS} -BUILD_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools -LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis -.else -CONFIGURE_ARGS+= --disable-vorbis -.endif - -.if ${PORT_OPTIONS:MMAD} -LIB_DEPENDS+= libmad.so:${PORTSDIR}/audio/mad -.else -CONFIGURE_ARGS+= --disable-mad -.endif +ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib +ALSA_CONFIGURE_OFF= --disable-alsa +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack +JACK_CONFIGURE_OFF= --disable-jack +MPG123_BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 +MPG123_CONFIGURE_OFF= --disable-mpg123 +SOX_BUILD_DEPENDS= sox:${PORTSDIR}/audio/sox +SOX_CONFIGURE_OFF= --disable-sox +VORBIS_BUILD_DEPENDS= oggenc:${PORTSDIR}/audio/vorbis-tools +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis +VORBIS_CONFIGURE_OFF= --disable-vorbis +MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/mad +MAD_CONFIGURE_OFF= --disable-mad post-patch: @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ @@ -88,27 +60,26 @@ post-patch: 's|%%LOCALBASE%%|${LOCALBASE}|g' do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/terminatorX ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/terminatorX.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/src/terminatorX ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/terminatorX.1 ${STAGEDIR}${MANPREFIX}/man/man1 .for file in terminatorX-app.png terminatorX-mime.png ${INSTALL_DATA} ${WRKSRC}/gnome-support/${file} \ - ${PREFIX}/share/pixmaps + ${STAGEDIR}${PREFIX}/share/pixmaps .endfor .for f in terminatorX.mime terminatorX.keys ${INSTALL_DATA} ${WRKSRC}/gnome-support/${f} \ - ${PREFIX}/share/mime-info + ${STAGEDIR}${PREFIX}/share/mime-info .endfor ${INSTALL_DATA} ${WRKSRC}/gnome-support/terminatorX.desktop \ - ${PREFIX}/share/applications - @${MKDIR} ${PREFIX}/share/gnome/help/terminatorX/C + ${STAGEDIR}${PREFIX}/share/applications + @${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome/help/terminatorX/C ${INSTALL_DATA} ${WRKSRC}/doc/terminatorX-manual/C/terminatorX-manual.xml \ - ${PREFIX}/share/gnome/help/terminatorX/C/terminatorX.xml - @${MKDIR} ${PREFIX}/share/gnome/help/terminatorX/C/figures + ${STAGEDIR}${PREFIX}/share/gnome/help/terminatorX/C/terminatorX.xml + @${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome/help/terminatorX/C/figures ${INSTALL_DATA} ${WRKSRC}/doc/terminatorX-manual/C/figures/signalflow.png \ - ${PREFIX}/share/gnome/help/terminatorX/C/figures - @${MKDIR} ${PREFIX}/share/omf/terminatorX + ${STAGEDIR}${PREFIX}/share/gnome/help/terminatorX/C/figures + @${MKDIR} ${STAGEDIR}${PREFIX}/share/omf/terminatorX ${INSTALL_DATA} ${WRKSRC}/doc/terminatorX-manual/C/terminatorX-manual-C.omf \ - ${PREFIX}/share/omf/terminatorX/terminatorX-C.omf - @scrollkeeper-install -q ${PREFIX}/share/omf/terminatorX/terminatorX-C.omf 2>/dev/null || ${TRUE} + ${STAGEDIR}${PREFIX}/share/omf/terminatorX/terminatorX-C.omf .include Modified: head/audio/terminatorx/pkg-plist ============================================================================== --- head/audio/terminatorx/pkg-plist Sat Jan 18 14:39:44 2014 (r340171) +++ head/audio/terminatorx/pkg-plist Sat Jan 18 14:49:41 2014 (r340172) @@ -1,4 +1,5 @@ bin/terminatorX +man/man1/terminatorX.1.gz share/applications/terminatorX.desktop share/gnome/help/terminatorX/C/figures/signalflow.png share/gnome/help/terminatorX/C/terminatorX.xml