13 files changed, 240 insertions, 227 deletions

diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index 14b09ba7f068..51fa7029a398 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -14,8 +14,8 @@ MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Abraca is a GTK2 client for the XMMS2 music player
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	xmmsclient.6:${PORTSDIR}/audio/xmms2 \
-		gee.2:${PORTSDIR}/devel/libgee
+LIB_DEPENDS=	xmmsclient:${PORTSDIR}/audio/xmms2 \
+		gee:${PORTSDIR}/devel/libgee
 
 USE_SCONS=	yes
 USE_GNOME=	gtk30
@@ -25,11 +25,12 @@ SCONS_ARGS=	MANDIR=${MANPREFIX}/man
 MAN1=		abraca.1
 MANCOMPRESSED=	yes
 
-OPTIONS=	NLS	"Enable gettext support" on
+OPTIONS_DEFINE=	NLS
+OPTIONS_DEFAULT=	NLS
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS='@comment '
 .else
@@ -38,7 +39,7 @@ USE_GETTEXT=	yes
 .endif
 
 post-configure:
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e 's/%%NLS%%/0/' ${WRKSRC}/SConstruct
 .else
 	@${REINPLACE_CMD} -e 's/%%NLS%%/1/' ${WRKSRC}/SConstruct
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index caf90c640e56..500ef0945cef 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -29,39 +29,36 @@ PLIST_SUB+=	INCLUDEDIR="include/${PORTNAME}" LIBDIR="lib/${PORTNAME}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-OPTIONS=	AIRPLAY	"Support output via Airport Express" off \
-		AO	"Support to output via libao" off \
-		APE	"Support to playback Monkey's Audio files" off \
-		AVCODEC	"Support to playback files with avcodec" off \
-		CDDA	"Support to playback AudioCD" off \
-		CURL	"Support to playback files via HTTP" on \
-		FAAD	"Support to playback AAC files" on \
-		FAM	"Support to update Media Library on file change" off \
-		FLAC	"Support to playback FLAC files" on \
-		GME	"Support to playback video game music files" off \
-		GVFS	"Support to playback files via GVFS" off \
-		ICES	"Support to playback files to an icecast server" off \
-		JACK	"Support to output via the Jack output server" off \
-		MAD	"Support to playback MP3 files" on \
-		MDNS_APPLE "Support to announce XMMS2d via mDNS (Apple)" on \
-		MDNS_AVAHI "Support to announce XMMS2d via mDNS (Avahi)" off \
-		MMS	"Support to playback streams via MMS" off \
-		MODPLUG	"Support to playback MOD files" off \
-		MPG123	"Support to playback MP3 files" off \
-		MUSEPACK "Support to playback MPC files" off \
-		OFA	"Support to collect MusicDNS fingerprints" off \
-		PULSE	"Support to output via the PulseAudio" off \
-		SAMBA	"Support to playback files via SMB" off \
-		SID	"Support to playback SID files" off \
-		SNDFILE	"Support to playback AIFF/AU/CAF/PAF files" off \
-		SPEEX	"Support to playback SPEEX files" off \
-		TREMOR	"Support to playback OGG files" off \
-		VISUAL	"Support for visualization plugins" off \
-		VOCODER	"Phase Vocoder effect plugin" off \
-		VORBIS	"Support to playback OGG files" on \
-		WAVPACK	"Support to playback WV files" off \
-		XML	"Support for XML based playlists (XSPF, RSS)" off \
-		ET	"Install usage feedback reporting client" off
+OPTIONS_DEFINE=	AIRPLAY AO APE AVCODEC CDDA CURL ET FAAD FAM FLAC \
+		GME GVFS ICES JACK MAD MDNS_APPLE MDNS_AVAHI MMS \
+		MODPLUG MPG123 MUSEPACK OFA PULSEAUDIO SAMBA SID \
+		SNDFILE SPEEX TREMOR VISUAL VOCODER VORBIS WAVPACK XML
+OPTIONS_DEFAULT=	CURL FAAD FLAC MAD MDNS_APPLE VORBIS
+
+AIRPLAY_DESC=	Support output via Airport Express
+APE_DESC=	Support to playback Monkey's Audio files
+AVCODEC_DESC=	Support to playback files with avcodec
+CDDA_DESC=	Support to playback AudioCD
+CURL_DESC=	Support to playback files via HTTP
+ET_DESC=	Install usage feedback reporting client
+FAAD_DESC=	Support to playback AAC files
+FAM_DESC=	Support to update Media Library on file change
+GME_DESC=	Support to playback video game music files
+GVFS_DESC=	Support to playback files via GVFS
+ICES_DESC=	Support to playback files to an icecast server
+MAD_DESC=	Support to playback MP3 files
+MDNS_APPLE_DESC=	Support to announce XMMS2d via mDNS (Apple)
+MDNS_AVAHI_DESC=	Support to announce XMMS2d via mDNS (Avahi)
+MMS_DESC=	Support to playback streams via MMS
+MPG123_DESC=	Support to playback MP3 files
+OFA_DESC=	Support to collect MusicDNS fingerprints
+SAMBA_DESC=	Support to playback files via SMB
+SID_DESC=	Support to playback SID files
+VISUAL_DESC=	Support for visualization plugins
+VOCODER_DESC=	Phase Vocoder effect plugin
+WAVPACK_DESC=	Support to playback WV files
+XML_DESC=	Support for XML based playlists (XSPF, RSS)
+
 .endif # !XMMS_SLAVE
 
 .include <bsd.port.options.mk>
@@ -97,7 +94,7 @@ EXCLUDE+=	--without-optionals="python" \
 
 .if !defined(XMMS2_SLAVE)
 
-.if !defined(WITHOUT_AIRPLAY)
+.if ${PORT_OPTIONS:MAIRPLAY}
 USE_OPENSSL=	yes
 PLIST_SUB+=	AIRPLAY=""
 .else
@@ -105,56 +102,56 @@ EXCLUDE+=	--without-plugins="airplay"
 PLIST_SUB+=	AIRPLAY="@comment "
 .endif
 
-.if !defined(WITHOUT_AO)
-LIB_DEPENDS+=	ao.4:${PORTSDIR}/audio/libao
+.if ${PORT_OPTIONS:MAO}
+LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
 PLIST_SUB+=	AO=""
 .else
 EXCLUDE+=	--without-plugins="ao"
 PLIST_SUB+=	AO="@comment "
 .endif
 
-.if !defined(WITHOUT_APE)
-LIB_DEPENDS+=	mac.2:${PORTSDIR}/audio/mac
+.if ${PORT_OPTIONS:MAPE}
+LIB_DEPENDS+=	mac:${PORTSDIR}/audio/mac
 PLIST_SUB+=	MAC=""
 .else
 EXCLUDE+=	--without-plugins="mac"
 PLIST_SUB+=	MAC="@comment "
 .endif
 
-.if !defined(WITHOUT_AVCODEC)
-LIB_DEPENDS+=	avutil.1:${PORTSDIR}/multimedia/ffmpeg
+.if ${PORT_OPTIONS:MAVCODEC}
+LIB_DEPENDS+=	avutil:${PORTSDIR}/multimedia/ffmpeg
 PLIST_SUB+=	AVCODEC=""
 .else
 EXCLUDE+=	--without-plugins="avcodec"
 PLIST_SUB+=	AVCODEC="@comment "
 .endif
 
-.if !defined(WITHOUT_CDDA)
-LIB_DEPENDS+=	cdio.13:${PORTSDIR}/sysutils/libcdio \
-		discid.0:${PORTSDIR}/audio/libdiscid
+.if ${PORT_OPTIONS:MCDDA}
+LIB_DEPENDS+=	cdio:${PORTSDIR}/sysutils/libcdio \
+		discid:${PORTSDIR}/audio/libdiscid
 PLIST_SUB+=	CDDA=""
 .else
 EXCLUDE+=	--without-plugins="cdda"
 PLIST_SUB+=	CDDA="@comment "
 .endif
 
-.if !defined(WITHOUT_CURL)
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+.if ${PORT_OPTIONS:MCURL}
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 PLIST_SUB+=	CURL=""
 .else
 EXCLUDE+=	--without-plugins="curl" --without-plugins="icymetaint"
 PLIST_SUB+=	CURL="@comment "
 .endif
 
-.if !defined(WITHOUT_FAAD)
-LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
+.if ${PORT_OPTIONS:MFAAD}
+LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
 PLIST_SUB+=	FAAD=""
 .else
 EXCLUDE+=	--without-plugins="faad" --without-plugins="mp4"
 PLIST_SUB+=	FAAD="@comment "
 .endif
 
-.if !defined(WITHOUT_FAM)
+.if ${PORT_OPTIONS:MDAM}
 USE_FAM=	yes
 WANT_FAM_SYSTEM=gamin
 PLIST_SUB+=	FAM=""
@@ -163,23 +160,23 @@ EXCLUDE+=	--without-optionals="medialib-updater"
 PLIST_SUB+=	FAM="@comment "
 .endif
 
-.if !defined(WITHOUT_FLAC)
-LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
+.if ${PORT_OPTIONS:MFLAC}
+LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
 PLIST_SUB+=	FLAC=""
 .else
 EXCLUDE+=	--without-plugins="flac"
 PLIST_SUB+=	FLAC="@comment "
 .endif
 
-.if !defined(WITHOUT_GME)
-LIB_DEPENDS+=	gme.0:${PORTSDIR}/audio/libgme
+.if ${PORT_OPTIONS:MGME}
+LIB_DEPENDS+=	gme:${PORTSDIR}/audio/libgme
 PLIST_SUB+=	GME=""
 .else
 EXCLUDE+=	--without-plugins="gme"
 PLIST_SUB+=	GME="@comment "
 .endif
 
-.if !defined(WITHOUT_GVFS)
+.if ${PORT_OPTIONS:MGVFS}
 USE_GNOME+=	gvfs
 PLIST_SUB+=	GVFS=""
 .else
@@ -187,37 +184,37 @@ EXCLUDE+=	--without-plugins="gvfs"
 PLIST_SUB+=	GVFS="@comment "
 .endif
 
-.if !defined(WITHOUT_ICES)
-LIB_DEPENDS+=	shout.5:${PORTSDIR}/audio/libshout2
+.if ${PORT_OPTIONS:MICES}
+LIB_DEPENDS+=	shout:${PORTSDIR}/audio/libshout2
 PLIST_SUB+=	ICES=""
 .else
 EXCLUDE+=	--without-plugins="ices"
 PLIST_SUB+=	ICES="@comment "
 .endif
 
-.if !defined(WITHOUT_JACK)
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+.if ${PORT_OPTIONS:MJACK}
+LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 PLIST_SUB+=	JACK=""
 .else
 EXCLUDE+=	--without-plugins="jack"
 PLIST_SUB+=	JACK="@comment "
 .endif
 
-.if !defined(WITHOUT_MAD)
-LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
+.if ${PORT_OPTIONS:MMAD}
+LIB_DEPENDS+=	mad:${PORTSDIR}/audio/libmad
 PLIST_SUB+=	MAD=""
 .else
 EXCLUDE+=	--without-plugins="mad"
 PLIST_SUB+=	MAD="@comment "
 .endif
 
-.if !defined(WITHOUT_MDNS_APPLE) && !defined(WITHOUT_MDNS_AVAHI)
-BROKEN=		You may choose either MDNS_APPLE or MDNS_AVAHI, but not both
-.elif defined(WITHOUT_MDNS_APPLE) && defined(WITHOUT_MDNS_AVAHI)
+.if ${PORT_OPTIONS:MMDNS_APPLE} && ${PORT_OPTIONS:MMDNS_AVAHI}
+IGNORE=		you may choose either MDNS_APPLE or MDNS_AVAHI, but not both
+.elif !${PORT_OPTIONS:MMDNS_APPLE} && !${PORT_OPTIONS:MMDNS_AVAHI}
 EXCLUDE+=	--without-optionals="mdns"
 .endif
 
-.if !defined(WITHOUT_MDNS_APPLE)
+.if ${PORT_OPTIONS:MMDNS_APPLE}
 EXCLUDE+=	--with-mdns-backend="dns_sd"
 LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
 PLIST_SUB+=	MDNS_APPLE=""
@@ -225,7 +222,7 @@ PLIST_SUB+=	MDNS_APPLE=""
 PLIST_SUB+=	MDNS_APPLE="@comment "
 .endif
 
-.if !defined(WITHOUT_MDNS_AVAHI)
+.if ${PORT_OPTIONS:MMDNS_AVAHI}
 EXCLUDE+=	--with-mdns-backend="avahi"
 LIB_DEPENDS+=	avahi-core:${PORTSDIR}/net/avahi-app
 PLIST_SUB+=	MDNS_AVAHI=""
@@ -234,88 +231,88 @@ MAN1+=		xmms2-mdns-avahi.1
 PLIST_SUB+=	MDNS_AVAHI="@comment "
 .endif
 
-.if !defined(WITHOUT_MMS)
-LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
+.if ${PORT_OPTIONS:MMMS}
+LIB_DEPENDS+=	mms:${PORTSDIR}/net/libmms
 PLIST_SUB+=	MMS=""
 .else
 EXCLUDE+=	--without-plugins="mms"
 PLIST_SUB+=	MMS="@comment "
 .endif
 
-.if !defined(WITHOUT_MODPLUG)
-LIB_DEPENDS+=	modplug.1:${PORTSDIR}/audio/libmodplug
+.if ${PORT_OPTIONS:MMODPLUG}
+LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug
 PLIST_SUB+=	MODPLUG=""
 .else
 EXCLUDE+=	--without-plugins="modplug"
 PLIST_SUB+=	MODPLUG="@comment "
 .endif
 
-.if !defined(WITHOUT_MPG123)
-LIB_DEPENDS+=	mpg123.0:${PORTSDIR}/audio/mpg123
+.if ${PORT_OPTIONS:MMPG123}
+LIB_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123
 PLIST_SUB+=	MPG123=""
 .else
 EXCLUDE+=	--without-plugins="mpg123"
 PLIST_SUB+=	MPG123="@comment "
 .endif
 
-.if !defined(WITHOUT_MUSEPACK)
-LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
+.if ${PORT_OPTIONS:MMUSEPACK}
+LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/musepack
 PLIST_SUB+=	MUSEPACK=""
 .else
 EXCLUDE+=	--without-plugins="musepack"
 PLIST_SUB+=	MUSEPACK="@comment "
 .endif
 
-.if !defined(WITHOUT_OFA)
-LIB_DEPENDS+=	ofa.0:${PORTSDIR}/audio/libofa
+.if ${PORT_OPTIONS:MOFA}
+LIB_DEPENDS+=	ofa:${PORTSDIR}/audio/libofa
 PLIST_SUB+=	OFA=""
 .else
 EXCLUDE+=	--without-plugins="ofa"
 PLIST_SUB+=	OFA="@comment "
 .endif
 
-.if !defined(WITHOUT_PULSE)
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
 EXCLUDE+=	--without-plugins="pulse"
 PLIST_SUB+=	PULSE="@comment "
 .endif
 
-.if !defined(WITHOUT_SAMBA)
-LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+.if ${PORT_OPTIONS:MSAMBA}
+LIB_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-libsmbclient
 PLIST_SUB+=	SAMBA=""
 .else
 EXCLUDE+=	--without-plugins="samba"
 PLIST_SUB+=	SAMBA="@comment "
 .endif
 
-.if !defined(WITHOUT_SID)
-LIB_DEPENDS+=	sidplay2.[0-9]:${PORTSDIR}/audio/libsidplay2
+.if ${PORT_OPTIONS:MSID}
+LIB_DEPENDS+=	sidplay2:${PORTSDIR}/audio/libsidplay2
 PLIST_SUB+=	SID=""
 .else
 EXCLUDE+=	--without-plugins="sid"
 PLIST_SUB+=	SID="@comment "
 .endif
 
-.if !defined(WITHOUT_SNDFILE)
-LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+.if ${PORT_OPTIONS:MSNDFILE}
+LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
 PLIST_SUB+=	SNDFILE=""
 .else
 EXCLUDE+=	--without-plugins="sndfile"
 PLIST_SUB+=	SNDFILE="@comment "
 .endif
 
-.if !defined(WITHOUT_SPEEX)
-LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
+.if ${PORT_OPTIONS:MSPEEX}
+LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex
 PLIST_SUB+=	SPEEX=""
 .else
 EXCLUDE+=	--without-plugins="speex"
 PLIST_SUB+=	SPEEX="@comment "
 .endif
 
-.if !defined(WITHOUT_TREMOR)
-LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
+.if ${PORT_OPTIONS:MTREMOR}
+LIB_DEPENDS+=	vorbisidec:${PORTSDIR}/audio/libtremor
 PLIST_SUB+=	TREMOR=""
 .else
 EXCLUDE+=	--without-plugins="tremor"
@@ -323,52 +320,52 @@ PLIST_SUB+=	TREMOR="@comment "
 .endif
 
 # xmms2-ripper
-.if !defined(WITHOUT_VISUAL) && !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	vorbisenc.2:${PORTSDIR}/audio/libvorbis
+.if ${PORT_OPTIONS:MVISUAL} && ${PORT_OPTIONS:MVORBIS}
+LIB_DEPENDS+=	vorbisenc:${PORTSDIR}/audio/libvorbis
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-clients-vistest-wscript
 .endif
 
 # XXX: shm support requires semtimedop(2)
-.if !defined(WITHOUT_VISUAL)
+.if ${PORT_OPTIONS:MVISUAL}
 USE_SDL=	yes
 LIB_DEPENDS+=	visual-0.4.0:${PORTSDIR}/graphics/libvisual04
 .else
 EXCLUDE+=	--without-optionals="vistest"
 .endif
 
-.if !defined(WITHOUT_VISUAL) && ${EXCLUDE:M--with-vis-reference-clients}
+.if ${PORT_OPTIONS:MVISUAL} && ${EXCLUDE:M--with-vis-reference-clients}
 PLIST_SUB+=	VISUAL=""
 .else
 PLIST_SUB+=	VISUAL="@comment "
 .endif
 
-.if !defined(WITHOUT_VOCODER)
+.if ${PORT_OPTIONS:MVOCODER}
 LIB_DEPENDS+=	fftw3f:${PORTSDIR}/math/fftw3-float
-LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	samplerate:${PORTSDIR}/audio/libsamplerate
 PLIST_SUB+=	VOCODER=""
 .else
 EXCLUDE+=	--without-plugins="vocoder"
 PLIST_SUB+=	VOCODER="@comment "
 .endif
 
-.if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+.if ${PORT_OPTIONS:MVORBIS}
+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 EXCLUDE+=	--without-plugins="vorbis"
 PLIST_SUB+=	VORBIS="@comment "
 .endif
 
-.if !defined(WITHOUT_WAVPACK)
-LIB_DEPENDS+=	wavpack.2:${PORTSDIR}/audio/wavpack
+.if ${PORT_OPTIONS:MWAVPACK}
+LIB_DEPENDS+=	wavpack:${PORTSDIR}/audio/wavpack
 PLIST_SUB+=	WAVPACK=""
 .else
 EXCLUDE+=	--without-plugins="wavpack"
 PLIST_SUB+=	WAVPACK="@comment "
 .endif
 
-.if !defined(WITHOUT_XML)
+.if ${PORT_OPTIONS:MXML}
 USE_GNOME+=	libxml2
 PLIST_SUB+=	XML=""
 .else
@@ -377,7 +374,7 @@ EXCLUDE+=	--without-plugins="xml" --without-plugins="rss" \
 PLIST_SUB+=	XML="@comment "
 .endif
 
-.if !defined(WITHOUT_ET)
+.if ${PORT_OPTIONS:MET}
 PLIST_SUB+=	ET=""
 MAN1+=		xmms2-et.1
 .else
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 6bc2e5d373a7..3e4938523730 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -46,66 +46,78 @@ MAN8=		gnokiid.8 mgnokiidev.8
 
 CONFLICTS=	smstools-[0-9]* sendsms-[0-9]*
 
-OPTIONS=	ICAL	"Build with IETF iCal support"		off \
-		USB	"Build with libusb support"		off \
-		PCSC	"Build with PC/SC-Lite support"		off \
-		SMSD	"Enable smsd daemon"			off \
-		MYSQL	"Enable MySQL support for smsd"		off \
-		PGSQL	"Enable PostgreSQL support for smsd"	off \
-		SQLITE	"Enable SQLite support in smsd"		off \
-		X11	"Build graphical version (xgnokii)"	on
-
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/lib/libical.so) || defined(WITH_ICAL)
-LIB_DEPENDS+=	ical.44:${PORTSDIR}/devel/libical
+OPTIONS_DEFINE=	DOCS ICAL MYSQL PCSC PGSQL SMSD SQLITE USB X11
+OPTIONS_DEFAULT=	X11
+
+ICAL_DESC=	Build with IETF iCal support
+USB_DESC=	Build with libusb support
+PCSC_DESC=	Build with PC/SC-Lite support
+SMSD_DESC=	Enable smsd daemon
+MYSQL_DESC=	Enable MySQL backend for smsd
+PGSQL_DESC=	Enable PostgreSQL backend for smsd
+SQLITE_DESC=	Enable SQLite backend in smsd
+X11_DESC=	Build graphical version (xgnokii)
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MICAL}
+LIB_DEPENDS+=		ical:${PORTSDIR}/devel/libical
+.else
+CONFIGURE_ARGS+=	--disable-libical
 .endif
 
 .if ${OSVERSION} < 800069
-. if exists(${LOCALBASE}/lib/libusb.so) || defined(WITH_USB)
-LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
+. if ${PORT_OPTIONS:MUSB}
+LIB_DEPENDS+=		usb-0.1.8:${PORTSDIR}/devel/libusb
+. else
+CONFIGURE_ARGS+=	--disable-libusb
 . endif
 .endif
 
-.if exists(${LOCALBASE}/lib/libpcsclite.so) || defined(WITH_PCSC)
-LIB_DEPENDS+=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
+.if ${PORT_OPTIONS:MPCSC}
+LIB_DEPENDS+=		pcsclite:${PORTSDIR}/devel/pcsc-lite
+.else
+CONFIGURE_ARGS+=	--disable-libpcsclite
 .endif
 
-.if !defined(WITH_SMSD)
+.if !${PORT_OPTIONS:MSMSD}
 PLIST_SUB+=	SMSD='@comment ' MSM='@comment ' PGM='@comment ' SQLT='@comment '
 CONFIGURE_ARGS+=	--disable-smsd
 .else
 PLIST_SUB+=	SMSD=''
 USE_GNOME+=	glib20
 MAN8+=		smsd.8
-.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so) && !defined(WITHOUT_MYSQL)
+. if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 PLIST_SUB+=	MSM=''
-.else
+. else
+CONFIGURE_ARGS+=	--disable-mysql
 PLIST_SUB+=	MSM='@comment '
-.endif
-.if exists(${LOCALBASE}/bin/psql) && !defined(WITHOUT_PGSQL)
+. endif
+. if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 PLIST_SUB+=	PGM=''
-.else
+. else
+CONFIGURE_ARGS+=	--disable-postgres
 PLIST_SUB+=	PGM='@comment '
-.endif
-.if exists(${LOCALBASE}/lib/libsqlite3.so) && !defined(WITHOUT_SQLITE)
-LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+. endif
+. if ${PORT_OPTIONS:MSQLITE}
+LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
 PLIST_SUB+=	SQLT=''
-.else
+. else
+CONFIGURE_ARGS+=	--disable-sqlite
 PLIST_SUB+=	SQLT='@comment '
-.endif
+. endif
 .endif
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--without-x
-PLIST_SUB+=	X11='@comment '
-.else
+.if ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS+=	--with-x
 USE_XORG=	xpm
 USE_GNOME+=	gtk20
 PLIST_SUB+=	X11=''
+.else
+CONFIGURE_ARGS+=	--without-x
+PLIST_SUB+=	X11='@comment '
 .endif
 
 FIXPREFIX=	Docs/man/gnokiid.8 Docs/DataCalls-QuickStart Docs/README \
@@ -130,27 +142,27 @@ post-patch:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/xgnokii/xgnokii.pc ${PREFIX}/libdata/pkgconfig
 	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${GMAKE} install -C ${WRKSRC}/Docs
 .else
 	${GMAKE} install -C ${WRKSRC}/Docs/man
 .endif
 	${INSTALL_DATA} ${WRKSRC}/Docs/sample/gnokiirc \
 		${PREFIX}/etc/gnokiirc.sample
