Convert to new option framework

8 files changed, 61 insertions, 60 deletions

diff --git a/multimedia/abby/Makefile b/multimedia/abby/Makefile
index c67d2215eb84..eff38c2a5309 100644
--- a/multimedia/abby/Makefile
+++ b/multimedia/abby/Makefile
@@ -14,7 +14,9 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Front-end for c/clive
 
-OPTIONS=	CCLIVE "Use cclive backend (instead of clive)" on
+OPTIONS_DEFINE=	CCLIVE
+OPTIONS_DEFAULT=	CCLIVE
+CCLIVE_DESC=	Use cclive backend (instead of clive)
 
 USE_BZIP2=	yes
 USE_QT4=	gui network xml moc_build qmake_build rcc_build uic_build
@@ -24,9 +26,9 @@ QMAKE_PRO=	abby.pro
 
 PLIST_FILES=	bin/abby
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CCLIVE)
+.if ${PORT_OPTIONS:MCCLIVE}
 RUN_DEPENDS+=	cclive>=0.5.6:${PORTSDIR}/multimedia/cclive
 .else
 RUN_DEPENDS+=	clive>=2.2.5:${PORTSDIR}/multimedia/clive
@@ -38,4 +40,4 @@ do-configure:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/abby ${PREFIX}/bin/abby
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index a65d98e9f09d..22dceedb4a67 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -34,15 +34,15 @@ INPUT_PLUGINS=	cdaudio,mpg123,wav
 OUTPUT_PLUGINS=	OSS
 VISUALIZATION_PLUGINS=	blur_scope
 
-OPTIONS=	VORBIS	"Enable Ogg Vorbis support" on \
-		ESOUND	"Enable Esound support"  off \
-		3DNOW	"Enable 3DNow! optimized decoding routines" on \
-		IPV6	"Enable IPv6 support" off
+OPTIONS_DEFINE=	VORBIS ESOUND 3DNOW IPV6
+OTPIONS_DEFAULT=	VORBIS 3DNOW
 
-.include <bsd.port.pre.mk>
+3DNOW_DESC=	3DNow! optimized decoding routines
+
+.include <bsd.port.options.mk>
 
 # Enable IPv6 support
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 PATCH_SITES+=	http://izb.knu.ac.kr/~bh/diffs/
 PATCHFILES+=	bmp-0.9.7-ipv6-simple.diff
 PATCH_DIST_STRIP+=	-p1
@@ -51,7 +51,7 @@ PATCH_DIST_STRIP+=	-p1
 CONFIGURE_ARGS+=	--disable-mikmod
 PLIST_SUB+=	MIKMODPLUGIN:="@comment "
 
-.if !defined(WITHOUT_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 INPUT_PLUGINS+=	vorbis
 PLIST_SUB+=	VORBISPLUGIN:=""
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--disable-vorbis
 PLIST_SUB+=	VORBISPLUGIN:="@comment "
 .endif
 
-.if defined(WITH_ESOUND)
+.if ${PORT_OPTIONS:MESOUND}
 USE_GNOME+=	esound
 OUTPUT_PLUGINS+=	esd
 PLIST_SUB+=	ESDPLUGIN:=""
@@ -74,11 +74,7 @@ CONFIGURE_ARGS+=	--disable-esd
 PLIST_SUB+=	ESDPLUGIN:="@comment "
 .endif
 
-.if ${ARCH} != "i386"
-WITHOUT_3DNOW=	yes
-.endif
-
-.if !defined(WITHOUT_3DNOW)
+.if ${PORT_OPTIONS:M3DNOW} && ${ARCH} != "i386"
 CONFIGURE_ARGS+=	--enable-3dnow
 .endif
 
@@ -97,4 +93,4 @@ post-install:
 	-@update-desktop-database
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 1929bda49c43..8813b81f61ad 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -19,9 +19,8 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/nspr \
 		xine.2:${PORTSDIR}/multimedia/libxine
 
-OPTIONS=	MOZILLA_PLUGIN "Install Mozilla plugin" off \
-		GNOME "Enable Gnome integration" off \
-		LIRC "Enable lirc support" off
+OPTIONS_DEFINE=	MOZILLA_PLUGIN GNOME LIRC
+MOZILLA_PLUGIN_DESC=	Mozilla plugin
 
 USE_XZ=		yes
 USE_GNOME=	gnomehack gtk20
@@ -43,7 +42,7 @@ MANCOMPRESSED=	no
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_MOZILLA_PLUGIN)
+.if ${PORT_OPTIONS:MMOZILLA_PLUGIN}
 USE_XORG+=	xaw
 USE_WEBPLUGINS=	native
 WEBPLUGINS_DIR=	${PREFIX}/lib/gxine
@@ -55,7 +54,7 @@ CONFIGURE_ARGS+=--without-browser-plugin
 PLIST_SUB+=	MOZILLA_PLUGIN="@comment "
 .endif
 
-.if defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGNOME}
 BUILD_DEPENDS+=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS+=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
@@ -64,7 +63,7 @@ CONFIGURE_ARGS+=--with-dbus
 CONFIGURE_ARGS+=--disable-integration-wizard --without-dbus
 .endif
 
-.if defined(WITH_LIRC)
+.if ${PORT_OPTIONS:MLIRC}
 LIB_DEPENDS+=	lirc_client.2:${PORTSDIR}/comms/lirc
 CONFIGURE_ARGS+=--enable-lirc
 .else
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index ca10c8dc88ad..664baeb84553 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -42,14 +42,16 @@ CONFIGURE_ENV+=	AKODE_CONFIG=${LOCALBASE}/bin/akode-config
 USE_LDCONFIG=	yes
 DO_NOT_COMPILE+=akode juk mpeglib mpeglib_artsplug xine_artsplugin
 
-OPTIONS=	AKODE "Use akode for audio playback" on \
-		MPEGLIB "Use mpeglib for audio playback" off \
-		XINE "Enable support for video playback using libxine" off
+OPTIONS_DEFINE=	AKODE MPEGLIB XINE
+OPTIONS_DEFAULT=	AKODE
+AKODE_DESC=	akode for audio playback
+MPEGLIB_DESC=	Use mpeglib for audio playback
+XINE_DESC=	support for video playback using libxine
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_AKODE)
+.if ${PORT_OPTIONS:MAKODE}
 LIB_DEPENDS+=	akode:${PORTSDIR}/audio/akode
 RUN_DEPENDS+=	${LOCALBASE}/lib/libakode.so:${PORTSDIR}/audio/akode
 PLIST_SUB+= AKODE=""
@@ -58,11 +60,11 @@ DO_NOT_COMPILE+=akode_artsplugin
 PLIST_SUB+= AKODE="@comment "
 .endif
 
-.if defined(WITH_XINE)
+.if ${PORT_OPTIONS:MXINE}
 RUN_DEPENDS+=	${LOCALBASE}/lib/libarts_xine.la:${PORTSDIR}/multimedia/xine_artsplugin
 .endif
 
-.if defined(WITH_MPEGLIB)
+.if ${PORT_OPTIONS:MMPEGLIB}
 RUN_DEPENDS+=	mpeglibartsplay:${PORTSDIR}/audio/mpeglib_artsplug
 .endif
 
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 34e63e0a56d1..7769540af203 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -20,8 +20,9 @@ LIB_DEPENDS=	dv.4:${PORTSDIR}/multimedia/libdv	\
 RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder	\
 		mplex:${PORTSDIR}/multimedia/mjpegtools
 
-OPTIONS=	QUICKTIME "With Quicktime support" off	\
-		FFMPEG_KINO "With ffmpeg-kino" off
+OPTIONS_DEFINE=	QUICKTIME FFMPEG_KINO
+QUICKTIME_DESC=	With Quicktime support
+FFMPEG_KINO_DESC=	With ffmpeg-kino
 
 USE_XORG=	x11 xv ice
 USE_AUTOTOOLS=	autoconf
@@ -38,18 +39,18 @@ LDFLAGS+=	-L${LOCALBASE}/lib/libquicktime	\
 CONFIGURE_ARGS=	--with-dv1394
 MAN1=	kino.1 kino2raw.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_FFMPEG_KINO)
+.if ${PORT_OPTIONS:MFFMPEG_KINO}
 MAN1+=	ffmpeg-kino.1
 .endif
 
-.if defined(WITH_QUICKTIME)
+.if ${PORT_OPTIONS:MQUICKTIME}
 LIB_DEPENDS+=	quicktime.0:${PORTSDIR}/multimedia/libquicktime
 CONFIGURE_ARGS+=	--enable-quicktime
 .endif
 
-.if defined(WITH_FFMPEG_KINO)
+.if ${PORT_OPTIONS:MFFMPEG_KINO}
 PLIST_SUB+=	FFMPEG_KINO=""
 .else
 CONFIGURE_ARGS+=	--disable-local-ffmpeg
