From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 13 18:40:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 14636A45 for ; Sat, 13 Oct 2012 18:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id DEACB8FC14 for ; Sat, 13 Oct 2012 18:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9DIe0db073332 for ; Sat, 13 Oct 2012 18:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9DIe0mq073331; Sat, 13 Oct 2012 18:40:00 GMT (envelope-from gnats) Resent-Date: Sat, 13 Oct 2012 18:40:00 GMT Resent-Message-Id: <201210131840.q9DIe0mq073331@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Petrik Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6ED4F8B8 for ; Sat, 13 Oct 2012 18:38:24 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 55E0D8FC18 for ; Sat, 13 Oct 2012 18:38:24 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q9DIcOBA019354 for ; Sat, 13 Oct 2012 18:38:24 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q9DIcOqr019353; Sat, 13 Oct 2012 18:38:24 GMT (envelope-from nobody) Message-Id: <201210131838.q9DIcOqr019353@red.freebsd.org> Date: Sat, 13 Oct 2012 18:38:24 GMT From: Chris Petrik To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/172666: [PATCH] Convert ports to OptionsNG X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Oct 2012 18:40:01 -0000 >Number: 172666 >Category: ports >Synopsis: [PATCH] Convert ports to OptionsNG >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 13 18:40:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Chris Petrik >Release: FreeBSD 10-CURRENT >Organization: none >Environment: FreeBSD 10 >Description: Convert ports in category audio/* >How-To-Repeat: >Fix: Patch attached with submission follows: Index: aften/Makefile =================================================================== --- aften/Makefile (revision 305743) +++ aften/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: aften -# Date created: April 3, 2010 -# Whom: Gabor Zahemszky -# +# Created by: Gabor Zahemszky # $FreeBSD$ -# PORTNAME= aften PORTVERSION= 0.0.8 @@ -22,24 +18,26 @@ USE_CMAKE= yes CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}" -OPTIONS= SHARED_LIB "Build with shared library" off \ - CXX_BINDINGS "Build with C++ bindings" off \ - DOUBLE "Use double precision" off +OPTIONS_DEFINE= SHARED_LIB CXX_BINDINGS DOUBLE -.include +SHARED_LIB_DESC= Build with shared library +CXX_BINDINGS_DESC= Build with C++ bindings +DOUBLE_DESC= Use double precision -.if defined(WITH_SHARED_LIB) +.include + +.if ${PORT_OPTIONS:MWITH_SHARED_LIB} CMAKE_ARGS+= -DSHARED:BOOL=ON .endif -.if defined(WITH_CXX_BINDINGS) +.if ${PORT_OPTIONS:MCXX_BINDINGS} CMAKE_ARGS+= -DBINDINGS_CXX:BOOL=ON PLIST_SUB+= CXX="" .else PLIST_SUB+= CXX="@comment " .endif -.if defined(WITH_SHARED_LIB) || defined(WITH_CXX_BINDINGS) +.if ${PORT_OPTIONS:MWITH_SHARED_LIB} || ${PORT_OPTIONS:MCXX_BINDINGS} PLIST_SUB+= PORTVERSION="${PORTVERSION}" PLIST_SUB+= LIBS="" USE_LDCONFIG= yes @@ -47,7 +45,7 @@ PLIST_SUB+= LIBS="@comment " .endif -.if defined(WITH_DOUBLE) +.if ${PORT_OPTIONS:MDOUBLE} CMAKE_ARGS+= -DDOUBLE:BOOL=ON .endif @@ -55,4 +53,4 @@ @${MKDIR} ${BUILDDIR} @cd ${BUILDDIR}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} .. -.include +.include Index: akode/Makefile =================================================================== --- akode/Makefile (revision 305743) +++ akode/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mpeglib_artsplug -# Date created: July 09 2004 -# Whom: Michael Nottebrock -# +# Created by: Michael Nottebrock # $FreeBSD$ -# PORTNAME= akode PORTVERSION= 2.0.2 @@ -17,19 +13,19 @@ MAINTAINER= swhetzel@gmail.com COMMENT= Default KDE audio backend + LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS= kdemultimedia-3.[1-3]* -OPTIONS= FFMPEG "FFMPEG decoder plugin" off \ - JACK "Jack output plugin" off \ - MPC "Monkey's Audio decoder plugin" on \ - MPEG "MPEG Audio (including mp3) plugin" on \ - OSS "OSS output plugin" on \ - RESAMPLER "Resampler processing plugin" on \ - XIPH "FLAC/Speex/Vorbis decoder plugin" on +OPTIONS_DEFINE= FFMPEG JACK MPC MPEG OSS RESAMPLER XIPH +OPTIONS_DEFAULT= MPC MPEG OSS RESAMPLER XIP +MPC_DESC= Monkey's Audio decoder plugin +RESAMPLER_DESC= Resampler processing plugin +XIPH_DESC= FLAC/Speex/Vorbis decoder plugin + USE_AUTOTOOLS= libltdl libtool USE_BZIP2= yes USE_GCC= any @@ -41,33 +37,33 @@ --with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include -.include +.include -.if defined(WITH_FFMPEG) +.if ${PORT_OPTIONS:MFFMPEG} RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_ffmpeg_decoder.so:${PORTSDIR}/audio/akode-plugins-ffmpeg .endif -.if defined(WITH_JACK) +.if ${PORT_OPTIONS:MJACK} RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_jack_sink.so:${PORTSDIR}/audio/akode-plugins-jack .endif -.if !defined(WITHOUT_MPC) +.if ${PORT_OPTIONS:MMPC} RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_mpc_decoder.so:${PORTSDIR}/audio/akode-plugins-mpc .endif -.if !defined(WITHOUT_MPEG) +.if ${PORT_OPTIONS:MMPEG} RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_mpeg_decoder.so:${PORTSDIR}/audio/akode-plugins-mpeg .endif -.if !defined(WITHOUT_OSS) +.if ${PORT_OPTIONS:MOSS} RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_oss_sink.so:${PORTSDIR}/audio/akode-plugins-oss .endif -.if !defined(WITHOUT_RESAMPLER) +.if ${PORT_OPTIONS:MRESAMPLER} RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_src_resampler.so:${PORTSDIR}/audio/akode-plugins-resampler .endif -.if !defined(WITHOUT_XIPH) +.if ${PORT_OPTIONS:MXIPH} RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_xiph_decoder.so:${PORTSDIR}/audio/akode-plugins-xiph .endif @@ -78,4 +74,4 @@ $$(all_libraries) ${PTHREAD_LIBS}|g' \ ${WRKSRC}/akode/akodeplay/Makefile.in -.include +.include Index: aqualung/Makefile =================================================================== --- aqualung/Makefile (revision 305743) +++ aqualung/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: aqualung -# Date created: 08 October 2006 -# Whom: Andrew Pantyukhin -# +# Created by: Andrew Pantyukhin # $FreeBSD$ -# PORTNAME= aqualung DISTVERSION= 0.9beta11 @@ -15,26 +11,26 @@ MAINTAINER= jsa@FreeBSD.org COMMENT= Music player with rich features -LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \ - sndfile.1:${PORTSDIR}/audio/libsndfile \ - FLAC.10:${PORTSDIR}/audio/flac \ - vorbis.4:${PORTSDIR}/audio/libvorbis \ - oggz.8:${PORTSDIR}/audio/liboggz \ - speex.1:${PORTSDIR}/audio/speex \ - mad.2:${PORTSDIR}/audio/libmad \ - modplug.1:${PORTSDIR}/audio/libmodplug \ - mpcdec.7:${PORTSDIR}/audio/musepack \ - mac.2:${PORTSDIR}/audio/mac \ - tag.1:${PORTSDIR}/audio/taglib \ - lrdf.2:${PORTSDIR}/textproc/liblrdf \ - cdio.13:${PORTSDIR}/sysutils/libcdio \ - mp3lame.0:${PORTSDIR}/audio/lame \ - avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ - strfunc.9:${PORTSDIR}/devel/libstrfunc \ - wavpack.2:${PORTSDIR}/audio/wavpack \ - xslt.2:${PORTSDIR}/textproc/libxslt \ - cddb.4:${PORTSDIR}/audio/libcddb \ - strfunc.9:${PORTSDIR}/devel/libstrfunc +LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate \ + sndfile:${PORTSDIR}/audio/libsndfile \ + FLAC:${PORTSDIR}/audio/flac \ + vorbis:${PORTSDIR}/audio/libvorbis \ + oggz:${PORTSDIR}/audio/liboggz \ + speex:${PORTSDIR}/audio/speex \ + mad:${PORTSDIR}/audio/libmad \ + modplug:${PORTSDIR}/audio/libmodplug \ + mpcdec:${PORTSDIR}/audio/musepack \ + mac:${PORTSDIR}/audio/mac \ + tag:${PORTSDIR}/audio/taglib \ + lrdf:${PORTSDIR}/textproc/liblrdf \ + cdio:${PORTSDIR}/sysutils/libcdio \ + mp3lame:${PORTSDIR}/audio/lame \ + avcodec:${PORTSDIR}/multimedia/ffmpeg \ + strfunc:${PORTSDIR}/devel/libstrfunc \ + wavpack:${PORTSDIR}/audio/wavpack \ + xslt:${PORTSDIR}/textproc/libxslt \ + cddb:${PORTSDIR}/audio/libcddb \ + strfunc:${PORTSDIR}/devel/libstrfunc USE_GETTEXT= yes USE_GNOME= pkgconfig gtk20 libxml2 @@ -46,22 +42,21 @@ LDFLAGS+= -L${LOCALBASE}/lib -lstrfunc MAN1= ${PORTNAME}.1 -OPTIONS= JACK "Enable JACK low-latency audio server support" Off \ - PULSE "Enable PulseAudio sound server support" Off +OPTIONS_DEFINE= JACK PULSE .include -.if !defined(WITH_JACK) +.if ${PORT_OPTIONS:MJACK} CONFIGURE_ARGS+= --with-jack=no .else -LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack +LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack CONFIGURE_ARGS+= --with-jack=yes .endif -.if !defined(WITH_PULSE) +.if ${PORT_OPTIONS:MPULSE} CONFIGURE_ARGS+= --with-pulse=no .else -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio CONFIGURE_ARGS+= --with-pulse=yes .endif Index: asunder/Makefile =================================================================== --- asunder/Makefile (revision 305743) +++ asunder/Makefile (working copy) @@ -1,7 +1,4 @@ -# New ports collection makefile for: asunder -# Date created: 14 September 2007 -# Whom: frase@frase.id.au -# +# Created by: frase@frase.id.au # $FreeBSD$ PORTNAME= asunder @@ -16,38 +13,37 @@ LIB_DEPENDS= cddb.4:${PORTSDIR}/audio/libcddb RUN_DEPENDS= ${LOCALBASE}/bin/cdparanoia:${PORTSDIR}/audio/cdparanoia -OPTIONS= LAME "lame support" on \ - OGG "ogg-vorbis support" on \ - FLAC "FLAC support" on \ - WAVPACK "WavPack support" off \ - MONKEYAUDIO "Monkey's Audio support" off \ - WINDOWS_CHARS "Allow Windows special chars in filenames" off +OPTIONS_DEFINE= LAME OGG FLAC WAVPACK MONKEYAUDIO WINDOWS_CHARS +OPTIONS_DEFAULT= LAME OGG FLAC +MONKEYAUDIO_DESC= Monkey's Audio support +WINDOWS_CHARS_DESC= Allow Windows special chars in filenames + USE_BZIP2= yes GNU_CONFIGURE= yes USE_GNOME= gtk20 PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README TODO -.include +.include -.if defined(WITH_LAME) +.if ${PORT_OPTIONS:MLAME} RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame .endif -.if defined(WITH_OGG) +.if ${PORT_OPTIONS:MOGG} RUN_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools .endif -.if defined(WITH_FLAC) +.if ${PORT_OPTIONS:MFLAC} RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac .endif -.if defined(WITH_WAVPACK) +.if ${PORT_OPTIONS:MWAVPACK} RUN_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack .endif -.if defined(WITH_MONKEYAUDIO) +.if ${PORT_OPTIONS:MMONKEYAUDIO} RUN_DEPENDS+= mac:${PORTSDIR}/audio/mac .endif @@ -62,4 +58,4 @@ @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ .endif -.include +.include Index: audiere/Makefile =================================================================== --- audiere/Makefile (revision 305743) +++ audiere/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: audiere -# Date created: 12 Sep 2007 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= audiere PORTVERSION= 1.9.4 @@ -30,12 +26,14 @@ CONFIGURE_REPLACES='s|wx_config|no_&|' -OPTIONS= DUMB "Enable DUMB support" on \ - CDAUDIO "Enable libcdaudio support" on \ - VORBIS "Enable ogg vorbis support" on \ - SPEEX "Enable speex support" on -# FLAC "Enable FLAC support" on +#OPTIONS_DEFINE= DUMB CDAUDIO VORBIS SPEEX FLAC +#OPTIONS_DEFAULT= DUMB CDAUDIO VORBIS SPEEX FLAC +OPTIONS_DEFINE= DUMB CDAUDIO VORBIS SPEEX +OPTIONS_DEFAULT= DUMB CDAUDIO VORBIS SPEEX +DUMB_DESC= Enable DUMB support +CDAUDIO_DESC= Enable libcdaudio support + .include # Broken with recent FLAC @@ -45,27 +43,27 @@ CONFIGURE_REPLACES+='/AC_CHECK_LIB/ s|FLAC|no_&|' #.endif -.if !defined(WITHOUT_DUMB) +.if ${PORT_OPTIONS:MDUMB} BUILD_DEPENDS+= ${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb .else CONFIGURE_REPLACES+='/AC_CHECK_LIB/ s|dumb|no_&|' .endif -.if !defined(WITHOUT_CDAUDIO) -LIB_DEPENDS+= cdaudio.1:${PORTSDIR}/audio/libcdaudio +.if ${PORT_OPTIONS:MCDAUDIO} +LIB_DEPENDS+= cdaudio:${PORTSDIR}/audio/libcdaudio .else CONFIGURE_REPLACES+='/AC_CHECK_LIB/ s|cdaudio|no_&|' .endif -.if !defined(WITHOUT_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis \ ogg:${PORTSDIR}/audio/libogg .else CONFIGURE_REPLACES+='/AC_CHECK_HEADER/ s|vorbis|no_&|' .endif -.if !defined(WITHOUT_SPEEX) -LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex +.if ${PORT_OPTIONS:MSPEEX} +LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex .else CONFIGURE_REPLACES+='/AC_CHECK_HEADER/ s|speex|no_&|' .endif Index: aumix/Makefile =================================================================== --- aumix/Makefile (revision 305743) +++ aumix/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: aumix -# Date created: 21 May 1999 -# Whom: Chris Piazza -# +# Created by: Chris Piazza # $FreeBSD$ -# PORTNAME= aumix PORTVERSION= 2.9.1 @@ -34,11 +30,12 @@ PLIST_FILES+= share/aumix/${ii} .endfor -OPTIONS= NLS "Enable NLS support" on \ - GTK2 "Enable GTK2 gui" off +.include -.include -.if defined(WITHOUT_NLS) +OPTIONS_DEFINE= NLS GTK2 +OPTIONS_DEFAULT= NLS + +.if ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+=--disable-nls .else USE_GETTEXT= yes @@ -48,14 +45,14 @@ .endfor .endif -pre-patch: - @${REINPLACE_CMD} -e "s:/etc:${PREFIX}/etc:" ${WRKSRC}/src/common.[ch] - -.if defined(WITH_GTK2) +.if ${PORT_OPTIONS:MGTK2} PKGNAMESUFFIX= -gtk USE_GNOME= gtk20 .else CONFIGURE_ARGS+=--without-gtk .endif -.include +pre-patch: + @${REINPLACE_CMD} -e "s:/etc:${PREFIX}/etc:" ${WRKSRC}/src/common.[ch] + +.include Index: clementine-player/Makefile =================================================================== --- clementine-player/Makefile (revision 305743) +++ clementine-player/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: clementine-player -# Date created: 2010-03-23 -# Whom: Gvozdikov Veniamin -# +# Created by: Gvozdikov Veniamin # $FreeBSD$ -# PORTNAME= clementine PORTVERSION= 1.0.0 @@ -17,10 +13,10 @@ LICENSE= GPLv3 -LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib \ - notify.4:${PORTSDIR}/devel/libnotify \ - xine.2:${PORTSDIR}/multimedia/libxine \ - qjson.0:${PORTSDIR}/devel/qjson +LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \ + notify:${PORTSDIR}/devel/libnotify \ + xine:${PORTSDIR}/multimedia/libxine \ + qjson:${PORTSDIR}/devel/qjson BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs PROJECTHOST= ${PORTNAME}${PKGNAMESUFFIX} @@ -37,36 +33,37 @@ CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" -OPTIONS= VISUALISATION "Visualisations from projectM" off \ - LASTFM "Support Last.fm service (requires ruby)" on \ - GPOD "iPod support" on \ - MTP "MTP device support" on +OPTIONS_DEFINE= VISUALISATION LASTFM GPOD MTP +OPTIONS_DEFAULTS= LASTFM GPOD MTP -.include +VISUALISATION_DESC= Visualisations from projectM +GPOD_DESC= iPod support -.if defined(WITH_VISUALISATION) +.include + +.if ${PORT_OPTIONS:MVISUALISATION} PLIST_SUB+= VSL="" .else CMAKE_ARGS+= -DENABLE_VISUALISATIONS=OFF PLIST_SUB+= VSL="@comment " .endif -.if defined(WITH_LASTFM) -LIB_DEPENDS+= lastfm.0:${PORTSDIR}/audio/liblastfm +.if ${PORT_OPTIONS:MLASTFM} +LIB_DEPENDS+= lastfm:${PORTSDIR}/audio/liblastfm .else CMAKE_ARGS+= -DENABLE_LIBLASTFM=Off .endif -.if defined(WITH_GPOD) -LIB_DEPENDS+= gpod.7:${PORTSDIR}/audio/libgpod +.if ${PORT_OPTIONS:MGPOD} +LIB_DEPENDS+= gpod:${PORTSDIR}/audio/libgpod .else CMAKE_ARGS+= -DENABLE_LIBGPOD=Off .endif -.if defined(WITH_MTP) -LIB_DEPENDS+= mtp.9:${PORTSDIR}/audio/libmtp +.if ${PORT_OPTIONS:MMTP} +LIB_DEPENDS+= mtp:${PORTSDIR}/audio/libmtp .else CMAKE_ARGS+= -DENABLE_LIBMTP=Off .endif -.include +.include Index: clunk/Makefile =================================================================== --- clunk/Makefile (revision 305743) +++ clunk/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: clunk -# Date created: 05 Aug 2009 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= clunk PORTVERSION= 1.2.130 @@ -20,11 +16,11 @@ USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -OPTIONS= SIMD "Enable SIMD support (SSE)" off +OPTIONS_DEFINE= SIMD .include -.if defined(WITH_SIMD) +.if ${PORT_OPTIONS:MSIMD} CMAKE_ARGS+= -DWITH_SSE:BOOL=TRUE .endif Index: cmus/Makefile =================================================================== --- cmus/Makefile (revision 305743) +++ cmus/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: cmus -# Date created: 14 October 2005 -# Whom: Adam Weinberger -# +# Created by: Adam Weinberger # $FreeBSD$ -# PORTNAME= cmus PORTVERSION= 2.4.2 @@ -25,24 +21,14 @@ exampledir=${EXAMPLESDIR} \ CONFIG_ALSA=n -OPTIONS= FLAC "FLAC (Free Lossless Audio Codec) support" Off \ - MAD "MPEG Audio Decoder (libmad) support" On \ - MODPLUG "libmodplug (mod, x3m, ...) support" Off \ - MIKMOD "libmikmod (mod, x3m, ...) support" Off \ - MUSEPACK "libmpcdec (Musepack .mpc) support" Off \ - VORBIS "Ogg/Vorbis support" On \ - TREMOR "Use Tremor as Ogg/Vorbis input plugin" Off \ - MP4 "MPEG-4 AAC support" Off \ - AAC "AAC support" Off \ - WAVPACK "Wavpack support" Off \ - FFMPEG "FFMPEG support" Off \ - LIBAO "Libao cross-platform audio library" Off \ - PULSEAUDIO "Pulseaudio support" Off \ - ARTS "ARTS support" Off +OPTIONS_DEFINE= FLAC MAD MODPLUG MIKMOD MUSEPACK VORBIS TREMOR MP4 AAC WAVPACK FFMPEG LIBAO PULSEAUDIO ARTS +OPTIONS_DEFAULT= MAD VORBIS -.include +LIBAO_DESC= Libao cross-platform audio library -.if defined(WITH_FLAC) +.include + +.if ${PORT_OPTIONS:MFLAC} LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac CONFIGURE_ARGS+=CONFIG_FLAC=y PLIST_SUB+= FLAC="" @@ -51,7 +37,7 @@ PLIST_SUB+= FLAC="@comment " .endif -.if !defined(WITHOUT_MAD) +.if ${PORT_OPTIONS:MMAD} LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad CONFIGURE_ARGS+=CONFIG_MAD=y PLIST_SUB+= MAD="" @@ -60,7 +46,7 @@ PLIST_SUB+= MAD="@comment " .endif -.if defined(WITH_MODPLUG) +.if ${PORT_OPTIONS:MMODPLUG} LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug CONFIGURE_ARGS+=CONFIG_MODPLUG=y PLIST_SUB+= MODPLUG="" @@ -69,7 +55,7 @@ PLIST_SUB+= MODPLUG="@comment " .endif -.if defined(WITH_MIKMOD) +.if ${PORT_OPTIONS:MMIKMOD} LIB_DEPENDS+= mikmod:${PORTSDIR}/audio/libmikmod CONFIGURE_ARGS+=CONFIG_MIKMOD=y PLIST_SUB+= MIKMOD="" @@ -77,7 +63,7 @@ PLIST_SUB+= MIKMOD="@comment " .endif -.if defined(WITH_MUSEPACK) +.if ${PORT_OPTIONS:MMUSEPACK} LIB_DEPENDS+= mpcdec:${PORTSDIR}/audio/musepack CONFIGURE_ARGS+=CONFIG_MPC=y PLIST_SUB+= MPC="" @@ -86,7 +72,7 @@ PLIST_SUB+= MPC="@comment " .endif -.if !defined(WITHOUT_VORBIS) || defined(WITH_TREMOR) +.if ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MTREMOR} LIB_DEPENDS+= vorbisfile:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+=CONFIG_VORBIS=y PLIST_SUB+= VORBIS="" @@ -95,12 +81,12 @@ PLIST_SUB+= VORBIS="@comment " .endif -.if defined(WITH_TREMOR) +.if ${PORT_OPTIONS:MTREMOR} LIB_DEPENDS+= vorbisidec:${PORTSDIR}/audio/libtremor CONFIGURE_ARGS+=CONFIG_TREMOR=y .endif -.if defined(WITH_MP4) +.if ${PORT_OPTIONS:MMP4} LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad LIB_DEPENDS+= mp4v2:${PORTSDIR}/multimedia/mp4v2 CONFIGURE_ARGS+=CONFIG_MP4=y @@ -110,7 +96,7 @@ PLIST_SUB+= MP4="@comment " .endif -.if defined(WITH_AAC) +.if ${PORT_OPTIONS:MAAC} LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad CONFIGURE_ARGS+=CONFIG_AAC=y PLIST_SUB+= AAC="" @@ -119,7 +105,7 @@ PLIST_SUB+= AAC="@comment " .endif -.if defined(WITH_WAVPACK) +.if ${PORT_OPTIONS:MWAVPACK} LIB_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack CONFIGURE_ARGS+=CONFIG_WAVPACK=y PLIST_SUB+= WAVPACK="" @@ -128,8 +114,8 @@ PLIST_SUB+= WAVPACK="@comment " .endif -.if defined(WITH_FFMPEG) -LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +.if ${PORT_OPTIONS:MFFMPEG} +LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg CONFIGURE_ARGS+=CONFIG_FFMPEG=y PLIST_SUB+= FFMPEG="" .else @@ -137,7 +123,7 @@ PLIST_SUB+= FFMPEG="@comment " .endif -.if defined(WITH_LIBAO) +.if ${PORT_OPTIONS:MLIBAO} LIB_DEPENDS+= ao:${PORTSDIR}/audio/libao CONFIGURE_ARGS+=CONFIG_AO=y PLIST_SUB+= AO="" @@ -146,7 +132,7 @@ PLIST_SUB+= AO="@comment " .endif -.if defined(WITH_PULSEAUDIO) +.if ${PORT_OPTIONS:MPULSEAUDIO} LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio CONFIGURE_ARGS+=CONFIG_PULSE=y PLIST_SUB+= PULSEAUDIO="" @@ -155,7 +141,7 @@ PLIST_SUB+= PULSEAUDIO="@comment " .endif -.if defined(WITH_ARTS) +.if ${PORT_OPTIONS:MARTS} LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts CONFIGURE_ARGS+=CONFIG_ARTS=y PLIST_SUB+= ARTS="" @@ -172,4 +158,4 @@ ${WRKSRC}/Makefile ${WRKSRC}/Doc/cmus.txt @${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' ${WRKSRC}/Doc/cmus.txt -.include +.include Index: ezstream/Makefile =================================================================== --- ezstream/Makefile (revision 305743) +++ ezstream/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ezstream -# Date created: 27 Nov 2004 -# Whom: Frank Laszlo -# +# Created by: Frank Laszlo # $FreeBSD$ -# PORTNAME= ezstream PORTVERSION= 0.5.6 @@ -15,11 +11,14 @@ MAINTAINER= ayu@commun.jp COMMENT= A command line utility for streaming to icecast servers -LIB_DEPENDS= shout.5:${PORTSDIR}/audio/libshout2 \ - vorbis.4:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS= shout:${PORTSDIR}/audio/libshout2 \ + vorbis:${PORTSDIR}/audio/libvorbis -OPTIONS= TAGLIB "TagLib support" on +OPTIONS_DEFINE= TAGLIB +OPTIONS_DEFAULT= TAGLIB +TAGLIB_DESC= TagLib support + USE_GNOME= libxml2 USE_ICONV= yes USE_RC_SUBR= ${PORTNAME} @@ -36,12 +35,12 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -.include +.include -.if defined(WITHOUT_TAGLIB) +.if ${PORT_OPTIONS:MTAGLIB} CONFIGURE_ARGS+= --without-taglib .else -LIB_DEPENDS+= tag.1:${PORTSDIR}/audio/taglib +LIB_DEPENDS+= tag:${PORTSDIR}/audio/taglib CONFIGURE_ARGS+= --with-taglib=${LOCALBASE} .endif @@ -65,4 +64,4 @@ @${MKDIR} ${ETCDIR}/ @${INSTALL_DATA} ${WRKSRC}/examples/ezstream_vorbis.xml ${ETCDIR}/ezstream.xml -.include +.include Index: festival/Makefile =================================================================== --- festival/Makefile (revision 305743) +++ festival/Makefile (working copy) @@ -1,11 +1,5 @@ -# New ports collection makefile for: festival -# Date created: 2000-06-11 -# Whom: Trevor Johnson -# based on the NetBSD port -# -# $NetBSD: Makefile,v 1.11 1999/12/28 04:19:58 wiz Exp $ +# Created by: Trevor Johnson # $FreeBSD$ -# PORTNAME= festival PORTVERSION= 1.96 @@ -19,9 +13,11 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Multi-lingual speech synthesis system -OPTIONS= NAS "Enable Network Audio System (NAS) backend" on \ - ESD "Enable ESound backend" on +OPTIONS_DEFINE= NAS ESD +OPTIONS_DEFAULT= NAS ESD +ESD_DESC= Enable ESound backend + DIST_SUBDIR= festival CONFIGURE_WRKSRC= ${WRKDIR}/festival @@ -54,7 +50,7 @@ .include .for m in nas esd -. ifdef WITH_${m:U} +. if ${PORT_OPTIONS:Mm:U} LIB_DEPENDS+= ${m:nas=audio}:${PORTSDIR}/audio/${m:esd=esound} post-patch:: ${REINPLACE_CMD} -e 's,# INCLUDE_MODULES += ${m:U}_AUDIO,INCLUDE_MODULES += ${m:U}_AUDIO,' \ Index: firefly/Makefile =================================================================== --- firefly/Makefile (revision 305743) +++ firefly/Makefile (working copy) @@ -1,8 +1,5 @@ -# New ports collection makefile for: mt-daapd-devel -# Date created: 26 Nov 2007 -# Whom: Mark Foster +# Created by: Mark Foster # $FreeBSD$ -# PORTNAME= firefly PORTVERSION= 1696 @@ -22,8 +19,8 @@ RUN_DEPENDS= oggdec:${PORTSDIR}/audio/vorbis-tools \ flac:${PORTSDIR}/audio/flac LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg \ - sqlite3.8:${PORTSDIR}/databases/sqlite3 \ - id3tag.0:${PORTSDIR}/audio/libid3tag + sqlite3:${PORTSDIR}/databases/sqlite3 \ + id3tag:${PORTSDIR}/audio/libid3tag GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" @@ -45,11 +42,13 @@ USE_LDCONFIG= yes -OPTIONS= JAPANESE "Japanese support in ID3 tags" off +OPTIONS_DEFINE= JAPANESE +JAPANESE_DESC= Japanese support in ID3 tags + .include -.if defined(WITH_JAPANESE) +.if ${PORT_OPTIONS:MJAPANESE} EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_scan-mp3.c USE_ICONV= yes CONFIGURE_ARGS+= --enable-iconv Index: fpc-a52/Makefile =================================================================== --- fpc-a52/Makefile (revision 305743) +++ fpc-a52/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fpc-a52 -# Date created: 2010-04-22 -# Whom: Christopher Key -# +# Created by: Christopher Key # $FreeBSD$ -# PORTREVISION= 0 CATEGORIES= audio lang @@ -18,6 +14,7 @@ WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} EXTRACTUNITDIR+= ${WRKUNITDIR} -OPTIONS= LIBA52 "Install a52 library" on +OPTIONS_DEFINE= A52 +OPTIONS_SET= A52 .include "${MASTERDIR}/Makefile" Index: fpc-mad/Makefile =================================================================== --- fpc-mad/Makefile (revision 305743) +++ fpc-mad/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fpc-mad -# Date created: 2010-04-22 -# Whom: Christopher Key -# +# Created by: Christopher Key # $FreeBSD$ -# PORTREVISION= 0 CATEGORIES= audio lang @@ -18,6 +14,7 @@ WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} EXTRACTUNITDIR+= ${WRKUNITDIR} -OPTIONS= LIBMAD "Install mad library" on +OPTIONS_DEFINE= MAD +OPTIONS_SET= MAD .include "${MASTERDIR}/Makefile" Index: fpc-modplug/Makefile =================================================================== --- fpc-modplug/Makefile (revision 305743) +++ fpc-modplug/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fpc-modplug -# Date created: 2010-04-22 -# Whom: Christopher Key -# +# Created by: Christopher Key # $FreeBSD$ -# PORTREVISION= 0 CATEGORIES= audio lang @@ -18,6 +14,7 @@ WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} EXTRACTUNITDIR+= ${WRKUNITDIR} -OPTIONS= LIBMODPLUG "Install modplug library" on +OPTIONS_DEFINE= MODPLUG +OPTIONS_SET= MODPLUG .include "${MASTERDIR}/Makefile" Index: fpc-oggvorbis/Makefile =================================================================== --- fpc-oggvorbis/Makefile (revision 305743) +++ fpc-oggvorbis/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fpc-oggvorbis -# Date created: 2010-04-22 -# Whom: Christopher Key -# +# Created by: Christopher Key # $FreeBSD$ -# PORTREVISION= 0 CATEGORIES= audio lang @@ -18,7 +14,7 @@ WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} EXTRACTUNITDIR+= ${WRKUNITDIR} -OPTIONS= LIBOGG "Install ogg library" on \ - LIBVORBIS "Install vorbis library" on +OPTIONS_DEFINE= OGG VORBIS +OPTIONS_SET= OGG VORBIS .include "${MASTERDIR}/Makefile" Index: fpc-openal/Makefile =================================================================== --- fpc-openal/Makefile (revision 305743) +++ fpc-openal/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fpc-openal -# Date created: 2010-04-22 -# Whom: Christopher Key -# +# Created by: Christopher Key # $FreeBSD$ -# PORTREVISION= 0 CATEGORIES= audio lang @@ -18,6 +14,7 @@ WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} EXTRACTUNITDIR+= ${WRKUNITDIR} -OPTIONS= OPENAL "Install openal library" on +OPTIONS_DEFINE= OPENAL +OPTIONS_SET= OPENAL .include "${MASTERDIR}/Makefile" Index: fpc-sndfile/Makefile =================================================================== --- fpc-sndfile/Makefile (revision 305743) +++ fpc-sndfile/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fpc-sndfile -# Date created: 2010-04-22 -# Whom: Christopher Key -# +# Created by: Christopher Key # $FreeBSD$ -# PORTREVISION= 0 CATEGORIES= audio lang @@ -18,6 +14,7 @@ WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} EXTRACTUNITDIR+= ${WRKUNITDIR} -OPTIONS= LIBSNDFILE "Install sndfile library" on +OPTIONS_DEFINE= SNDFILE +OPTIONS_SET= SNDFILE .include "${MASTERDIR}/Makefile" Index: gmusicbrowser/Makefile =================================================================== --- gmusicbrowser/Makefile (revision 305743) +++ gmusicbrowser/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gmusicbrowser -# Date created: 2011-10-13 -# Whom: Zhihao Yuan -# +# Created by: Zhihao Yuan # $FreeBSD$ -# PORTNAME= gmusicbrowser PORTVERSION= 1.1.9 @@ -20,28 +16,27 @@ PORTDOCS= AUTHORS COPYING README NEWS INSTALL layout_doc.html PORTDATA= * -OPTIONS= GST "Enable GStreamer backend" Off \ - MPLAYER "Enable mplayer backend" On \ - DBUS "Enable DBus (Gnome multimedia key)" Off \ - WEBKIT "Enable embedded web browser" Off \ - NLS "Enable Native Language Support" On -# 123 "Enable mpg123/ogg123 backend" Off # alsa-only +#OPTIONS_DEFINE= GST MPLAYER DBUS WEBKIT NLS MPG123 +OPTIONS_DEFINE= GSTREAMER MPLAYER DBUS WEBKIT NLS +OPTIONS_DEFAULT= MPLAYER NLS -.include +WEBKIT_DESC= Enable embedded web browser -.if defined(WITH_GST) +.include + +.if ${PORT_OPTIONS:MGSTREAMER} RUN_DEPENDS+= p5-GStreamer>=0:${PORTSDIR}/multimedia/p5-GStreamer .endif -.if defined(WITH_MPLAYER) +.if ${PORT_OPTIONS:MMPLAYER} RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer .endif -.if defined(WITH_DBUS) +.if ${PORT_OPTIONS:MDBUS} RUN_DEPENDS+= p5-Net-DBus>=1.0:${PORTSDIR}/devel/p5-Net-DBus .endif -.if defined(WITH_WEBKIT) +.if ${PORT_OPTIONS:MWEBKIT} RUN_DEPENDS+= p5-Gtk2-WebKit>=0:${PORTSDIR}/www/p5-Gtk2-WebKit .endif @@ -72,4 +67,4 @@ ${FIND} locale -type f | ${SED} "s|^|share/|g" >> ${TMPPLIST}) .endif -.include +.include Index: gnome-media/Makefile =================================================================== --- gnome-media/Makefile (revision 305743) +++ gnome-media/Makefile (working copy) @@ -1,10 +1,5 @@ -# New ports collection makefile for: gnomemedia2 -# Date created: 06 May 2002 -# Whom: Joe Marcus Clarke -# +# Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/audio/gnome-media/Makefile,v 1.155 2010/09/29 08:17:11 kwm Exp $ -# PORTNAME= gnome-media PORTVERSION= 2.32.0 @@ -17,8 +12,8 @@ COMMENT= Multimedia applications for the GNOME 2 desktop BUILD_DEPENDS= xml2po:${PORTSDIR}/textproc/gnome-doc-utils -LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique +LIB_DEPENDS= canberra-gtk:${PORTSDIR}/audio/libcanberra \ + unique-1:${PORTSDIR}/x11-toolkits/unique USE_BZIP2= yes USE_GETTEXT= yes @@ -37,12 +32,13 @@ GCONF_SCHEMAS= gnome-audio-profiles.schemas \ gnome-sound-recorder.schemas -OPTIONS= PULSEAUDIO "Enable Pulse Audio support" on +OPTIONS_DEFINE= PULSEAUDIO +OPTIONS_DEFAULT= PULSEAUDIO .include -.if !defined(WITHOUT_PULSEAUDIO) -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +.if ${PORT_OPTIONS:MPULSEAUDIO} +LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio CONFIGURE_ARGS+=--enable-pulseaudio PLIST_SUB+= PULSE="" .else Index: gnormalize/Makefile =================================================================== --- gnormalize/Makefile (revision 305743) +++ gnormalize/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gnormalize -# Date created: 27 Oct 2007 -# Whom: Denise H. G. -# +# Created by: Denise H. G. # $FreeBSD$ -# PORTNAME= gnormalize PORTVERSION= 0.63 @@ -24,58 +20,51 @@ MAN1= gnormalize.1 -OPTIONS= \ - GNORMALIZE_MP3 "WAV <-> MP3 Support" on \ - GNORMALIZE_OGG "Ogg Encoding and Playback" on \ - GNORMALIZE_MP4 "WAV <-> MP4 Support" on \ - GNORMALIZE_CDRIP "CD Ripping" off \ - GNORMALIZE_CDDB "CDDB Support" off \ - GNORMALIZE_CDPLAY "CD Playback" off \ - GNORMALIZE_FLAC "FLAC Encoding and Playback" off \ - GNORMALIZE_MAC "Monkey's Audio Encoding and Playback" off \ - GNORMALIZE_MPC "MPC (musepack) Audio" off +OPTIONS_DEFINE= MP3 OGG MP4 CDPARANOIA CDDB CDPLAY PLAC MAC MUSEPACK +OPTIONS_DEFAULT= MP3 OGG MP4 -.include +MAC_DESC= Monkey's Audio Encoding and Playback +CDPLAY_DESC= CD Playback -.if defined(WITH_GNORMALIZE_MP3) +.include + +.if ${PORT_OPTIONS:MMP3} RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame \ p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info .endif -.if defined(WITH_GNORMALIZE_OGG) +.if ${PORT_OPTIONS:MOGG} RUN_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools .endif -.if defined(WITH_GNORMALIZE_MP4) +.if ${PORT_OPTIONS:MMP4} RUN_DEPENDS+= faac:${PORTSDIR}/audio/faac \ faad:${PORTSDIR}/audio/faad .endif -.if defined(WITH_GNORMALIZE_CDRIP) -.if defined(WITH_CDDA2WAV) -RUN_DEPENDS+= cdda2wav:${PORTSDIR}/sysutils/cdrtools +.if ${PORT_OPTIONS:MCDPARANOIA} || ${PORT_OPTIONS:MCDDA2WAV} +USE_CDRTOOLS= yes .else RUN_DEPENDS+= cdparanoia:${PORTSDIR}/audio/cdparanoia .endif -.endif -.if defined(WITH_GNORMALIZE_CDDB) +.if ${PORT_OPTIONS:MCDDB} RUN_DEPENDS+= cddb.pl:${PORTSDIR}/audio/p5-CDDB_get .endif -.if defined(WITH_GNORMALIZE_CDPLAY) +.if ${PORT_OPTIONS:MCDPLAY} RUN_DEPENDS+= p5-Audio-CD>=0:${PORTSDIR}/audio/p5-Audio-CD .endif -.if defined(WITH_GNORMALIZE_FLAC) +.if ${PORT_OPTIONS:MFLAC} RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac .endif -.if defined(WITH_GNORMALIZE_MAC) +.if ${PORT_OPTIONS:MMAC} RUN_DEPENDS+= mac:${PORTSDIR}/audio/mac .endif -.if defined(WITH_GNORMALIZE_MPC) +.if ${PORT_OPTIONS:MMUSEPACK} RUN_DEPENDS+= mppenc:${PORTSDIR}/audio/musepack .endif @@ -91,4 +80,4 @@ @${REINPLACE_CMD} -e 's,/usr/share/gnormalize,${DATADIR},' \ ${WRKSRC}/gnormalize -.include +.include Index: goobox/Makefile =================================================================== --- goobox/Makefile (revision 305743) +++ goobox/Makefile (working copy) @@ -1,10 +1,5 @@ -# New ports collection makefile for: guikachu -# Date created: 11 Nov 2004 -# Whom: Alexander Nedotsukov -# +# Created by: Alexander Nedotsukov # $FreeBSD$ -# $MCom: ports/audio/goobox/Makefile,v 1.25 2007/08/15 03:03:09 mezz Exp $ -# PORTNAME= goobox PORTVERSION= 2.2.0 @@ -17,10 +12,10 @@ COMMENT= CD player and ripper for GNOME Desktop environment BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme -LIB_DEPENDS= discid.0:${PORTSDIR}/audio/libdiscid \ - musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \ - brasero-media.3:${PORTSDIR}/sysutils/brasero \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique +LIB_DEPENDS= discid:${PORTSDIR}/audio/libdiscid \ + musicbrainz3:${PORTSDIR}/audio/libmusicbrainz3 \ + brasero-media:${PORTSDIR}/sysutils/brasero \ + unique-1:${PORTSDIR}/x11-toolkits/unique RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme USE_XORG= x11 @@ -37,12 +32,13 @@ GCONF_SCHEMAS= goobox.schemas -OPTIONS= NOTIFY "Enable libnotify support" on +OPTIONS_DEFINE= NOTIFY +OPTIONS_DEFAULT= NOTIFY -.include +.include -.if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify +.if ${PORT_OPTIONS:MNOTIFY} +LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+= --enable-notification .else CONFIGURE_ARGS+= --disable-notification @@ -51,4 +47,4 @@ post-install: @-update-desktop-database -.include +.include Index: gtkpod/Makefile =================================================================== --- gtkpod/Makefile (revision 305743) +++ gtkpod/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gtkpod -# Date created: 28 January 2003 -# Whom: David Le Brun -# +# Created by: David Le Brun # $FreeBSD$ -# PORTNAME= gtkpod PORTVERSION= 1.0.0 @@ -16,8 +12,8 @@ LICENSE= GPLv2 -LIB_DEPENDS= id3tag.0:${PORTSDIR}/audio/libid3tag \ - gpod.7:${PORTSDIR}/audio/libgpod +LIB_DEPENDS= id3tag:${PORTSDIR}/audio/libid3tag \ + gpod:${PORTSDIR}/audio/libgpod USE_GETTEXT= yes USE_GMAKE= yes @@ -30,26 +26,25 @@ PORTDOCS= ChangeLog NEWS README TODOandBUGS.txt TROUBLESHOOTING -OPTIONS= VORBIS "Enable Ogg/Vorbis support" on \ - FLAC "Enable FLAC support" on \ - CURL "Enable coverart download support" on +OPTIONS_DEFINE= VORBIS FLAC CURL +OPTIONS_DEFAULT= VORBIS FLAC CURL -.include +.include -.if defined(WITH_VORBIS) -LIB_DEPENDS+= vorbisfile.6:${PORTSDIR}/audio/libvorbis +.if ${PORT_OPTIONS:MVORBIS} +LIB_DEPENDS+= vorbisfile:${PORTSDIR}/audio/libvorbis .else CONFIGURE_ARGS+= --without-ogg .endif -.if defined(WITH_FLAC) -LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac +.if ${PORT_OPTIONS:MFLAC} +LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac .else CONFIGURE_ARGS+= --without-flac .endif -.if defined(WITH_CURL) -LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl +.if ${PORT_OPTIONS:MCURL} +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl .else CONFIGURE_ARGS+= --without-curl .endif @@ -70,4 +65,4 @@ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif -.include +.include Index: hawkvoice/Makefile =================================================================== --- hawkvoice/Makefile (revision 305743) +++ hawkvoice/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: hawkvoice -# Date created: 2006-03-05 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTNAME= hawkvoice PORTVERSION= 0.91 @@ -27,15 +23,15 @@ WRKSRC= ${WRKDIR}/HawkVoiceDI/src -OPTIONS= OPTIMIZATION "Enable optimization" off +OPTIONS_DEFINE= OPTIMIZED_CFLAGS -.include +.include .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fPIC -DPIC .endif -.if defined(WITH_OPTIMIZATION) +.if ${PORT_OPTIONS:MOPTIMIZE_CFLAGS} CFLAGS+= -funroll-all-loops -ffast-math -fomit-frame-pointer -D_GNU_SOURCE -D_REENTRANT .endif @@ -50,4 +46,4 @@ .endfor .endif -.include +.include Index: herrie/Makefile =================================================================== --- herrie/Makefile (revision 305743) +++ herrie/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: herrie -# Date created: 01 August 2006 -# Whom: Ed Schouten -# +# Created by: Ed Schouten # $FreeBSD$ -# PORTNAME= herrie PORTVERSION= 2.2 @@ -22,64 +18,62 @@ USE_BZIP2= yes USE_GNOME= glib20 -OPTIONS= MAD "MAD MP3 support" on \ - VORBIS "Ogg Vorbis support" on \ - SNDFILE "libsndfile support" off \ - MODPLUG "libmodplug support" off \ - HTTP "HTTP streams and AudioScrobbler support" on \ - LIBAO "LibAO support (breaks chroot)" off \ - XCURSES "Build XCurses version" off \ - XSPF "Support for XSPF playlists" on +OPTIONS_DEFINE= MAD VORBIS SNDFILE MODPLUG HTTP LIBAO XCURSES XSPF +OPTIONS_DEFAULT= MAD VORBIS HTTP XSPF +HTTP_DESC= HTTP streams and AudioScrobbler support +LIBAO_DESC= LibAO support (breaks chroot) +XCURSES_DESC= Build XCurses version + MAN1= herrie.1 MANCOMPRESSED= yes -.include +.include .if ${OSVERSION} < 700033 CONFIGURE_ARGS+=ncurses .endif -.if !defined(WITHOUT_MAD) -LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/mad \ - id3tag.0:${PORTSDIR}/audio/libid3tag +.if ${PORT_OPTIONS:MMAD} +LIB_DEPENDS+= mad:${PORTSDIR}/audio/mad \ + id3tag:${PORTSDIR}/audio/libid3tag .else CONFIGURE_ARGS+=no_mp3 .endif -.if !defined(WITHOUT_VORBIS) -LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis +.if ${PORT_OPTIONS:MVORBIS} +LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis .else CONFIGURE_ARGS+=no_vorbis .endif -.if !defined(WITHOUT_SNDFILE) -LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile +.if ${PORT_OPTIONS:MSNDFILE} +LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile .else CONFIGURE_ARGS+=no_sndfile .endif -.if !defined(WITHOUT_MODPLUG) +.if ${PORT_OPTIONS:MMODPLUG} LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug .else CONFIGURE_ARGS+=no_modplug .endif -.if !defined(WITHOUT_HTTP) +.if ${PORT_OPTIONS:MHTTP} LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl .else CONFIGURE_ARGS+=no_http no_scrobbler .endif -.if !defined(WITHOUT_LIBAO) -LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao +.if ${PORT_OPTIONS:MLIBAO} +LIB_DEPENDS+= ao:${PORTSDIR}/audio/libao CONFIGURE_ARGS+=ao .endif -.if !defined(WITHOUT_XCURSES) -LIB_DEPENDS+= XCurses.2:${PORTSDIR}/devel/pdcurses +.if ${PORT_OPTIONS:MXCURSES} +LIB_DEPENDS+= XCurses:${PORTSDIR}/devel/pdcurses CONFIGURE_ARGS+=xcurses .endif -.if !defined(WITHOUT_XSPF) -LIB_DEPENDS+= xspf.4:${PORTSDIR}/multimedia/libxspf +.if ${PORT_OPTIONS:MXSPF} +LIB_DEPENDS+= xspf:${PORTSDIR}/multimedia/libxspf .else CONFIGURE_ARGS+=no_xspf .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} PLIST_SUB+= NLS="" USE_GETTEXT= yes .else @@ -87,4 +81,4 @@ CONFIGURE_ARGS+=no_nls .endif -.include +.include Index: hydrogen/Makefile =================================================================== --- hydrogen/Makefile (revision 305743) +++ hydrogen/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Hydrogen -# Date created: 23 Jun 2004 -# Whom: Jean-Yves Lefort -# +# Created by: Jean-Yves Lefort # $FreeBSD$ -# PORTNAME= hydrogen PORTVERSION= 0.9.5 @@ -13,32 +9,32 @@ MAINTAINER= devel@stasyan.com COMMENT= An advanced drum machine -LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile \ - tar.0:${PORTSDIR}/devel/libtar \ - lrdf.2:${PORTSDIR}/textproc/liblrdf - LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile \ + tar:${PORTSDIR}/devel/libtar \ + lrdf:${PORTSDIR}/textproc/liblrdf + BROKEN= does not install MAJORVERSION= 0.9.5 USE_QT4= corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml USE_SCONS= yes -OPTIONS= JACK "JACK support" on \ - ALSA "ALSA support" off \ - PORTAUDIO "PortAudio support" off \ - LIBARCHIVE "LibArchive support" off \ - LASH "Lash support" off +OPTIONS_DEFINE= JACK ALSA PORTAUDIO LIBARCHIVE LASH +OPTIONS_DEFAULT= JACK +LIBARCHIVE_DESC= LibArchive support + post-patch: ${REINPLACE_CMD} -e "s|includes = \[\]|includes = \['-I${QT_INCDIR}/QtCore', '-I${QT_INCDIR}/QtXml', '-I${QT_INCDIR}/QtGui', '-I${QT_INCDIR}', '-I${QT_INCDIR}/Qt', '-I${LOCALBASE}/include'\]|g; s|ldflags = \[\]|ldflags = \['-L${QT_LIBDIR}','-L${LOCALBASE}/lib'\,'-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork', '${PTHREAD_LIBS}']|g" ${WRKSRC}/Sconstruct .include SCONS_ENV+= oss=1 -.if defined(WITH_JACK) + +.if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} @@ -47,30 +43,30 @@ SCONS_ENV+= jack=0 .endif -.if defined(WITH_PORTAUDIO) -LIB_DEPENDS+= portaudio.0:${PORTSDIR}/audio/portaudio +.if ${PORT_OPTIONS:MPORTAUDIO} +LIB_DEPENDS+= portaudio:${PORTSDIR}/audio/portaudio SCONS_ENV+= portaudio=1 .else SCONS_ENV+= portaudio=0 .endif -.if defined(WITH_LIBARCHIVE) +.if ${PORT_OPTIONS:MLIBARCHIVE} LIB_DEPENDS+= archive:${PORTSDIR}/archivers/libarchive SCONS_ENV+= libarchive=1 .else SCONS_ENV+= libarchive=0 .endif -.if defined(WITH_ALSA) -LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib +.if ${PORT_OPTIONS:MALSA} +LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins SCONS_ENV+= alsa=1 .else SCONS_ENV+= alsa=0 .endif -.if defined(WITH_LASH) -LIB_DEPENDS+= lash.2:${PORTSDIR}/audio/lash +.if ${PORT_OPTIONS:MLASH} +LIB_DEPENDS+= lash:${PORTSDIR}/audio/lash SCONS_ENV+= lash=1 .else SCONS_ENV+= lash=0 Index: jack-keyboard/Makefile =================================================================== --- jack-keyboard/Makefile (revision 305743) +++ jack-keyboard/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: jack-keyboard -# Date created: 2007-01-23 -# Whom: trasz -# +# Created by: trasz # $FreeBSD$ -# PORTNAME= jack-keyboard DISTVERSION= 2.7.1 @@ -17,7 +13,7 @@ LICENSE= BSD -LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack +LIB_DEPENDS= jack:${PORTSDIR}/audio/jack MAN1= jack-keyboard.1 @@ -26,12 +22,13 @@ USE_CMAKE= yes INSTALLS_ICONS= yes -OPTIONS= LASH "Build with lash support" on +OPTIONS_DEFINE= LASH +OPTIONS_DEFAULT= LASH .include -.if defined(WITH_LASH) -LIB_DEPENDS+= lash.2:${PORTSDIR}/audio/lash +.if ${PORT_OPTIONS:MLASH} +LIB_DEPENDS+= lash:${PORTSDIR}/audio/lash CMAKE_ARGS+= -DLashEnable:BOOL=On .else CMAKE_ARGS+= -DLashEnable:BOOL=Off Index: jack_ghero/Makefile =================================================================== --- jack_ghero/Makefile (revision 305743) +++ jack_ghero/Makefile (working copy) @@ -1,9 +1,5 @@ -# Ports collection makefile for: jack_ghero -# Date created: 21 June 2011 -# Whom: Hans Petter Selasky -# +# Created by: Hans Petter Selasky # $FreeBSD$ -# PORTNAME= jack_ghero PORTVERSION= 1.0.3 @@ -14,9 +10,10 @@ MAINTAINER= hselasky@FreeBSD.org COMMENT= Daemon that converts a GuitarHero device into a JACK MIDI device -LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack +LICENSE= BSD -LICENSE= BSD +LIB_DEPENDS= jack:${PORTSDIR}/audio/jack + USE_BZIP2= yes MAKE_JOBS_SAFE= yes MANCOMPRESSED= yes @@ -24,21 +21,19 @@ PLIST_FILES= sbin/jack_ghero -OPTIONS= DEBUG "Build with debugging support" Off +OPTIONS_DEFINE= DEBUG .include MAKE_ARGS+=" HAVE_MAN=YES" MAKE_ARGS+=" PTHREAD_LIBS=${PTHREAD_LIBS}" -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} MAKE_ARGS+=" HAVE_DEBUG=YES" .endif -.include - .if ${OSVERSION} < 800000 IGNORE= requires usb stack from FreeBSD 8.0-RELEASE or later .endif -.include +.include Index: jack_umidi/Makefile =================================================================== --- jack_umidi/Makefile (revision 305743) +++ jack_umidi/Makefile (working copy) @@ -1,9 +1,5 @@ -# Ports collection makefile for: jack_umidi -# Date created: 21 June 2011 -# Whom: Hans Petter Selasky -# +# Created by: Hans Petter Selasky # $FreeBSD$ -# PORTNAME= jack_umidi PORTVERSION= 1.0.4 @@ -14,9 +10,10 @@ MAINTAINER= hselasky@FreeBSD.org COMMENT= Daemon that converts a raw MIDI device into a JACK MIDI device -LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack +LICENSE= BSD -LICENSE= BSD +LIB_DEPENDS= jack:${PORTSDIR}/audio/jack + USE_BZIP2= yes MAKE_JOBS_SAFE= yes MANCOMPRESSED= yes @@ -24,14 +21,14 @@ PLIST_FILES= sbin/jack_umidi -OPTIONS= DEBUG "Build with debugging support" Off +OPTIONS_DEFINE= DEBUG .include MAKE_ARGS+=" HAVE_MAN=YES" MAKE_ARGS+=" PTHREAD_LIBS=${PTHREAD_LIBS}" -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} MAKE_ARGS+=" HAVE_DEBUG=YES" .endif Index: libcanberra/Makefile =================================================================== --- libcanberra/Makefile (revision 305743) +++ libcanberra/Makefile (working copy) @@ -14,10 +14,11 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Implementation of the Freedesktop sound theme spec -LIB_DEPENDS= vorbisfile.6:${PORTSDIR}/audio/libvorbis - LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LGPL + +LIB_DEPENDS= vorbisfile:${PORTSDIR}/audio/libvorbis + USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack gconf2 USE_LDCONFIG= yes @@ -29,30 +30,30 @@ .if !defined(SLAVEPORT) GCONF_SCHEMAS= libcanberra.schemas -OPTIONS= PULSE "Enable Pulse Audio support" off \ - GSTREAMER "Enable GStreamer audio support" off +OPTIONS_DEFINE= PULSEAUDIO GSTREAMER + .endif PLIST_SUB= VERSION=${PORTVERSION} -.include +.include .if defined(SLAVEPORT) USE_GNOME+= gtk30 -LIB_DEPENDS+= canberra.0:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS+= canberra:${PORTSDIR}/audio/libcanberra CONFIGURE_ARGS+=--enable-gtk3 .else CONFIGURE_ARGS+=--disable-gtk3 -.if !defined(WITHOUT_PULSE) -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +.if ${PORT_OPTIONS:MPULSE} +LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio PLIST_SUB+= PULSE="" .else CONFIGURE_ARGS+=--disable-pulse PLIST_SUB+= PULSE="@comment " .endif -.if !defined(WITHOUT_GSTREAMER) +.if ${PORT_OPTIONS:MGSTREAMER} USE_GSTREAMER= yes PLIST_SUB+= GSTREAMER="" .else @@ -66,4 +67,4 @@ @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure -.include +.include Index: lmms/Makefile =================================================================== --- lmms/Makefile (revision 305743) +++ lmms/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: lmms -# Date created: 04 Dec 2006 -# Whom: Jean-Yves Lefort -# +# Created by: Jean-Yves Lefort # $FreeBSD$ -# PORTNAME= lmms PORTVERSION= 0.4.13 @@ -18,11 +14,11 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa -LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \ - fluidsynth.1:${PORTSDIR}/audio/fluidsynth \ - samplerate.1:${PORTSDIR}/audio/libsamplerate \ - sndfile.1:${PORTSDIR}/audio/libsndfile \ - vorbis.4:${PORTSDIR}/audio/libvorbis \ +LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \ + fluidsynth:${PORTSDIR}/audio/fluidsynth \ + samplerate:${PORTSDIR}/audio/libsamplerate \ + sndfile:${PORTSDIR}/audio/libsndfile \ + vorbis:${PORTSDIR}/audio/libvorbis \ fftw3:${PORTSDIR}/math/fftw3 \ fftw3f:${PORTSDIR}/math/fftw3-float RUN_DEPENDS= ${LOCALBASE}/share/ladspa/rdf/caps.rdf:${PORTSDIR}/audio/caps-plugins \ @@ -31,9 +27,7 @@ ${LOCALBASE}/share/ladspa/rdf/tap-plugins.rdf:${PORTSDIR}/audio/tap-plugins \ update-mime-database:${PORTSDIR}/misc/shared-mime-info -OPTIONS= JACK "Enable JACK support" OFF \ - PULSEAUDIO "Enable PulseAudio support" OFF \ - SDL "Enable SDL support" OFF +OPTIONS_DEFINE= JACK PULSEAUDIO SDL USE_LDCONFIG= yes USE_PKGCONFIG= build @@ -60,19 +54,19 @@ .include -.if defined(WITH_JACK) -LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack +.if ${PORT_OPTIONS:MJACK} +LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack .else CMAKE_ARGS+= -DWANT_JACK:BOOL=OFF .endif -.if defined(WITH_PULSEAUDIO) -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +.if ${PORT_OPTIONS:MPULSEAUDIO} +LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio .else CMAKE_ARGS+= -DWANT_PULSEAUDIO:BOOL=OFF .endif -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL= sdl .else CMAKE_ARGS+= -DWANT_SDL:BOOL=OFF >Release-Note: >Audit-Trail: >Unformatted: