6 files changed, 179 insertions, 185 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 0888d928f35d..7257a6dec95d 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -16,23 +16,23 @@ DISTNAME=	${PORTNAME}-lib-${PORTVERSION}
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
 
-LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
-		vorbis.4:${PORTSDIR}/audio/libvorbis \
-		speex.1:${PORTSDIR}/audio/speex \
-		mng.1:${PORTSDIR}/graphics/libmng \
+LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
+		vorbis:${PORTSDIR}/audio/libvorbis \
+		speex:${PORTSDIR}/audio/speex \
+		mng:${PORTSDIR}/graphics/libmng \
 		png15:${PORTSDIR}/graphics/png \
-		dvdread.4:${PORTSDIR}/multimedia/libdvdread \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		fame-0.9.1:${PORTSDIR}/multimedia/libfame \
-		cdio.13:${PORTSDIR}/sysutils/libcdio \
-		modplug.1:${PORTSDIR}/audio/libmodplug \
-		vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
-		theora.0:${PORTSDIR}/multimedia/libtheora \
-		mad.2:${PORTSDIR}/audio/libmad \
-		dca.0:${PORTSDIR}/multimedia/libdca \
-		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		faad.2:${PORTSDIR}/audio/faad \
-		vdpau.1:${PORTSDIR}/multimedia/libvdpau
+		dvdread:${PORTSDIR}/multimedia/libdvdread \
+		freetype:${PORTSDIR}/print/freetype2 \
+		fame-0.9:${PORTSDIR}/multimedia/libfame \
+		cdio:${PORTSDIR}/sysutils/libcdio \
+		modplug:${PORTSDIR}/audio/libmodplug \
+		vcdinfo:${PORTSDIR}/multimedia/vcdimager \
+		theora:${PORTSDIR}/multimedia/libtheora \
+		mad:${PORTSDIR}/audio/libmad \
+		dca:${PORTSDIR}/multimedia/libdca \
+		avcodec:${PORTSDIR}/multimedia/ffmpeg \
+		faad:${PORTSDIR}/audio/faad \
+		vdpau:${PORTSDIR}/multimedia/libvdpau
 
 BUILD_DEPENDS+=	v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
 
@@ -70,19 +70,8 @@ CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32 \
 		--enable-dvb
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	CACA "Enable libcaca support" off \
-		ESOUND "Enable EsounD support" off \
-		JACK "Enable JACK support" off \
-		GNOMEVFS2 "Enable GnomeVFS2 support" off \
-		PULSEAUDIO "Enable PulseAudio support" off \
-		XVMC "Enable XvMC support" off \
-		SMB "Enable SMB protocol support" off \
-		AALIB "Enable aalib support" off \
-		IMAGEMAGICK "Enable ImageMagick support" off \
-		GTK2 "Enable gdkpixbuf support" off \
-		WAVPACK "Enable WavPack support" off \
-		VAAPI "Enable VAAPI support" off \
-		LIBBLURAY "Enable libbluray support" off
+OPTIONS_DEFINE=	CACA ESOUND JACK GNOMEVFS2 PULSEAUDIO XVMC SMB AALIB \
+		IMAGEMAGICK GTK2 WAVPACK VAAPI LIBBLURAY
 
 MAN1=	xine-config.1 xine-list-1.2.1
 MAN5=	xine.5
@@ -109,7 +98,7 @@ DEBUG_FLAGS=	-g -O1
 IGNORE=		only builds with -O1 or higher, check CFLAGS
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
@@ -117,15 +106,15 @@ PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
-.if defined(WITH_CACA)
-LIB_DEPENDS+=	caca.0:${PORTSDIR}/graphics/libcaca
+.if ${PORT_OPTIONS:MCACA}
+LIB_DEPENDS+=	caca:${PORTSDIR}/graphics/libcaca
 PLIST_SUB+=	WITH_CACA=""
 .else
 PLIST_SUB+=	WITH_CACA="@comment "
 CONFIGURE_ARGS+=	--without-caca --disable-cacatest
 .endif
 
-.if defined(WITH_ESOUND)
+.if ${PORT_OPTIONS:MESOUND}
 USE_GNOME+=	esound
 PLIST_SUB+=	WITH_ESOUND=""
 .else
