From owner-svn-ports-head@FreeBSD.ORG Sun Jul 14 18:07:38 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3BE7220A; Sun, 14 Jul 2013 18:07:38 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2D775BD5; Sun, 14 Jul 2013 18:07:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6EI7b96051267; Sun, 14 Jul 2013 18:07:37 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6EI7ba8051264; Sun, 14 Jul 2013 18:07:37 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201307141807.r6EI7ba8051264@svn.freebsd.org> From: William Grzybowski Date: Sun, 14 Jul 2013 18:07:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322994 - head/audio/alure 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.14 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, 14 Jul 2013 18:07:38 -0000 Author: wg Date: Sun Jul 14 18:07:37 2013 New Revision: 322994 URL: http://svnweb.freebsd.org/changeset/ports/322994 Log: audio/alure: minor fixes - Use pkgconfig - Add DOCS, EXAMPLES and STATIC options - Remove unused PLIST_SUB and convert to OPTIONS_SUB PR: ports/180235 Submitted by: nemysis (maintainer) Modified: head/audio/alure/Makefile head/audio/alure/pkg-plist Modified: head/audio/alure/Makefile ============================================================================== --- head/audio/alure/Makefile Sun Jul 14 16:22:29 2013 (r322993) +++ head/audio/alure/Makefile Sun Jul 14 18:07:37 2013 (r322994) @@ -1,9 +1,9 @@ -# Created by: nemysis@gmx.ch +# Created by: nemysis # $FreeBSD$ PORTNAME= alure PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://kcat.strangesoft.net/alure-releases/ @@ -12,90 +12,78 @@ COMMENT= Utility library to help manage LICENSE= MIT -LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile +LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile +USES= cmake pkgconfig USE_OPENAL= soft USE_LDCONFIG= yes -USES= cmake CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -OPTIONS_DEFINE= VORBIS FLAC MPG123 DUMB MODPLUG FLUIDSYNTH DOCS EXAMPLES +PORTDOCS= * +PORTEXAMPLES= * + +OPTIONS_DEFINE= DOCS EXAMPLES STATIC VORBIS FLAC MPG123 DUMB MODPLUG FLUIDSYNTH OPTIONS_DEFAULT= VORBIS FLAC DUMB DUMB_DESC= DUMB audio library decoding support MODPLUG_DESC= MOD decoding via ModPlug FLUIDSYNTH_DESC= MIDI support via FluidSynth +OPTIONS_SUB= yes + .include .if ${PORT_OPTIONS:MVORBIS} -PLIST_SUB+= VORBIS="" LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis PLUGIN_OPTIONS_CMAKE+= -DUSE_VORBIS:BOOL=TRUE .else -PLIST_SUB+= VORBIS="@comment " PLUGIN_OPTIONS_CMAKE+= -DUSE_VORBIS:BOOL=FALSE .endif .if ${PORT_OPTIONS:MFLAC} -PLIST_SUB+= FLAC="" LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac PLUGIN_OPTIONS_CMAKE+= -DUSE_FLAC:BOOL=TRUE .else -PLIST_SUB+= FLAC="@comment " PLUGIN_OPTIONS_CMAKE+= -DUSE_FLAC:BOOL=FALSE .endif .if ${PORT_OPTIONS:MMPG123} -PLIST_SUB+= MPG123="" LIB_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123 PLUGIN_OPTIONS_CMAKE+= -DUSE_MPG123:BOOL=TRUE .else -PLIST_SUB+= mpg123="@comment " PLUGIN_OPTIONS_CMAKE+= -DUSE_MPG123:BOOL=FALSE .endif .if ${PORT_OPTIONS:MDUMB} -PLIST_SUB+= DUMB="" BUILD_DEPENDS+= ${LOCALBASE}/include/dumb.h:${PORTSDIR}/audio/dumb-allegro PLUGIN_OPTIONS_CMAKE+= -DUSE_DUMB:BOOL=TRUE .else -PLIST_SUB+= DUMB="@comment " PLUGIN_OPTIONS_CMAKE+= -DUSE_DUMB:BOOL=FALSE .endif .if ${PORT_OPTIONS:MMODPLUG} -PLIST_SUB+= MODPLUG="" BUILD_DEPENDS+= ${LOCALBASE}/include/libmodplug/modplug.h:${PORTSDIR}/audio/libmodplug PLUGIN_OPTIONS_CMAKE+= -DUSE_MODPLUG:BOOL=TRUE .else -PLIST_SUB+= MODPLUG="@comment " PLUGIN_OPTIONS_CMAKE+= -DUSE_MODPLUG:BOOL=FALSE .endif .if ${PORT_OPTIONS:MFLUIDSYNTH} -PLIST_SUB+= FLUIDSYNTH="" LIB_DEPENDS+= fluidsynth:${PORTSDIR}/audio/fluidsynth PLUGIN_OPTIONS_CMAKE+= -DUSE_FLUIDSYNTH:BOOL=TRUE .else -PLIST_SUB+= FLUIDSYNTH="@comment " PLUGIN_OPTIONS_CMAKE+= -DUSE_FLUIDSYNTH:BOOL=FALSE .endif .if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= NaturalDocs:${PORTSDIR}/devel/naturaldocs -PLIST_SUB+= PORTDOCS="" -.else -PLIST_SUB+= PORTDOCS="@comment " .endif post-patch: @${REINPLACE_CMD} -e 's|lib$${LIB_SUFFIX}/pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' \ -e 's|"ModPlug support (for IT/XM/S3M/MOD)" OFF)|"ModPlug support (for IT/XM/S3M/MOD)" ON)|' \ ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e 's|/lib/pkgconfig|/libdata/pkgconfig|' \ - ${WRKSRC}/XCompile.txt .if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} \ @@ -108,10 +96,15 @@ post-patch: @${REINPLACE_CMD} -i '' -e '/INSTALL(DIRECTORY "$${ALURE_SOURCE_DIR}/,+2d' ${WRKSRC}/CMakeLists.txt .endif +.if ! ${PORT_OPTIONS:MSTATIC} + @${REINPLACE_CMD} -e 's|"Build the static version of the library" ON)|"Build the static version of the library" OFF)|' \ + ${WRKSRC}/CMakeLists.txt +.endif + post-install: .if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} - @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) + @${MKDIR} ${EXAMPLESDIR} + @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}) .endif .include Modified: head/audio/alure/pkg-plist ============================================================================== --- head/audio/alure/pkg-plist Sun Jul 14 16:22:29 2013 (r322993) +++ head/audio/alure/pkg-plist Sun Jul 14 18:07:37 2013 (r322994) @@ -2,45 +2,10 @@ bin/alurecdplay bin/alureplay bin/alurestream include/AL/alure.h -lib/libalure-static.a +%%STATIC%%lib/libalure-static.a lib/libalure.so lib/libalure.so.1 lib/libalure.so.1.2.0 -libdata/pkgconfig/alure-static.pc +%%STATIC%%libdata/pkgconfig/alure-static.pc libdata/pkgconfig/alure.pc -%%PORTDOCS%%%%DOCSDIR%%/html/files/alure-cpp.html -%%PORTDOCS%%%%DOCSDIR%%/html/files/buffer-cpp.html -%%PORTDOCS%%%%DOCSDIR%%/html/files/istream-cpp.html -%%PORTDOCS%%%%DOCSDIR%%/html/files/stream-cpp.html -%%PORTDOCS%%%%DOCSDIR%%/html/files/streamplay-cpp.html -%%PORTDOCS%%%%DOCSDIR%%/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/index/Functions.html -%%PORTDOCS%%%%DOCSDIR%%/html/index/General.html -%%PORTDOCS%%%%DOCSDIR%%/html/javascript/main.js -%%PORTDOCS%%%%DOCSDIR%%/html/javascript/searchdata.js -%%PORTDOCS%%%%DOCSDIR%%/html/search/FunctionsA.html -%%PORTDOCS%%%%DOCSDIR%%/html/search/GeneralA.html -%%PORTDOCS%%%%DOCSDIR%%/html/search/GeneralF.html -%%PORTDOCS%%%%DOCSDIR%%/html/search/GeneralM.html -%%PORTDOCS%%%%DOCSDIR%%/html/search/GeneralS.html -%%PORTDOCS%%%%DOCSDIR%%/html/search/NoResults.html -%%PORTDOCS%%%%DOCSDIR%%/html/styles/1.css -%%PORTDOCS%%%%DOCSDIR%%/html/styles/2.css -%%PORTDOCS%%%%DOCSDIR%%/html/styles/main.css -%%PORTDOCS%%%%DOCSDIR%%/naturaldocs/CustomStyle.css -%%PORTDOCS%%%%DOCSDIR%%/naturaldocs/Languages.txt -%%PORTDOCS%%%%DOCSDIR%%/naturaldocs/Menu.txt -%%PORTDOCS%%%%DOCSDIR%%/naturaldocs/Topics.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alurecdplay.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alureplay.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alurestream.c -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/naturaldocs -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/styles -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/search -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/javascript -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/index -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/files -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry include/AL