Convert to new options framework left un converted ports in a* categories

While here trim headers
Convert some gnomehack to pathfix
Convert some pkgconfig to USE_PKGCONFIG=build

21 files changed, 551 insertions, 630 deletions

diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index 42c4e8dbfc38..400d23884ae4 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gpsd
-# Date created:				Jan, 10. 2006
-# Whom:					Anton Karpov <toxa@toxahost.ru>
-#
+# Created by: Anton Karpov <toxa@toxahost.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	gpsd
 PORTVERSION=	3.6
@@ -17,7 +13,8 @@ COMMENT=	Daemon that monitors one or more GPSes attached to a host computer
 BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
 		xsltproc:${PORTSDIR}/textproc/libxslt
 
-USE_GNOME=	pkgconfig
+USES=		pathfix
+USE_PKGCONFIG=	build
 USE_SCONS=	yes
 USE_RC_SUBR=	gpsd
 USE_PYTHON=	yes
@@ -37,214 +34,217 @@ MAN5=	srec.5 gpsd_json.5
 MAN8=	gpsd.8 gpsdctl.8
 MANCOMPRESSED=	no
 
-OPTIONS=	AIVDM "Aivdm support" on \
-		ASHTECH "Ashtech support" on \
-		CPPBIND "Build C++ bindings" on \
-		DBUS "DBUS support" off \
-		EARTHMATE "DeLorme EarthMate Zodiac support" on \
-		EVERMORE "Evermore binary support" on \
-		FV18 "San Jose Navigation FV-18 support" on \
-		GARMIN "Garmin kernel driver support" on \
-		GARMINTXT "Garmin Simple Text support" on \
-		GEOSTAR "Geostar Protocol support" on \
-		GPSCLOCK "GPSclock support" on \
-		GTK2 "Install py-gtk2 (required for xgps & xgpsspeed)" off \
-		IP6 "IPv6 support" on \
-		ITRAX "iTrax support" on \
-		MTK "MTK-3301 support" on \
-		NAVCOM "Navcom support" on \
-		NETFEED "Build support for handling TCP/IP data sources" on \
-		NCURSES "Build with ncurses(3)" off \
-		NMEA "NMEA support" on \
-		NTPSHM "NTP time hinting support" on \
-		NTRIP "NTRIP support" on \
-		OCEANSERVER "Oceanserver support" on \
-		OLDPROTO "Old (pre-JSON) protocol support in client lib" on \
-		ONCORE "Motorola OnCore chipset support" on \
-		PASSTHROUGH "Build support for passing through JSON" on \
-		PPS "PPS time syncing support" on \
-		PPSONCTS "PPS pulse on CTS rather than DCD" off \
-		PROFILING "Profiling support" off \
-		RECONFIGURE "Allow gpsd to change device settings" on \
-		RTCM104V2 "rtcm104v2 support" on \
-		RTCM104V3 "rtcm104v3 support" on \
-		SHMEXPORT "Enable export via shared memory" on \
-		SIRF "SiRF chipset support" on \
-		SOCKEXPORT "Enable export over sockets" on \
-		SUPERSTARII "SuperStarII support" on \
-		TIMING "Build latency timing support" on \
-		TNT "True North Technologies support" on \
-		TRIPMATE "DeLorme TripMate support" on \
-		TSIP "Trimble TSIP support" on \
-		QTBIND "build QT bindings" off \
-		UBX "UBX protocol support" on \
-		USB "libusb support for USB devices" on
+OPTIONS_DEFINE=	AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FV18 GARMIN GARMINTXT \
+		GEOSTAR GPSCLOCK GTK2 IPV6 ITRAX MTK NAVCOM NETFEED NCURSES NMEA NTPSHM NTRIP \
+		OCEANSERVER OLDPROTO ONCORE PASSTHROUGH PPS PPSONCTS PROFILING RECONFIGURE \
+		RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \
+		TSIP QTBIND UBX USB
+OPTIONS_DEFAULT=	AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FV18 GARMIN GARMINTXT GEOSTAR \
+			GPSCLOCK ITRAX NAVCOM NETFEED NMEA NTPSHM NTRIP OCEANSERVER OLDPROTO \
+			ONCORE PASSTHROUGH PPS RECONFIGURE RTCM104V2 RTCM104V3 SHMEXPORT SIRF \
+			SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE TSIP UBX USB
+
+AIVDM_DESC=		Aivdm support
+ASHTECH_DESC=		Ashtech support
+CPPBIND_DESC=		Build C++ bindings
+EARTHMATE_DESC=		DeLorme EarthMate Zodiac support
+EVERMORE_DESC=		Evermore binary support
+FV18_DESC=		San Jose Navigation FV-18 support
+GARMIN_DESC=		Garmin kernel driver support
+GARMINTXT_DESC=		Garmin Simple Text support
+GEOSTAR_DESC=		Geostar Protocol support
+GPSCLOCK_DESC=		GPSclock support
+GTK2_DESC=		Install py-gtk2 (required for xgps & xgpsspeed)
+ITRAX_DESC=		iTrax support
+MTK_DESC=		MTK-3301 support
+NAVCOM_DESC=		Navcom support
+NCURSES_DESC=		Build with ncurses(3)
+NETFEED_DESC=		Build support for handling TCP/IP data sources
+NMEA_DESC=		NMEA support
+NTPSHM_DESC=		NTP time hinting support
+NTRIP_DESC=		NTRIP support
+OCEANSERVER_DESC=	Oceanserver support
+OLDPROTO_DESC=		Old (pre-JSON) protocol support in client lib
+ONCORE_DESC=		Motorola OnCore chipset support
+PASSTHROUGH_DESC=	Build support for passing through JSON
+PPS_DESC=		PPS time syncing support
+PPSONCTS_DESC=		PPS pulse on CTS rather than DCD
+PROFILING_DESC=		Profiling support
+RECONFIGURE_DESC=	Allow gpsd to change device settings
+RTCM104V2_DESC=		rtcm104v2 support
+RTCM104V3_DESC=		rtcm104v3 support
+SHMEXPORT_DESC=		Enable export via shared memory
+SIRF_DESC=		SiRF chipset support
+SOCKEXPORT_DESC=	Enable export over sockets
+SUPERSTARII_DESC=	SuperStarII support
+TIMING_DESC=		Build latency timing support
+TNT_DESC=		True North Technologies support
+TRIPMATE_DESC=		DeLorme TripMate support
+TSIP_DESC=		Trimble TSIP support
+QTBIND_DESC=		build QT bindings
+UBX_DESC=		UBX protocol support
+USB_DESC=		libusb support for USB devices
 
 .include <bsd.port.options.mk>
 
-# Requires libusb.h available in 8.x
-.if ${OSVERSION} < 800069
-WITHOUT_USB=	yes
-.endif
-
 # Options related to GPS protocols
-.if defined(WITHOUT_NMEA)
+.if ! ${PORT_OPTIONS:MNMEA}
 SCONS_ARGS+=	nmea=no
 .endif
 
-.if defined(WITHOUT_ASHTECH)
+.if ! ${PORT_OPTIONS:MASHTECH}
 SCONS_ARGS+=	ashtech=no
 .endif
 
-.if defined(WITHOUT_EARTHMATE)
+.if ! ${PORT_OPTIONS:MEARTHMATE}
 SCONS_ARGS+=	earthmate=no
 .endif
 
-.if defined(WITHOUT_EVERMORE)
+.if ! ${PORT_OPTIONS:MEVERMORE}
 SCONS_ARGS+=	evermore=no
 .endif
 
-.if defined(WITHOUT_FV18)
+.if ! ${PORT_OPTIONS:MFV18}
 SCONS_ARGS+=	fv18=no
 .endif
 
-.if defined(WITHOUT_GARMIN)
+.if ! ${PORT_OPTIONS:MGARMIN}
 SCONS_ARGS+=	garmin=no
 .endif
 
-.if defined(WITHOUT_GARMINTXT)
+.if ! ${PORT_OPTIONS:MGARMINTXT}
 SCONS_ARGS+=	garmintxt=no
 .endif
 
-.if defined(WITHOUT_GEOSTAR)
+.if ! ${PORT_OPTIONS:MGEOSTAR}
 SCONS_ARGS+=	geostar=no
 .endif
 
-.if defined(WITHOUT_ITRAX)
+.if ! ${PORT_OPTIONS:MITRAX}
 SCONS_ARGS+=	itrax=no
 .endif
 
-.if defined(WITHOUT_MTK)
+.if ! ${PORT_OPTIONS:MMTK}
 SCONS_ARGS+=	mtk3301=no
 .endif
 
-.if defined(WITHOUT_NAVCOM)
+.if ! ${PORT_OPTIONS:MNAVCOM}
 SCONS_ARGS+=	navcom=no
 .endif
 
-.if defined(WITHOUT_ONCORE)
+.if ! ${PORT_OPTIONS:MONCORE}
 SCONS_ARGS+=	oncore=no
 .endif
 
-.if defined(WITHOUT_SIRF)
+.if ! ${PORT_OPTIONS:MSIRF}
 SCONS_ARGS+=	sirf=no
 .endif
 
-.if defined(WITHOUT_SUPERSTARII)
+.if ! ${PORT_OPTIONS:MSUPERSTARII}
 SCONS_ARGS+=	superstar2=no
 .endif
 
-.if defined(WITHOUT_TNT)
+.if ! ${PORT_OPTIONS:MTNT}
 SCONS_ARGS+=	tnt=no
 .endif
 
-.if defined(WITHOUT_TRIPMATE)
+.if ! ${PORT_OPTIONS:MTRIPMATE}
 SCONS_ARGS+=	tripmate=no
 .endif
 
-.if defined(WITHOUT_TSIP)
+.if ! ${PORT_OPTIONS:MTSIP}
 SCONS_ARGS+=	tsip=no
 .endif
 
-.if defined(WITHOUT_UBX)
+.if ! ${PORT_OPTIONS:MUBX}
 SCONS_ARGS+=	ubx=no
 .endif
 
 # Options related to Non-GPS protocols
-.if defined(WITHOUT_AIVDM)
+.if ! ${PORT_OPTIONS:MAIVDM}
 SCONS_ARGS+=	aivdm=no
 .endif
 
-.if defined(WITHOUT_GPSCLOCK)
+.if ! ${PORT_OPTIONS:MGPSCLOCK}
 SCONS_ARGS+=	gpsclock=no
 .endif
 
-.if defined(WITHOUT_NTRIP)
+.if ! ${PORT_OPTIONS:MNTRIP}
 SCONS_ARGS+=	ntrip=no
 .endif
 
-.if defined(WITHOUT_OCEANSERVER)
+.if ! ${PORT_OPTIONS:MOCEANSERVER}
 SCONS_ARGS+=	oceanserver=no
 .endif
 
-.if defined(WITHOUT_RTCM104V2)
+.if ! ${PORT_OPTIONS:MRTCM104V2}
 SCONS_ARGS+=	rtcm104v2=no
 .endif
 
-.if defined(WITHOUT_RTCM104V3)
+.if ! ${PORT_OPTIONS:MRTCM104V3}
 SCONS_ARGS+=	rtcm104v3=no
 .endif
 
 # Time service
-.if defined(WITHOUT_NTPSHM)
+.if ! ${PORT_OPTIONS:MNTPSHM}
 SCONS_ARGS+=	ntpshm=no
 .endif
 
-.if defined(WITHOUT_PPS)
+.if ! ${PORT_OPTIONS:MPPS}
 SCONS_ARGS+=	pps=no
 .else
-.	if defined(WITHOUT_NTPSHM)
+.	if ! ${PORT_OPTIONS:MNTPSHM}
 IGNORE=		PPS requires NTPSHM
 .	endif
 .endif
 