@@ -133,7 +122,7 @@ PLIST_SUB+=	WITH_ESOUND="@comment "
 CONFIGURE_ARGS+=	--without-esound
 .endif
 
-.if defined(WITH_JACK)
+.if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 PLIST_SUB+=	WITH_JACK=""
 .else
@@ -141,7 +130,7 @@ PLIST_SUB+=	WITH_JACK="@comment "
 CONFIGURE_ARGS+=	--without-jack
 .endif
 
-.if defined(WITH_GNOMEVFS2)
+.if ${PORT_OPTIONS:MGNOMEVFS2}
 USE_GNOME+=	gnomevfs2
 PLIST_SUB+=	WITH_GNOMEVFS2=""
 .else
@@ -149,21 +138,21 @@ PLIST_SUB+=	WITH_GNOMEVFS2="@comment "
 CONFIGURE_ARGS+=	--disable-gnomevfs
 .endif
 
-.if defined(WITH_PULSEAUDIO)
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	WITH_PULSEAUDIO=""
 .else
 PLIST_SUB+=	WITH_PULSEAUDIO="@comment "
 CONFIGURE_ARGS+=	--without-pulseaudio
 .endif
 
-.if defined(WITH_XVMC)
+.if ${PORT_OPTIONS:MXVMC}
 .if defined(WITH_NVIDIA_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)
 CONFIGURE_ARGS+=	--with-xvmc-lib=XvMCNVIDIA
-LIB_DEPENDS+=	XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver
+LIB_DEPENDS+=	XvMCNVIDIA:${PORTSDIR}/x11/nvidia-driver
 .else
 CONFIGURE_ARGS+=	--with-xvmc-lib=XvMCW
-LIB_DEPENDS+=	XvMC.1:${PORTSDIR}/x11/libXvMC
+LIB_DEPENDS+=	XvMC:${PORTSDIR}/x11/libXvMC
 .endif
 PLIST_SUB+=	WITH_XVMC=""
 .else
@@ -171,31 +160,32 @@ CONFIGURE_ARGS+=	--disable-xvmc
 PLIST_SUB+=	WITH_XVMC="@comment "
 .endif
 
-.if defined(WITH_SMB)
-LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+.if ${PORT_OPTIONS:MSMB}
+LIB_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-libsmbclient
 PLIST_SUB+=	WITH_SMB=""
+CONFIGURE_ARGS+=	--enable-samba
 .else
 PLIST_SUB+=	WITH_SMB="@comment "
 CONFIGURE_ARGS+=	--disable-samba
 .endif
 
-.if defined(WITH_AALIB)
-LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
+.if ${PORT_OPTIONS:MAALIB}
+LIB_DEPENDS+=	aa:${PORTSDIR}/graphics/aalib
 PLIST_SUB+=	WITH_AALIB=""
 .else
 PLIST_SUB+=	WITH_AALIB="@comment "
 CONFIGURE_ARGS+=	--disable-aalib --disable-aalibtest
 .endif
 
-.if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	MagickWand.5:${PORTSDIR}/graphics/ImageMagick
+.if ${PORT_OPTIONS:MMAGICK}
+LIB_DEPENDS+=	MagickWand:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
 .else
 PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
 CONFIGURE_ARGS+=	--without-imagemagick
 .endif
 
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
 PLIST_SUB+=	WITH_GTK2=""
 .else
@@ -203,8 +193,8 @@ PLIST_SUB+=	WITH_GTK2="@comment "
 CONFIGURE_ARGS+=	--disable-gdkpixbuf
 .endif
 
-.if defined(WITH_WAVPACK)
-LIB_DEPENDS+=	wavpack.2:${PORTSDIR}/audio/wavpack
+.if ${PORT_OPTIONS:MWAVPACK}
+LIB_DEPENDS+=	wavpack:${PORTSDIR}/audio/wavpack
 PLIST_SUB+=	WITH_WAVPACK=""
 CONFIGURE_ARGS+=	--with-wavpack
 .else
@@ -212,13 +202,13 @@ PLIST_SUB+=	WITH_WAVPACK="@comment "
 CONFIGURE_ARGS+=	--without-wavpack
 .endif
 