-.if defined(WITH_SMSD)
+.if ${PORT_OPTIONS:MSMSD}
 	@cd ${WRKSRC}/smsd && ${GMAKE} install
 	${MKDIR} ${PREFIX}/share/smsd
 	${INSTALL_SCRIPT} ${WRKSRC}/smsd/action ${PREFIX}/share/smsd
 	${INSTALL_DATA} ${WRKSRC}/smsd/README ${PREFIX}/share/smsd
-.if defined(WITH_MYSQL)
+.  if ${PORT_OPTIONS:MMYSQL}
 	${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.mysql.sql ${PREFIX}/share/smsd
-.endif
-.if defined(WITH_PGSQL)
+.  endif
+.  if ${PORT_OPTIONS:MPGSQL}
 	${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.pq.sql ${PREFIX}/share/smsd
-.endif
+.  endif
 .endif
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index f3441242eba9..9ae766070d24 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -20,11 +20,13 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	LIBUSB "Enable OBEX over USB" no
+OPTIONS_DEFINE=	USB
 
-.include <bsd.port.pre.mk>
+USB_DESC=	Enable OBEX over USB
 
-.if defined(WITH_LIBUSB)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MUSB}
 . if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
 CFLAGS+=	-I${PREFIX}/include
@@ -36,4 +38,4 @@ CONFIGURE_ARGS+=--enable-usb
 CONFIGURE_ARGS+=--disable-usb
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/jsmin/Makefile b/devel/jsmin/Makefile
index a6730904f5ed..b8b947e30617 100644
--- a/devel/jsmin/Makefile
+++ b/devel/jsmin/Makefile
@@ -21,12 +21,14 @@ FETCH_ARGS=	-pRr
 PLIST_FILES=	bin/jsmin
 PORTDOCS=	README
 
+.include <bsd.port.options.mk>
+
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -o ${PORTNAME} ${PORTNAME}.c
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
 .endif
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index 67c64dc40bb2..20c0fc8366fd 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -17,11 +17,11 @@ COMMENT=	A poker game written in C++/QT4
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
-		mikmod.2:${PORTSDIR}/audio/libmikmod \
-		gnutls.47:${PORTSDIR}/security/gnutls \
-		curl.6:${PORTSDIR}/ftp/curl \
-		gsasl.15:${PORTSDIR}/security/gsasl \
+LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
+		mikmod:${PORTSDIR}/audio/libmikmod \
+		gnutls:${PORTSDIR}/security/gnutls \
+		curl:${PORTSDIR}/ftp/curl \
+		gsasl5:${PORTSDIR}/security/gsasl \
 		tinyxml:${PORTSDIR}/textproc/tinyxml
 BUILD_DEPENDS=	${LOCALBASE}/include/libircclient.h:${PORTSDIR}/irc/libircclient
 
@@ -39,6 +39,8 @@ QMAKE_ARGS+=	PREFIX=${PREFIX}
 PORTDOCS=	server_setup_howto.txt
 MAN1=		pokerth.1
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's|/usr([a-z|/]*)|${LOCALBASE}/\1|g' \
@@ -55,7 +57,7 @@ post-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/pokerth ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin/pokerth_server ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/docs/server_setup_howto.txt ${DOCSDIR}
 .endif
diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
index 85f16abfdd53..b1b6e45bc2c4 100644
--- a/graphics/amide/Makefile
+++ b/graphics/amide/Makefile
@@ -30,12 +30,12 @@ MAN1=		amide.1
 OPTIONS_DEFINE=	DCMTK FAME FFMPEG GSL VOLPACK XMEDCON
 OPTIONS_DEFAULT= DCMTK FFMPEG GSL VOLPACK XMEDCON
 
-DCMTK_DESC=	"Use dcmtk"
-FAME_DESC=	"Use libfame (mutually exclusive with ffmpeg)"
-FFMPEG_DESC=	"Use ffmpeg (mutually exclusive with libfame)"
-GSL_DESC=	"Use gsl"
-VOLPACK_DESC=	"Use volpack"
-XMEDCON_DESC=	"Use xmedcon"
+DCMTK_DESC=	Use dcmtk
+FAME_DESC=	Use libfame (mutually exclusive with ffmpeg)
+FFMPEG_DESC=	Use ffmpeg (mutually exclusive with libfame)
+GSL_DESC=	Use gsl
+VOLPACK_DESC=	Use volpack
+XMEDCON_DESC=	Use xmedcon
 
 .include <bsd.port.options.mk>
 
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=	--disable-libdcmdata
 
 .if ${PORT_OPTIONS:MFAME}
 .  if${PORT_OPTIONS:MFFMPEG}
-IGNORE=		libfame and ffmpeg support are mutually exclusive, please check options.
+IGNORE=		libfame and ffmpeg support are mutually exclusive, please check options
 .  endif
 LIB_DEPENDS+=	fame:${PORTSDIR}/multimedia/libfame
 CONFIGURE_ARGS+=	--enable-libfame
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 685a839bd353..2ef84c06b35b 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -25,22 +25,21 @@ WANT_GNOME=	yes
 MAKE_ARGS=	CFLAGS=""
 CONFLICTS=	unison-[0-9]* unison-nox11-[0-9]*
 
+OPTIONS_DEFINE=	DOCS GTK2
+OPTIONS_DEFAULT=	DOCS GTK2
+
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	unison all
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 DOCS=		BUGS.txt NEWS README
 EXTRA_DOCS=	unison-${PORTVERSION}-manual.html \
 		unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
 .endif
 
-.if !defined(WITHOUT_GTK2) && !defined(WITHOUT_X11)
-WITH_GTK2=	yes
-.endif
-
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 MAKE_ARGS+=	UISTYLE=gtk2
 PLIST_SUB+=	TEXT=""
 BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml \
@@ -57,7 +56,7 @@ BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml-nox11
 PATCH_DEPENDS+=	${BUILD_DEPENDS}
 .endif
 
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 post-build:
 	@${ECHO} Building text-only version
 	@${ECHO} ${WRKSRC}
@@ -68,15 +67,15 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unison ${PREFIX}/bin
 
 post-install:
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 	@${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
 .endif
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 	@${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin
 	@${MKDIR} ${DESKTOPDIR}
 	@${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR}
@@ -86,4 +85,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}.nox11
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/unison-nox11/Makefile b/net/unison-nox11/Makefile
index d87bd7837602..c5bec352d492 100644
--- a/net/unison-nox11/Makefile
+++ b/net/unison-nox11/Makefile
@@ -13,7 +13,8 @@ COMMENT=	A user-level file synchronization tool (without x11 stuff)
 
 CONFLICTS=	unison-[0-9]*, unison-devel-[0-9]*
 
-WITHOUT_X11=	yes
+OPTIONS_EXCLUDE=	GTK2
+OPTIONS_DEFAULT=	DOCS
 MASTERDIR=	${.CURDIR}/../unison
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 4122f3706a34..32585686146c 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -16,30 +16,29 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	A user-level file synchronization tool
 
+LICENSE=	GPLv3
+
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 MAKE_ARGS=	CFLAGS=""
-CONFLICTS=	unison-devel-[0-9]* unison-nox11-[0-9]*
+CONFLICTS?=	unison-devel-[0-9]* unison-nox11-[0-9]*
 
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	unison all
 
-LICENSE=	GPLv3
+OPTIONS_DEFINE= DOCS GTK2
+OPTIONS_DEFAULT?=        DOCS GTK2
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 DOCS=		BUGS.txt NEWS README
 EXTRA_DOCS=	unison-${PORTVERSION}-manual.html \
 		unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
 .endif
 
-.if !defined(WITHOUT_GTK2) && !defined(WITHOUT_X11)
-WITH_GTK2=	yes
-.endif
-
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 MAKE_ARGS+=	UISTYLE=gtk2
 PLIST_SUB+=	TEXT=""
 BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml \
@@ -56,7 +55,7 @@ BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml-nox11
 PATCH_DEPENDS+=	${BUILD_DEPENDS}
 .endif
 
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 post-build:
 	@${ECHO} Building text-only version
 	@${ECHO} ${WRKSRC}
@@ -67,12 +66,12 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unison ${PREFIX}/bin
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
 .endif
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 	@${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin
 	@${MKDIR} ${DESKTOPDIR}
 	@${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR}
@@ -82,4 +81,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}.nox11
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
index b8da2eae7460..01251a1957ab 100644
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -27,22 +27,19 @@ MAKE_JOBS_UNSAFE=	yes
 
 LICENCE=	GPLv3
 
-.if defined(WITHOUT_X11)
-WITHOUT_GTK2=	yes
-.else
-OPTIONS=	GTK2 "Build a GTK2-based version" on
-.endif
+OPTIONS_DEFINE= DOCS GTK
+OPTIONS_DEFAULT=	DOCS GTK
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 DOCS=		BUGS.txt NEWS README
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 EXTRA_DOCS=	${PORTNAME}-${PORTVERSION}-manual.html \
 		${PORTNAME}-${PORTVERSION}-manual.pdf ${PORTNAME}-${PORTVERSION}-manual.ps
 .endif
 
-.if !defined(WITHOUT_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 MAKE_ARGS+=	UISTYLE=gtk2
 PLIST_SUB+=	TEXT=""
 BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml \
@@ -59,7 +56,7 @@ BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml-nox11
 PATCH_DEPENDS+=	${BUILD_DEPENDS}
 .endif
 
-.if !defined(WITHOUT_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 post-build:
 	@${ECHO} Building text-only version
 	@${ECHO} ${WRKSRC}
@@ -70,16 +67,16 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
 .endif
-.if !defined(WITHOUT_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text
 	${MKDIR} ${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR}/${PORTNAME}${PKGNAMESUFFIX}.desktop
 	-update-desktop-database > /dev/null
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index bf98607c1f0a..46bcb59a2740 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -19,11 +19,11 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	A fast redirector for squid
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
-
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
+
 USE_BDB=	40+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-db-inc=${BDB_INCLUDE_DIR} \
@@ -50,30 +50,32 @@ SUB_LIST=	PORTNAME=${PORTNAME} \
 		SAMPLE_BL_DIR=${SAMPLE_BL_DIR}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-OPTIONS=	SAMPLE_BL	"Install sample blacklists" On \
-		LDAP		"Enable LDAP support" Off \
-		DNS_BL		"Enable DNS based blacklists" Off \
-		QUOTE_STRING	"Add quoted string patch" Off
+OPTIONS_DEFINE=	DNS_BL DOCS LDAP QUOTE_STRING SAMPLE_BL
+OPTIONS_DEFAULT=	SAMPLE_BL
 
-.include <bsd.port.pre.mk>
+SAMPLE_BL_DESC=	Install sample blacklists
+DNS_BL_DESC=	Enable DNS based blacklists
+QUOTE_STRING=	Add quoted string patch
 
-.if defined(WITH_LDAP)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLDAP}
 CONFIGURE_ARGS+=	--with-ldap
 USE_OPENLDAP=		yes
 .else
 CONFIGURE_ARGS+=	--without-ldap
 .endif
 
-.if defined(WITHOUT_SAMPLE_BL)
-INSTALL_BL=	no
-PLIST_SUB+=	BLACKLIST="@comment "
-.else
-.if !exists(${DATADIR})
+.if ${PORT_OPTIONS:MSAMPLE_BL}
+. if !exists(${DATADIR})
 INSTALL_BL=	yes
-.else
+. else
 INSTALL_BL=	no
-.endif
+. endif
 PLIST_SUB+=	BLACKLIST=""
+.else
+INSTALL_BL=	no
+PLIST_SUB+=	BLACKLIST="@comment "
 .endif
 
 pre-fetch:
@@ -90,15 +92,15 @@ post-patch:
 		${REINPLACE_CMD} -E -e 's,(db_version),\1_4002,g' \
 			${WRKSRC}/configure ; \
 	fi
-.if defined(WITH_QUOTE_STRING)
+.if ${PORT_OPTIONS:MQUOTE_STRING}
 	${PATCH} -d ${WRKSRC} --forward --quiet -p2 <${DISTDIR}/squidGuard-1.4-quoted_string_support.diff
 .endif
-.if defined(WITH_DNS_BL)
+.if ${PORT_OPTIONS:MDNS_BL}
 	${PATCH} -d ${WRKSRC} --forward --quiet -p1 <${DISTDIR}/squidGuard-1.4-dnsbl.patch
 .endif
 
 post-build:
-.if !defined(WITHOUT_SAMPLE_BL)
+.if ${PORT_OPTIONS:MSAMPLE_BL}
 	@${ECHO_MSG} "===>   Building blacklists"
 	${MKDIR} ${_DATADIR}
 	@${TAR} -C ${_DATADIR} --exclude *.diff -pxzf \
@@ -112,7 +114,7 @@ pre-install:
 #
 # Install blacklists
 #
-.if !defined(WITHOUT_SAMPLE_BL)
+.if ${PORT_OPTIONS:MSAMPLE_BL}
 	@${MKDIR} ${SAMPLE_BL_DIR}
 	@${CP} -Rpf ${_DATADIR}/* ${SAMPLE_BL_DIR}
 	@${CHOWN} -R ${SQUID_UID}:${SQUID_GID} ${SAMPLE_BL_DIR}
@@ -179,12 +181,12 @@ post-install:
 #
 # Install documentation
 #
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "===>   Installing ${PORTNAME} documentation"
 	-@${MKDIR} ${DOCSDIR}
-.for i in ${WRKSRC}/doc/*.txt ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.gif ${WRKSRC}/doc/README
+. for i in ${WRKSRC}/doc/*.txt ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.gif ${WRKSRC}/doc/README
 	@${INSTALL_DATA} ${WRKSRC}$i ${DOCSDIR}
-.endfor
+. endfor
 	@if [ -f ${WRKDIR}/README.blacklists ] ; then \
 		${INSTALL_DATA} ${WRKDIR}/README.blacklists ${DOCSDIR} ; \
 	fi
@@ -198,4 +200,4 @@ post-install:
 
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/trayer-srg/Makefile b/x11/trayer-srg/Makefile
index c94faf5f5c44..273cd2223260 100644
--- a/x11/trayer-srg/Makefile
+++ b/x11/trayer-srg/Makefile
@@ -26,18 +26,17 @@ USE_XORG=	xmu
 USE_GMAKE=	yes
 MAKE_ARGS=	"PREFIX=${PREFIX}"
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	README CREDITS CHANGELOG
-.endif
-
 PLIST_FILES=	bin/trayer
 
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
+. for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+. endfor
 .endif
 
 .include <bsd.port.mk>