@@ -57,4 +58,4 @@ PLIST_SUB+=	FFMPEG_KINO="@comment "
 LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index c0006cd6cb38..4bc87a17d88f 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -35,10 +35,11 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	atk glib20 gtk20 libxml2 pango # See above
 USE_XORG=	xv
 
-OPTIONS=	ARTS	  "ARts audio system support" on \
-		GSTREAMER "GStreamer playback support" off \
-		TUBESTUFF "YouTube and other 'download & play' support" off \
-		XINE	  "Xine playback support" off
+OPTIONS_DEFINE=	ARTS GSTREAMER TUBESTUFF XINE DOCS
+OPTIONS_DEFAULT=	ARTS
+GSTREAMER_DESC=	GStreamer playback support
+TUBESTUFF_DESC=	YouTube and other 'download & play' support
+XINE_DESC=	Xine playback support
 
 CONFIGURE_ENV+=	PKG_CONFIG=${LOCALBASE}/bin/pkg-config
 
@@ -49,25 +50,25 @@ post-patch:
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_ARTS)
+.if empty(PORT_OPTIONS:MARTS)
 CONFIGURE_ARGS+=--without-arts
-.endif # WITHOUT_ARTS
+.endif
 
-.if defined(WITH_GSTREAMER)
+.if ${PORT_OPTIONS:MGSTREAMER}
 USE_GSTREAMER+=	yes
 PLIST_FILES+=	bin/kgstplayer
 .else
 CONFIGURE_ARGS+=--without-gstreamer
-.endif # WITH_GSTREAMER
+.endif
 
-.if defined(WITH_XINE)
+.if ${PORT_OPTIONS:MXINE}
 LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
 PLIST_FILES+=	bin/kxineplayer
 .else
 CONFIGURE_ARGS+=--without-xine
 .endif # WITH_XINE
 
-.if defined(WITH_TUBESTUFF)
+.if ${PORT_OPTIONS:MTUBESTUFF}
 TUBESTUFF_VER=	20080314
 DISTFILES+=	tubestuff-${TUBESTUFF_VER}.tbz
 BUILD_DEPENDS+=	mencoder:${PORTSDIR}/multimedia/mencoder
@@ -88,11 +89,11 @@ pre-install:
 post-install:
 	cd ${WRKDIR}/tubestuff && ./make_install
 
-.if defined(NOPORTDOCS)
-	${RM} ${PREFIX}/share/apps/kmplayer/tubestuff/README
-.else
+.if ${PORT_OPTIONS:MDOCs}
 PLIST_FILES+=	share/apps/kmplayer/tubestuff/README
-.endif # NOPORTDOCS
+.else
+	${RM} ${PREFIX}/share/apps/kmplayer/tubestuff/README
+.endif
 
 PLIST_FILES+=	share/apps/kmplayer/tubestuff/altertube-dl \
 		share/apps/kmplayer/tubestuff/blip-dl \
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index c270ffa6f2cf..632e4ad4ee41 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Advanced editing and manipulation of MPEG streams
 
 LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52
 
-OPTIONS=	MMX "Enable MMX instruction set (i386 only)" off
+OPTIONS_DEFINE=	MMX DOCS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -38,9 +38,9 @@ LDFLAGS+=	-lm -L${LOCALBASE}/lib -la52 ${PTHREAD_LIBS}
 
 NASM?=		${LOCALBASE}/bin/nasm
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MMX) && (${ARCH} == "i386")
+.if ${PORT_OPTIONS:MMMX} && (${ARCH} == "i386")
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 MAKE_ARGS+=	USE_MMX=1 NASM="${NASM}"
 CFLAGS+=	-DHAVE_MMX
@@ -65,11 +65,11 @@ do-install:
 .for file in ${LIB_FILES}
 	cd ${WRKSRC}/obj && ${INSTALL_DATA} ${file} ${PREFIX}/lib
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
 	cd ${WRKSRC}/docs && ${INSTALL_DATA} ${file} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index 8b80f2b5f801..6355aee310ce 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -24,11 +24,11 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 PKGDEINSTALL=	${PKGINSTALL}
 
-OPTIONS=	DEBUG "Turn on debugging" off
+OPTIONS_DEFINE=	DEBUG
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug=no
 .endif
 
@@ -50,4 +50,4 @@ post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
 		${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>