-.if defined(WITH_VAAPI)
-LIB_DEPENDS+=	va.1:${PORTSDIR}/multimedia/libva
+.if ${PORT_OPTIONS:MVAAPI}
+LIB_DEPENDS+=	va:${PORTSDIR}/multimedia/libva
 .endif
 
-.if defined(WITH_LIBBLURAY)
+.if ${PORT_OPTIONS:MLIBBLURAY}
 CONFIGURE_OPTS+=	--enable-bluray
-LIB_DEPENDS+=	bluray.2:${PORTSDIR}/multimedia/libbluray
+LIB_DEPENDS+=	bluray:${PORTSDIR}/multimedia/libbluray
 PLIST_SUB+=	LIBBLURAY=""
 .else
 CONFIGURE_OPTS+=	--disable-bluray
@@ -239,7 +229,7 @@ CONFIGURE_ARGS+=	--disable-vidix
 .endif
 
 post-patch:
-.if defined(WITH_VAAPI)
+.if ${PORT_OPTIONS:MVAAPI}
 	${PATCH} ${PATCH_DIST_ARGS} <${FILESDIR}/ffmpeg-vaapi_xine-lib-1.2.1-defaultoff.diff
 .endif
 .for f in libtool ltmain.sh
diff --git a/multimedia/vdr-plugin-softhddevice/Makefile b/multimedia/vdr-plugin-softhddevice/Makefile
index f8a2d550c958..fb53df491b1e 100644
--- a/multimedia/vdr-plugin-softhddevice/Makefile
+++ b/multimedia/vdr-plugin-softhddevice/Makefile
@@ -15,11 +15,11 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Video Disk Recorder - softhddevice plugin
 
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		vdpau.1:${PORTSDIR}/multimedia/libvdpau \
-		xcb.2:${PORTSDIR}/x11/libxcb \
-		xcb-keysyms.1:${PORTSDIR}/x11/xcb-util-keysyms \
-		asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg \
+		vdpau:${PORTSDIR}/multimedia/libvdpau \
+		xcb:${PORTSDIR}/x11/libxcb \
+		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
+		asound:${PORTSDIR}/audio/alsa-lib
 
 USE_GNOME+=	pkgconfig
 USE_XORG+=	xv x11 xinerama
@@ -36,19 +36,20 @@ WRKSRC=		${WRKDIR}/${PLUGIN}-${PORTVERSION}
 
 .include	"${.CURDIR}/../vdr/Makefile.plugins"
 
-OPTIONS=	VAAPI	"Enable vaapi support (experimental)"		off
+OPTIONS_DEFINE=	VAAPI
+VAAPI_DESC=	"Enable vaapi support (experimental)"
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_VAAPI)
-LIB_DEPENDS+=	va.1:${PORTSDIR}/multimedia/libva
+.if ${PORT_OPTIONS:MVAAPI}
+LIB_DEPENDS+=	va:${PORTSDIR}/multimedia/libva
 CONFIG+= 	-DUSE_VAAPI
 .endif
 
 post-patch: post-patch-plugin
 
 post-install: post-install-pluginlocales
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
 .endif
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile
index a345c8b6bfef..7b082b3bbd3b 100644
--- a/multimedia/vdr-plugin-xineliboutput/Makefile
+++ b/multimedia/vdr-plugin-xineliboutput/Makefile
@@ -18,10 +18,10 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:snapshot
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Video Disk Recorder - xineliboutput plugin/viewer
 
-LIB_DEPENDS+=	xine.2:${PORTSDIR}/multimedia/libxine \
-		avutil.1:${PORTSDIR}/multimedia/ffmpeg \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		vdpau.1:${PORTSDIR}/multimedia/libvdpau
+LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine \
+		avutil:${PORTSDIR}/multimedia/ffmpeg \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		vdpau:${PORTSDIR}/multimedia/libvdpau
 
 USE_BZIP2=	yes
 PATCH_STRIP=	-p1
@@ -35,19 +35,18 @@ WRKSRC=		${WRKDIR}/vdr-${PLUGIN}
 
 .include	"${.CURDIR}/../vdr/Makefile.plugins"
 
