ports/173776: [PATCH] audio/aqualung optionsng

[Chris Petrik]

>Number:         173776
>Category:       ports
>Synopsis:       [PATCH] audio/aqualung 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 21:50: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: 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 <infofarmer at FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	aqualung
 DISTVERSION=	0.9beta11
@@ -15,26 +11,26 @@
 MAINTAINER=	jsa at 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 <bsd.port.options.mk>
 
-.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


>Release-Note:
>Audit-Trail:
>Unformatted: