7 files changed, 86 insertions, 91 deletions

diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index 1c66e97a1ee7..e2da287119cc 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -16,8 +16,7 @@ COMMENT=	MIDI-capable real-time audio processor/synthesizer
 
 LICENSE=	BSD
 
-OPTIONS=	ALSA "Enable ALSA support" off \
-		JACK "Enable JACK support" off
+OPTIONS_DEFINE=	ALSA JACK DOCS
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S;.src;/src;}
 PATCH_WRKSRC=	${WRKSRC}/..
@@ -37,14 +36,14 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_ALSA)
+.if ${PORT_OPTIONS:MALSA}
 LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
 CONFIGURE_ARGS+=	--enable-alsa
 .else
 CONFIGURE_ARGS+=	--disable-alsa
 .endif
 
-.if defined(WITH_JACK)
+.if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 CONFIGURE_ARGS+=	--enable-jack
 .else
@@ -93,7 +92,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/pd-watchdog ${PREFIX}/lib/pd/bin
 	@${MKDIR} ${PREFIX}/lib/pd/tcl
 	${INSTALL_DATA} ${WRKSRC}/../tcl/*.tcl ${PREFIX}/lib/pd/tcl
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@(${TAR} -C ${WRKSRC}/../doc --exclude "*.bak" --exclude "*.orig" \
 		-cf - . | ${TAR} -C ${DOCSDIR} --unlink -xf -)
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 51ef75f66b92..a9f9fcb76e7d 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -22,10 +22,9 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	GNOME "use GNOME 1.x (enables envelope editors)" off \
-		I386_ASM "i386 asm optimizations (potentially unstable)" off \
-		JACK "JACK support" off \
-		SDL "SDL support" off
+OPTIONS_DEFINE=	GNOME1 I386_ASM JACK SDL NLS
+GNOME1_DESC=	use GNOME 1.x (enables envelope editors)
+I386_ASM_DESC=	i386 asm optimizations (potentially unstable)
 
 DESKTOP_ENTRIES="SoundTracker" \
 		"Compose music" \
@@ -36,35 +35,35 @@ DESKTOP_ENTRIES="SoundTracker" \
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386" && defined(WITH_I386_ASM)
+.if ${ARCH} == "i386" && ${PORT_OPTIONS:MI386_ASM}
 CONFIGURE_ARGS+=	--enable-asm
 .endif
 
-.if defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGNOME}
 USE_GNOME+=	gnomelibs gnomeprefix
 CONFIGURE_ARGS+=	--enable-gnome
 .else
 CONFIGURE_ARGS+=	--disable-gnome
 .endif
 
-.if defined(WITH_JACK)
+.if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=		jack.0:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=	--disable-jack
 .endif
 
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
 .else
 CONFIGURE_ARGS+=	--disable-sdl
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
@@ -78,7 +77,7 @@ post-patch:
 		${WRKSRC}/app/gui.c
 
 pre-build:
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt -c -o ja.gmo ja.po
 .endif
 
diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index 68989c0b891f..fa70c2c82666 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -18,12 +18,10 @@ COMMENT=	Slim Devices audio streaming server
 
 # Defaults support playback of relativly unrestricted formats on SB2 or
 # SB3 devices and wired SB1 devices.
-OPTIONS=	APE "Support Monkey's Audio Codec input" on \
-		FAAD "Support AAC input via FAAD" on \
-		FLAC "Support FLAC output (and input on SliMP3 and SB1)" on \
-		LAME "Support MP3 output via LAME" off \
-		SHORTEN "Support Shorten input" off \
-		SOX "Support OGG Vorbis input via SoX (SliMP3 and SB1)" on
+OPTIONS_DEFINE=	APE FAAD FLAC LAME SHORTEN SOX DOCS
+OPTIONS_DEFAULT=	APE FAAD FLAX SOX
+SHORTEN_DESC=	Support Shorten input
+SOX_DESC=	Support OGG Vorbis input via SoX (SliMP3 and SB1)
 
 RESTRICTED=	Contains non-redistributable firmware, documentation, and images
 
@@ -61,22 +59,22 @@ RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
 USE_MYSQL=	server
 WANT_MYSQL_VER=	50
 
-.if !defined(WITHOUT_APE)
+.if ${PORT_OPTIONS:MAPE}
 RUN_DEPENDS+=	mac:${PORTSDIR}/audio/mac
 .endif
-.if !defined(WITHOUT_FAAD)
+.if ${PORT_OPTIONS:MFAAD}
 RUN_DEPENDS+=	faad:${PORTSDIR}/audio/faad
 .endif
-.if !defined(WITHOUT_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
 RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
 .endif
-.if !defined(WITHOUT_LAME)
+.if ${PORT_OPTIONS:MLAME}
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 .endif
-.if !defined(WITHOUT_SHORTEN)
+.if ${PORT_OPTIONS:MSHORTEN}
 RUN_DEPENDS+=	shorten:${PORTSDIR}/audio/shorten
 .endif
-.if !defined(WITHOUT_SOX)
+.if ${PORT_OPTIONS:MSOX}
 RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
 .endif
 
@@ -187,7 +185,7 @@ do-build:
 .for _CONF in ${CONFFILES}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${_CONF} ${TMP_SLIMDIR}/${_CONF}.sample
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${TMP_DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${TMP_DOCSDIR}
 .endif
@@ -210,7 +208,7 @@ do-install:
 	    ${LOCALBASE}/share/mysql/english/errmsg.sys \
 	    ${PREFIX}/${SLIMDIR}/MySQL/
 	@${INSTALL_SCRIPT} ${WRKDIR}/softsqueeze.sh ${PREFIX}/bin/softsqueeze
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${TMP_DOCSDIR} && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 9709c8e7626a..cfc6dfef69e3 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -26,59 +26,60 @@ GNU_CONFIGURE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
-OPTIONS=		SHOUTCAST "SHOUTcast plugin" on \
-			LIVE365 "Live365 plugin" on \
-			XIPH "Xiph plugin" on \
-			LOCAL "Local plugin" on \
-			LOCAL_METADATA "metadata support for the Local plugin" on \
-			PYTHON "Python plugin" on
+OPTIONS_DEFINE=	SHOUTCAST LIVE365 XIPH LOCAL LOCAL_METADATA
+OPTIONS_DEFAULT=	SHOUTCAST LIVE365 XIPH LOCAL LOCAL_METADATA
+SHOUTCAST_DESC=	SHOUTcast plugin
+LIVE365_DESC=	Live365 plugin
+LOCAL_DESC=	Local plugin
+LOCAL_METADATA_DESC=	metadata support for the Local plugin
+XIPH_DESC=	Xiph plugin
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_SHOUTCAST)
+.if ${PORT_OPTIONS:MSHOUTCAST}
+PLIST_SUB+=		SHOUTCAST=""
+.else
 CONFIGURE_ARGS+=	--disable-shoutcast
 PLIST_SUB+=		SHOUTCAST="@comment "
-.else
-PLIST_SUB+=		SHOUTCAST=""
 .endif
 
-.if defined(WITHOUT_LIVE365)
+.if ${PORT_OPTIONS:MLIVE365}
+PLIST_SUB+=		LIVE365=""
+.else
 CONFIGURE_ARGS+=	--disable-live365
 PLIST_SUB+=		LIVE365="@comment "
-.else
-PLIST_SUB+=		LIVE365=""
 .endif
 
-.if defined(WITHOUT_XIPH)
-CONFIGURE_ARGS+=	--disable-xiph
-PLIST_SUB+=		XIPH="@comment "
-.else
+.if ${PORT_OPTIONS:MXIPH}
 PLIST_SUB+=		XIPH=""
 USE_GNOME+=		libxml2
+.else
+CONFIGURE_ARGS+=	--disable-xiph
+PLIST_SUB+=		XIPH="@comment "
 .endif
 
-.if defined(WITHOUT_LOCAL)
-CONFIGURE_ARGS+=	--disable-local
-PLIST_SUB+=		LOCAL="@comment "
-.else
+.if ${PORT_OPTIONS:MLOCAL}
 PLIST_SUB+=		LOCAL=""
-.if defined(WITHOUT_LOCAL_METADATA)
-CONFIGURE_ARGS+=	--disable-local-metadata
-.else
+.if ${PORT_OPTIONS:MLOCAL_METADATA}
 LIB_DEPENDS+=		tag_c:${PORTSDIR}/audio/taglib
+.else
+CONFIGURE_ARGS+=	--disable-local-metadata
 .endif
+.else
+CONFIGURE_ARGS+=	--disable-local
+PLIST_SUB+=		LOCAL="@comment "
 .endif
 
-.if defined(WITHOUT_PYTHON)
-CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=		PYTHON="@comment "
-.else
+.if ${PORT_OPTIONS:MPYTHON}
 PLIST_SUB+=		PYTHON=""
 USE_PYTHON=		2.5+
 # we need to manually include this, because USE_PYTHON is defined
 # after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 USE_GNOME+=		pygtk2
+.else
+CONFIGURE_ARGS+=	--disable-python
+PLIST_SUB+=		PYTHON="@comment "
 .endif
 
 post-patch:
@@ -86,4 +87,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|[(]datadir[)]/help|(datadir)/gnome/help|g' \
 		${WRKSRC}/help/C/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index e1415dfaa8b7..a4dccee2d6b8 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -31,25 +31,25 @@ USE_LDCONFIG=	yes
 
 CFLAGS+=	-fPIC -DPIC
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
+OPTIONS_DEFINE=	NLS 3DNOW SSE
+3DNOW_DESC=	use 3DNow! instructions
+SSE_DESC=	use SSE instructions
+
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 LDFLAGS+=	-lintl
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
-OPTIONS=	3DNOW "use 3DNow! instructions" off \
-		SSE "use SSE instructions" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_3DNOW)
+.if ${PORT_OPTIONS:M3DNOW}
 CONFIGURE_ARGS+=	--enable-3dnow
 .endif
 
-.if defined(WITH_SSE)
+.if ${PORT_OPTIONS:MSSE}
 CONFIGURE_ARGS+=	--enable-sse
 .endif
 
@@ -59,4 +59,4 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|<stdint\.h>|<inttypes.h>|g' ${WRKSRC}/ladspa-util.h
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 95a742f35765..ea368d2b88a8 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -23,12 +23,10 @@ BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		lrdf.2:${PORTSDIR}/textproc/liblrdf
 
-OPTIONS=	ALSA "ALSA support" off \
-		JACK "JACK support" on \
-		MPG123 "mpg123 support" on \
-		SOX "sox (.au) support" on \
-		VORBIS "OGG Vorbis support" on \
-		MAD "MPEG Audio Decoder (libmad) support" on
+OPTIONS_DEFINE=	ALSA JACK MPG123 SOX VORBIS MAD
+OPTIONS_DEFAULT=	JACK MPG123 SOX VORBIS MAD
+SOX_DESC=	sox (.au) support
+MPG123_DESC=	mpg123 support
 
 USE_BZIP2=	yes
 USE_XORG=	x11 xext xi xxf86dga ice sm
@@ -46,40 +44,40 @@ MAN1=		terminatorX.1
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_ALSA)
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
-.else
+.if ${PORT_OPTIONS:MALSA}
 CONFIGURE_ARGS+=	--disable-alsa
+.else
+LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
 .endif
 
-.if !defined(WITHOUT_JACK)
+.if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=	--disable-jack
 .endif
 
-.if !defined(WITHOUT_MPG123)
+.if ${PORT_OPTIONS:MMPG123}
 BUILD_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123
 .else
 CONFIGURE_ARGS+=	--disable-mpg123
 .endif
 
-.if !defined(WITHOUT_SOX)
+.if ${PORT_OPTIONS:MSOX}
 BUILD_DEPENDS+=	sox:${PORTSDIR}/audio/sox
 .else
 CONFIGURE_ARGS+=	--disable-sox
 .endif
 
-.if !defined(WITHOUT_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 BUILD_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--disable-vorbis
 .endif
 
-.if !defined(WITHOUT_MAD)
+.if ${PORT_OPTIONS:MMAD}
 LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/mad
 .else
 CONFIGURE_ARGS+=	--disable-mad
@@ -116,4 +114,4 @@ do-install:
 		${PREFIX}/share/omf/terminatorX/terminatorX-C.omf
 	@scrollkeeper-install -q ${PREFIX}/share/omf/terminatorX/terminatorX-C.omf 2>/dev/null || ${TRUE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/timemachine/Makefile b/audio/timemachine/Makefile
index c9493acc31bc..12c08ef7341e 100644
--- a/audio/timemachine/Makefile
+++ b/audio/timemachine/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
 		lo.7:${PORTSDIR}/audio/liblo \
 		sndfile.1:${PORTSDIR}/audio/libsndfile
 
-OPTIONS=	LASH "Enable LASH support" off
+OPTIONS_DEFINE=	LASH
 
 USE_GNOME=	gnomehack gtk20
 USE_GMAKE=	yes
@@ -29,7 +29,7 @@ MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_LASH)
+.if ${PORT_OPTIONS:MLASH}
 LIB_DEPENDS+=	lash.2:${PORTSDIR}/audio/lash
 .else
 CONFIGURE_ARGS+=--disable-lash