-OPTIONS=	LIBBLURAY	"Enable libbluray support"		off \
-		LIBEXTRACTOR	"Enable libextractor support"		off
+OPTIONS_DEFINE=	LIBBLURAY LIBEXTRACTOR
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_LIBEXTRACTOR)
-LIB_DEPENDS+=	extractor.3:${PORTSDIR}/textproc/libextractor
+.if ${PORT_OPTIONS:MLIBEXTRACTOR}
+LIB_DEPENDS+=	extractor:${PORTSDIR}/textproc/libextractor
 CONFIGURE_OPTS+=	--enable-libextractor
 .else
 CONFIGURE_OPTS+=	--disable-libextractor
 .endif
 
-.if defined(WITH_LIBBLURAY)
+.if ${PORT_OPTIONS:MLIBBLURAY}
 CONFIGURE_OPTS+=	--enable-libbluray
 LIB_DEPENDS+=	bluray:${PORTSDIR}/multimedia/libbluray
 .else
@@ -67,11 +66,11 @@ post-install: post-install-pluginlocales
 	@if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}/allowed_hosts.conf ]; then \
 	    ${INSTALL_DATA} ${WRKSRC}/examples/allowed_hosts.conf ${PREFIX}/etc/vdr/plugins/${PLUGIN}; \
 	fi
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}/xine
 	${INSTALL_DATA} ${FILESDIR}/keymap ${EXAMPLESDIR}/xine
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
 .endif
diff --git a/multimedia/vdr-plugins/Makefile b/multimedia/vdr-plugins/Makefile
index 1c260c0bcf9c..a5dbf4b82747 100644
--- a/multimedia/vdr-plugins/Makefile
+++ b/multimedia/vdr-plugins/Makefile
@@ -18,103 +18,114 @@ COMMENT=	Video Disk Recorder - plugin metaport
 
 NO_BUILD=	yes
 
-OPTIONS=	CONTROL "telnet control" On \
-		EPGSEARCH "EPG search" On \
-		FEMON "frontend monitor" On \
-		INFOSATEPG "infosat EPG data via satellite" On \
-		IPTV "IP television" On \
-		OSDPIP "picture-in-picture" On \
-		OSDTELETEXT "OSD teletext" On \
-		REELSCAN "Reel channelscan" On \
-		REMOTE "non-lirc remote control (experimental)" On \
-		SKINENIGMANG "Enigma-NG skin" On \
-		STREAMDEV "stream device (server and client)" On \
-		TTXTSUBS "teletext subtitle plugin" On \
-		WIRBELSCAN "Wirbelscan" On \
-		XINELIBOUTPUT "xineliboutput plugin/viewer" On \
-		LIVE "live web plugin" On \
-		UPNP "UPnP/DLNA plugin (alpha!)" On \
-		SLEEPTIMER "sleep timer plugin" On \
-		XVDR "XVDR plugin (for connecting XBMC PVR)" On \
-		EEPG "extended EPG plugin (for UK/NL/etc.)" On \
-		VDRMANAGER "plugin for VDR-Manager Android clients" On \
-		SOFTHDDEVICE "softhddevice plugin" On \
-		VNSISERVER "VNSI server (for XBMC PVR branch - old)" Off \
-		SOFTDEVICE "softdevice (broken?)" Off \
-		MARKAD "MarkAd plugin" Off
+OPTIONS_DEFINE=	CONTROL EPGSEARCH FEMON INFOSATEPG IPTV OSDPIP \
+		OSDTELETEXT REELSCAN REMOTE SKINENIGMANG STREAMDEV \
+		TTXTSUBS WIRBELSCAN XINELIBOUTPUT LIVE UPNP \
+		SLEEPTIMER XVDR EEPG VDRMANAGER SOFTHDDEVICE \
+		VNSISERVER SOFTDEVICE MARKAD
+
+CONTROL_DESC=		telnet control
+EPGSEARCH_DESC=		EPG search
+FEMON_DESC=		frontend monitor
+INFOSATEPG_DESC=	infosat EPG data via satellite
+IPTV_DESC=		IP television
+OSDPIP_DESC=		picture-in-picture
+OSDTELETEXT_DESC=	OSD teletext
+REELSCAN_DESC=		Reel channelscan
+REMOTE_DESC=		"non-lirc remote control (experimental)"
+SKINENIGMANG_DESC=	Enigma-NG skin
+STREAMDEV_DESC=		"stream device (server and client)"
+TTXTSUBS_DESC=		teletext subtitle plugin
+WIRBELSCAN_DESC=	Wirbelscan
+XINELIBOUTPUT_DESC=	xineliboutput plugin/viewer
+LIVE_DESC=		live web plugin
+UPNP_DESC=		"UPnP/DLNA plugin (alpha!)"
+SLEEPTIMER_DESC=	sleep timer plugin
+XVDR_DESC=		"XVDR plugin (for connecting XBMC PVR)"
+EEPG_DESC=		"extended EPG plugin (for UK/NL/etc.)"
+VDRMANAGER_DESC=	plugin for VDR-Manager Android clients
+SOFTHDDEVICE_DESC=	softhddevice plugin
+VNSISERVER_DESC=	"VNSI server (for XBMC PVR branch - old)"
+SOFTDEVICE_DESC=	"softdevice (broken?)"
+MARKAD_DESC=		MarkAd plugin
+
+OPTIONS_DEFAULT=	CONTROL EPGSEARCH FEMON INFOSATEPG IPTV OSDPIP \
+		OSDTELETEXT REELSCAN REMOTE SKINENIGMANG STREAMDEV \
+		TTXTSUBS WIRBELSCAN XINELIBOUTPUT LIVE UPNP \
+		SLEEPTIMER XVDR EEPG VDRMANAGER SOFTHDDEVICE
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_CONTROL)
+.if ${PORT_OPTIONS:MCONTROL}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-control.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-control
 .endif
