ports/173774: [PATCH] audio/audiere optionsng

[Chris Petrik]

>Number:         173774
>Category:       ports
>Synopsis:       [PATCH] audio/audiere 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:00 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: 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 <amdmi3 at FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3 at FreeBSD.org>
 # $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 <bsd.port.pre.mk>
 
 # 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


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