-.if defined(WITH_PPSONCTS)
+.if ${PORT_OPTIONS:MPPSONCTS}
 SCONS_ARGS+=	pps_on_cts=yes
 .endif
 
 # Export methods
-.if defined(WITHOUT_SOCKEXPORT)
+.if ! ${PORT_OPTIONS:MSOCKEXPORT}
 SCONS_ARGS+=	socket_export=no
 .endif
 
-.if defined(WITH_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	dbus:${PORTSDIR}/devel/dbus \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 SCONS_ARGS+=	dbus_export=yes
 .endif
 
-.if defined(WITHOUT_SHMEXPORT)
+.if ! ${PORT_OPTIONS:MSHMEXPORT}
 SCONS_ARGS+=	shm_export=no
 .endif
 
 # Communication
-.if defined(WITHOUT_USB)
+.if ! ${PORT_OPTIONS:MUSB}
 SCONS_ARGS+=	usb=no
 .endif
 
-.if defined(WITHOUT_IPV6)
+.if ! ${PORT_OPTIONS:MIPV6}
 SCONS_ARGS+=	ipv6=no
 .endif
 
-.if defined(WITHOUT_NETFEED)
+.if ! ${PORT_OPTIONS:MNETFEED}
 SCONS_ARGS+=	netfeed=no
 .endif
 
-.if defined(WITHOUT_PASSTHROUGH)
+.if ! ${PORT_OPTIONS:MPASSTHROUGH}
 SCONS_ARGS+=	passthrough=no
 .endif
 
 # Other daemon options
-.if defined(WITHOUT_TIMING)
+.if ! ${PORT_OPTIONS:MTIMING}
 SCONS_ARGS+=	timing=no
 .endif
 
 # Client-side options
-.if defined(WITHOUT_OLDPROTO)
+.if ! ${PORT_OPTIONS:MOLDPROTO}
 SCONS_ARGS+=	oldstyle=no
 .endif
 
-.if defined(WITH_QTBIND)
+.if ${PORT_OPTIONS:MQTBIND}
 USE_QT4=	network
 SCONS_ARGS+=	libQgpsmm=yes
 PLIST_SUB+=	QTBIND=""
@@ -253,23 +253,24 @@ SCONS_ARGS+=	libQgpsmm=no
 PLIST_SUB+=	QTBIND="@comment "
 .endif
 
-.if defined(WITHOUT_RECONFIGURE)
+.if ! ${PORT_OPTIONS:MRECONFIGURE}
 SCONS_ARGS+=	reconfigure=no
 .endif
 
-.if defined(WITHOUT_CPPBIND)
+.if ! ${PORT_OPTIONS:MCPPBIND}
 SCONS_ARGS+=	libgpsmm=no
 .endif
 
-.if defined(WITHOUT_NCURSES)
+.if ! ${PORT_OPTIONS:MNCURSES}
 SCONS_ARGS+=	ncurses=no
 PLIST_SUB+=	CURSES="@comment "
 .else
 PLIST_SUB+=	CURSES=""
+USE_NCURSES=	yes
 .endif
 
 # Build control
-.if defined(WITH_PROFILING)
+.if ${PORT_OPTIONS:MPROFILING}
 SCONS_ARGS+=	profiling=yes
 .endif
 
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 6d94dbdb0d5f..7839909bc04b 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	deadbeef
-# Date created:		2010-01-17
-# Whom:			Gvozdikov Veniamin <g.veniamin@googlemail.com>
-#
+# Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	deadbeef
 PORTVERSION=	0.5.5
@@ -27,91 +23,86 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_ICONV=	yes
+USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--disable-alsa --disable-nullout \
 		CPPFLAGS="-I../dumb/dumb-kode54/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lexecinfo -lintl"
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
-SH=		${LOCALBASE}/bin/bash # Hack for detecting depends
-
-OPTIONS=	PULSE "PulseAudio output plugin (unsupported)" off\
-		GUI "standard GTK2 user interface plugin" on\
-		VFS "HTTP streaming vfs plugin" on\
-		LASTFM "last.fm/libre.fm scrobbler plugin" on\
-		ART "album art loader plugin" on\
-		EQ "SuperEQ DSP plugin" on\
-		SID "SID music player plugin" on\
-		FFAP "Monkey's Audio plugin" on\
-		VTX "libayemy VTX ZX-Spectrum music player plugin" on\
-		ADP "adplug plugin" on\
-		HOTKEYS "global hotkeys plugin" on\
-		OGG "Ogg Vorbis player plugin" on\
-		FFMPEG "FFMPEG plugin for WMA, MPC, TTA, etc" on\
-		FLAC "FLAC player plugin" on\
-		SNDFILE "libsndfile plugin for PCM wave files" on\
-		WAV "wavpack plugin" on\
-		CDDA "CD-Audio plugin" on\
-		GME "Game Music Emu plugin" on\
-		DUMB "D.U.M.B. plugin for MOD, S3M and other" on\
-		NOTIFY "support for OSD notifications into GTKUI plugin" on\
-		MUSEPACK "musepack plugin" on\
-		WILD "wildmidi plugin" on\
-		TTA "tta plugin" on\
-		DCA "dca (DTS audio) plugin" on\
-		AAC "AAC decoder based on FAAD2" on\
-		MMS "MMS streaming vfs plugin" on\
-		SHN "shorten plugin" on\
-		AO "audio overload plugin" on\
-		SHELLEXEC "shell commands plugin" on\
-		NLS "Native Language Support" on\
-		M3U "m3u plugin" on\
-		PSF "AOSDK-based PSF(,QSF,SSF,DSF) plugin" on\
-		DSP "libsamplerate (SRC) plugin" on\
-		MONO2STEREO "mono2stereo DSP plugin" on\
-		CONVERTER "Build converter" on\
-		VFS_ZIP "ZIP support" on
+CONFIGURE_ENV+=	CONFIG_SHELL="${LOCALBASE}/bin/bash"
+
+OPTIONS_DEFINE=	PULSEAUDIO GUI VFS LASTFM ART EQ SID FFAP VTX HOTKEYS VORBIS FFMPEG \
+		FLAC SNDFILE WAV CDDA GME DUMB NOTIFY MUSEPACK WILD TTA DCA AAC \
+		MMS SHN AO SHELLEXEC NLS M3U PSF ADP DSP MONO2STEREO CONVERTER VFS_ZIP
+OPTIONS_DEFAULT=	GUI VFS LASTFM ART EQ SID FFAP VTX HOSTKEYS VORBIS FFMPEG \
+			FLAC SNDFILE WAV CDDA GME DUMB NOTIFY MUSEPACK WILD TTA DCA \
+			AAC MMS SHN AO SHELLEXEC M3U PSF ADP DSP MONO2STEREO CONVERTER VFS_ZIP \
+			HOtKEYS
+PULSEAUDIO_DESC=	PulseAudio output plugin (unsupported)
+GUI_DESC=		standard GTK2 user interface plugin
+VFS_DESC=		HTTP streaming vfs plugin
+LASTFM_DESC=		last.fm/libre.fm scrobbler plugin
+ART_DESC=		album art loader plugin
+EQ_DESC=		SuperEQ DSP plugin
+SID_DESC=		SID music player plugin
+FFAP_DESC=		Monkey's Audio plugin
+VTX_DESC=		libayemy VTX ZX-Spectrum music player plugin
+ADP_DESC=		adplug plugin
+HOTKEYS_DESC=		global hotkeys plugin
+CDDA_DESC=		CD-Audio plugin
+GME_DESC=		Game Music Emu plugin
+DUMB_DESC=		D.U.M.B. plugin for MOD, S3M and other
+NOTIFY_DESC=		support for OSD notifications into GTKUI plugin
+WILD_DESC=		wildmidi plugin
+TTA_DESC=		tta plugin
+SHN_DESC=		shorten plugin
+AO_DESC=		audio overload plugin
+SHELLEXEC_DESC=		shell commands plugin
+M3U_DESC=		m3u plugin
+PSF_DESC=		AOSDK-based PSF(,QSF,SSF,DSF) plugin
+DSP_DESC=		libsamplerate (SRC) plugin
+MONO2STEREO_DESC=	mono2stereo DSP plugin
+CONVERTER_DESC=		Build converter
+VFS_ZIP_DESC=		ZIP support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_PULSE)
-CONFIGURE_ARGS+=	--disable-pulse
-PLIST_SUB+=	PULSE="@comment "
-.else
+.if ${PORT_OPTIONS:MPULSEAUDIO}
 PLIST_SUB+=	PULSE=""
 LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+.else
+CONFIGURE_ARGS+=	--disable-pulse
+PLIST_SUB+=	PULSE="@comment "
 .endif
 
-.if defined(WITHOUT_GUI)
+.if ${PORT_OPTIONS:MGUI}
+PLIST_SUB+=	GUI=""
+USE_GNOME=	gtk20 glib20
+.else
 CONFIGURE_ARGS+=	--disable-gtkui
 CONFIGURE_ARGS+=	--disable-gtk3
 PLIST_SUB+=	GUI="@comment "
-.else
-PLIST_SUB+=	GUI=""
-USE_GNOME=	gtk20 glib20
 .endif
 
-.if defined(WITHOUT_VFS)
-CONFIGURE_ARGS+=	--disable-vfs-curl
-PLIST_SUB+=	VFS="@comment "
-.else
+.if ${PORT_OPTIONS:MVFS}
 PLIST_SUB+=	VFS=""
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+.else
+CONFIGURE_ARGS+=	--disable-vfs-curl
+PLIST_SUB+=	VFS="@comment "
 .endif
 
-.if defined(WITHOUT_LASTFM)
-CONFIGURE_ARGS+=	--disable-lfm
-PLIST_SUB+=	LASTFM="@comment "
-.else
+.if ${PORT_OPTIONS:MLASTFM}
 PLIST_SUB+=	LASTFM=""
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+.else
+CONFIGURE_ARGS+=	--disable-lfm
+PLIST_SUB+=	LASTFM="@comment "
 .endif
 
-.if defined(WITHOUT_ART)
-CONFIGURE_ARGS+=	--disable-artwork
-PLIST_SUB+=	ART="@comment "
-.else
-.if !defined(WITHOUT_VFS)
+.if ${PORT_OPTIONS:MART}
+.if ${PORT_OPTIONS:MVFS}
 CONFIGURE_ARTS+=	--disable-artwork-imlib2
 PLIST_SUB+=	ART=""
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl \
@@ -119,243 +110,246 @@ LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl \
 .else
 BROKEN=		VFS plugin required for album art loader, please rerun 'make config' and either disable ART or enable VFS
 .endif
+.else
+CONFIGURE_ARGS+=	--disable-artwork
+PLIST_SUB+=	ART="@comment "
 .endif
 
-.if defined(WITHOUT_EQ)
+.if ${PORT_OPTIONS:MEQ}
+PLIST_SUB+=	EQ=""
+.else
 CONFIGURE_ARGS+=	--disable-supereq
 PLIST_SUB+=	EQ="@comment "
-.else
-PLIST_SUB+=	EQ=""
 .endif
 
-.if defined(WITHOUT_SID)
+.if ${PORT_OPTIONS:MSID}
+PLIST_SUB+=	SID=""
+.else
 CONFIGURE_ARGS+=	--disable-sid
 PLIST_SUB+=	SID="@comment "
-.else
-PLIST_SUB+=	SID=""
 .endif
 
-.if defined(WITHOUT_FFAP)
-CONFIGURE_ARGS+=	--disable-ffap
-PLIST_SUB+=	FFAP="@comment "
-.else
+.if ${PORT_OPTIONS:MFFAP}
 PLIST_SUB+=	FFAP=""
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
+.else
+CONFIGURE_ARGS+=	--disable-ffap
+PLIST_SUB+=	FFAP="@comment "
 .endif
 
-.if defined(WITHOUT_VTX)
+.if ${PORT_OPTIONS:MVTX}
+PLIST_SUB+=	VTX=""
+.else
 CONFIGURE_ARGS+=	--disable-vtx
 PLIST_SUB+=	VTX="@comment "
-.else
-PLIST_SUB+=	VTX=""
 .endif
 
-.if defined(WITHOUT_ADP)
+.if ${PORT_OPTIONS:MADP}
+PLIST_SUB+=	ADP=""
+.else
 CONFIGURE_ARGS+=	--disable-adplug
 PLIST_SUB+=	ADP="@comment "
-.else
-PLIST_SUB+=	ADP=""
 .endif
 
-.if defined(WITHOUT_HOTKEYS)
+.if ${PORT_OPTIONS:MHOTKEYS}
+PLIST_SUB+=	HOTKEYS=""
+.else
 CONFIGURE_ARGS+=	--disable-hotkeys
 PLIST_SUB+=	HOTKEYS="@comment "
-.else
-PLIST_SUB+=	HOTKEYS=""
 .endif
 
-.if defined(WITHOUT_OGG)
-CONFIGURE_ARGS+=	--disable-vorbis
-PLIST_SUB+=	OGG="@comment "
-.else
+.if ${PORT_OPTIONS:MOGG}
 LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	OGG=""
+.else
+CONFIGURE_ARGS+=	--disable-vorbis
+PLIST_SUB+=	OGG="@comment "
 .endif
 
-.if defined(WITHOUT_FFMPEG)
-CONFIGURE_ARGS+=	--disable-ffmpeg
-PLIST_SUB+=	FFMPEG="@comment "
-.else
+.if ${PORT_OPTIONS:MFFMPEG}
 PLIST_SUB+=	FFMPEG=""
 LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg \
 		avformat:${PORTSDIR}/multimedia/ffmpeg \
 		avutil:${PORTSDIR}/multimedia/ffmpeg
+.else
+CONFIGURE_ARGS+=	--disable-ffmpeg
+PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
-.if defined(WITHOUT_FLAC)
-CONFIGURE_ARGS+=	--disable-flac
-PLIST_SUB+=	FLAC="@comment "
-.else
+.if ${PORT_OPTIONS:MFLAC}
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
 PLIST_SUB+=	FLAC=""
+.else
+CONFIGURE_ARGS+=	--disable-flac
+PLIST_SUB+=	FLAC="@comment "
 .endif
 
-.if defined(WITHOUT_SNDFILE)
-CONFIGURE_ARGS+=	--disable-sndfile
-PLIST_SUB+=	SNDFILE="@comment "
-.else
+.if ${PORT_OPTIONS:MSNDFILE}
 LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
 PLIST_SUB+=	SNDFILE=""
+.else
+CONFIGURE_ARGS+=	--disable-sndfile
+PLIST_SUB+=	SNDFILE="@comment "
 .endif
 
-.if defined(WITHOUT_WAV)
-CONFIGURE_ARGS+=	--disable-wavpack
-PLIST_SUB+=	WAV="@comment "
-.else
+.if ${PORT_OPTIONS:MWAV}
 LIB_DEPENDS+=	wavpack:${PORTSDIR}/audio/wavpack
 PLIST_SUB+=	WAV=""
+.else
+CONFIGURE_ARGS+=	--disable-wavpack
+PLIST_SUB+=	WAV="@comment "
 .endif
 
-.if defined(WITHOUT_CDDA)
-CONFIGURE_ARGS+=	--disable-cdda
-PLIST_SUB+=	CDDA="@comment "
-.else
+.if ${PORT_OPTIONS:MCDDA}
 PLIST_SUB+=	CDDA=""
 LIB_DEPENDS+=	cdio:${PORTSDIR}/sysutils/libcdio \
 		cddb:${PORTSDIR}/audio/libcddb
+.else
+CONFIGURE_ARGS+=	--disable-cdda
+PLIST_SUB+=	CDDA="@comment "
 .endif
 
-.if defined(WITHOUT_GME)
+.if ${PORT_OPTIONS:MGME}
+PLIST_SUB+=	GME=""
+.else
 CONFIGURE_ARGS+=	--disable-gme
 PLIST_SUB+=	GME="@comment "
-.else
-PLIST_SUB+=	GME=""
 .endif
 
-.if defined(WITHOUT_DUMB)
+.if ${PORT_OPTIONS:MDUMB}
+PLIST_SUB+=	DUMB=""
+.else
 CONFIGURE_ARGS+=	--disable-dumb
 PLIST_SUB+=	DUMB="@comment "
-.else
-PLIST_SUB+=	DUMB=""
 .endif
 
-.if defined(WITHOUT_NOTIFY)
-CONFIGURE_ARGS+=	--disable-notify
-PLIST_SUB+=	NOTIFY="@comment "
-.else
+.if ${PORT_OPTIONS:MNOTIFY}
 PLIST_SUB+=	NOTIFY=""
 LIB_DEPENDS+=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+.else
+CONFIGURE_ARGS+=	--disable-notify
+PLIST_SUB+=	NOTIFY="@comment "
 .endif
 
-.if defined(WITHOUT_MUSEPACK)
+.if ${PORT_OPTIONS:MMUSEPACK}
+PLIST_SUB+=	MUSEPACK=""
+.else
 CONFIGURE_ARGS+=	--disable-musepack
 PLIST_SUB+=	MUSEPACK="@comment "
-.else
-PLIST_SUB+=	MUSEPACK=""
 .endif
 
-.if defined(WITHOUT_WILD)
-CONFIGURE_ARGS+=	--disable-wildmidi
-PLIST_SUB+=	WILD="@comment "
-.else
+.if ${PORT_OPTIONS:MWILD}
 RUN_DEPENDS+=	${LOCALBASE}/share/freepats/crude.cfg:${PORTSDIR}/audio/freepats
 PLIST_SUB+=	WILD=""
+.else
+CONFIGURE_ARGS+=	--disable-wildmidi
+PLIST_SUB+=	WILD="@comment "
 .endif
 
-.if defined(WITHOUT_TTA)
+.if ${PORT_OPTIONS:MTTA}
+PLIST_SUB+=	TTA=""
+.else
 CONFIGURE_ARGS+=	--disable-tta
 PLIST_SUB+=	TTA="@comment "
-.else
-PLIST_SUB+=	TTA=""
 .endif
 
-.if defined(WITHOUT_DCA)
+.if ${PORT_OPTIONS:MDCA}
+PLIST_SUB+=	DCA=""
+.else
 CONFIGURE_ARGS+=	--disable-dca
 PLIST_SUB+=	DCA="@comment "
-.else
-PLIST_SUB+=	DCA=""
 .endif
 
-.if defined(WITHOUT_AAC)
-CONFIGURE_ARGS+=	--disable-aac
-PLIST_SUB+=	AAC="@comment "
-.else
+.if ${PORT_OPTIONS:MAAC}
 PLIST_SUB+=	AAC=""
 LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
+.else
+CONFIGURE_ARGS+=	--disable-aac
+PLIST_SUB+=	AAC="@comment "
 .endif
 
-.if defined(WITHOUT_MMS)
+.if ${PORT_OPTIONS:MMMS}
+PLIST_SUB+=	MMS=""
+.else
 CONFIGURE_ARGS+=	--disable-mms
 PLIST_SUB+=	MMS="@comment "
-.else
-PLIST_SUB+=	MMS=""
 .endif
 
-.if defined(WITHOUT_SHN)
+.if ${PORT_OPTIONS:MSHN}
+PLIST_SUB+=	SHN=""
+.else
 CONFIGURE_ARGS+=	--disable-shn
 PLIST_SUB+=	SHN="@comment "
-.else
-PLIST_SUB+=	SHN=""
 .endif
 
-.if defined(WITHOUT_AO)
+.if ${PORT_OPTIONS:MAO}
+PLIST_SUB+=	AO=""
+.else
 CONFIGURE_ARGS+=	--disable-ao
 PLIST_SUB+=	AO="@comment "
-.else
-PLIST_SUB+=	AO=""
 .endif
 
-.if defined(WITHOUT_SHELLEXEC)
+.if ${PORT_OPTIONS:MSHELLEXEC}
+PLIST_SUB+=	SHELLEXEC=""
+.else
 CONFIGURE_ARGS+=	--disable-shellexec
 PLIST_SUB+=	SHELLEXEC="@comment "
-.else
-PLIST_SUB+=	SHELLEXEC=""
 .endif
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
+PLIST_SUB+=	NLS=""
+.else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
-.else
-PLIST_SUB+=	NLS=""
 .endif
 
-.if defined(WITHOUT_CONVERTER)
-CONFIGURE_ARGS+=	--disable-converter
-PLIST_SUB+=	CONVERTER="@comment "
-.else
-.if !defined(WITHOUT_GUI)
+.if ${PORT_OPTIONS:MCONVERTER}
+.if ${PORT_OPTIONS:MGUI}
 PLIST_SUB+=	CONVERTER=""
 USE_GNOME=	gtk20 glib20
 .else
 BROKEN=		CONVERTER plugin required for gui, please rerun 'make config' and either disable CONVERTER or enable GUI
 .endif
+.else
+CONFIGURE_ARGS+=	--disable-converter
+PLIST_SUB+=	CONVERTER="@comment "
 .endif
 
-.if defined(WITHOUT_M3U)
+.if ${PORT_OPTIONS:MM3U}
+PLIST_SUB+=	M3U=""
+.else
 CONFIGURE_ARGS+=	--disable-m3u
 PLIST_SUB+=	M3U="@comment "
-.else
-PLIST_SUB+=	M3U=""
 .endif
 
-.if defined(WITHOUT_PSF)
+.if ${PORT_OPTIONS:MPSF}
+PLIST_SUB+=	PSF=""
+.else
 CONFIGURE_ARGS+=	--disable-psf
 PLIST_SUB+=	PSF="@comment "
-.else
-PLIST_SUB+=	PSF=""
 .endif
 
-.if defined(WITHOUT_DSP)
-CONFIGURE_ARGS+=	--disable-src
-PLIST_SUB+=	DSP="@comment "
-.else
+.if ${PORT_OPTIONS:MDSP}
 PLIST_SUB+=	DSP=""
 LIB_DEPENDS+=	samplerate:${PORTSDIR}/audio/libsamplerate
+.else
+CONFIGURE_ARGS+=	--disable-src
+PLIST_SUB+=	DSP="@comment "
 .endif
 
-.if defined(WITHOUT_MONO2STEREO)
+.if ${PORT_OPTIONS:MMONO2STEREO}
+PLIST_SUB+=	MONO2STEREO=""
+.else
 CONFIGURE_ARGS+=	--disable-mono2stereo
 PLIST_SUB+=	MONO2STEREO="@comment "
-.else
-PLIST_SUB+=	MONO2STEREO=""
 .endif
 
-.if defined(WITHOUT_VFS_ZIP)
-CONFIGURE_ARGS+=	--disable-vfs-zip
-PLIST_SUB+=	VFS_ZIP="@comment "
-.else
+.if ${PORT_OPTIONS:MVFS_ZIP}
 PLIST_SUB+=	VFS_ZIP=""
 LIB_DEPENDS+=	zip:${PORTSDIR}/archivers/libzip
+.else
+CONFIGURE_ARGS+=	--disable-vfs-zip
+PLIST_SUB+=	VFS_ZIP="@comment "
 .endif
 
 post-patch:
diff --git a/audio/decibel-audio-player/Makefile b/audio/decibel-audio-player/Makefile
index 14f397d25faa..9124d89b5dfb 100644
--- a/audio/decibel-audio-player/Makefile
+++ b/audio/decibel-audio-player/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	decibel-audio-player
-# Date created:		2010-03-17
-# Whom:			kipz <somicide@gmail.com>
-#
+# Created by: kipz <somicide@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	decibel-audio-player
 PORTVERSION=	1.08
@@ -27,57 +23,53 @@ NO_BUILD=	yes
 MAN1=		decibel-audio-player.1 decibel-audio-player-remote.1
 
 #Audio gstreamer plugins
-OPTIONS=	AUDIOCD "AudioCD support" on \
-		FLAC "FLAC support" on \
-		MP3 "MP3 support" on \
-		MPEG4IP "AAC/MP4P support" on \
-		OGG "OGG support" on \
-		SPEEX "OGG/Speex support" off \
-		VORBIS "OGG/Vorbis support" on \
-		WAVPACK "Wavpack support" on
-
-#A few extra requirements if we want to use some nifty plugins in decibel
-OPTIONS+=	EXTRAS "Extra dependencies for plugins" on
+OPTIONS_DEFINE=	AUDIOCD FLAC MP3 MPEG4IP OGG VORBIS SPEEX WAVPACK EXTRAS
+OPTIONS_DEFAULT=	AUDIOCD FLAC MP3 MPEG4IP OGG VORBIS WAVPACK EXTRAS
+AUDIOCD_DESC=	AudioCD support
+MPEG4IP_DESC=	AAC/MP4P support
+#
+##A few extra requirements if we want to use some nifty plugins in decibel
+EXTRAS_DESC=	Extra dependencies for plugins
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_AUDIOCD)
+.if ${PORT_OPTIONS:MAUDIOCD}
 RUN_DEPENDS+=	cd-discid>=0.9:${PORTSDIR}/audio/cd-discid \
 		py*-cddb>=1.4:${PORTSDIR}/audio/py-cddb \
 		gstreamer-plugins-cdio>=0.10.16:${PORTSDIR}/sysutils/gstreamer-plugins-cdio
 .endif
 
-.if !defined(WITHOUT_EXTRAS)
+.if ${PORT_OPTIONS:MEXTRAS}
 RUN_DEPENDS+=	py*-imaging>=1.1.6:${PORTSDIR}/graphics/py-imaging \
 		py*-notify>=0.1.1:${PORTSDIR}/devel/py-notify
 .endif
 