-.if defined(WITH_EPGSEARCH)
+.if ${PORT_OPTIONS:MEPGSEARCH}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-epgsearch.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-epgsearch
 .endif
-.if defined(WITH_FEMON)
+.if ${PORT_OPTIONS:MFEMON}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-femon.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-femon
 .endif
-.if defined(WITH_INFOSATEPG)
+.if ${PORT_OPTIONS:MINFOSATEPG}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-infosatepg.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-infosatepg
 .endif
-.if defined(WITH_IPTV)
+.if ${PORT_OPTIONS:MIPTV}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-iptv.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-iptv
 .endif
-.if defined(WITH_OSDPIP)
+.if ${PORT_OPTIONS:MOSDPIP}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-osdpip.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-osdpip
 .endif
-.if defined(WITH_OSDTELETEXT)
+.if ${PORT_OPTIONS:MOSDTELETEXT}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-osdteletext.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-osdteletext
 .endif
-.if defined(WITH_REELSCAN)
+.if ${PORT_OPTIONS:MREELSCAN}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-reelchannelscan.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-reelchannelscan
 .endif
-.if defined(WITH_REMOTE)
+.if ${PORT_OPTIONS:MREMOTE}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-remote.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-remote
 .endif
-.if defined(WITH_SKINENIGMANG)
+.if ${PORT_OPTIONS:MSKINENIGMANG}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-skinenigmang.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-skinenigmang
 .endif
-.if defined(WITH_STREAMDEV)
+.if ${PORT_OPTIONS:MSTREAMDEV}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-streamdev-server.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-streamdev
 .endif
-.if defined(WITH_TTXTSUBS)
+.if ${PORT_OPTIONS:MTTXTSUBS}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-ttxtsubs.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-ttxtsubs
 .endif
-.if defined(WITH_WIRBELSCAN)
+.if ${PORT_OPTIONS:MWIRBELSCAN}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-wirbelscan.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-wirbelscan
 .endif
-.if defined(WITH_XINELIBOUTPUT)
+.if ${PORT_OPTIONS:MXINELIBOUTPUT}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-xineliboutput.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-xineliboutput
 .endif
-.if defined(WITH_LIVE)
+.if ${PORT_OPTIONS:MLIVE}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-live.so.${PORTVERSION}:${PORTSDIR}/www/vdr-plugin-live
 .endif
-.if defined(WITH_UPNP)
+.if ${PORT_OPTIONS:MUPNP}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-upnp.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-upnp
 .endif
-.if defined(WITH_SLEEPTIMER)
+.if ${PORT_OPTIONS:MSLEEPTIMER}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-sleeptimer.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-sleeptimer
 .endif
-.if defined(WITH_SOFTDEVICE)
+.if ${PORT_OPTIONS:MSOFTDEVICE}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-softdevice.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-softdevice
 .endif
