ports/173807: [PATCH] accessibility/speech-dispatcher optionsng

[Chris Petrik]

>Number:         173807
>Category:       ports
>Synopsis:       [PATCH] accessibility/speech-dispatcher 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: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: speech-dispatcher/Makefile
===================================================================
--- speech-dispatcher/Makefile	(revision 305485)
+++ speech-dispatcher/Makefile	(working copy)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	speech-dispatcher
-# Date created:				8 December 2009
-# Whom:					Alberto Villa <villa.alberto at gmail.com>
-#
+# Created by: Alberto Villa <villa.alberto at gmail.com>
 # $FreeBSD$
 
 PORTNAME=	speech-dispatcher
@@ -16,8 +13,8 @@
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	dotconf.0:${PORTSDIR}/devel/dotconf \
-		sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	dotconf:${PORTSDIR}/devel/dotconf \
+		sndfile:${PORTSDIR}/audio/libsndfile
 
 # gnomehier is required because of share/sounds directory.
 USE_GNOME=	glib20 gnomehier pkgconfig
@@ -42,30 +39,29 @@
 
 INFO=		spd-say ${PORTNAME} ssip
 
-OPTIONS=	ALSA	"ALSA support" off \
-		ESPEAK	"eSpeak output module" on \
-		FESTIVAL	"Festival output module" off \
-		FLITE	"Festival Lite output module" off \
-		LIBAO	"libao support" off \
-		NAS	"Network Audio System support" off \
-		PULSEAUDIO	"PulseAudio support" off \
-		PYTHON	"Python support" off
+OPTIONS_DEFINE=	ALSA ESPEAK FESTIVAL FLITE FLITE LIBAO NAS PULSEAUDIO PYTHON
+OPTIONS_DEFAULT=	ESPEAK
 
+ESPEAK_DESC=	eSpeak output module
+FESTIVAL_DESC=	Festival output module
+FLITE_DESC=	Festival Lite output module
+LIBAO_DESC=	libao support
+
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 800067 && ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
 .endif
 
-.ifdef(WITH_ALSA)
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+.if ${PORT_OPTIONS:MALSA}
+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
 CONFIGURE_ARGS+=	--with-alsa
 .else
 CONFIGURE_ARGS+=	--without-alsa
 .endif
 
-.ifndef(WITHOUT_ESPEAK)
-LIB_DEPENDS+=	espeak.1:${PORTSDIR}/audio/espeak
+.if ${PORT_OPTIONS:MESPEAK}
+LIB_DEPENDS+=	espeak:${PORTSDIR}/audio/espeak
 CONFIGURE_ARGS+=	--with-espeak
 PLIST_SUB+=	ESPEAK=""
 .else
@@ -73,12 +69,12 @@
 PLIST_SUB+=	ESPEAK="@comment "
 .endif
 
-.ifdef(WITH_FESTIVAL)
+.if ${PORT_OPTIONS:MFESTIVAL}
 RUN_DEPENDS+=	festival:${PORTSDIR}/audio/festival \
 		${LOCALBASE}/share/festival/lib/${PORTNAME}.scm:${PORTSDIR}/audio/festival-freebsoft-utils
 .endif
 
-.ifdef(WITH_FLITE)
+.if ${PORT_OPTIONS:MFLITE}
 BUILD_DEPENDS+=	flite:${PORTSDIR}/audio/flite
 RUN_DEPENDS+=	flite:${PORTSDIR}/audio/flite
 CONFIGURE_ARGS+=	--with-flite
@@ -88,28 +84,28 @@
 PLIST_SUB+=	FLITE="@comment "
 .endif
 
-.ifdef(WITH_LIBAO)
-LIB_DEPENDS+=	ao.4:${PORTSDIR}/audio/libao
+.if ${PORT_OPTIONS:MLIBAO}
+LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
 CONFIGURE_ARGS+=	--with-libao
 .else
 CONFIGURE_ARGS+=	--without-libao
 .endif
 
-.ifdef(WITH_NAS)
-LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
+.if ${PORT_OPTIONS:MNAS}
+LIB_DEPENDS+=	audio:${PORTSDIR}/audio/nas
 CONFIGURE_ARGS+=	--with-nas
 .else
 CONFIGURE_ARGS+=	--without-nas
 .endif
 
-.if defined(WITH_PULSEAUDIO) && ${OSVERSION} >= 700041
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.if ${PORT_OPTIONS:MPULSEAUDIO} && ${OSVERSION} >= 700041
+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
 CONFIGURE_ARGS+=	--with-pulse
 .else
 CONFIGURE_ARGS+=	--without-pulse
 .endif
 
-.ifdef(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	2.5+
 CONFIGURE_ARGS+=	--enable-python
 PLIST_SUB+=	PYTHON=""


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