Date: Wed, 21 Nov 2012 21:58:25 GMT From: Chris Petrik <c.petrik.sosa@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/173780: [PATCH] audio/cmus optionsng Message-ID: <201211212158.qALLwPRn030030@red.freebsd.org> Resent-Message-ID: <201211212200.qALM02Yg037574@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173780
>Category: ports
>Synopsis: [PATCH] audio/cmus 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: Wed Nov 21 22:00:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Chris Petrik
>Release:
>Organization:
na
>Environment:
>Description:
OptionsNG Changes
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
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 <bsd.port.pre.mk>
+LIBAO_DESC= Libao cross-platform audio library
-.if defined(WITH_FLAC)
+.include <bsd.port.options.mk>
+
+.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211212158.qALLwPRn030030>