From owner-svn-ports-head@freebsd.org Sun Oct 18 21:19:47 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ADDD5A188AD; Sun, 18 Oct 2015 21:19:47 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 6905D370; Sun, 18 Oct 2015 21:19:47 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9ILJk8T011631; Sun, 18 Oct 2015 21:19:46 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9ILJkZK011630; Sun, 18 Oct 2015 21:19:46 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510182119.t9ILJkZK011630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 18 Oct 2015 21:19:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399628 - head/audio/audiere X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Oct 2015 21:19:47 -0000 Author: amdmi3 Date: Sun Oct 18 21:19:46 2015 New Revision: 399628 URL: https://svnweb.freebsd.org/changeset/ports/399628 Log: - Switch to options helpers Modified: head/audio/audiere/Makefile Modified: head/audio/audiere/Makefile ============================================================================== --- head/audio/audiere/Makefile Sun Oct 18 19:33:03 2015 (r399627) +++ head/audio/audiere/Makefile Sun Oct 18 21:19:46 2015 (r399628) @@ -26,58 +26,49 @@ PORTDOCS= changelog.txt cvs.txt dependen license.txt overview.txt readme.txt release-howto.txt \ tutorial.txt -CONFIGURE_REPLACES='s|wx_config|no_&|' - OPTIONS_DEFINE= DUMB CDAUDIO VORBIS SPEEX DOCS OPTIONS_DEFAULT= DUMB CDAUDIO VORBIS SPEEX DUMB_DESC= DUMB support CDAUDIO_DESC= libcdaudio support -.include - -# Broken with recent FLAC -#.if !defined(WITHOUT_FLAC) -#LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac -#.else -CONFIGURE_REPLACES+='/AC_CHECK_LIB/ s|FLAC|no_&|' -#.endif - -.if ${PORT_OPTIONS:MDUMB} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb -.else -CONFIGURE_REPLACES+='/AC_CHECK_LIB/ s|dumb|no_&|' -.endif - -.if ${PORT_OPTIONS:MCDAUDIO} -LIB_DEPENDS+= libcdaudio.so:${PORTSDIR}/audio/libcdaudio -.else -CONFIGURE_REPLACES+='/AC_CHECK_LIB/ s|cdaudio|no_&|' -.endif - # since dumb is a static lib and it depends on ogg, we should # link audiere with ogg as well -.if ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MDUMB} -LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis \ - libogg.so:${PORTSDIR}/audio/libogg -.else -CONFIGURE_REPLACES+='/AC_CHECK_HEADER/ s|vorbis|no_&|' -.endif - -.if ${PORT_OPTIONS:MSPEEX} -LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex -.else -CONFIGURE_REPLACES+='/AC_CHECK_HEADER/ s|speex|no_&|' -.endif +DUMB_IMPLIES= VORBIS + +DUMB_BUILD_DEPENDS= ${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb +CDAUDIO_LIB_DEPENDS= libcdaudio.so:${PORTSDIR}/audio/libcdaudio +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis \ + libogg.so:${PORTSDIR}/audio/libogg +SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex post-patch: - @${REINPLACE_CMD} ${CONFIGURE_REPLACES:C/.*/-e &/} \ - -e 's|-lpthread|-pthread|' \ +# could be an option, but build is broken with recent FLAC + @${REINPLACE_CMD} -e '/AC_CHECK_LIB/ s|FLAC|no_&|; \ + s|wx_config|no_&|' \ + ${WRKSRC}/configure.in + +post-patch-DUMB-off: + @${REINPLACE_CMD} -e '/AC_CHECK_LIB/ s|dumb|no_&|' \ + ${WRKSRC}/configure.in + +post-patch-CDAUDIO-off: + @${REINPLACE_CMD} -e '/AC_CHECK_LIB/ s|cdaudio|no_&|' \ + ${WRKSRC}/configure.in + +post-patch-VORBIS-off: + @${REINPLACE_CMD} -e '/AC_CHECK_HEADER/ s|vorbis|no_&|' \ + ${WRKSRC}/configure.in + +post-patch-SPEEX-off: + @${REINPLACE_CMD} -e '/AC_CHECK_HEADER/ s|speex|no_&|' \ ${WRKSRC}/configure.in post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudiere.so - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudiere.so + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} .endfor