-.if defined(WITH_XVDR)
+.if ${PORT_OPTIONS:MXVDR}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-xvdr.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-xvdr
 .endif
-.if defined(WITH_EEPG)
+.if ${PORT_OPTIONS:MEEPG}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-eepg.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-eepg
 .endif
-.if defined(WITH_VNSISERVER)
+.if ${PORT_OPTIONS:MVNSISERVER}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-vnsiserver.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-vnsiserver
 .endif
-.if defined(WITH_MARKAD)
+.if ${PORT_OPTIONS:MMARKAD}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-markad.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-markad
 .endif
-.if defined(WITH_VDRMANAGER)
+.if ${PORT_OPTIONS:MVDRMANAGER}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-vdrmanager.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-vdrmanager
 .endif
-.if defined(WITH_SOFTHDDEVICE)
+.if ${PORT_OPTIONS:MSOFTHDDEVICE}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-softhddevice.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-softhddevice
 .endif
 
diff --git a/multimedia/w_scan/Makefile b/multimedia/w_scan/Makefile
index 9e99ae4991b1..212729bd4b6f 100644
--- a/multimedia/w_scan/Makefile
+++ b/multimedia/w_scan/Makefile
@@ -15,7 +15,8 @@ COMMENT=	Perform frequency scans for DVB and ATSC transmissions
 
 BUILD_DEPENDS=  v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat
 
-OPTIONS=	LINUX "Install Linux binary too (linux-w_scan)" off
+OPTIONS_DEFINE=	LINUX
+LINUX_DESC=	"Install Linux binary too (linux-w_scan)"
 
 .include <bsd.port.options.mk>
 
@@ -31,7 +32,7 @@ MAN1=		w_scan.1
 MAKE_JOBS_SAFE=	yes
 WRKSRC=		${WRKDIR}
 
-.if defined(WITH_LINUX)
+.if ${PORT_OPTIONS:MLINUX}
 USE_LINUX=	yes
 RUN_DEPENDS+=	linux_dvbwrapper-kmod>=1.0:${PORTSDIR}/multimedia/linux_dvbwrapper-kmod
 PLIST_FILES+=	bin/linux-${PORTNAME}
@@ -42,11 +43,11 @@ post-patch:
 	${CP} ${WRKSRC}/${PORTNAME} ${WRKSRC}/linux-${PORTNAME}
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
 .endif
-.if defined(WITH_LINUX)
+.if ${PORT_OPTIONS:MLINUX}
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} linux-${PORTNAME} ${PREFIX}/bin)
 .endif
 
diff --git a/multimedia/xbmc-pvr/Makefile b/multimedia/xbmc-pvr/Makefile
index 22407a2b6e5f..2483186c20ce 100644
--- a/multimedia/xbmc-pvr/Makefile
+++ b/multimedia/xbmc-pvr/Makefile
@@ -27,33 +27,33 @@ BUILD_DEPENDS=	enca:${PORTSDIR}/converters/enca \
 		nasm:${PORTSDIR}/devel/nasm \
 		dvdread-config:${PORTSDIR}/multimedia/libdvdread
 
-LIB_DEPENDS=	asound.2:${PORTSDIR}/audio/alsa-lib	\
-		boost_thread.4:${PORTSDIR}/devel/boost-libs \
-		cdio.13:${PORTSDIR}/sysutils/libcdio	\
-		curl.6:${PORTSDIR}/ftp/curl \
-		dbus-1.3:${PORTSDIR}/devel/dbus \
-		enca.5:${PORTSDIR}/converters/enca \
-		GLEW.1:${PORTSDIR}/graphics/glew \
-		avcodec.1:${PORTSDIR}/multimedia/ffmpeg	\
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		fribidi.3:${PORTSDIR}/converters/fribidi \
-		lzo2.2:${PORTSDIR}/archivers/lzo2 \
-		jasper.4:${PORTSDIR}/graphics/jasper \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		faad.2:${PORTSDIR}/audio/faad \
+LIB_DEPENDS=	asound:${PORTSDIR}/audio/alsa-lib	\
+		boost_thread:${PORTSDIR}/devel/boost-libs \
+		cdio:${PORTSDIR}/sysutils/libcdio	\
+		curl:${PORTSDIR}/ftp/curl \
+		dbus-1:${PORTSDIR}/devel/dbus \
+		enca:${PORTSDIR}/converters/enca \
+		GLEW:${PORTSDIR}/graphics/glew \
+		avcodec:${PORTSDIR}/multimedia/ffmpeg	\
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		freetype:${PORTSDIR}/print/freetype2 \
+		fribidi:${PORTSDIR}/converters/fribidi \
+		lzo2:${PORTSDIR}/archivers/lzo2 \
+		jasper:${PORTSDIR}/graphics/jasper \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		faad:${PORTSDIR}/audio/faad \
 		mad:${PORTSDIR}/audio/libmad \
 		modplug:${PORTSDIR}/audio/libmodplug \
 		mpeg2:${PORTSDIR}/multimedia/libmpeg2 \