-.if !defined(WITHOUT_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
 USE_GSTREAMER+=	flac
 .endif
 
-.if !defined(WITHOUT_MP3)
+.if ${PORT_OPTIONS:MMP3}
 USE_GSTREAMER+=	mp3
 .endif
 
-.if !defined(WITHOUT_MPEG4IP)
+.if ${PORT_OPTIONS:MMPEG4IP}
 LIB_DEPENDS+=	mp4v2.10:${PORTSDIR}/multimedia/mp4v2
 USE_GSTREAMER+=	faad
 .endif
 
-.if !defined(WITHOUT_OGG)
+.if ${PORT_OPTIONS:MOGG}
 USE_GSTREAMER+=	ogg
 .endif
 
-.if !defined(WITHOUT_SPEEX)
+.if ${PORT_OPTIONS:MSPEEX}
 USE_GSTREAMER+=	speex
 .endif
 
-.if !defined(WITHOUT_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 USE_GSTREAMER+=	vorbis
 .endif
 
-.if !defined(WITHOUT_WAVPACK)
+.if ${PORT_OPTIONS:MWAVPACK}
 LIB_DEPENDS+=	wavpack.2:${PORTSDIR}/audio/wavpack
 USE_GSTREAMER+=	wavpack
 .endif
@@ -86,4 +78,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 55c0cdeeb1d6..9e2e2e8dd541 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -13,8 +13,9 @@ DISTFILES=	${DISTNAME}-beta.tar.gz 	\
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Multi-lingual speech synthesis system
 
-OPTIONS=	NAS "Enable Network Audio System (NAS) backend" on \
-		ESD "Enable ESound backend" on
+OPTIONS_DEFINE=	NAS ESD
+OPTIONS_DEFAULT=	NAS ESD
+ESD_DESC=	${ESOUND_DESC}
 
 DIST_SUBDIR=	festival
 
@@ -45,10 +46,10 @@ post-patch::
 	${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g'	\
 		${WRKSRC}/*/config/systems/default.mak
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .for m in nas esd
-.	ifdef WITH_${m:U}
+.	ifdef ${PORT_OPTIONS:M${m:U}}
 LIB_DEPENDS+=	${m:nas=audio}:${PORTSDIR}/audio/${m:esd=esound}
 post-patch::
 	${REINPLACE_CMD} -e 's,# INCLUDE_MODULES += ${m:U}_AUDIO,INCLUDE_MODULES += ${m:U}_AUDIO,' \
@@ -103,4 +104,4 @@ do-install:
 	${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/man/man1/festival_client.1
 	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/liquidsoap/Makefile b/audio/liquidsoap/Makefile
index 054c8a030571..e9d2417a8054 100644
--- a/audio/liquidsoap/Makefile
+++ b/audio/liquidsoap/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: liquidsoap
-# Date created:                4 Nov 2009
-# Whom:                        Mykola Dzham <i@levsha.me>
-#
+# Created by: Mykola Dzham <i@levsha.me>
 # $FreeBSD$
-#
 
 PORTNAME=	liquidsoap
 PORTVERSION=	1.0.0
@@ -29,30 +25,30 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 BUILD_DEPENDS+=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
 .endif
 
-OPTIONS=	AACPLUS		"AAC+ encoding"	On	\
-		AO		"portable and stable, but it does only output"	Off \
-		CRY		"streaming to icecast and compatible servers"	On	\
-		DSSI		"standard for synthesizer plugins (need LADSPA)"	Off	\
-		FAAD		"AAC decoding"	On \
-		FESTIVAL	"speech synthesis (say)"	On	\
-		FLAC		"flac format decoding and encoding" Off	\
-		GAVL		"converts from and to many formats"	Off \
-		GSTREAMER	"used to provide V4l inputs"	Off \
-		JACK		"audio connection kit, designed for low latency"	On \
-		LADSPA		"audio plugins providing sound effects"	Off \
-		LO		"OSC protocol to have external controls"	Off	\
-		MAD		"for MP3 decoding"	On \
-		OGG		"ogg/vorbis and ogg/theora encoding and decoding"	On \
-		VOAACENC	"AAC encoding"	On	\
-		VORBIS		"ogg/vorbis encoding and decoding (need OGG)"	On \
-		SCHROEDINGER	"for ogg/dirac encoding and decoding (need OGG)"	Off	\
-		SPEEX		"ogg/speex encoding and decoding (need OGG)"	Off \
-		THEORA		"ogg/theora encoding and decoding (need OGG)"	Off \
-		SAMPLERATE	"for having better quality resampling"	Off \
-		SOUNDTOUCH	"for changing pitch and tempo of sound" Off \
-		PULSEAUDIO	"cross-platform audio sound server"	Off \
-		TAGLIB		"for MP3 ID3 tag reading"	On \
-		WGET		"for downloading remote files (http, https, ftp)"	On
+OPTIONS_DEFINE=	AACPLUS AO CRY DSSI FAAD FESTIVAL FLAC GAVL GSTREAMER JACK LADSPA LO \
+		MAD OGG VOAACENC VORBIS SCHROEDINGER SPEEX THEORA SAMPLERATE PULSEAUDIO \
+		TAGLIB WGET DOCS EXAMPLES
+OPTIONS_DEFAULT=	AACPLUS CRY FAAD FESTIVAL JACK MAD OGG VOAACENC VORBIS TAGLIB WGET
+AACPLUS_DESC=		AAC+ encoding
+AO_DESC=		portable and stable, but it does only output
+CRY_DESC=		streaming to icecast and compatible servers
+DSSI_DESC=		standard for synthesizer plugins (need LADSPA)
+FESTIVAL_DESC=		speech synthesis (say)
+GAVL_DESC=		converts from and to many formats
+GSTREAMER_DESC=		used to provide V4l inputs
+JACK_DESC=		audio connection kit, designed for low latency
+LADSPA_DESC=		audio plugins providing sound effects
+LO_DESC=		OSC protocol to have external controls
+OGG_DESC=		ogg/vorbis and ogg/theora encoding and decoding
+VOAACENC_DESC=		AAC encoding
+VORBIS_DESC=		ogg/vorbis encoding and decoding (need OGG)
+SCHROEDINGER_DESC=	ogg/dirac encoding and decoding (need OGG)
+SPEEX_DESC=		ogg/speex encoding and decoding (need OGG)
+THEORA_DESC=		ogg/theora encoding and decoding (need OGG)
+SAMPLERATE_DESC=	for having better quality resampling
+SOUNDTOUCH_DESC=	for changing pitch and tempo of sound
+TAGLIB_DESC=		for MP3 ID3 tag reading
+WGET_DESC=		for downloading remote files (http, https, ftp)
 
 # xmplapalylist disabled now: missing ocaml-xmlm port
 #		XMLPLAYLIST	"support various xml format (rss/podcast/etc)"	Off \
@@ -81,13 +77,6 @@ CONFIGURE_ARGS=	--disable-gui --localstatedir=/var
 CFLAGS+=	-I${LOCALBASE}/${OCAML_LIBDIR}
 
 MAKE_ENV+=	OCAMLMKLIB_FLAGS="-L${LOCALBASE}/lib"
-.if defined(NOPORTDOCS)
-MAKE_ENV+=	PORTDOCS="@: "
-.endif
-.if defined(NOPORTEXAMPLES)
-MAKE_ENV+=	PORTEXAMPLES="@: "
-.endif
-
 MAN1=	liquidsoap.1
 
 LIQUIDSOAP_USER=	liquidsoap
@@ -105,7 +94,14 @@ PLIST_SUB=	RELVER=${PORTVERSION} \
 
 .include <bsd.port.options.mk>
 
-WITH_LAME=	yes
+.if ${PORT_OPTIONS:MDOCS}
+MAKE_ENV+=	PORTDOCS="@: "
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+MAKE_ENV+=	PORTEXAMPLES="@: "
+.endif
+
+PORT_OPTIONS+=	LAME
 
 # alsa and portaudio disabled permanently - alsa is linux only, portaudio broken
 _ALL_PACKAGES=	aacplus alsa ao cry dssi faad flac gavl gstreamer ladspa lame lo mad ogg vorbis schroedinger speex theora samplerate soundtouch voaacenc portaudio pulseaudio taglib xmlplaylist lastfm
@@ -132,36 +128,36 @@ LIB_DEPENDS_pulseaudio=	pulse.0:${PORTSDIR}/audio/pulseaudio
 LIB_DEPENDS_taglib=	tag.1:${PORTSDIR}/audio/taglib
 LIB_DEPENDS_voaacenc=	vo-aacenc.0:${PORTSDIR}/audio/vo-aacenc
 
-.if defined(WITH_FESTIVAL)
+.if ${PORT_OPTIONS:MFESTIVAL}
 RUN_DEPENDS+=	${LOCALBASE}/bin/festival:${PORTSDIR}/audio/festival
 .endif
 
-.if defined(WITH_WGET)
+.if ${PORT_OPTIONS:MWGET}
 RUN_DEPENDS+=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 .endif
 
-.if defined(WITH_VORBIS) && !defined(WITH_OGG)
+.if ${PORT_OPTIONS:MVORBIS} && ! ${PORT_OPTIONS:MDOCS}
 IGNORE=	ogg required for vorbis. please rerun make config and select ogg
 .endif
 
-.if defined(WITH_SPEEX) && !defined(WITH_OGG)
+.if ${PORT_OPTIONS:MSPEEX} && ! ${PORT_OPTIONS:MOGG}
 IGNORE=	ogg required for speex. please rerun make config and select ogg
 .endif
 
-.if defined(WITH_THEORA) && ( !defined(WITH_OGG) || !defined(WITH_VORBIS) )
+.if ${PORT_OPTIONS:MTHEORA} && ( ! ${PORT_OPTIONS:MOGG} || ! ${PORT_OPTIONS:MVORBIS} )
 IGNORE=	ogg and vorbis required for theora. Please rerun make config and select ogg and vorbis
 .endif
 
-.if defined(WITH_LASTFM) && !defined(WITH_XMLPLAYLIST)
+.if ${PORT_OPTIONS:MLASTFM} && ${PORT_OPTIONS:MXMLPLAYLIST}
 IGNORE=	xmlplaylist required for lastfm. please rerun make config and select xmlplaylist
 .endif
 
-.if defined(WITH_DSSI) && !defined(WITH_LADSPA)
+.if ${PORT_OPTIONS:MDSSI} &&  ! ${PORT_OPTIONS:MLADSPA}
 IGNORE=	ladspa required for dssi. Please rerun make config and select ladspa
 .endif
 
 #Server is known as JACK, but module named ocaml-bjack
-.if defined(WITH_JACK)
+.if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 .else
 _DISABLE_SED_ARGS+=	-e "s/^ocaml-bjack/\#ocaml-bjack/"
@@ -169,7 +165,7 @@ CONFIGURE_ARGS+=	--disable-bjack
 .endif
 
 .for i in ${_ALL_PACKAGES}
-.if defined(WITH_${i:U})
+.if ${PORT_OPTIONS:M${i:U}}
 .if defined(LIB_DEPENDS_${i})
 LIB_DEPENDS+=	${LIB_DEPENDS_${i}}
 .endif
@@ -182,7 +178,7 @@ CONFIGURE_ARGS+=	--disable-${i}
 .endif
 .endfor
 
-.if	!defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 ALL_TARGET=	all doc
 .endif
 
diff --git a/audio/mma/Makefile b/audio/mma/Makefile
index 674d15019d7b..6d3539991356 100644
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mma
-# Date created:		2007-03-10
-# Whom:			Nicola Vitale <nivit@FreeBSD.org>
-#
+# Created by: Nicola Vitale <nivit@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mma
 PORTVERSION=	12.02
@@ -17,8 +13,10 @@ COMMENT=	Musical MIDI Accompaniment generator
 
 USE_PYTHON=	-2.7
 
-OPTIONS=	TIMIDITY	"Install timidity++ as MIDI player" Off \
-		PLAYMIDI	"Install playmidi as MIDI player" Off
+OPTIONS_DEFINE=	TIMIDITY PLAYMIDI DOCS EXAMPLES
+
+TIMIDITY_DESC=	Install timidity++ as MIDI player
+PLAYMIDI_DESC=	Install playmidi as MIDI player
 
 REINPLACE_ARGS=	-i.bak -e 's,%%DATADIR%%,${DATADIR},'
 
@@ -32,10 +30,20 @@ MAN1=	mma.1 mma-renum.1
 MAN8=	mma-libdoc.8
 .endif
 
-.if !defined (NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${PORTNAME}-pdf-${DISTVERSION:S,a,,}.tar.gz
 .endif
 
+.if ${PORT_OPTIONS:MTIMIDITY}
+RUN_DEPENDS+=	timidity:${PORTSDIR}/audio/timidity++
+.endif
+
+.if ${PORT_OPTIONS:MPLAYMIDI}
+RUN_DEPENDS+=	playmidi:${PORTSDIR}/audio/playmidi
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} ${WRKSRC}/mma.py
 
@@ -48,10 +56,10 @@ do-install:
 .for d in lib includes MMA
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR}
 .endfor
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR} && cd ${WRKSRC}/egs && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}/pdf && ${CP} ${WRKDOC}/*.pdf ${DOCSDIR}/pdf/ && \
 	cd ${WRKSRC}/docs/html && ${COPYTREE_SHARE} . ${DOCSDIR}/html
 .endif
@@ -63,14 +71,4 @@ do-install:
 post-install:
 	${MMABIN} -G
 
-.include <bsd.port.pre.mk>
-
-.if defined (WITH_TIMIDITY)
-RUN_DEPENDS+=	timidity:${PORTSDIR}/audio/timidity++
-.endif
-
-.if defined (WITH_PLAYMIDI)
-RUN_DEPENDS+=	playmidi:${PORTSDIR}/audio/playmidi
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index 9514471d0bf5..1240ce6b8a28 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	moc
-# Date created:				24 July 2005
-# Whom:					Revis Zinkov <rzinkov@gmail.com>
-#
+# Created by: Revis Zinkov <rzinkov@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	moc
 PORTVERSION=	2.4.4
@@ -24,27 +20,20 @@ MAN1=		mocp.1
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	JACK "JACK support" off \
-		MP3 "MP3 support" on \
-		FFMPEG "FFMPEG support" off \
-		MUSEPACK "Musepack (mpc) support" off \
-		VORBIS "Ogg Vorbis support" on \
-		FLAC "FLAC support" off \
-		SNDFILE "libsndfile support" off \
-		SPEEX "Speex support" off \
-		SAMPLERATE "libsamplerate support" off \
-		CURL "curl support (Internet streams)" on \
-		RCC "RCC support" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_JACK)
+OPTIONS_DEFINE=	JACK MP3 FFMPEG MUSEPACK VORBIS FLAC SNDFILE SPEEX SAMPLERATE CURL RCC
+OPTIONS_DEFAULT=	MP3 VORBIS CURL
+CURL_DESC=	curl support (Internet streams)
+RCC_DESC=	RCC support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=	--without-jack
 .endif
 
-.if defined(WITH_MP3)
+.if ${PORT_OPTIONS:MMP3}
 LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
 		id3tag.0:${PORTSDIR}/audio/libid3tag
 PLIST_FILES+=	lib/moc/decoder_plugins/libmp3_decoder.a \
@@ -54,7 +43,7 @@ PLIST_FILES+=	lib/moc/decoder_plugins/libmp3_decoder.a \
 CONFIGURE_ARGS+=	--without-mp3
 .endif
 
-.if defined(WITH_MUSEPACK)
+.if ${PORT_OPTIONS:MMUSEPACK}
 LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack \
 		tag_c.0:${PORTSDIR}/audio/taglib
 PLIST_FILES+=	lib/moc/decoder_plugins/libmusepack_decoder.a \
@@ -64,7 +53,7 @@ PLIST_FILES+=	lib/moc/decoder_plugins/libmusepack_decoder.a \
 CONFIGURE_ARGS+=	--without-musepack
 .endif
 
-.if defined(WITH_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 PLIST_FILES+=	lib/moc/decoder_plugins/libvorbis_decoder.a \
 		lib/moc/decoder_plugins/libvorbis_decoder.la \
@@ -73,7 +62,7 @@ PLIST_FILES+=	lib/moc/decoder_plugins/libvorbis_decoder.a \
 CONFIGURE_ARGS+=	--without-ogg
 .endif
 
-.if defined(WITH_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
 PLIST_FILES+=	lib/moc/decoder_plugins/libflac_decoder.a \
 		lib/moc/decoder_plugins/libflac_decoder.la \
@@ -82,7 +71,7 @@ PLIST_FILES+=	lib/moc/decoder_plugins/libflac_decoder.a \
 CONFIGURE_ARGS+=	--without-flac
 .endif
 
-.if defined(WITH_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
 LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 PLIST_FILES+=   lib/moc/decoder_plugins/libffmpeg_decoder.a \
 		lib/moc/decoder_plugins/libffmpeg_decoder.la \
@@ -91,7 +80,7 @@ PLIST_FILES+=   lib/moc/decoder_plugins/libffmpeg_decoder.a \
 CONFIGURE_ARGS+=	--without-ffmpeg
 .endif
 
-.if defined(WITH_SNDFILE)
+.if ${PORT_OPTIONS:MSNDFILE}
 LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
 PLIST_FILES+=	lib/moc/decoder_plugins/libsndfile_formats_decoder.a \
 		lib/moc/decoder_plugins/libsndfile_formats_decoder.la \
@@ -100,7 +89,7 @@ PLIST_FILES+=	lib/moc/decoder_plugins/libsndfile_formats_decoder.a \
 CONFIGURE_ARGS+=	--without-sndfile
 .endif
 
-.if defined(WITH_SPEEX)
+.if ${PORT_OPTIONS:MSPEEX}
 LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
 PLIST_FILES+=	lib/moc/decoder_plugins/libspeex_decoder.a \
 		lib/moc/decoder_plugins/libspeex_decoder.la \
@@ -109,23 +98,23 @@ PLIST_FILES+=	lib/moc/decoder_plugins/libspeex_decoder.a \
 CONFIGURE_ARGS+=	--without-speex
 .endif
 
-.if defined(WITH_SAMPLERATE)
+.if ${PORT_OPTIONS:MSAMPLERATE}
 LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
 .else
 CONFIGURE_ARGS+=	--without-samplerate
 .endif
 
-.if defined(WITH_CURL)
+.if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
 .else
 CONFIGURE_ARGS+=	--without-curl
 .endif
 
-.if defined(WITH_RCC)
+.if ${PORT_OPTIONS:MRCC}
 LIB_DEPENDS+=	rcc.2:${PORTSDIR}/devel/librcc \
 		rcd.1:${PORTSDIR}/devel/librcd
 .else
 CONFIGURE_ARGS+=	--without-rcc
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 6cd7772cb57f..56a432946b0e 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mp3blaster
-# Date created:		5 January 2000
-# Whom:			Michael Vasilenko <acid@stu.cn.ua>
-#
+# Created by: Michael Vasilenko <acid@stu.cn.ua>
 # $FreeBSD$
-#
 
 PORTNAME=	mp3blaster
 PORTVERSION=	3.2.5
@@ -25,41 +21,41 @@ MAN1=		mp3blaster.1 nmixer.1 splay.1
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-OPTIONS=	LIRC "LIRC support" off \
-		SIDPLAY "Sidplayer support" on \
-		VORBIS "Ogg Vorbis support" on
+OPTIONS_DEFINE=	LIRC SIDPLAY VORBIS DOCS
+OPTIONS_DEFAULT=	SIDPLAY VORBIS
+SIDPLAY_DESC=	Sidplayer support
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	AUTHORS CREDITS ChangeLog FAQ README TODO
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_LIRC)
+.if ${PORT_OPTIONS:MLIRC}
 LIB_DEPENDS+=		lirc_client.2:${PORTSDIR}/comms/lirc
 CONFIGURE_ARGS+=	--with-lirc
 .endif
 
-.if !defined(WITHOUT_SIDPLAY)
+.if ${PORT_OPTIONS:MSIDPLAY}
 LIB_DEPENDS+=		sidplay.1:${PORTSDIR}/audio/libsidplay
 .else
 CONFIGURE_ARGS+=	--without-sidplay
 .endif
 
-.if defined(WITHOUT_VORBIS)
-CONFIGURE_ARGS+=	--without-oggvorbis
-.else
+.if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=		vorbisfile.6:${PORTSDIR}/audio/libvorbis
+.else
+CONFIGURE_ARGS+=	--without-oggvorbis
 .endif
 
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 CONFIGURE_ARGS+=	--with-sdl
 USE_SDL=	yes
 .else
 CONFIGURE_ARGS+=	--without-sdl
 .endif
 
-.if defined(WITH_NAS)
+.if ${PORT_OPTIONS:MNAS}
 CONFIGURE_ARGS+=	--with-nas
 LIB_DEPENDS+=		audio.2:${PORTSDIR}/audio/nas
 LDFLAGS+=		-laudio
@@ -67,8 +63,9 @@ LDFLAGS+=		-laudio
 CONFIGURE_ARGS+=	--without-nas
 .endif
 
+.include <bsd.port.pre.mk>
 .if ${HAVE_GNOME:Mesound} != ""
-USE_GNOME+=     	esound
+USE_GNOME+=		esound
 CONFIGURE_ARGS+=	--with-esd
 .else
 CONFIGURE_ARGS+=	--without-esd
@@ -80,7 +77,7 @@ post-patch:
 				${WRKSRC}/doc/sample.mp3blasterrc
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile
index 09e2fefd1e19..ea201bfb7e5a 100644
--- a/audio/mp3plot/Makefile
+++ b/audio/mp3plot/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Mp3 bitrate plot tool
 
 LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
 
-OPTIONS=	GD "Enable support for GD library" on \
-		IMAGEMAGICK "Enable support for Magick++" off
+OPTIONS_DEFINE=	GD IMAGEMAGICK
+OPTIONS_DEFAULT=	GD
 
 LICENSE=	GPLv2
 
@@ -28,15 +28,15 @@ PLIST_FILES=	bin/${PORTNAME}
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_GD)
-CONFIGURE_ARGS+=	--disable-gd
-.else
+.if ${PORT_OPTIONS:MGD}
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
+.else
+CONFIGURE_ARGS+=	--disable-gd
 .endif
 
-.if defined(WITH_IMAGEMAGICK)
+.if ${PORT_OPTIONS:MIMAGEMAGICK}
 LIB_DEPENDS+=	Magick++.5:${PORTSDIR}/graphics/ImageMagick
 .else
 CONFIGURE_ARGS+=	--disable-magick
@@ -47,4 +47,4 @@ post-patch:
 		-e 's|^extra_LD.*||g' \
 		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile
index 01c37ab5dec7..38b65e7c4dd0 100644
--- a/audio/mpc/Makefile
+++ b/audio/mpc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mpc
-# Date created:		Oct 02 2003
-# Whom:			Mark Reidel <ports@mark.reidle.info>
-#
+# Created by: Mark Reidel <ports@mark.reidle.info>
 # $FreeBSD$
-#
 
 PORTNAME=	mpc
 PORTVERSION=	0.21
@@ -15,7 +11,9 @@ COMMENT=	Command line client for the musicpd
 
 LIB_DEPENDS=	mpdclient:${PORTSDIR}/audio/libmpdclient
 
-OPTIONS=	ICONV "Support for international characters" on
+OPTIONS_DEFINE=	EXAMPLES DOCS ICONV
+OPTIONS_DEFAULT=	ICONV
+ICONV_DESC=	Support for international characters
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -27,7 +25,9 @@ PORTDOCS=	AUTHORS README NEWS
 
 PLIST_FILES=	bin/${PORTNAME} %%PORTEXAMPLES%%%%EXAMPLESDIR%%/${PORTNAME}-completion.bash
 
-.ifndef(NOPORTEXAMPLES)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MEXAMPLESDIR}
 PLIST_DIRS=	%%EXAMPLESDIR%%
 .endif
 
@@ -35,12 +35,10 @@ PLIST_DIRS=	%%EXAMPLESDIR%%
 MAN1=		${PORTNAME}.1
 .endif
 
-.include <bsd.port.pre.mk>
-
-.ifdef(WITHOUT_ICONV)
-CONFIGURE_ARGS+=--disable-iconv
-.else
+.if ${PORT_OPTIONS:MICONV}
 USE_ICONV=	yes
+.else
+CONFIGURE_ARGS+=--disable-iconv
 .endif
 
 post-patch:
@@ -48,13 +46,13 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
-.ifndef(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}-completion.bash ${EXAMPLESDIR}
 .endif
@@ -62,4 +60,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index fb8d83b18f1e..be816c49e34d 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -28,26 +28,23 @@ INSTALLS_ICONS=	yes
 CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-update \
 		no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations
 
-OPTIONS=	DBUS "Enable D-Bus support" on \
-		BONJOUR "Enable Bonjour support" off \
-		MUMBLE11X "Enable mumble 1.1 support" off \
-		SYSCELT "Use system CELT libraries" off \
+OPTIONS_DEFINE=	DBUS BONJOUR MUMBLE11X SYSCELT
+OPTIONS_DEFAULT=	DBUS
+BONJOUR_DESC=		Bonjour support
+MUMBLE11X_DESC=		mumble 1.1 support
+SYSCELT_DESC=		Use system CELT libraries
 
 MAN1=		mumble.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 800000
-BROKEN=		does not compile on FreeBSD 7.x
-.endif
-
-.if defined(WITHOUT_DBUS)
+.if ! ${PORT_OPTIONS:MDBUS}
 CONFIG+=	no-dbus
 .else
 USE_QT4+=	dbus
 .endif
 
-.if defined(WITHOUT_SYSCELT)
+.if ! ${PORT_OPTIONS:MSYSCELT}
 CONFIG+=	bundled-celt
 PLIST_SUB+=	BUNDLECELT=""
 .else
@@ -56,13 +53,13 @@ PLIST_SUB+=	BUNDLECELT="@comment "
 LIB_DEPENDS+=	celt0.2:${PORTSDIR}/audio/celt
 .endif
 
-.if defined(WITHOUT_BONJOUR)
+.if ! ${PORT_OPTIONS:MBONJOUR}
 CONFIG+=	no-bonjour
 .else
 LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
 .endif
 
-.if defined(WITHOUT_MUMBLE11X)
+.if ! ${PORT_OPTIONS:MMUMBLE11X}
 CONFIG+=	no-11x
 PLIST_SUB+=	MUMBLE11X="@comment "
 .else
@@ -72,12 +69,12 @@ PLIST_SUB+=	MUMBLE11X=""
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
 	# Fix with celt 0.11
-.if !defined(WITHOUT_SYSCELT)
+.if ${PORT_OPTIONS:MSYSCELT}
 	@${REINPLACE_CMD} -e 's/CELT_SET_VBR_RATE/CELT_SET_BITRATE/g' ${WRKSRC}/src/mumble/AudioInput.cpp
 .endif
 
 do-configure:
-.if defined(WITHOUT_SYSCELT)
+.if ! ${PORT_OPTIONS:MSYSCELT}
 	cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}"
 .else
 	cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}" "DEFINES+=FREEBSD_SYSTEM_CELT=1"
@@ -85,11 +82,11 @@ do-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${PREFIX}/bin
-.if defined(WITHOUT_SYSCELT)
+.if ! ${PORT_OPTIONS:MSYSCELT}
 	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${PREFIX}/lib/libcelt-mumble.so.0.11.0
 	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.7.0 ${PREFIX}/lib/libcelt-mumble.so.0.7.0
 .endif
-.if !defined(WITHOUT_MUMBLE11X)
+.if ${PORT_OPTIONS:MMUMBLE11X}
 	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble11x ${PREFIX}/bin
 .endif
 	${MKDIR} ${PREFIX}/share/services
@@ -103,4 +100,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${MANPREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index 2b594a6c8867..db2bc2efca96 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -23,25 +23,26 @@ CONFIG=		no-client
 MAN1=		murmurd.1
 USE_RC_SUBR=	murmur
 
-OPTIONS=	ICE "Ice Support" on \
-		DBUS "D-Bus Support" off \
-		BONJOUR "Bonjour Support" on
+OPTIONS_DEFINE=	ICE DBUS BONJOUR DOCS
+OPTIONS_DEFAULT=	ICE BONJOUR
+ICE_DESC=	Ice Support
+BONJOUR_DESC=	Bonjour Support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_ICE)
+.if ${PORT_OPTIONS:MICE}
 LIB_DEPENDS+=	Ice.34:${PORTSDIR}/devel/ice
 .else
 CONFIG+=	no-ice
 .endif
 
-.if defined(WITH_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
 USE_QT4+=	dbus
 .else
 CONFIG+=	no-dbus
 .endif
 
-.if defined(WITH_BONJOUR)
+.if ${PORT_OPTIONS:MBONJOUR}
 LIB_DEPENDS+=	dns_sd.1:${PORTSDIR}/net/mDNSResponder
 .else
 CONFIG+=	no-bonjour
@@ -69,7 +70,7 @@ do-install:
 		${CP} -p ${PREFIX}/etc/murmur.ini.sample ${PREFIX}/etc/murmur.ini; \
 	fi
 	${INSTALL_MAN} ${WRKSRC}/man/murmurd.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for f in CHANGES INSTALL LICENSE README README.Linux
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
@@ -79,4 +80,4 @@ do-install:
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index ad1c224e22d3..e7956e82d429 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ncmpc
-# Date created:		Apr 14 2004
-# Whom:			Mark Reidel <ports@mark.reidel.info>
-#
+# Created by: Mark Reidel <ports@mark.reidel.info>
 # $FreeBSD$
-#
 
 PORTNAME=	ncmpc
 PORTVERSION=	0.20
@@ -20,10 +16,11 @@ USE_GNOME=	glib20
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	NLS "Native language support" on \
-		LYRICS "Compile with lyrics screen" on
+OPTIONS_DEFINE=	NLS LYRICS
+OPTIONS_DEFAULT=	LYRICS
+LYRICS_DESC=	Compile with lyrics screen
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 USE_ICONV=	yes
 PLIST_FILES=	bin/ncmpc \
@@ -32,18 +29,17 @@ PLIST_FILES=	bin/ncmpc \
 		%%EXAMPLESDIR%%/ncmpc.lirc
 PLIST_DIRS=%%EXAMPLESDIR%%
 
-.ifdef(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 LANGUAGES=cs da de eo es fi fr gl he hu it ko nb nl pl pt_BR ru sk sv uk zh_CN
 .for language in ${LANGUAGES}
 PLIST_FILES+=share/locale/${language}/LC_MESSAGES/ncmpc.mo
 .endfor
-
+.else
+CONFIGURE_ARGS+=--disable-nls
 .endif
 
-.ifdef(WITH_LYRICS)
+.if ${PORT_OPTIONS:MLYRICS}
 CONFIGURE_ARGS+=--enable-lyrics-screen
 PLIST_FILES+=	lib/ncmpc/lyrics/10-hd.sh \
 		lib/ncmpc/lyrics/15-leoslyrics.sh \
@@ -68,13 +64,13 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/keys.sample ${EXAMPLESDIR}/keys
 	${INSTALL_DATA} ${WRKSRC}/doc/ncmpc.lirc ${EXAMPLESDIR}/
 	${INSTALL_MAN} ${WRKSRC}/doc/ncmpc.1 ${MAN1PREFIX}/man/man1/
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 .for language in ${LANGUAGES}
 	${MKDIR} ${LOCALBASE}/share/locale/${language}/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/po/${language}.gmo ${PREFIX}/share/locale/${language}/LC_MESSAGES/ncmpc.mo
 .endfor
 .endif
-.if !defined(WITHOUT_LYRICS)
+.if ${PORT_OPTIONS:MLYRICS}
 	${MKDIR} ${PREFIX}/lib/ncmpc/lyrics
 	${INSTALL_SCRIPT} ${WRKSRC}/lyrics/10-hd.sh ${PREFIX}/lib/ncmpc/lyrics/10-hd.sh
 	${INSTALL_SCRIPT} ${WRKSRC}/lyrics/15-leoslyrics.sh ${PREFIX}/lib/ncmpc/lyrics/15-leoslyrics.sh
@@ -82,4 +78,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/lyrics/30-leoslyrics.py ${PREFIX}/lib/ncmpc/lyrics/30-leoslyrics.py
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 7450b75cc615..2cf36c2480c1 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   normalize
-# Date created:        31 January 2001
-# Whom:                George Reid <greid@ukug.uk.freebsd.org>
-#
+# Created by: George Reid <greid@ukug.uk.freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	normalize
 PORTVERSION=	0.7.7
@@ -24,14 +20,13 @@ LDFLAGS+=		-L${LOCALBASE}/lib
 
 MAN1=		normalize.1 normalize-mp3.1
 
-OPTIONS=	XMMS "Build XMMS plugin" off \
-		MP3 "MP3 support" on \
-		OGG "OGG support" off \
-		FLAG "FLAC support" off
+OPTIONS_DEFINE=	XMMS MP3 OGG FLAC NLS
+OPTIONS_DEFAULT=	MP3
+XMMS_DESC=	XMMS plugin
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_XMMS)
+.if ${PORT_OPTIONS:MXMMS}
 LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 PLIST_SUB+=	XMMS=""
 .else
@@ -39,20 +34,20 @@ CONFIGURE_ARGS+=--disable-xmms
 PLIST_SUB+=	XMMS="@comment "
 .endif
 
-.if defined(WITH_MP3)
+.if ${PORT_OPTIONS:MMP3}
 RUN_DEPENDS+=	madplay:${PORTSDIR}/audio/madplay \
 		lame:${PORTSDIR}/audio/lame
 .endif
 
-.if defined(WITH_OGG)
+.if ${PORT_OPTIONS:MOGG}
 RUN_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools
 .endif
 
-.if defined(WITH_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
 RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
@@ -60,4 +55,4 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 78fdd9a831af..a1a02fe30503 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	openal
-# Date created:		25 September 2000
-# Whom:			Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	openal
 PORTVERSION=	20060211
@@ -23,37 +19,35 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-capture
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig gnomehack
+USES=		pathfix
+USE_PKGCONFIG=	build
 WANT_SDL=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS=	ARTS "aRts backend" off \
-		ESD "esd backend" off \
-		SDL "SDL backend" off \
-		VORBIS "vorbis support" off \
-		SMPEG "smpeg support" off
+OPTIONS_DEFINE=	ARTS ESOUND SDL VORBIS SMPEG
+SMPEG_DESC=	smpeg support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SMPEG)
+.if ${PORT_OPTIONS:MSMPEG}
 WITH_SDL=	yes	# smpeg requires SDL
 .endif
 
-.if defined(WITH_ARTS)
+.if ${PORT_OPTIONS:MARTS}
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
 CONFIGURE_ARGS+=--enable-arts
 .else
 CONFIGURE_ARGS+=--disable-arts
 .endif
 
-.if defined(WITH_ESD)
+.if ${PORT_OPTIONS:MESD}
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=--enable-esd
 .else
 CONFIGURE_ARGS+=--disable-esd
 .endif
 
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl
 CONFIGURE_ENV+=	HAVESDL="${SDL_CONFIG}"
 CONFIGURE_ARGS+=--enable-sdl
@@ -61,14 +55,14 @@ CONFIGURE_ARGS+=--enable-sdl
 CONFIGURE_ARGS+=--disable-sdl
 .endif
 
-.if defined(WITH_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=--enable-vorbis
 .else
 CONFIGURE_ARGS+=--disable-vorbis
 .endif
 
-.if defined(WITH_SMPEG)
+.if ${PORT_OPTIONS:MSMPEG}
 LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
 CONFIGURE_ARGS+=--enable-smpeg
 .else
@@ -104,4 +98,4 @@ post-patch:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index d3f0000cd9f7..1906d82f35f7 100644
--- a/audio/pytone/Makefile
+++ b/audio/pytone/Makefile
@@ -21,38 +21,38 @@ USE_NCURSES=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	PyTone
 
-OPTIONS=	MAD "MPEG Audio Decoder (libmad) support" On \
-		VORBIS "Ogg/Vorbis support" On \
-		PYAO "Libao cross-platform audio library" Off \
-		XMMS "Enable XMMS player engine" Off \
-		MPG123 "Enable mpg123 player engine" Off \
-		MPG321 "Enable mpg321 player engine" Off
+OPTIONS_DEFINE=	MAD VORBIS PYAO XMMS MPG123 MPG321
+OPTIONS_DEFAULT=	MAD VORBIS
+PYAO_DESC=	${AO_DESC}
+XMMS_DESC=	XMMS player engine
+MPG123_DESC=	mpg123 player engine
+MPG321_DESC=	mpg321 player engine
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
-.if !defined(WITHOUT_MAD)
+.if ${PORT_OPTIONS:MMAD}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/madmodule.so:${PORTSDIR}/audio/py-mad
 .endif
 
-.if !defined(WITHOUT_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
 .endif
 
-.if defined(WITH_PYAO)
+.if ${PORT_OPTIONS:MPYAO}
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/aomodule.so:${PORTSDIR}/audio/py-ao
 .endif
 
-.if defined(WITH_XMMS)
+.if ${PORT_OPTIONS:MXMMS}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xmms/xmmscontrol.so:${PORTSDIR}/audio/py-xmms
 .endif
 
-.if defined(WITH_MPG123)
+.if ${PORT_OPTIONS:MMPG123}
 RUN_DEPENDS+=	${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123
 .endif
 
-.if defined(WITH_MPG321)
+.if ${PORT_OPTIONS:MMPG321}
 RUN_DEPENDS+=	${LOCALBASE}/bin/mpg321:${PORTSDIR}/audio/mpg321
 .endif
 
@@ -66,4 +66,4 @@ post-install:
 	@${CP} ${WRKSRC}/conf/pytonerc ${PREFIX}/etc/pytonerc.sample
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile
index 5df300e9125f..8091d7066390 100644
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	qmpdclient
-# Date created:		4 June 2007
-# Whom:			uyamba@gmail.com
-#
+# Created by: uyamba@gmail.com
 # $FreeBSD$
-#
 
 PORTNAME=	qmpdclient
 PORTVERSION=	1.2.2
@@ -27,32 +23,31 @@ INSTALLS_ICONS=	yes
 QMAKE_ARGS=	${QMAKE_PRO}
 QMAKE_PRO=	${PORTNAME}.pro
 
-OPTIONS=	DBUS	"Enable D-BUS support"	off \
-		NLS	"Enable National Language Support" on
+OPTIONS_DEFINE=	DBUS NLS DEBUG
 
 DATADIR=	${PREFIX}/share/QMPDClient
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-.include  <bsd.port.pre.mk>
+.include  <bsd.port.options.mk>
 
-.if defined(WITHOUT_NLS)
+.if ! ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS="@comment "
 .else
 USE_QT4+=	linguist_build
 PLIST_SUB+=	NLS=""
 .endif
 
-.if defined(WITH_DBUS) && !defined(WITHOUT_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
 USE_QT4+=	dbus
 QMAKEFLAGS+=	"CONFIG+=qdbus"
 .endif
 
-.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 QMAKEFLAGS+=	"CONFIG+=debug"
 .endif
 
 post-patch:
-.if defined(WITHOUT_NLS)
+.if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e '/INSTALLS += translations/d' \
 		${WRKSRC}/${QMAKE_PRO}
 .endif
@@ -67,4 +62,4 @@ do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} \
 		${QMAKEFLAGS} ${QMAKE_ARGS}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/shoutcast/Makefile b/audio/shoutcast/Makefile
index 026381b4f6f7..81f6ce2b1d33 100644
--- a/audio/shoutcast/Makefile
+++ b/audio/shoutcast/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	shoutcast
-# Date created:				15 January 2011
-# Whom:					Jarrod Sayers <jarrod@downtools.com.au>
-#
+# Created by: Jarrod Sayers <jarrod@downtools.com.au>
 # $FreeBSD$
-#
 
 PORTNAME=	shoutcast
 PORTVERSION=	2.0.0.29
@@ -27,7 +23,8 @@ CONFLICTS=	linux-shoutcast-[0-9]*
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-OPTIONS=	CONFIG_BUILDER "Install SHOUTcast Configuration Builder" off
+OPTIONS_DEFINE=	CONFIG_BUILDER DOCS EXAMPLE
+CONFIG_BUILDER_DESC=	SHOUTcast Configuration Builder
 
 SHOUTCASTUSER=	${PORTNAME}
 SHOUTCASTGROUP=	${PORTNAME}
@@ -48,9 +45,9 @@ SUB_LIST=	${SHOUTCAST_SUB}
 USERS=		${SHOUTCASTUSER}
 GROUPS=		${SHOUTCASTGROUP}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CONFIG_BUILDER)
+.if ${PORT_OPTIONS:MCONFIG_BUILDER}
 PLIST_SUB+=	CONFIG_BUILDER=""
 .else
 PLIST_SUB+=	CONFIG_BUILDER="@comment "
@@ -62,7 +59,7 @@ post-patch:
 		-e 's#=.*/\([^\.]*.log\)#=${SHOUTCASTLDIR}/\1#g' \
 		-e 's#=control/#=${SHOUTCASTDIR}/#g' ${WRKSRC}/sc_serv_${_file}.conf
 .endfor
-.if defined(WITH_CONFIG_BUILDER)
+.if ${PORT_OPTIONS:MCONFIG_BUILDER}
 	@${REINPLACE_CMD} -e 's#<[^>]*>Windows<[^>]*>##g' \
 		-e 's#<[^>]*>Macintosh<[^>]*>##g' ${WRKSRC}/config_builder/config_builder.html
 	@${REINPLACE_CMD} -e 's#\(LogFile="\)\([^"/]*\)#\1${SHOUTCASTLDIR}/\2#g' \
@@ -74,7 +71,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sc_serv ${PREFIX}/sbin
 	${MKDIR} ${ETCDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/changes.txt ${DOCSDIR}/changes.txt
 	${INSTALL_DATA} ${WRKSRC}/docs/getting_started.txt ${DOCSDIR}/getting_started.txt
@@ -84,7 +81,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/shoutcast_system_overview.txt ${DOCSDIR}/shoutcast_system_overview.txt
 	${INSTALL_DATA} ${WRKSRC}/tos.txt ${DOCSDIR}/tos.txt
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/crossdomain.xml ${EXAMPLESDIR}/crossdomain.xml
 	${INSTALL_DATA} ${WRKSRC}/sc_serv_basic.conf ${EXAMPLESDIR}/sc_serv_basic.conf
@@ -93,7 +90,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/sc_serv_relay.conf ${EXAMPLESDIR}/sc_serv_relay.conf
 	${INSTALL_DATA} ${WRKSRC}/sc_serv_simple.conf ${EXAMPLESDIR}/sc_serv_simple.conf
 .endif
-.if defined(WITH_CONFIG_BUILDER)
+.if ${PORT_OPTIONS:MCONFIG_BUILDER}
 	${MKDIR} ${WWWDIR}/config_builder
 	${INSTALL_DATA} ${WRKSRC}/config_builder/config_builder.html ${WWWDIR}/config_builder/config_builder.html
 	${MKDIR} ${WWWDIR}/config_builder/db
@@ -119,4 +116,4 @@ post-install:
 	@${CHOWN} ${SHOUTCASTUSER}:wheel ${SHOUTCASTLDIR}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 13009c9c3ece..b0fa1e1855e1 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sox - Sound Exchange
-# Date created:		17 Oct 1994
-# Whom:			torstenb
-#
+# Created by: torstenb
 # $FreeBSD$
-#
 
 PORTNAME=	sox
 PORTVERSION=	14.3.2
@@ -28,37 +24,27 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libltdl
 USE_PKGCONFIG=	build
 
+OPTIONS_DEFINE=	ALSA AO AMRNB AMRWB FFMPEG FLAC GSM ID3TAG LADSPA LAME \
+		MAD PNG SNDFILE VORBIS WAVPACK
+OPTIONS_DEFAULT=	AO FFMPEG FLAC GSM ID3TAG MAD PNG SNDFILE VORBIS
 # Default LAME to off for packages so we don't end up RESTRICTED
-.if defined(PACKAGE_BUILDING)
-_LAME=	off
-.else
-_LAME=	on
-.endif
-
-OPTIONS=	ALSA "ALSA output driver" off \
-		AO "Enable libao output" on \
-		AMRNB "AMR Speech Codec (Narrowband)" off \
-		AMRWB "AMR Speech Codec (Wideband)" off \
-		FFMPEG "Enable ffmpeg en/decoding" on \
-		FLAC "Enable flac en/decoding with libflac" on \
-		GSM "Use libgsm from ports (else use bundled lib)" on \
-		ID3TAG "Enable mp3 tagging with libid3tag" on \
-		LADSPA "Audio plugin support" off \
-		LAME "Enable mp3 encoding with LAME" ${_LAME} \
-		MAD "Enable mp3 decoding with MAD" on \
-		PNG "Enable PNG spectrogram creation" on \
-		SNDFILE "Enable libsndfile" on \
-		VORBIS "Enable Ogg Vorbis support" on \
-		WAVPACK "Enable Wavpack support" off
-
-.include <bsd.port.pre.mk>
+.if !defined(PACKAGE_BUILDING)
+OPTIONS_DEFAULT=	LAME
+.endif
+
+AMRNB_DESC=	AMR Speech Codec (Narrowband)
+AMRWB_DESC=	AMR Speech Codec (Wideband)
+GSM_DESC=	Use libgsm from ports (else use bundled lib)
+PNG_DESC=	PNG spectrogram creation
+
+.include <bsd.port.options.mk>
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 CONFIGURE_ARGS+=	--with-distro="${CONFIGURE_TARGET} ${PKGNAME}"
 
-.if defined(WITH_ALSA)
+.if ${PORT_OPTIONS:MALSA}
 LIB_DEPENDS+=		asound.2:${PORTSDIR}/audio/alsa-lib
 RUN_DEPENDS+=		${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
 CONFIGURE_ARGS+=	--with-alsa
@@ -66,49 +52,49 @@ CONFIGURE_ARGS+=	--with-alsa
 CONFIGURE_ARGS+=	--without-alsa
 .endif
 
-.if defined(WITH_AO)
+.if ${PORT_OPTIONS:MAO}
 CONFIGURE_ARGS+=	--with-ao
 LIB_DEPENDS+=		ao.4:${PORTSDIR}/audio/libao
 .else
 CONFIGURE_ARGS+=	--without-ao
 .endif
 
-.if defined(WITH_AMRNB)
+.if ${PORT_OPTIONS:MAMRNB}
 CONFIGURE_ARGS+=	--with-amrnb
 LIB_DEPENDS+=		amrnb.3:${PORTSDIR}/audio/libamrnb
 .else
 CONFIGURE_ARGS+=	--without-amrnb
 .endif
 
-.if defined(WITH_AMRWB)
+.if ${PORT_OPTIONS:MAMRWB}
 CONFIGURE_ARGS+=	--with-amrwb
 LIB_DEPENDS+=		amrwb.3:${PORTSDIR}/audio/libamrwb
 .else
 CONFIGURE_ARGS+=	--without-amrwb
 .endif
 
-.if defined(WITH_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
 CONFIGURE_ARGS+=	--with-ffmpeg
 LIB_DEPENDS+=		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 .else
 CONFIGURE_ARGS+=	--without-ffmpeg
 .endif
 
-.if defined(WITH_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 CONFIGURE_ARGS+=	--with-oggvorbis
 LIB_DEPENDS+=		vorbis.4:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--without-oggvorbis
 .endif
 
-.if defined(WITH_SNDFILE)
+.if ${PORT_OPTIONS:MSNDFILE}
 CONFIGURE_ARGS+=	--with-sndfile
 LIB_DEPENDS+=		sndfile.1:${PORTSDIR}/audio/libsndfile
 .else
 CONFIGURE_ARGS+=	--without-sndfile
 .endif
 
-.if defined(WITH_LADSPA)
+.if ${PORT_OPTIONS:MLADSPA}
 CONFIGURE_ARGS+=	--with-ladspa
 RUN_DEPENDS+=		${LOCALBASE}/lib/ladspa/filter.so:${PORTSDIR}/audio/ladspa
 BUILD_DEPENDS+=		${LOCALBASE}/lib/ladspa/filter.so:${PORTSDIR}/audio/ladspa
@@ -116,35 +102,35 @@ BUILD_DEPENDS+=		${LOCALBASE}/lib/ladspa/filter.so:${PORTSDIR}/audio/ladspa
 CONFIGURE_ARGS+=	--without-ladspa
 .endif
 
-.if defined(WITH_LAME)
+.if ${PORT_OPTIONS:MLAME}
 CONFIGURE_ARGS+=	--with-lame
 LIB_DEPENDS+=		mp3lame.0:${PORTSDIR}/audio/lame
 .else
 CONFIGURE_ARGS+=	--without-lame
 .endif
 
-.if defined(WITH_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
 CONFIGURE_ARGS+=	--with-flac
 LIB_DEPENDS+=		FLAC.10:${PORTSDIR}/audio/flac
 .else
 CONFIGURE_ARGS+=	--without-flac
 .endif
 
-.if defined(WITH_MAD)
+.if ${PORT_OPTIONS:MMAD}
 CONFIGURE_ARGS+=	--with-mad
 LIB_DEPENDS+=		mad.2:${PORTSDIR}/audio/libmad
 .else
 CONFIGURE_ARGS+=	--without-mad
 .endif
 
-.if defined(WITH_PNG)
+.if ${PORT_OPTIONS:MPNG}
 CONFIGURE_ARGS+=	--with-png
 LIB_DEPENDS+=		png15:${PORTSDIR}/graphics/png
 .else
 CONFIGURE_ARGS+=	--without-png
 .endif
 
-.if defined(WITH_GSM)
+.if ${PORT_OPTIONS:MGSM}
 CONFIGURE_ARGS+=	--with-gsm
 LIB_DEPENDS+=		gsm.1:${PORTSDIR}/audio/gsm
 .else
@@ -155,18 +141,18 @@ CONFIGURE_ENV+=	ac_cv_header_gsm_h=no ac_cv_header_gsm_gsm_h=no \
 		ac_cv_lib_gsm_gsm_create=no
 .endif
 
-.if defined(WITH_ID3TAG)
+.if ${PORT_OPTIONS:MID3TAG}
 CONFIGURE_ARGS+=	--with-id3tag
 LIB_DEPENDS+=		id3tag.0:${PORTSDIR}/audio/libid3tag
 .else
 CONFIGURE_ARGS+=	--without-id3tag
 .endif
 
-.if defined(WITH_WAVPACK)
+.if ${PORT_OPTIONS:MWAVPACK}
 CONFIGURE_ARGS+=	--with-wavpack
 LIB_DEPENDS+=		wavpack.2:${PORTSDIR}/audio/wavpack
 .else
 CONFIGURE_ARGS+=	--without-wavpack
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile
index 80ccc00d3240..91d4f11e002c 100644
--- a/audio/streamripper/Makefile
+++ b/audio/streamripper/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Splits SHOUTcast stream into tracks
 LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
 		tre.5:${PORTSDIR}/textproc/libtre
 
-OPTIONS=	FAAD "Include FAAD mpeg4 codec support" on \
-		VORBIS "Include Ogg Vorbis codec support" on
+OPTIONS_DEFINE=	FAAD VORBIS
+OPTIONS_DEFAULT=	FAAD VORBIS
 
 LICENSE=	GPLv2
 
@@ -39,15 +39,15 @@ LDFLAGS+=	-Lcdk-${CDK_VERSION} -L${LOCALBASE}/lib
 
 CDK_VERSION=	5.0-20060507
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_FAAD)
+.if ! ${PORT_OPTIONS:MFAAD}
 CONFIGURE_ARGS+=	ac_cv_lib_faad_NeAACDecDecode2=no
 .else
 LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
 .endif
 
-.if defined(WITHOUT_VORBIS)
+.if ! ${PORT_OPTIONS:MVORBIS}
 CONFIGURE_ARGS+=	--without-ogg
 .else
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
@@ -73,4 +73,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/streamripper ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/streamripper.1 ${MANPREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index 848959384582..e8b919cca25a 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	zynaddsubfx
-# Date created:		2007-01-25
-# Whom:			trasz <trasz@pin.if.uz.zgora.pl>
-#
+# Created by: trasz <trasz@pin.if.uz.zgora.pl>
 # $FreeBSD$
-#
 
 PORTNAME=	zynaddsubfx
 PORTVERSION=	2.4.1
@@ -27,26 +23,24 @@ USE_GMAKE=	yes
 CXXFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS=	ALSAMIDI	"Enable midi input through ALSA" off \
-		GUI		"Enable graphical front-end" on \
-		JACK		"Enable sound output through JackAudio" off \
-		PORTAUDIO	"Enable sound output through PortAudio" off
+OPTIONS_DEFINE=	ALSAMIDI GUI
+OPTIONS_DEFAULT=	GUI
+ALSAMIDI_DESC=		midi input through ALSA
+OPTIONS_RADIO=	OUTPUT
+OPTIONS_RADIO_OUTPUT=	JACK PORTAUDIO
+OUTPUT_DESC=	Audio output type
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_ALSAMIDI)
+.if ${PORT_OPTIONS:MALSAMIDI}
 LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
 .endif
 
-.if (defined(WITH_JACK) && defined(WITH_PORTAUDIO))
-BROKEN=		only one output type can be chosen
-.endif
-
-.if defined(WITH_JACK)
+.if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 .endif
 
-.if defined(WITH_PORTAUDIO)
+.if ${PORT_OPTIONS:MPORTAUDIO}
 LIB_DEPENDS+=	portaudio.0:${PORTSDIR}/audio/portaudio
 .endif
 
@@ -66,19 +60,19 @@ post-patch:
 		's|LIBS= -lm  -lmxml -lz|LIBS= -lm  -lmxml -lz -L${LOCALBASE}/lib|g' \
 		${WRKSRC}/Makefile
 
-.if !defined(WITH_ALSAMIDI)
+.if ! ${PORT_OPTIONS:MALSAMIDI}
 	${REINPLACE_CMD} -e 's|LINUX_MIDIIN=ALSA|LINUX_MIDIIN=OSS|g' \
 		${WRKSRC}/Makefile.inc
 .endif
-.if defined(WITH_JACK)
+.if ${PORT_OPTIONS:MJACK}
 	${REINPLACE_CMD} -e 's|LINUX_AUDIOOUT=OSS|LINUX_AUDIOOUT=OSS_AND_JACK|g' \
 		${WRKSRC}/Makefile.inc
 .endif
-.if defined(WITH_PORTAUDIO)
+.if ${PORT_OPTIONS:MPORTAUDIO}
 	${REINPLACE_CMD} -e 's|LINUX_AUDIOOUT=OSS|LINUX_AUDIOOUT=PA|g' \
 		${WRKSRC}/Makefile.inc
 .endif
-.if defined(WITHOUT_GUI)
+.if ! ${PORT_OPTIONS:MGUI}
 	${REINPLACE_CMD} -e 's|DISABLE_GUI=NO|DISABLE_GUI=YES|g' \
 		${WRKSRC}/Makefile.inc
 .endif
@@ -91,4 +85,4 @@ do-install:
 		cd ${WRKDIR}/${DISTNAME}/banks && ${FIND} . -type f \
 			-exec ${INSTALL_DATA} {} ${DATADIR}/banks/{} \;
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>