-		ogg.7:${PORTSDIR}/audio/libogg \
-		pcre.1:${PORTSDIR}/devel/pcre \
+		ogg:${PORTSDIR}/audio/libogg \
+		pcre:${PORTSDIR}/devel/pcre \
 		png15:${PORTSDIR}/graphics/png \
-		samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		smbclient.0:${PORTSDIR}/net/samba-libsmbclient	\
-		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-		vorbis.4:${PORTSDIR}/audio/libvorbis \
-		ass.5:${PORTSDIR}/multimedia/libass \
-		wavpack.2:${PORTSDIR}/audio/wavpack \
+		samplerate:${PORTSDIR}/audio/libsamplerate \
+		smbclient:${PORTSDIR}/net/samba-libsmbclient	\
+		sqlite3:${PORTSDIR}/databases/sqlite3 \
+		vorbis:${PORTSDIR}/audio/libvorbis \
+		ass:${PORTSDIR}/multimedia/libass \
+		wavpack:${PORTSDIR}/audio/wavpack \
 		yajl:${PORTSDIR}/devel/yajl \
 		plist:${PORTSDIR}/devel/libplist \
 		iconv:${PORTSDIR}/converters/libiconv
@@ -87,19 +87,11 @@ CONFLICTS_INSTALL=	xbmc-[0-9]*
 
 PLIST_SUB+=	PYVER="${PYTHON_VERSION:S/python//:S/.//g}"
 
-OPTIONS=	AVAHI		"Enable Avahi support"			on \
-		LIBBLURAY	"Enable libbluray support"		on \
-		FAAC		"Enable FAAC support"			off \
-		HAL		"Enable HAL support"			on \
-		LIRC		"Enable lirc support"			off \
-		MMS		"Enable mms:// & mmsh:// support"	on \
-		NONFREE		"Enable non-free components (rar, ccx, ffmpeg)"	off \
-		PULSE		"Enable PulseAudio support"		off \
-		RTMP		"RTMP support via librtmp"		off \
-		VAAPI		"Enable VAAPI support"			off \
-		VDPAU		"Enable VDPAU support"			off \
-		XRANDR		"Enable xrandr support"			on \
-		WEBSERVER	"Build Internal Webserver"		off
+OPTIONS_DEFINE=	AVAHI LIBBLURAY FAAC HAL LIRC MMS NONFREE PULSEAUDIO RTMP \
+		VAAPI VDPAU XRANDR WEBSERVER
+MMS_DESC=	"Enable mms:// & mmsh:// support"
+NONFREE_DESC=	"Enable non-free components (rar, ccx, ffmpeg)"
+OPTIONS_DEFAULT=	AVAHI LIBBLURAY HAL MMS XRANDR
 
 DESKTOP_ENTRIES="XBMC" \
 		"${COMMENT}" \
@@ -127,46 +119,46 @@ PLIST_SUB+=	ARCH="x86"
 PLIST_SUB+=	ARCH="x86_64"
 .endif
 
-.if !defined(WITHOUT_AVAHI)
+.if ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=	--enable-avahi
-LIB_DEPENDS+=	avahi-common.3:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=	avahi-common:${PORTSDIR}/net/avahi-app
 .else
 CONFIGURE_ARGS+=	--disable-avahi
 .endif
 
-.if !defined(WITHOUT_LIBBLURAY)
+.if ${PORT_OPTIONS:MLIBBLURAY}
 CONFIGURE_ARGS+=	--enable-libbluray
-LIB_DEPENDS+=	bluray.2:${PORTSDIR}/multimedia/libbluray
+LIB_DEPENDS+=	bluray:${PORTSDIR}/multimedia/libbluray
 .else
 CONFIGURE_ARGS+=	--disable-libbluray
 .endif
 
-.if defined(WITH_FAAC)
+.if ${PORT_OPTIONS:MFAAC}
 CONFIGURE_ARGS+=	--enable-faac
-LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
+LIB_DEPENDS+=	faac:${PORTSDIR}/audio/faac
 .else
 CONFIGURE_ARGS+=	--disable-faac
 .endif
 
-.if !defined(WITHOUT_HAL)
+.if ${PORT_OPTIONS:MHAL}
 CONFIGURE_ARGS+=	--enable-hal
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
 .else
 CONFIGURE_ARGS+=	--disable-hal
 .endif
 
-.if defined(WITH_LIRC)
+.if ${PORT_OPTIONS:MLIRC}
 RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
 .endif
 
-.if !defined(WITHOUT_MMS)
+.if ${PORT_OPTIONS:MMMS}
 CONFIGURE_ARGS+=	--enable-libmms
-LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
+LIB_DEPENDS+=	mms:${PORTSDIR}/net/libmms
 .else
 CONFIGURE_ARGS+=	--disable-libmms
 .endif
 
-.if defined(WITH_NONFREE)
+.if ${PORT_OPTIONS:MNONFREE}
 CONFIGURE_ARGS+=	--enable-non-free
 NO_CDROM=	Restricted binary distribution
 NO_PACKAGE=	${NO_CDROM}
@@ -174,44 +166,44 @@ NO_PACKAGE=	${NO_CDROM}
 CONFIGURE_ARGS+=	--disable-non-free
 .endif
 
-.if defined(WITH_PULSE)
+.if ${PORT_OPTIONS:MPULSEAUDIO}
 CONFIGURE_ARGS+=	--enable-pulse
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
 .else
 CONFIGURE_ARGS+=	--disable-pulse
 .endif
 
-.if defined(WITH_RTMP)
+.if ${PORT_OPTIONS:MRTMP}
 CONFIGURE_ARGS+=	--enable-rtmp
-LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
+LIB_DEPENDS+=	rtmp:${PORTSDIR}/multimedia/rtmpdump
 .else
 CONFIGURE_ARGS+=	--disable-rtmp
 .endif
 
-.if defined(WITH_VAAPI)
-LIB_DEPENDS+=	va.1:${PORTSDIR}/multimedia/libva
+.if ${PORT_OPTIONS:MVAAPI}
+LIB_DEPENDS+=	va:${PORTSDIR}/multimedia/libva
 CONFIGURE_ARGS+=	--enable-vaapi
 .else
 CONFIGURE_ARGS+=	--disable-vaapi
 .endif
 
-.if defined(WITH_VDPAU)
-LIB_DEPENDS+=	vdpau.1:${PORTSDIR}/multimedia/libvdpau
+.if ${PORT_OPTIONS:MVDPAU}
+LIB_DEPENDS+=	vdpau:${PORTSDIR}/multimedia/libvdpau
 CONFIGURE_ARGS+=	--enable-vdpau
 .else
 CONFIGURE_ARGS+=	--disable-vdpau
 .endif
 
-.if defined(WITH_WEBSERVER)
+.if ${PORT_OPTIONS:MWEBSERVER}
 CONFIGURE_ARGS+=	--enable-webserver
-LIB_DEPENDS+=	microhttpd.23:${PORTSDIR}/www/libmicrohttpd
+LIB_DEPENDS+=	microhttpd:${PORTSDIR}/www/libmicrohttpd
 PLIST_SUB+=	HTTPD=""
 .else
 CONFIGURE_ARGS+=	--disable-webserver
 PLIST_SUB+=	HTTPD="@comment "
 .endif
 
-.if defined(WITH_XRANDR)
+.if ${PORT_OPTIONS:MXRANDR}
 CONFIGURE_ARGS+=	--enable-xrandr
 USE_XORG+=	xrandr
 PLIST_SUB+=	XRANDR=""