- adopt optionsNG for games

- trim historical headers and trim comments
- some Makefile cleanup

Approved by:	portmgr (bapt)

45 files changed, 525 insertions, 623 deletions

diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 10de25cf82da..92e54a37bb62 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	alephone
-# Date created:		27 February 2001
-# Whom:			Michael Alyn Miller <malyn@strangeGizmo.com>
-#
+# Created by: Michael Alyn Miller <malyn@strangeGizmo.com>
 # $FreeBSD$
-#
 
 PORTNAME=	alephone
 PORTVERSION=	20120514
@@ -30,53 +26,53 @@ DATADIR=	${PREFIX}/share/AlephOne
 
 MAN6=		alephone.6
 
-OPTIONS=	MAD "use libmad for mp3 playback" on \
-		OGG "enable ogg/vorbis music playback" on \
-		SPEEX "enable speex net mic playback" on \
-		SMPEG "use SMPEG for movie playback" on \
-		TTF "enable SDL_ttf font rendering" on \
-		ZZIP "enable zziplib support" on
+OPTIONS_DEFINE=	MAD OGG SPEEX SMPEG TTF ZZIP
+SMPEG_DESC=	Use SMPEG for movie playback
+TTF_DESC=	Enable SDL_ttf font rendering
+ZZIP_DESC=	Enable zziplib support
+
+OPTIONS_DEFAULT=	MAD OGG SPEEX SMPEG TTF ZZIP
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_MAD)
-CONFIGURE_ARGS+=--disable-mad
-.else
+.if ${PORT_OPTIONS:MMAD}
 LIB_DEPEND+=	mad.2:${PORTSDIR}/audio/libmad
+.else
+CONFIGURE_ARGS+=--disable-mad
 .endif
 
-.if defined(WITHOUT_OGG)
-CONFIGURE_ARGS+=--disable-vorbis
-.else
+.if ${PORT_OPTIONS:MOGG}
 LIB_DEPEND+=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
+.else
+CONFIGURE_ARGS+=--disable-vorbis
 .endif
 
-.if defined(WITHOUT_SPEEX)
-CONFIGURE_ARGS+=--disable-speex
-.else
+.if ${PORT_OPTIONS:MSPEEX}
 LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
+.else
+CONFIGURE_ARGS+=--disable-speex
 .endif
 
-.if defined(WITHOUT_SMPEG)
-CONFIGURE_ARGS+=--disable-smpeg
-.else
+.if ${PORT_OPTIONS:MSMPEG}
 LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
+.else
+CONFIGURE_ARGS+=--disable-smpeg
 .endif
 
-.if defined(WITHOUT_TTF)
-CONFIGURE_ARGS+=--disable-ttf
-.else
+.if ${PORT_OPTIONS:MTTF}
 USE_SDL+=	ttf
+.else
+CONFIGURE_ARGS+=--disable-ttf
 .endif
 
-.if defined(WITHOUT_ZZIP)
-CONFIGURE_ARGS+=--disable-zzip
-.else
+.if ${PORT_OPTIONS:MZZIP}
 LIB_DEPENDS+=	zzip.13:${PORTSDIR}/devel/zziplib
+.else
+CONFIGURE_ARGS+=--disable-zzip
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} README ${DOCSDIR}
 	cd ${WRKSRC}/docs && ${INSTALL_DATA} *.html ${DOCSDIR}
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index c2cace7e6a29..cb1266eea393 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -36,8 +36,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-7.53/source
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	CLIENT "Build client" on \
-		DEDICATED "Build dedicated server" on
+OPTIONS_MULTI=	FLAVOR
+OPTIONS_MULTI_FLAVOR=	CLIENT DEDICATED
+CLIENT_DESC=	Build client
+DEDICATED_DESC=	Build dedicated server
+
+OPTIONS_DEFAULT=	CLIENT DEDICATED
 
 PLIST_SUB=	LIBDIR=${LIBDIR:S/${PREFIX}\///}
 
@@ -45,7 +49,7 @@ LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 USES+=		pkgconfig
 LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl \
 		freetype.9:${PORTSDIR}/print/freetype2 \
@@ -57,21 +61,17 @@ USE_OPENAL=	soft alut
 USE_XORG=	xxf86dga xxf86vm
 .endif
 
-.if !defined(WITH_CLIENT) && defined(WITH_DEDICATED)
+.if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MDEDICATED}
 CONFIGURE_ARGS+=--disable-client
 .endif
 
-.if !defined(WITH_CLIENT) && !defined(WITH_DEDICATED)
-IGNORE=		needs at least one executable (CLIENT or DEDICATED)
-.endif
-
-.if defined(WITH_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 PLIST_SUB+=	CLIENT=""
 .else
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if defined(WITH_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 PLIST_SUB+=	DEDICATED=""
 .else
 PLIST_SUB+=	DEDICATED="@comment "
@@ -89,11 +89,11 @@ do-install:
 	${LN} -s ${DATADIR}/arena/* ${LIBDIR}/arena
 	${LN} -s ${DATADIR}/botinfo ${LIBDIR}
 	${LN} -s ${DATADIR}/data1/* ${LIBDIR}/data1
-.if defined(WITH_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 	${INSTALL_PROGRAM} ${WRKSRC}/crx \
 		${PREFIX}/bin/${PORTNAME}
 .endif
-.if defined(WITH_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 	${INSTALL_PROGRAM} ${WRKSRC}/crx-ded \
 		${PREFIX}/bin/${PORTNAME}-ded
 .endif
diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile
index b7d6f7c5152e..9900b0225f6d 100644
--- a/games/armagetron/Makefile
+++ b/games/armagetron/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for:   	armagetron
-# Date created:                        	12 November 2005
-# Whom:                                 Maxime Henrion <mux@FreeBSD.org>
-#
+# Created by: Maxime Henrion <mux@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	armagetron
 PORTVERSION=	0.2.8.2.1
@@ -27,12 +22,15 @@ LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-OPTIONS=	MUSIC	"Compile in support for background music" on \
-		ARMA_SERVER_ONLY	"Build dedicated server only" off
+OPTIONS_DEFINE=	MUSIC ARMA_SERVER_ONLY
+MUSIC_DESC=	Compile in support for background music
+ARMA_SERVER_ONLY_DESC=	Build dedicated server only
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	MUSIC
 
-.if defined(WITH_ARMA_SERVER_ONLY)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MARMA_SERVER_ONLY}
 CONFIGURE_ARGS+=	--disable-glout
 PLIST_SUB+=	CLIENT="@comment " SERVER="" SUFFIX="-dedicated"
 PKGNAMESUFFX=	-dedicated
@@ -42,7 +40,7 @@ USE_GL=		gl
 USE_SDL=	sdl image
 CXXFLAGS+=	`${SDL_CONFIG} --cflags`
 PLIST_SUB+=	CLIENT="" SERVER="@comment " SUFFIX=""
-.if !defined(WITHOUT_MUSIC)
+.if ${PORT_OPTIONS:MMUSIC}
 USE_SDL+=	mixer
 CONFIGURE_ARGS+=--enable-music
 .endif
@@ -58,4 +56,4 @@ post-patch:
 	    ${WRKSRC}/batch/*.in
 	@${FIND} ${WRKSRC}/batch -name '*.bak' -o -name '*.orig' -delete
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/arx-libertatis/Makefile b/games/arx-libertatis/Makefile
index e805603040a9..a24bef5eae13 100644
--- a/games/arx-libertatis/Makefile
+++ b/games/arx-libertatis/Makefile
@@ -33,11 +33,12 @@ MAN6=		arx.6
 
 PORTDOCS=	AUTHORS CHANGELOG README.md
 
-OPTIONS=	CRASHREPORTER "Build crash reporter (requires Qt4)" off
+OPTIONS_DEFINE=	CRASHREPORTER 
+CRASHREPORTER_DESC=	Build crash reporter (requires Qt4)
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_CRASHREPORTER)
+.if ${PORT_OPTIONS:MCRASHREPORTER}
 USE_QT4=	corelib gui network rcc_build moc_build uic_build qmake_build
 CMAKE_ARGS+=	-DBUILD_CRASHREPORTER=ON
 PLIST_SUB+=	CRASHREPORTER=""
@@ -47,7 +48,7 @@ PLIST_SUB+=	CRASHREPORTER="@comment "
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
diff --git a/games/balazarbrothers/Makefile b/games/balazarbrothers/Makefile
index 058f61e0a97d..5742c578d85a 100644
--- a/games/balazarbrothers/Makefile
+++ b/games/balazarbrothers/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	balazarbrothers
-# Date created:		2006-05-07
-# Whom:			Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
-#
 
 PORTNAME=	balazarbrothers
 PORTVERSION=	0.3.1
@@ -34,12 +30,14 @@ PYDISTUTILS_PKGNAME=	BalazarBrothers
 PYDISTUTILS_EGGINFODIR=	${PREFIX}/share
 DATADIR=	share/balazar_brothers
 
-OPTIONS=	OPENAL	"Use openal sound system" on
+OPTIONS_DEFINE=	OPENAL
+OPTIONS_DEFAULT=	OPENAL
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_OPENAL)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_openal.so:${PORTSDIR}/audio/py-openal
+.if ${PORT_OPTIONS:MOPENAL}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openal>=0:${PORTSDIR}/audio/py-openal
 .endif
 
 post-patch:
diff --git a/games/blinkensisters/Makefile b/games/blinkensisters/Makefile
index 409a766db315..6f714f311777 100644
--- a/games/blinkensisters/Makefile
+++ b/games/blinkensisters/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	blinkensisters
-# Date created:		26 Mar 2006
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	blinkensisters
 PORTVERSION=	0.5.3
@@ -26,18 +22,20 @@ ADDONS_WRKSRC=	${WRKDIR}/blinkensisters/lostpixels/game/addons
 
 PORTDOCS=	*
 
-OPTIONS=	ADDONS	"Install addons (~200 MB download size)" off \
-		SDL_MIXER	"Build with sound support" on \
-		SDL_NET	"Build with network support" on \
-		THEORA	"Build with theora support" off
+OPTIONS_DEFINE=	ADDONS SDL_MIXER SDL_NET THEORA
+ADDONS_DESC=	Install addons (~200 MB download size)
+SDL_MIXER_DESC=	Build with sound support
+SDL_NET_DESC=	Build with network support
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	SDL_MIXER SDL_NET
+
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
 
-.if defined(WITH_ADDONS)
+.if ${PORT_OPTIONS:MADDONS}
 DISTNAME=	LostPixels-${PORTVERSION}-source-with-addons
 PKGNAMESUFFIX=	-with-addons
 PLIST_SUB+=	ADDONS=""
@@ -46,41 +44,41 @@ DISTNAME=	LostPixels-${PORTVERSION}-source
 PLIST_SUB+=	ADDONS="@comment "
 .endif
 
-.if defined(WITHOUT_SDL_MIXER)
-CMAKE_ARGS+=	-DUSE_SDL_MIXER:BOOL=OFF
-PLIST_SUB+=	SDL_MIXER="@comment "
-.else
+.if ${PORT_OPTIONS:MSDL_MIXER}
 USE_SDL+=	mixer
 PLIST_SUB+=	SDL_MIXER=""
+.else
+CMAKE_ARGS+=	-DUSE_SDL_MIXER:BOOL=OFF
+PLIST_SUB+=	SDL_MIXER="@comment "
 .endif
 
-.if defined(WITHOUT_SDL_NET)
-CMAKE_ARGS+=	-DUSE_SDL_NET:BOOL=OFF
-PLIST_SUB+=	SDL_NET="@comment "
-.else
+.if ${PORT_OPTIONS:MSDL_NET}
 USE_SDL+=	net
 PLIST_SUB+=	SDL_NET=""
+.else
+CMAKE_ARGS+=	-DUSE_SDL_NET:BOOL=OFF
+PLIST_SUB+=	SDL_NET="@comment "
 .endif
 
-.if defined(WITH_THEORA)
+.if ${PORT_OPTIONS:MTHEORA}
 CMAKE_ARGS+=	-DUSE_THEORA:BOOL=ON
 .else
 LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
 .endif
 
 post-patch:
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/^INSTALL.*doc/ d' ${WRKSRC}/CMakeLists.txt
 .endif
 	@${REINPLACE_CMD} -e 's|share/blinkensisters|${DATADIR:S,${PREFIX}/,,}|; \
 		s|share/doc/blinkensisters|${DOCSDIR:S,${PREFIX}/,,}|' \
 		${WRKSRC}/CMakeLists.txt
-.if defined(WITH_ADDONS)
+.if ${PORT_OPTIONS:MADDONS}
 	@${FIND} ${ADDONS_WRKSRC} -name "Makefile" | ${XARGS} \
 		${REINPLACE_CMD} -e 's|bmfcompress|${WRKSRC}/&|'
 .endif
 
-.if defined(WITH_ADDONS)
+.if ${PORT_OPTIONS:MADDONS}
 post-build:
 	cd ${ADDONS_WRKSRC} && ${MAKE}
 
@@ -89,4 +87,4 @@ post-install:
 	${INSTALL_DATA} ${ADDONS_WRKSRC}/for_upload/*.bmf ${DATADIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/bloodfrontier/Makefile b/games/bloodfrontier/Makefile
index d877ae11c301..9d6152c63466 100644
--- a/games/bloodfrontier/Makefile
+++ b/games/bloodfrontier/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sauerbraten
-# Date created:		2006-02-01
-# Whom:			Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
-#
 
 PORTNAME=	bloodfrontier
 DISTVERSION=	B2
@@ -27,9 +23,14 @@ MAKE_JOBS_SAFE=	yes
 
 SUB_FILES=	bfclient bfserver
 
-OPTIONS=	CLIENT "Build client" on \
-		DEDICATED "Build dedicated server" on \
-		OPTIMIZED_CFLAGS "Enabled additional optimizations" on
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
+OPTIONS_MULTI=	FLAVOR
+OPTIONS_MULTI_FLAVOR=	CLIENT DEDICATED
+CLIENT_DESC=	Build client
+DEDICATED_DESC= Build dedicated server
+FLAVOR_DESC=	Executable Selections
+
+OPTIONS_DEFAULT=	CLIENT DEDICATED OPTIMIZED_CFLAGS
 
 .include <bsd.port.options.mk>
 
@@ -37,23 +38,19 @@ OPTIONS=	CLIENT "Build client" on \
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
 
-.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED)
-IGNORE=		needs at least one executable (CLIENT or DEDICATED)
-.endif
-
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 USE_GL=		yes
 USE_SDL=	image mixer sdl
 PLIST_FILES+=	bin/bfclient libexec/bfclient
 BINARIES+=	client
 .endif
 
-.if !defined(WITHOUT_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 PLIST_FILES+=	bin/bfserver libexec/bfserver
 BINARIES+=	server
 .endif
 
-.if defined(WITH_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -fomit-frame-pointer
 CXXFLAGS+=	-O3 -fomit-frame-pointer
 .endif
diff --git a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile
index b1897f463d5d..6fddcaab2841 100644
--- a/games/d2x-xl/Makefile
+++ b/games/d2x-xl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	d2x-xl
-# Date created:		25 Feb 2009
-# Whom:			Aragon Gouveia
-#
+# Created by: Aragon Gouveia
 # $FreeBSD$
-#
 
 PORTNAME=	d2x-xl
 PORTVERSION=	1.14.121
@@ -38,15 +34,16 @@ USE_DOS2UNIX=	missing depcomp
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	OPENGL "Use OpenGL for 3D graphics" on
+OPTIONS_DEFINE=	OPENGL
+OPTIONS_DEFAULT=	OPENGL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
 
-.if !defined(WITHOUT_OPENGL)
+.if ${PORT_OPTIONS:MOPENGL}
 USE_GL=		gl glu
 CONFIGURE_ARGS+=--with-opengl
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -74,4 +71,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/d2x-xl ${PREFIX}/bin/d2x-xl
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile
index 94652050e018..df230020e7f8 100644
--- a/games/daimonin/Makefile
+++ b/games/daimonin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	daimonin-client
-# Date created:				15 Feb 2005
-# Whom:					Pav Lucistnik <pav@FreeBSD.org>
-#
+# Created by: Pav Lucistnik <pav@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	daimonin
 PORTVERSION=	0.10.5
@@ -31,29 +27,26 @@ SUB_LIST=	PORTVERSION=${PORTVERSION}
 
 WRKSRC=		${WRKDIR}/client/make/linux
 
-OPTIONS=	KB_DESKTOP	"Install key bindings for desktop (num keypad)"		on \
-		KB_LAPTOP	"Install key bindings for laptop (789uojkl)"		off \
-		KB_ROGUE	"Install rogue-like key bindings (hjkl and yubn)"	off \
-		MUSIC		"Download and Install music files (83 Mb)"		on \
-		DEBUG		"Enable debugging messages in log"			off
+OPTIONS_DEFINE=	MUSIC DEBUG
+OPTIONS_SINGLE=	KB
+OPTIONS_SINGLE_KB=	KB_DESKTOP KB_LAPTOP KB_ROGUE
+KB_DESKTOP_DESC=	Key bindings for desktop (num keypad)
+KB_LAPTOP_DESC=	Key bindings for laptop (789uojkl)
+KB_ROGUE_DESC=	Rogue-like key bindings (hjkl and yubn)
+KB_DESC=	KB Selection
+MUSIC_DESC=	Download and Install music files (83 Mb)
 
-DD?=		/bin/dd
+OPTIONS_DEFAULT=	KB_DESKTOP MUSIC
 
-.include <bsd.port.pre.mk>
+DD?=		/bin/dd
 
-.if defined(WITH_KB_DESKTOP) && defined(WITH_KB_LAPTOP) || \
-    defined(WITH_KB_LAPTOP) && defined(WITH_KB_ROGUE) || \
-    defined(WITH_KB_DESKTOP) && defined(WITH_KB_ROGUE)
-pre-fetch::
-	@${ECHO_MSG} 'error: only one of the KB_* OPTIONS may be used - rerun "make config"'
-	@${FALSE}
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-wrapper.c
 .endif
 
-.if defined(WITH_MUSIC)
+.if ${PORT_OPTIONS:MMUSIC}
 RUN_DEPENDS+=	${DATADIR}/media/AnichGiantTrouble.ogg:${PORTSDIR}/games/daimonin-music
 .endif
 
@@ -79,10 +72,10 @@ post-install:
 	${CHMOD} a+x ${PREFIX}/bin/daimonin
 	@${FIND} ${DATADIR} -name '*.orig' -exec rm {} \;
 	${MV} ${DATADIR}/settings/keys.dat ${DATADIR}/settings/keys-desktop.dat
-.if defined(WITH_KB_LAPTOP)
+.if ${PORT_OPTIONS:MKB_LAPTOP}
 	@${ECHO} Configuring keyboard bindings for laptop
 	${LN} -s ${DATADIR}/settings/keys-laptop.dat ${DATADIR}/settings/keys.dat
-.elif defined(WITH_KB_ROGUE)
+.elif ${PORT_OPTIONS:MKB_ROGUE}
 	@${ECHO} Configuring rogue-like keyboard bindings
 	${LN} -s ${DATADIR}/settings/keys-rogue.dat ${DATADIR}/settings/keys.dat
 .else
@@ -90,4 +83,4 @@ post-install:
 	${LN} -s ${DATADIR}/settings/keys-desktop.dat ${DATADIR}/settings/keys.dat
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
index 731ce8746292..637b108235eb 100644
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	eduke32
-# Date Created:				1 Aug 2006
-# Whom:					alepulver
-#
+# Created by: alepulver
 # $FreeBSD$
 
 PORTNAME=	eduke32
@@ -28,12 +25,15 @@ USE_SDL=	mixer sdl
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
 SVNREVISION=	1923
 
-OPTIONS=	MIDI		"Enable original MIDI music support"	On \
-		TIMIDITYPLUS	"Use Timidity++ instead of Timidity"	Off \
-		VORBIS		"Enable Ogg Vorbis music files support"	On
+OPTIONS_DEFINE=	MIDI TIMIDITYPLUS VORBIS
+MIDI_DESC=	Original MIDI music support
+TIMIDITYPLUS_DESC=	Use Timidity++ instead of Timidity
+
+OPTIONS_DEFAULT=	MIDI VORBIS
 
 .include "${.CURDIR}/../duke3d-data/Makefile.include"
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
@@ -44,20 +44,20 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 BROKEN=		Does not compile on sparc64
 .endif
 
-.if defined(WITH_MIDI)
-.if defined(WITH_TIMIDITYPLUS)
+.if ${PORT_OPTIONS:MMIDI}
+.if ${PORT_OPTIONS:MTIMIDITYPLUS}
 RUN_DEPENDS+=	timidity:${PORTSDIR}/audio/timidity++
 .else
 RUN_DEPENDS+=	timidity:${PORTSDIR}/audio/timidity
 .endif
 .endif
 
-.if defined(WITH_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 .endif
 
 post-patch:
-.if defined(WITHOUT_VORBIS)
+.if ! ${PORT_OPTIONS:MVORBIS}
 	@${REINPLACE_CMD} '/+= -lvorbis/d' ${WRKSRC}/Makefile
 .endif
 .if ${ARCH} != "i386"
@@ -82,11 +82,11 @@ do-install:
 .for f in eduke32 mapster32
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/samples/*.sample ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 . for f in cfg map m32 txt
 	${INSTALL_DATA} ${WRKSRC}/samples/*.${f} ${EXAMPLESDIR}
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 02e45fa0eff0..ddf34470b29c 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	foobillard
-# Date created:				26 October 2002
-# Whom:					Thomas Vogt <thomas.vogt@bsdunix.ch>
-#
+# Created by: Thomas Vogt <thomas.vogt@bsdunix.ch>
 # $FreeBSD$
-#
 
 PORTNAME=	foobillard
 PORTVERSION=	3.0a
@@ -17,10 +13,11 @@ COMMENT=	Free OpenGL billiards game
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-OPTIONS=	SDL	"Use SDL instead of glut"	off \
-		NVIDIA_BUMPREF	"Enable NVidia extensions"	off
+OPTIONS_DEFINE=	SDL NVIDIA_BUMPREF
+SDL_DESC=	SDL instead of glut
+NVIDIA_BUMPREF_DESC=	NVidia extensions
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 FREETYPE_CONFIG?=	${LOCALBASE}/bin/freetype-config
 
@@ -38,7 +35,7 @@ DESKTOP_ENTRIES=	"Foobillard" \
 			"Game;Simulation;" \
 			false
 
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	yes
 CONFIGURE_ARGS+=	--enable-SDL
 .else
@@ -46,7 +43,7 @@ USE_GL=		glut
 CONFIGURE_ARGS+=	--enable-glut
 .endif
 
-.if !defined(WITH_NVIDIA_BUMPREF)
+.if ! ${PORT_OPTIONS:MNVIDIA_BUMPREF}
 CONFIGURE_ARGS+=	--disable-nvidia
 .endif
 
@@ -57,6 +54,6 @@ post-patch:
 		${WRKSRC}/src/Makefile.in
 
 post-install:
-	@${INSTALL_MAN} ${WRKSRC}/foobillard.6 ${PREFIX}/man/man6/foobillard.6
+	@${INSTALL_MAN} ${WRKSRC}/foobillard.6 ${MAN6PREFIX}/man/man6/foobillard.6
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/freedink-engine/Makefile b/games/freedink-engine/Makefile
index b4efeb2f9113..8361250bb5b8 100644
--- a/games/freedink-engine/Makefile
+++ b/games/freedink-engine/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	syncterm
-# Date created:		3 October 2006
-# Whom:			shurd
-#
+# Created by: shurd
 # $FreeBSD$
-#
 
 PORTNAME=	freedink
 PORTVERSION=	1.08.${PORTVER}
@@ -26,11 +22,14 @@ CONFIGURE_ARGS=	--disable-static --disable-upx
 
 MAN6=		freedink.6 freedinkedit.6 dink.6 dinkedit.6
 
-OPTIONS=	EMBEDDED	"Enable Embedded Resources"	on
+OPTIONS_DEFINE=	EMBEDDED
+EMBEDDED_DESC=	Embedded Resources
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	EMBEDDED
 
-.ifdef WITHOUT_EMBEDDED
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MEMBEDDED}
 CONFIGURE_ARGS+=	--enable-embedded-resources
 BUILD_DEPENDS+=		zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS+=		zip.3:${PORTSDIR}/archivers/libzip
@@ -39,4 +38,4 @@ RUN_DEPENDS+=		zip:${PORTSDIR}/archivers/zip
 CONFIGURE_ARGS+=	--disable-embedded-resources
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile
index 75e44b0430cd..e888a51c3948 100644
--- a/games/freedroidrpg/Makefile
+++ b/games/freedroidrpg/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	freedroidrpg
-# Date created:			18 Jul 2005
-# Whom:				Travis Poppe <tlp@liquidx.org>
-#
+# Created by: Travis Poppe <tlp@liquidx.org>
 # $FreeBSD$
-#
 
 PORTNAME=	freedroidrpg
 PORTVERSION=	0.15
@@ -23,13 +19,14 @@ CONFIGURE_ENV=	LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua"
 
 MAN6=		freedroidRPG.6
 
-OPTIONS=	BACKTRACE "Use backtrace() to generate nice bug reports" on \
-		OPENGL "Enable the OpenGL support (highly recommended!)" on \
-		VORBIS "Enable vorbis support (music)" on
+OPTIONS_DEFINE=	BACKTRACE OPENGL VORBIS
+BACKTRACE_DESC=	Use backtrace() to generate nice bug reports
+
+OPTIONS_DEFAULT=	BACKTRACE OPENGL VORBIS
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_BACKTRACE)
+.if ${PORT_OPTIONS:MBACKTRACE}
 LIB_DEPENDS+=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 CONFIGURE_ARGS+=--enable-backtrace
 STRIP=		#
@@ -37,14 +34,14 @@ STRIP=		#
 CONFIGURE_ARGS+=--disable-backtrace
 .endif
 
-.if !defined(WITHOUT_OPENGL)
+.if ${PORT_OPTIONS:MOPENGL}
 USE_GL=		yes
 CONFIGURE_ARGS+=--enable-opengl
 .else
 CONFIGURE_ARGS+=--disable-opengl
 .endif
 
-.if !defined(WITHOUT_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 		ogg:${PORTSDIR}/audio/libogg
 CONFIGURE_ARGS+=--enable-vorbis
diff --git a/games/galaxymage/Makefile b/games/galaxymage/Makefile
index 3a14c7872157..ad23464d116d 100644
--- a/games/galaxymage/Makefile
+++ b/games/galaxymage/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	galaxymage
-# Date created:		2006-01-30
-# Whom:			Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
-#
 
 PORTNAME=	galaxymage
 PORTVERSION=	0.3.0
@@ -23,11 +19,12 @@ USE_TWISTED=	yes
 USES=		gettext
 NO_BUILD=	yes
 
-OPTIONS=	PSYCO	"Use just-in-time Python compiler" off
+OPTIONS_DEFINE=	PSYCO
+PSYCO_DESC=	Use just-in-time Python compiler
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PSYCO)
+.if ${PORT_OPTIONS:MPSYCO}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
 .endif
 
@@ -50,7 +47,7 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/locale/${FILE}/LC_MESSAGES/* \
 			${PREFIX}/share/locale/${FILE}/LC_MESSAGES
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/doc && \
 		${FIND} * -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \
@@ -58,4 +55,4 @@ do-install:
 			"${DOCSDIR}/{}" \;
 	@${INSTALL_DATA} ${WRKSRC}/CREDITS.txt ${WRKSRC}/README.txt ${DOCSDIR}
 .endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/glest/Makefile b/games/glest/Makefile
index dc45cd1bd851..90bd487f72f1 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	glest
-# Date created:				2005-10-30
-# Whom:					Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
-#
 
 PORTNAME=	glest
 PORTVERSION=	3.2.2
@@ -36,13 +32,15 @@ SUB_FILES=		glest-wrapper pkg-message
 
 JAM_CMD=		${LOCALBASE}/bin/jam -qa
 
-OPTIONS=	EDITOR	"Build map editor"	off
+OPTIONS_DEFINE=	EDITOR
+EDITOR_DESC=	Build map editor
 
 EXTRACT_AFTER_ARGS=	-d ${WRKDIR}/${DISTNAME}
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_EDITOR)
+.if ${PORT_OPTIONS:MEDITOR}
 USE_WX=		2.6+
 WX_CONF_ARGS=	relative
 WANT_UNICODE=	yes
@@ -74,7 +72,7 @@ do-build:
 	@cd ${WRKSRC} && ${JAM_CMD}
 
 do-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/code_license.txt ${DOCSDIR}/code_license.txt
 .endif
diff --git a/games/heretic/Makefile b/games/heretic/Makefile
index e85689812c5d..4ca05540ef50 100644
--- a/games/heretic/Makefile
+++ b/games/heretic/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	glheretic
-# Date created:		04 Feb 2000
-# Whom:			Will Andrews <andrews@technologist.com>
-#
+# Created by: Will Andrews <andrews@technologist.com>
 # $FreeBSD$
-#
 
 PORTNAME=	heretic
 PORTVERSION=	1.2
@@ -20,36 +16,35 @@ USE_XORG=	x11 xi xpm xau
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
 
-OPTIONS=	X11	"Use X11"		on \
-		FASTX11	"Use FastX11"		off \
-		SDL	"Use SDL"		off \
-		WAD	"With shareware WAD"	on
+OPTIONS_DEFINE=	WAD
+OPTIONS_SINGLE=	SG1
+OPTIONS_SINGLE_SG1=	X11 FASTX11 SDL
+FASTX11_DESC=	Use FastX11
+WAD_DESC=	With shareware WAD
+SG1_DESC=	Graphics Selections
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	X11 WAD
 
-.if (defined(WITH_X11) && (defined(WITH_FASTX11) || defined(WITH_SDL))) || \
-    (defined(WITH_FASTX11) && (defined(WITH_X11) || defined(WITH_SDL)))
-IGNORE=		you must only define X11, xor FASTX11, xor SDL
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(WITH_X11)
+.if ${PORT_OPTIONS:MX11}
 ALL_TARGET=	x11
 BINARY=		xheretic
 .endif
 
-.if defined(WITH_FASTX11)
+.if ${PORT_OPTIONS:MFASTX11}
 ALL_TARGET=	fastx11
 BINARY=		xaheretic
 .endif
 
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	yes
 ALL_TARGET=	sdl
 BINARY=		sdlheretic
 CFLAGS+=	`${SDL_CONFIG} --cflags`
 .endif
 
-.if defined(WITH_WAD)
+.if ${PORT_OPTIONS:MWAD}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:source heretic_share.wad.gz:wad
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 PLIST_SUB=	WAD:=""
@@ -58,7 +53,7 @@ PLIST_SUB=	WAD:="@comment "
 .endif
 
 post-extract:
-.if !defined(WITHOUT_WAD)
+.if ${PORT_OPTIONS:MWAD}
 	@${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/heretic_share.wad.gz \
 		> ${WRKSRC}/heretic_share.wad
 .endif
@@ -67,15 +62,15 @@ post-extract:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/heretic
 	${INSTALL_PROGRAM} ${WRKSRC}/sndserver ${PREFIX}/bin/sndserver
-.if !defined(WITHOUT_WAD)
+.if ${PORT_OPTIONS:MWAD}
 	@${MKDIR} ${PREFIX}/share/heretic
 	${INSTALL_DATA} ${WRKSRC}/heretic_share.wad ${PREFIX}/share/heretic
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in "End User License Heretic Source Code.txt" Gamekeys.txt README.txt AUTHORS SourceReadme.txt Changelog README.opengl
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/linux-nerogame/Makefile b/games/linux-nerogame/Makefile
index b5f46e191565..55ff7e40a0f7 100644
--- a/games/linux-nerogame/Makefile
+++ b/games/linux-nerogame/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	linux-nerogame
-# Date created:		2007-10-04
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	nerogame
 PORTVERSION=	2.0
@@ -24,15 +20,17 @@ SUB_FILES=	nerogame pkg-message
 DATADIR=	share/${PKGNAMEPREFIX}${PORTNAME}
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-OPTIONS=	NVIDIA  "Install support for nvidia"    off
+OPTIONS_DEFINE=	NVIDIA
+NVIDIA_DESC=	Nvidia support
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 800076
 BROKEN=		does not build
 .endif
 
-.if defined(WITH_NVIDIA)
+.if ${PORT_OPTIONS:MNVIDIA}
 .	if !exists(${LINUXBASE}/usr/lib/libGL.so.1)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .	endif
diff --git a/games/linux-nwnclient/Makefile b/games/linux-nwnclient/Makefile
index d2e62b4205a9..78d0fd8860c8 100644
--- a/games/linux-nwnclient/Makefile
+++ b/games/linux-nwnclient/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    linux_nwnclient
-# Date created:         1 April 2003
-# Whom:                 Erik Olson <erikolson@olsonexpress.com>
-#
+# Created by: Erik Olson <erikolson@olsonexpress.com>
 # $FreeBSD$
-#
 
 PORTNAME=	nwnclient
 PORTVERSION=	1.69
@@ -36,8 +32,10 @@ USE_LINUX_APPS+=libglu
 USE_LINUX_APPS+=dri
 .endif
 
-OPTIONS=	NWMOVIES	"Install support for movies using BinkPlayer"	off
+OPTIONS_DEFINE=	NWMOVIES
+NWMOVIES_DESC=	Support for movies using BinkPlayer
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 # Client detection.  Currently, detects only original and Diamond editions.
@@ -45,7 +43,7 @@ OPTIONS=	NWMOVIES	"Install support for movies using BinkPlayer"	off
 CLIENT_FILES=	nwclientgold.tar.gz:GOLD \
 		nwclienthotu.tar.gz:HOTU \
 		English_linuxclient169_xp2.tar.gz:CLIENT
-.if !defined(WITHOUT_NWMOVIES)
+.if ${PORT_OPTIONS:MNWMOVIES}
 NWMOVIESFILE=	nwmovies-v4-public.20090223.080954.tar.gz
 BINKPLAYERFILE=	BinkLinuxPlayer.zip
 CLIENT_NWMOVIES=${NWMOVIESFILE}:NWMOVIES \
diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile
index 858d9f206c33..caadad586b55 100644
--- a/games/linux-quake4/Makefile
+++ b/games/linux-quake4/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Quake 4
-# Date created:				21 Oct 2005
-# Whom:					Ed Schouten <ed@fxq.nl>
-#
+# Created by: Ed Schouten <ed@fxq.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	quake4
 PORTVERSION=	1.4.2
@@ -28,15 +24,18 @@ PLIST_SUB+=	Q4DIR="${Q4DIR}" \
 		LINUXBASE="${LINUXBASE}"
 SUB_FILES=	pkg-message
 
-OPTIONS=	SMP	"Install threaded version"	on \
-		GERMANY	"Germany version"	off
+OPTIONS_DEFINE=	THREADS GERMANY
+GERMANY_DESC=	Germany version
 
+OPTIONS_DEFAULT=	THREADS
+
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_SMP)
-PLIST_SUB+=	SMP=""
+.if ${PORT_OPTIONS:MTHREADS}
+PLIST_SUB+=	THREADS=""
 .else
-PLIST_SUB+=	SMP="@comment "
+PLIST_SUB+=	THREADS="@comment "
 .endif
 
 do-extract:
@@ -63,7 +62,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PKGNAMEPREFIX}${FILE}.sh ${PREFIX}/bin/${PKGNAMEPREFIX}${FILE}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/${FILE}.x86 ${PREFIX}/${Q4DIR}
 .endfor
-.if !defined(WITHOUT_SMP)
+.if ${PORT_OPTIONS:MTHREADS}
 	${INSTALL_SCRIPT} ${WRKSRC}/${PKGNAMEPREFIX}quake4smp.sh ${PREFIX}/bin/${PKGNAMEPREFIX}quake4smp
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/quake4smp.x86 ${PREFIX}/${Q4DIR}
 .endif
@@ -82,7 +81,7 @@ do-install:
 			-exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \;
 
 	# All version (except germany) or only germany version
-.if defined(WITH_GERMANY)
+.if ${PORT_OPTIONS:MGERMANY}
 	@cd ${WRKSRC}/germany && \
 		${FIND} -E q4base -type f -iregex ".*\.(pk4)" \
 			-exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \;
@@ -93,7 +92,7 @@ do-install:
 .endif
 
 	# Documentation
-.if !defined (NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC}/Docs && \
 		${FIND} * -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \
 		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
diff --git a/games/linux-quake4/pkg-plist b/games/linux-quake4/pkg-plist
index 19640fb8a0ef..067276c60352 100644
--- a/games/linux-quake4/pkg-plist
+++ b/games/linux-quake4/pkg-plist
@@ -1,4 +1,4 @@
-%%SMP%%bin/linux-quake4smp
+%%THREADS%%bin/linux-quake4smp
 bin/linux-q4ded
 bin/linux-quake4
 %%Q4DIR%%/pb/htm/la001307.htm
@@ -58,7 +58,7 @@ bin/linux-quake4
 %%Q4DIR%%/q4base/zpak_spanish_02.pk4.off
 %%Q4DIR%%/q4base/zpak_spanish_03.pk4.off
 %%Q4DIR%%/q4base/zpak_spanish_04.pk4.off
-%%SMP%%%%Q4DIR%%/quake4smp.x86
+%%THREADS%%%%Q4DIR%%/quake4smp.x86
 %%Q4DIR%%/q4ded.x86
 %%Q4DIR%%/quake4.x86
 %%PORTDOCS%%%%DOCSDIR%%/ENG/License.txt
diff --git a/games/linux-savage/Makefile b/games/linux-savage/Makefile
index 8d3a5e8fd779..971682c4e549 100644
--- a/games/linux-savage/Makefile
+++ b/games/linux-savage/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	linux-savage
-# Date created:		2006-09-06
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	savage
 PORTVERSION=	2.00e
@@ -34,11 +30,13 @@ WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 
 SAVAGEDIR=	lib/${PKGNAMEPREFIX}${PORTNAME}
 
-OPTIONS=	NVIDIA_GL	"Install support for nvidia"	off
+OPTIONS_DEFINE=	NVIDIA_GL
+NVIDIA_GL_DESC=	Support for nvidia
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_NVIDIA_GL)
+.if ${PORT_OPTIONS:MNVIDIA_GL}
 .	if !exists(${LINUXBASE}/usr/X11R6/lib/libGL.so.1)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
 		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
@@ -74,7 +72,7 @@ do-install:
 .endfor
 	${LN} -s ${PREFIX}/${SAVAGEDIR}/libs/libfmod-3.75.so ${PREFIX}/${SAVAGEDIR}/libs/libfmod.so
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${PREFIX}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/licenses.txt ${PREFIX}/${DOCSDIR}
 .endif
diff --git a/games/linux-warsow/Makefile b/games/linux-warsow/Makefile
index acf5bd7fc28f..f963d27f3ce7 100644
--- a/games/linux-warsow/Makefile
+++ b/games/linux-warsow/Makefile
@@ -1,7 +1,5 @@
 # Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	warsow
 PORTVERSION=	0.12
@@ -44,15 +42,18 @@ DESKTOP_ENTRIES="Warsow" \
 		"Game;" \
 		false
 
-OPTIONS=	CLIENT	"Install client"	on \
-		SERVER	"Install dedicated server"	on \
-		NVIDIA	"Install support for nvidia"	off
+OPTIONS_DEFINE=	NVIDIA
+OPTIONS_MULTI=	FLAVOR
+OPTIONS_MULTI_FLAVOR=	CLIENT SERVER
+CLIENT_DESC=	Install client
+SERVER_DESC=	Dedicated server
+NVIDIA_DESC=	Support for nvidia
+FLAVOR_DESC=	Executable Selection
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	CLIENT SERVER
 
-.if defined(WITHOUT_CLIENT) && defined(WITHOUT_SERVER)
-IGNORE=		requires at least one of CLIENT and SERVER options
-.endif
+.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_NVIDIA)
 .	if !exists(${LINUXBASE}/usr/lib/libGL.so.1)
diff --git a/games/luola/Makefile b/games/luola/Makefile
index 05e7600d0288..fb9acd55f704 100644
--- a/games/luola/Makefile
+++ b/games/luola/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	luola
-# Date created:		20 Jan 2006
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	luola
 PORTVERSION=	1.3.0
@@ -25,18 +21,20 @@ USE_SDL=	sdl image ttf
 
 CONFIGURE_ARGS=	--program-prefix=''
 
-OPTIONS=	SDL_GFX	"Enable sdl_gfx for nicer graphics" on \
-		SOUND "Enable sound" on
+OPTIONS_DEFINE=	SDL_GFX SOUND
+SDL_GFX_DESC=	Nicer graphics
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	SDL_GFX SOUND
 
-.if defined(WITHOUT_SDL_GFX)
-CONFIGURE_ARGS+=	--disable-sdl-gfx
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSDL_GFX}
 USE_SDL+=	gfx
+.else
+CONFIGURE_ARGS+=	--disable-sdl-gfx
 .endif
 
-.if !defined(WITHOUT_SOUND)
+.if ${PORT_OPTIONS:MSOUND}
 CONFIGURE_ARGS+=	--enable-sound
 USE_SDL+=	mixer
 .endif
@@ -46,11 +44,11 @@ post-patch:
 
 post-install:
 	@${INSTALL_DATA} ${WRKDIR}/*.lev ${WRKDIR}/*.png ${DATADIR}/levels
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in README FAQ
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/mangos/Makefile b/games/mangos/Makefile
index 2a6922903ffd..d2d186ca722d 100644
--- a/games/mangos/Makefile
+++ b/games/mangos/Makefile
@@ -14,10 +14,13 @@ SCRIPTDEV2REV=	245
 MAINTAINER=    	neon_cyrex@mail.ru
 COMMENT=	Free dedicated-server for World of Warcraft
 
-OPTIONS=	SCRIPTDEV2	"ScriptDev2"	on \
-		CLI		"Command Line Itrerface support" off \
-		RA		"Remote Administration support" off \
-		DBC		"Install DBC files" on
+OPTIONS_DEFINE=	SCRIPTDEV2 CLI RA DBC
+SCRIPTDEV2_DESC=	ScriptDev2 support
+CLI_DESC=	Command Line Itrerface support
+RA_DESC=	Remote Administration support
+DBC_DESC=	Install DBC files
+
+OPTIONS_DEFAULT=	SCRIPTDEV2 DBC
 
 USE_AUTOTOOLS=	aclocal libtoolize autoconf autoheader automake libtool
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
@@ -29,30 +32,30 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX}/etc --datadir=${PREFIX}/share
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.ifdef WITH_SCRIPTDEV2
+.if ${PORT_OPTIONS:MSCRIPTDEV2}
 DISTFILES+=	ScriptDev2-${SCRIPTDEV2REV}.tar.gz
 EXTRA_PATCHES=	${FILESDIR}/ScriptDev2.patch
 PLIST_SUB+=	SD2=""
 .else
 PLIST_SUB+=	SD2="@comment "
 .endif
-.ifdef WITH_DBC
+.if ${PORT_OPTIONS:MDBC}
 PLIST_SUB+=	DBC=""
 DISTFILES+=	mangos-dbc2_3_0.tar.gz
 .else
 PLIST_SUB+=	DBC="@comment "
 .endif
-.ifdef WITH_CLI
+.if ${PORT_OPTIONS:MCLI}
 CONFIGURE_ARGS+=--enable-cli
 .endif
-.ifdef WITH_RA
+.if ${PORT_OPTIONS:MRA}
 CONFIGURE_ARGS+=--enable-ra
 .endif
 
 post-extract:
-.ifdef WITH_SCRIPTDEV2
+.if ${PORT_OPTIONS:MSCRIPTDEV2}
 	@${MV} ${WRKDIR}/ScriptDev2-${SCRIPTDEV2REV} ${WRKSRC}/src/bindings/ScriptDev2/
 .endif
 	@${LN} -s ${LTMAIN} ${WRKSRC}/
@@ -64,7 +67,7 @@ post-patch:
 		${WRKSRC}/src/mangosd/mangosd.conf.in
 	@${REINPLACE_CMD} -e '/^sysconf_DATA/,/conf/d' \
 		${WRKSRC}/src/mangosd/Makefile.am ${WRKSRC}/src/realmd/Makefile.am
-.ifdef WITH_SCRIPTDEV2
+.if ${PORT_OPTIONS:MSCRIPTDEV2}
 	@cd ${WRKSRC}/src/bindings/ScriptDev2/sql/Updates/&&\
 		${REINPLACE_CMD} -e '/pkgdata_DATA/,$$d' Makefile.am\
 		&&${ECHO_CMD} "pkgdata_DATA=`echo *.sql`">>Makefile.am
@@ -72,12 +75,12 @@ post-patch:
 
 run-autotools-automake:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} ${AUTOMAKE_ARGS})
-.ifdef WITH_SCRIPTDEV2
+.if ${PORT_OPTIONS:MSCRIPTDEV2}
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
 		${AUTOMAKE_ARGS} src/bindings/ScriptDev2/Makefile)
 .endif
 
-.ifdef WITH_SCRIPTDEV2
+.if ${PORT_OPTIONS:MSCRIPTDEV2}
 post-build:
 	@(cd ${BUILD_WRKSRC}/src/bindings/ScriptDev2; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 .endif
@@ -86,11 +89,11 @@ post-install:
 	@for i in mangosd realmd;do cd ${PREFIX}/etc/&&\
 		${INSTALL_DATA} ${WRKSRC}/src/$$i/$$i.conf $$i.conf.sample&&\
 		${CP} -np $$i.conf.sample $$i.conf || ${TRUE} ;done
-.ifdef WITH_SCRIPTDEV2
+.if ${PORT_OPTIONS:MSCRIPTDEV2}
 	@(cd ${INSTALL_WRKSRC}/src/bindings/ScriptDev2 && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .endif
-.ifdef WITH_DBC
+.if ${PORT_OPTIONS:MDBC}
 	@${CP} -Rf ${WRKDIR}/dbc ${PREFIX}/share/mangos/dbc
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile
index ede1a83261ac..845aadcc0d1f 100644
--- a/games/marsnomercy/Makefile
+++ b/games/marsnomercy/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Mars Land of No Mercy
-# Date created:		2006-03-21
-# Whom:			Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
-#
 
 PORTNAME=	marsnomercy
 PORTVERSION=	0.2.1
@@ -27,18 +23,17 @@ PLIST_DIRS=	%%DATADIR%%
 SUB_FILES=	mars-nomercy pkg-message
 WRKSRC=		${WRKDIR}/mars-${PORTVERSION}
 
-OPTIONS=	DEBUG	"With additional debug information"	off \
-		OPENGL	"Install support for opengl"	off
+OPTIONS_DEFINE=	DEBUG OPENGL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 SCONS_ARGS+=	debug=1
 .else
 SCONS_ARGS+=	debug=0
 .endif
 
-.if defined(WITH_OPENGL)
+.if ${PORT_OPTIONS:MOPENGL}
 SCONS_ARGS+=	with_opengl=1
 .else
 SCONS_ARGS+=	with_opengl=0
@@ -64,4 +59,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index 7bdad5fe8568..7812ce22a53c 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mirrormagic
-# Date created:				1 April 1998
-# Whom:					Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
 # $FreeBSD$
-#
 
 PORTNAME=	mirrormagic
 PORTVERSION=	2.0.2
@@ -13,7 +9,7 @@ MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/mirrormagic/ \
 		http://mirror.amdmi3.ru/distfiles/
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	An arcade style game with stereo sound for X Window System
+COMMENT=	Arcade style game with stereo sound for X Window System
 
 LICENSE=	GPLv2
 
@@ -23,11 +19,12 @@ MAKE_ARGS=	CC="${CC}" MAKE="${GMAKE}" OPTIONS="${CFLAGS}" \
 		X11_PATH="${LOCALBASE}"
 WANT_SDL=	yes
 
-OPTIONS=	SDL	"SDL support"	on
+OPTIONS_DEFINE=	SDL
+OPTIONS_DEFAULT=	SDL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	image mixer sdl
 ALL_TARGET=	sdl
 .else
@@ -50,11 +47,11 @@ do-install:
 		${TAR} -C ${DATADIR} -xf -
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 	@${CHMOD} 777 ${DATADIR}/scores
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in CHANGES CREDITS README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/mkgichessclub/Makefile b/games/mkgichessclub/Makefile
index 05ae963a3bf3..18c9bdbf0f02 100644
--- a/games/mkgichessclub/Makefile
+++ b/games/mkgichessclub/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mkgichessclub
-# Date created:		2008-01-11
-# Whom:			Nicola Vitale	<nivit@FreeBSD.org>
-#
+# Created by: Nicola Vitale	<nivit@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mkgichessclub
 PORTVERSION=	2.2.0
@@ -13,10 +9,13 @@ MASTER_SITES=	SF
 DISTNAME=	MKGIChessClub-${PORTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
-COMMENT=	A chess playing server with a pure web interface
+COMMENT=	Chess playing server with a pure web interface
 
-OPTIONS=	GNUCHESS "Install gnuchess robot" on \
-		PHALANX	"Install phalanx robot" on
+OPTIONS_DEFINE=	GNUCHESS PHALANX
+GNUCHESS_DESC=	Install gnuchess robot
+PHALANX_DESC=	Install phalanx robot
+
+OPTIONS_DEFAULT=	GNUCHESS PHALANX
 
 NO_BUILD=	yes
 
@@ -28,12 +27,14 @@ USE_PYTHON=	yes
 
 WRKSRC=	${WRKDIR}/MKGIChessClub-${PORTVERSION}
 
+.include <bsd.port.options.mk>
+
 do-install:
 	${MKDIR} ${DATADIR}; cd ${WRKSRC}; \
 	${INSTALL_DATA} database/* ${DATADIR}; \
 	${MKDIR} ${WWWDIR}; cd www; ${CP} -R . ${WWWDIR}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}; \
 	${INSTALL_DATA} ${WRKSRC}/README.INSTALL ${DOCSDIR}
 .endif
@@ -42,14 +43,12 @@ do-install:
 post-install:
 	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-.if defined (WITH_GNUCHESS)
+.if ${PORT_OPTIONS:MGNUCHESS}
 RUN_DEPENDS+=	gnuchess:${PORTSDIR}/games/gnuchess
 .endif
 
-.if defined (WITH_PHALANX)
+.if ${PORT_OPTIONS:MPHALANX}
 RUN_DEPENDS+=	phalanx:${PORTSDIR}/games/phalanx
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/moonlander/Makefile b/games/moonlander/Makefile
index 1697a6f26755..460e4eec43dd 100644
--- a/games/moonlander/Makefile
+++ b/games/moonlander/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	moonlander
-# Date created:				27 Jun 2003
-# Whom:					Kris Kennaway <kris@FreeBSD.org>
-#
+# Created by: Kris Kennaway <kris@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	moonlander
 PORTVERSION=	1.0
@@ -24,17 +20,18 @@ MAKE_JOBS_SAFE=	yes
 
 WRKSRC=		${WRKDIR}/moon-lander
 
-OPTIONS=	SOUND "Sound support" on
+OPTIONS=	SOUND
+OPTIONS_DEFINE=	SOUND
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 install_dirs=	fonts images
-.if defined(WITHOUT_SOUND)
-CFLAGS+=	-DNOSOUND
-PLIST_SUB+=	SOUND="@comment "
-.else
+.if ${PORT_OPTIONS:MSOUND}
 PLIST_SUB+=	SOUND=
 install_dirs+=	sounds
+.else
+CFLAGS+=	-DNOSOUND
+PLIST_SUB+=	SOUND="@comment "
 .endif
 
 do-configure:
@@ -52,4 +49,4 @@ post-install:
 	@${FIND} ${PREFIX}/share/moonlander -type f -print0 | \
 		${XARGS} -0 ${CHMOD} 444
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/naev/Makefile b/games/naev/Makefile
index 7a5a44a476ab..380e09ce9133 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	naev
-# Date created:		2009-04-26
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	naev
 PORTVERSION=	0.5.3
@@ -35,19 +31,21 @@ MAN6=		naev.6
 PLIST_FILES=	bin/${PORTNAME}
 SUB_FILES=	pkg-message
 
-OPTIONS=	OPENAL 		"Use the OpenAL sound backend"	on \
-		SDL_MIXER	"Use the SDL_mixer sound backend"	on
+OPTIONS_DEFINE=	OPENAL SDL_MIXER
+SDL_MIXER_DESC=	SDL_mixer sound backend
+
+OPTIONS_DEFINE=	OPENAL SDL_MIXER
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_OPENAL)
+.if ${PORT_OPTIONS:MOPENAL}
 USE_OPENAL=		yes
 CONFIGURE_ARGS+=	--with-openal=yes
 .else
 CONFIGURE_ARGS+=	--with-openal=no
 .endif
 
-.if defined(WITH_SDL_MIXER)
+.if ${PORT_OPTIONS:MSDL_MIXER}
 USE_SDL+=		mixer
 CONFIGURE_ARGS+=	--with-sdlmixer=yes
 .else
@@ -56,7 +54,7 @@ CONFIGURE_ARGS+=	--with-sdlmixer=no
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${MAN6PREFIX}/man/man6
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index a4158cc3ce1d..fcf9e9df6383 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Nexuiz
-# Date created:				03 Jun 2005
-# Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
-#
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	nexuiz
 PORTVERSION=	2.5.2
@@ -15,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	A fast-paced, chaotic, and intense multiplayer first person shooter
+COMMENT=	Fast-paced, chaotic, and intense multiplayer first person shooter
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
@@ -35,31 +31,33 @@ MAKE_ARGS=	DP_FS_BASEDIR="${DATADIR}" CC="${CC}" \
 MAKE_JOBS_UNSAFE=yes
 ALL_TARGET=	#
 
-OPTIONS=	CLIENT		"Build GLX client"		on \
-		SDL_CLIENT	"Build SDL client"		on \
-		SERVER		"Build dedicated server"	on \
-		MAPPACK		"Install community map pack"	on
+OPTIONS_DEFINE=	MAPPACK
+OPTIONS_MULTI=	FLAVOR
+OPTIONS_MULTI_FLAVOR=	CLIENT SDL_CLIENT SERVER
+CLIENT_DESC=	Build GLX client
+SDL_CLIENT_DESC=	Build SDL client
+SERVER_DESC=	Build dedicated server
+MAPPACK_DESC=	Install community map pack
+FLAVOR_DESC=	Executable Selection
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	CLIENT SDL_CLIENT SERVER MAPPAC
 
-.if !(defined(WITH_CLIENT) || defined(WITH_SDL_CLIENT) || defined(WITH_SERVER))
-IGNORE=		requires at least one of [SDL_]CLIENT or SERVER options
-.endif
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_MAPPACK)
+.if ${PORT_OPTIONS:MMAPPACK}
 DISTFILES+=	nexmappack_r2${EXTRACT_SUFX}:mappack
 PLIST_SUB+=	MAPPACK=""
 .else
 PLIST_SUB+=	MAPPACK="@comment "
 .endif
 
-.if defined(WITH_CLIENT) || defined(WITH_SDL_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT} || defined{WITH_SDL_CLIENT}
 LIB_DEPENDS+=	modplug.1:${PORTSDIR}/audio/libmodplug \
 		png15:${PORTSDIR}/graphics/png \
 		theora.0:${PORTSDIR}/multimedia/libtheora
 .endif
 
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 USE_GL=		glut
 USE_XORG=	x11 xpm xxf86vm xxf86dga xext
 ALL_TARGET+=	cl-release
@@ -68,7 +66,7 @@ PLIST_SUB+=	CLIENT=""
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if !defined(WITHOUT_SDL_CLIENT)
+.if ${PORT_OPTIONS:MSDL_CLIENT}
 USE_SDL=	sdl
 ALL_TARGET+=	sdl-release
 PLIST_SUB+=	SDL_CLIENT=""
@@ -76,7 +74,7 @@ PLIST_SUB+=	SDL_CLIENT=""
 PLIST_SUB+=	SDL_CLIENT="@comment "
 .endif
 
-.if !defined(WITHOUT_SERVER)
+.if ${PORT_OPTIONS:MSERVER}
 ALL_TARGET+=	sv-release
 PLIST_SUB+=	SERVER=""
 .else
@@ -103,14 +101,14 @@ do-install:
 	@${MKDIR} ${DATADIR}/data ${DATADIR}/havoc
 	${INSTALL_DATA} ${WRKDIR}/Nexuiz/data/*.pk3 ${DATADIR}/data
 	${INSTALL_DATA} ${WRKDIR}/Nexuiz/havoc/*.pk3 ${DATADIR}/havoc
-.if !defined(WITHOUT_MAPPACK)
+.if ${PORT_OPTIONS:MMAPPACK}
 	${INSTALL_DATA} ${WRKDIR}/data/*.pk3 ${DATADIR}/data
 .endif
-.if !defined(WITHOUT_SERVER)
+.if ${PORT_OPTIONS:MSERVER}
 	cd ${WRKDIR}/Nexuiz && ${COPYTREE_SHARE} server ${DATADIR}
 # Fixup lost +x permissions on scripts after COPYTREE_SHARE
 	${FIND} ${DATADIR}/server -type f -name *.sh -o -name rcon*.pl | \
 		${XARGS} ${CHMOD} +x
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/noegnud-addons/Makefile b/games/noegnud-addons/Makefile
index 99eee4f04c97..d9bf3b538229 100644
--- a/games/noegnud-addons/Makefile
+++ b/games/noegnud-addons/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	noegnud-addons
-# Date created:				7 April 2004
-# Whom:					Leland Wang <llwang@infor.org>
-#
+# Created by: Leland Wang <llwang@infor.org>
 # $FreeBSD$
-#
 
 PORTNAME=	noegnud
 PORTVERSION=	0.8.0
@@ -13,51 +9,54 @@ PKGNAMESUFFIX=	-addons
 DISTFILES=	${DISTNAME}_data-tileset-absurd${EXTRACT_SUFX}
 
 MAINTAINER=	llwang@infor.org
-COMMENT=	The addons (tilesets and sound themes) for noeGNUd
+COMMENT=	Addons (tilesets and sound themes) for noeGNUd
 
 USE_BZIP2=	yes
 PLIST=		${WRKDIR}/pkg-plist
-OPTIONS=	TILESET_ABSURD		"absurd tileset"		on \
-		TILESET_ITAKURA		"itakura tileset"		off \
-		TILESET_MAZKO		"mazko tileset"			off \
-		TILESET_ABIGABI		"abigabi tileset"		off \
-		TILESET_GEODUCK		"geoduck tileset"		off \
-		TILESET_LAGGED		"lagged tileset"		off \
-		TILESET_AOKI		"aoki tileset"			off \
-		TILESET_FALCONSEYE	"falcons eye tileset"		off \
-		SOUND_NHS		"nhs (qt) sound theme"		off \
-		SOUND_FALCONSEYE	"falcons eye sound theme"	off
+OPTIONS_DEFINE=	ABSURD ITAKURA ITAKURA ABIGABI GEODUCK LAGGED AOKI TFALCONSEYE NHS SFALCONSEYE
+ABSURD_DESC=	absurd tileset
+ITAKURA_DESC=	itakura tileset
+MAZKO_DESC=	mazko tileset
+ABIGABI_DESC=	abigabi tileset
+GEODUCK_DESC=	geoduck tileset
+LAGGED_DESC=	lagged tileset
+AOKI_DESC=	aoki tileset
+TFALCONSEYE_DESC=	falcons eye tileset
+NHS_DESC=	nhs (qt) sound theme
+SFALCONSEYE_DESC=	falcons eye sound theme
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	ABSURD
 
-.if defined(WITHOUT_TILESET_ABSURD)
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MABSURD}
 DISTFILES=
 .endif
-.if defined(WITH_TILESET_ITAKURA)
+.if ${PORT_OPTIONS:MITAKURA}
 DISTFILES+=	${DISTNAME}_data-tileset-itakura${EXTRACT_SUFX}
 .endif
-.if defined(WITH_TILESET_MAZKO)
+.if ${PORT_OPTIONS:MMAZKO}
 DISTFILES+=	${DISTNAME}_data-tileset-mazko${EXTRACT_SUFX}
 .endif
-.if defined(WITH_TILESET_ABIGABI)
+.if ${PORT_OPTIONS:MABIGABI}
 DISTFILES+=	${DISTNAME}_data-tileset-abigabi${EXTRACT_SUFX}
 .endif
-.if defined(WITH_TILESET_GEODUCK)
+.if ${PORT_OPTIONS:MGEODUCK}
 DISTFILES+=	${DISTNAME}_data-tileset-geoduck${EXTRACT_SUFX}
 .endif
-.if defined(WITH_TILESET_LAGGED)
+.if ${PORT_OPTIONS:MLAGGED}
 DISTFILES+=	${DISTNAME}_data-tileset-lagged${EXTRACT_SUFX}
 .endif
-.if defined(WITH_TILESET_AOKI)
+.if ${PORT_OPTIONS:MAOKI}
 DISTFILES+=	${DISTNAME}_data-tileset-aoki${EXTRACT_SUFX}
 .endif
-.if defined(WITH_TILESET_FALCONSEYE)
+.if ${PORT_OPTIONS:MTFALCONSEYE}
 DISTFILES+=	${DISTNAME}_data-tileset-falconseye${EXTRACT_SUFX}
 .endif
-.if defined(WITH_SOUND_NHS)
+.if ${PORT_OPTIONS:MNHS}
 DISTFILES+=	${DISTNAME}_data-sound-nhs${EXTRACT_SUFX}
 .endif
-.if defined(WITH_SOUND_FALCONSEYE)
+.if ${PORT_OPTIONS:MSFALCONSEYE}
 DISTFILES+=	${DISTNAME}_data-sound-falconseye${EXTRACT_SUFX}
 .endif
 
@@ -71,4 +70,4 @@ pre-install:
 do-install:
 	${CP} -R ${WRKSRC} ${PREFIX}/share
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/numptyphysics/Makefile b/games/numptyphysics/Makefile
index ae9e958fba80..bc9bd06c32a0 100644
--- a/games/numptyphysics/Makefile
+++ b/games/numptyphysics/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	numptyphysics
-# Date created:		04 Jan 2009
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	numptyphysics
 DISTVERSION=	0.3.r20090104
@@ -27,12 +23,15 @@ CPPFLAGS+=	-I${LOCALBASE}/include -DINSTALL_BASE_PATH=\"\\\"${DATADIR}\\\"\"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS=	MOREFPS "More FPS for smoother graphics" on
+OPTIONS_DEFINE=	MOREFPS
+MOREFPS_DESC=	Smoother graphics support
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	MOREFPS
+
+.include <bsd.port.options.mk>
 
 post-patch:
-.if !defined(WITHOUT_MOREFPS)
+.if ${PORT_OPTIONS:MMOREFPS}
 	@${REINPLACE_CMD} -e '/define RENDER_RATE/ s|20|60|' \
 		${WRKSRC}/Config.h
 .endif
@@ -45,4 +44,4 @@ post-patch:
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/${PORTNAME}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/pvpgn/Makefile b/games/pvpgn/Makefile
index eb817820a5a6..a43e35268a59 100644
--- a/games/pvpgn/Makefile
+++ b/games/pvpgn/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pvpgn
-# Date created:				19 January 2005
-# Whom:					mek
-#
+# Created by: mek
 # $FreeBSD$
-#
 
 PORTNAME=	pvpgn
 PORTVERSION=	1.8.5
@@ -46,33 +42,33 @@ MAN1=		bnbot.1 bnchat.1 bnetd.1 bnftp.1 bni2tga.1 bnibuild.1 \
 		bniextract.1 bnilist.1 bnpass.1 bnstat.1 bntrackd.1 tgainfo.1
 MAN5=		bnetd.conf.5 bntext.5
 
-OPTIONS=	MYSQL "Include MySQL user accounts support" off \
-		PGSQL "Include PostgreSQL user accounts support" off \
-		SQLITE3 "Include SQLite3 user accounts support" off \
-		D2 "Enable Diablo II server (D2CS/D2DBS)" on
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3 D2
+D2_DESC=	Diablo II server (D2CS/D2DBS)
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	D2
 
-.if defined(WITH_MYSQL)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=--with-pgsql
 .endif
 
-.if defined(WITH_SQLITE3)
+.if ${PORT_OPTIONS:MSQLITE3}
 USE_SQLITE=	3
 CONFIGURE_ARGS+=--with-sqlite3
 .endif
 
-.if defined(WITHOUT_D2)
+.if ${PORT_OPTIONS:MD2}
+PLIST_SUB+=	WITH_D2=""
+.else
 CONFIGURE_ARGS+=	--disable-d2cs --disable-d2dbs
 PLIST_SUB+=	WITH_D2="@comment "
-.else
-PLIST_SUB+=	WITH_D2=""
 .endif
 
 ## support files
@@ -99,7 +95,7 @@ post-install:
 
 ## Additional documentation
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in INSTALL.unix PORTS README.fdwatch README.storage bnmotd.txt
 	${INSTALL_MAN} ${WRKSRC}/../docs/${i} ${DOCSDIR}
@@ -108,4 +104,4 @@ post-install:
 
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/py-pychess/Makefile b/games/py-pychess/Makefile
index af2059ca0184..f44807e608fe 100644
--- a/games/py-pychess/Makefile
+++ b/games/py-pychess/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pychess
-# Date created:		2008-01-23
-# Whom:			Nicola Vitale <nivit@FreeBSD.org>
-#
+# Created by: Nicola Vitale <nivit@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	pychess
 DISTVERSION=	0.10rc1
@@ -21,13 +17,14 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=3-2.5.1_1:${PORTSDIR}/databases/py-
 
 INSTALLS_ICONS=	yes
 
-OPTIONS=	PYGSTREAMER "Install gst-python for audio support" off \
-		CRAFTY "Install crafty (chess engine)" off \
-		GNUCHESS "Install gnuchess (chess engine)" off \
-		PHALANX "Install phalanx (chess engine)" off \
-		SJENG "Install sjeng (chess engine)" off \
-		STRONGPLAYER "Install psyco/gmpy (strong player)" off \
-		STOCKFISH "Install stockfish (chess engine)" off
+OPTIONS_DEFINE=	PYGSTREAMER CRAFTY GNUCHESS PHALANX SJENG STRONGPLAYER STOCKFISH
+PYGSTREAMER_DESC=	Install gst-python for audio support
+CRAFTY_DESC=	Install crafty (chess engine)
+GNUCHESS_DESC=	Install gnuchess (chess engine)
+PHALANX_DESC=	Install phalanx (chess engine)
+SJENG_DESC=	Install sjeng (chess engine)
+STRONGPLAYER_DESC=	Install psyco/gmpy (strong player)
+STOCKFISH_DESC=	Install stockfish (chess engine)
 
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
@@ -50,35 +47,35 @@ MAKE_ENV+=	NO_INSTALL_MANPAGES=${NO_INSTALL_MANPAGES}
 post-patch:
 	cd ${WRKSRC} && ${REINPLACE_CMD} ${PORTNAME} ${PYSETUP} lib/pychess/widgets/newGameDialog.py lib/pychess/Players/PyChess.py
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined (WITH_PYGSTREAMER)
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}-gstreamer>=0.10.8:${PORTSDIR}/multimedia/py-gstreamer
+.if ${PORT_OPTIONS:MPYGSTREAMER}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10.8:${PORTSDIR}/multimedia/py-gstreamer
 .endif
 
-.if defined (WITH_CRAFTY)
+.if ${PORT_OPTIONS:MCRAFTY}
 RUN_DEPENDS+=	crafty:${PORTSDIR}/games/crafty
 .endif
 
-.if defined (WITH_GNUCHESS)
+.if ${PORT_OPTIONS:MGNUCHESS}
 RUN_DEPENDS+=	gnuchess:${PORTSDIR}/games/gnuchess
 .endif
 
-.if defined (WITH_PHALANX)
+.if ${PORT_OPTIONS:MPHALANX}
 RUN_DEPENDS+=	phalanx:${PORTSDIR}/games/phalanx
 .endif
 
-.if defined (WITH_SJENG)
+.if ${PORT_OPTIONS:MSJENG}
 RUN_DEPENDS+=	sjeng:${PORTSDIR}/games/sjeng
 .endif
 
-.if defined (WITH_STRONGPLAYER)
+.if ${PORT_OPTIONS:MSTRONGPLAYER}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psyco>=1.6:${PORTSDIR}/devel/py-psyco
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gmpy>=1.13:${PORTSDIR}/math/py-gmpy
 .endif
 
-.if defined (WITH_STOCKFISH)
+.if ${PORT_OPTIONS:MSTOCKFISH}
 RUN_DEPENDS+=	stockfish:${PORTSDIR}/games/stockfish
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/pysycache-lang/Makefile b/games/pysycache-lang/Makefile
index 279aee4074d9..6c376b126190 100644
--- a/games/pysycache-lang/Makefile
+++ b/games/pysycache-lang/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pysycache-lang
-# Date created:		2006-02-22
-# Whom:			Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
-#
 
 PORTNAME=	lang
 PORTVERSION=	2.0
@@ -24,15 +20,18 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=	${PREFIX}/share/${DIST_SUBDIR}
 
-OPTIONS=	FRENCH	"French language support"	on \
-		GERMAN	"German language support"	on \
-		ITALIAN	"Italian language support"	on \
-		PORTUGUESE	"Portuguese language support"	on \
-		SPANISH	"Spanish language support"	on
+OPTIONS_DEFINE=	FRENCH GERMAN ITALIAN PORTUGUESE SPANISH
+FRENCH_DESC=	French language support
+GERMAN_DESC=	German language support
+ITALIAN_DESC=	Italian language support
+PORTUGUESE_DESC=	Portuguese language support
+SPANISH_DESC=	Spanish language support
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	FRENCH GERMAN ITALIAN PORTUGUESE SPANISH
 
-.if !defined(WITHOUT_FRENCH)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFRENCH}
 DISTFILES+=	pysycache-lang-fr-${PORTVERSION}.zip
 PLIST_SUB+=	FRENCH=""
 FLAG_LANG=	true
@@ -41,7 +40,7 @@ HAVE_LANG+=	fr
 PLIST_SUB+=	FRENCH="@comment "
 .endif
 
-.if !defined(WITHOUT_GERMAN)
+.if ${PORT_OPTIONS:MGERMAN}
 DISTFILES+=	pysycache-lang-de-${PORTVERSION}.zip
 PLIST_SUB+=	GERMAN=""
 FLAG_LANG=	true
@@ -50,7 +49,7 @@ HAVE_LANG+=	de
 PLIST_SUB+=	GERMAN="@comment "
 .endif
 
-.if !defined(WITHOUT_ITALIAN)
+.if ${PORT_OPTIONS:MITALIAN}
 DISTFILES+=	pysycache-lang-it-${PORTVERSION}.zip
 PLIST_SUB+=	ITALIAN=""
 FLAG_LANG=	true
@@ -59,7 +58,7 @@ HAVE_LANG+=	it
 PLIST_SUB+=	ITALIAN="@comment "
 .endif
 
-.if !defined(WITHOUT_PORTUGUESE)
+.if ${PORT_OPTIONS:MPORTUGUESE}
 DISTFILES+=	pysycache-lang-pt-${PORTVERSION}.zip
 PLIST_SUB+=	PORTUGUESE=""
 FLAG_LANG=	true
@@ -68,7 +67,7 @@ HAVE_LANG+=	pt
 PLIST_SUB+=	PORTUGUESE="@comment "
 .endif
 
-.if !defined(WITHOUT_SPANISH)
+.if ${PORT_OPTIONS:MSPANISH}
 DISTFILES+=	pysycache-lang-es-${PORTVERSION}.zip
 PLIST_SUB+=	SPANISH=""
 FLAG_LANG=	true
@@ -100,4 +99,4 @@ do-install:
 		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
 		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/pysycache-themes/Makefile b/games/pysycache-themes/Makefile
index 1e7bf25ef2d0..35b3c20d2ffa 100644
--- a/games/pysycache-themes/Makefile
+++ b/games/pysycache-themes/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pysycache-themes
-# Date created:		2006-02-22
-# Whom:			Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
-#
 
 PORTNAME=	themes
 PORTVERSION=	2.0
@@ -15,7 +11,7 @@ DISTFILES=	#
 DIST_SUBDIR=	pysycache
 
 MAINTAINER=	acm@FreeBSD.org
-COMMENT=	The pysycache themes support
+COMMENT=	Pysycache themes support
 
 RUN_DEPENDS=	pysycache.py:${PORTSDIR}/games/pysycache
 
@@ -24,19 +20,22 @@ NO_BUILD=	yes
 WRKSRC=	${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=	${PREFIX}/share/${DIST_SUBDIR}
 
-OPTIONS=	ANIMALS_MOVE	"Animals move mouse theme"	on \
-		EARTH_MOVE	"Earth move mouse theme"	on \
-		FOOD_MOVE	"Food move mouse theme"	on \
-		PLANTS_MOVE	"Plants move mouse theme"	on \
-		SKY_MOVE	"Sky move mouse theme"	on \
-		SPORTS_MOVE	"Sports move mouse theme"	on \
-		VEHICLE_MOVE	"Vehicle move mouse theme"	on \
-		WORLD_MOVE	"World move mouse theme"	on \
-		AFRICA_ACTIVITY	"Africa activity theme"	on
+OPTIONS_DEFINE=	ANIMALS EARTH FOOD PLANTS SKY SPORTS VEHICLE WORLD AFRICA
+ANIMALS_DESC=	Animals move mouse theme
+EARTH_DESC=	Earth move mouse theme
+FOOD_DESC=	Food move mouse theme
+PLANTS_DESC=	Plants move mouse theme
+SKY_DESC=	Sky move mouse theme
+SPORTS_DESC=	Sports move mouse theme
+VEHICLE_DESC=	Vehicle move mouse theme
+WORLD_DESC=	World move mouse theme
+AFRICA_DESC=		Africa activity theme
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	ANIMALS EARTH FOOD PLANTS SKY SPORTS VEHICLE WORLD AFRICA
 
-.if !defined(WITHOUT_ANIMALS_MOVE)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MANIMALS}
 DISTFILES+=	animals-${PORTVERSION}.zip
 PLIST_SUB+=	ANIMALS=""
 FLAG_THEME=	true
@@ -45,7 +44,7 @@ HAVE_THEME+=	animals
 PLIST_SUB+=	ANIMALS="@comment "
 .endif
 
-.if !defined(WITHOUT_EARTH_MOVE)
+.if ${PORT_OPTIONS:MEARTH}
 DISTFILES+=	earth-${PORTVERSION}.zip
 PLIST_SUB+=	EARTH=""
 FLAG_THEME=	true
@@ -54,7 +53,7 @@ HAVE_THEME+=	earth
 PLIST_SUB+=	EARTH="@comment "
 .endif
 
-.if !defined(WITHOUT_FOOD_MOVE)
+.if ${PORT_OPTIONS:MFOOD}
 DISTFILES+=	food-${PORTVERSION}.zip
 PLIST_SUB+=	FOOD=""
 FLAG_THEME=	true
@@ -63,7 +62,7 @@ HAVE_THEME+=	food
 PLIST_SUB+=	FOOD="@comment "
 .endif
 
-.if !defined(WITHOUT_PLANTS_MOVE)
+.if ${PORT_OPTIONS:MPLANTS}
 DISTFILES+=	plants-${PORTVERSION}.zip
 PLIST_SUB+=	PLANTS=""
 FLAG_THEME=	true
@@ -72,7 +71,7 @@ HAVE_THEME+=	plants
 PLIST_SUB+=	PLANTS="@comment "
 .endif
 
-.if !defined(WITHOUT_SKY_MOVE)
+.if ${PORT_OPTIONS:MSKY}
 DISTFILES+=	sky-${PORTVERSION}.zip
 PLIST_SUB+=	SKY=""
 FLAG_THEME=	true
@@ -81,7 +80,7 @@ HAVE_THEME+=	sky
 PLIST_SUB+=	SKY="@comment "
 .endif
 
-.if !defined(WITHOUT_SPORTS_MOVE)
+.if ${PORT_OPTIONS:MSPORTS}
 DISTFILES+=	sports-${PORTVERSION}.zip
 PLIST_SUB+=	SPORTS=""
 FLAG_THEME=	true
@@ -90,7 +89,7 @@ HAVE_THEME+=	sports
 PLIST_SUB+=	SPORTS="@comment "
 .endif
 
-.if !defined(WITHOUT_VEHICLE_MOVE)
+.if ${PORT_OPTIONS:MVEHICLE}
 DISTFILES+=	vehicle-${PORTVERSION}.zip
 PLIST_SUB+=	VEHICLE=""
 FLAG_THEME=	true
@@ -99,7 +98,7 @@ HAVE_THEME+=	vehicle
 PLIST_SUB+=	VEHICLE="@comment "
 .endif
 
-.if !defined(WITHOUT_WORLD_MOVE)
+.if ${PORT_OPTIONS:MWORLD}
 DISTFILES+=	world-${PORTVERSION}.zip
 PLIST_SUB+=	WORLD=""
 FLAG_THEME=	true
@@ -108,7 +107,7 @@ HAVE_THEME+=	world
 PLIST_SUB+=	WORLD="@comment "
 .endif
 
-.if !defined(WITHOUT_AFRICA_ACTIVITY)
+.if ${PORT_OPTIONS:MAFRICA}
 DISTFILES+=	africa-${PORTVERSION}.zip
 PLIST_SUB+=	AFRICA=""
 FLAG_THEME=	true
@@ -140,4 +139,4 @@ do-install:
 		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
 		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/quake2-source/Makefile b/games/quake2-source/Makefile
index b0dc7b56e2f9..a80a719e5dd0 100644
--- a/games/quake2-source/Makefile
+++ b/games/quake2-source/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	quake2-source
-# Date created:				29 Sep 2005
-# Whom:					Alejandro Pulver <alejandro@varnet.biz>
-#
+# Created by: Alejandro Pulver <alejandro@varnet.biz>
 # $FreeBSD$
-#
 
 PORTNAME=	source
 PORTVERSION=	3.21
@@ -22,23 +18,24 @@ COMMENT=	Quake II game source
 
 NO_BUILD=	yes
 
-OPTIONS=	CTF "Install Capture The Flag mod source" off \
-		ROGUE "Install Ground Zero (Rogue) mission pack source" off \
-		XATRIX "Install The Reckoning (Xatrix) mission pack source" off
+OPTIONS_DEFINE=	CTF ROGUE XATRIX
+CTF_DESC=	Capture The Flag mod source
+ROGUE_DESC=	Ground Zero (Rogue) mission pack source
+XATRIX_DESC=	Reckoning (Xatrix) mission pack source
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
 
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CTF)
+.if ${PORT_OPTIONS:MCTF}
 PLIST_SUB+=	CTF=""
 .else
 PLIST_SUB+=	CTF="@comment "
 .endif
 
-.if defined(WITH_ROGUE)
+.if ${PORT_OPTIONS:MROGUE}
 DISTFILES+=	roguesrc320.shar.Z:id
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_rogue_g__local.h \
 		${FILESDIR}/extra-patch-src_rogue_q__shared.c
@@ -48,7 +45,7 @@ PLIST_SUB+=	ROGUE=""
 PLIST_SUB+=	ROGUE="@comment "
 .endif
 
-.if defined(WITH_XATRIX)
+.if ${PORT_OPTIONS:MXATRIX}
 DISTFILES+=	xatrixsrc320.shar.Z:id
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xatrix_q__shared.c
 XATRIX_OFF=	441
@@ -59,7 +56,7 @@ PLIST_SUB+=	XATRIX="@comment "
 
 post-extract:
 .for f in rogue xatrix
-.   if defined(WITH_${f:U})
+.   if ${PORT_OPTIONS:M${f:U}}
 	@${MKDIR} ${WRKSRC}/src/${f}
 	@(cd ${WRKSRC}/src/${f} && ${GUNZIP_CMD} -c \
 		${DISTDIR}/${DIST_SUBDIR}/${f}src320.shar.Z > \
@@ -78,10 +75,10 @@ do-install:
 	${CP} -R ${WRKSRC}/src/game ${DATADIR}
 	${INSTALL_DATA} ${FILESDIR}/Makefile.game ${DATADIR}/game/Makefile
 .for f in ctf rogue xatrix
-.   if defined(WITH_${f:U})
+.   if ${PORT_OPTIONS:M${f:U}}
 	${CP} -R ${WRKSRC}/src/${f} ${DATADIR}
 	${INSTALL_DATA} ${FILESDIR}/Makefile.${f} ${DATADIR}/${f}/Makefile
 .   endif
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/quake2-zaero/Makefile b/games/quake2-zaero/Makefile
index f088dbcecfe9..057a4e92d8ad 100644
--- a/games/quake2-zaero/Makefile
+++ b/games/quake2-zaero/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	quake2-zaero
-# Date created:				2006-12-24
-# Whom:					alepulver
-#
+# Created by: alepulver
 # $FreeBSD$
-#
 
 PORTNAME=	zaero
 PORTVERSION=	1.1
@@ -21,16 +17,17 @@ USE_ZIP=	yes
 USE_DOS2UNIX=	*.[ch]
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	DEMO "Install demo version of the game data" off \
-		DM "Install deathmatch maps" off
+OPTIONS_DEFINE=	DEMO DM
+DEMO_DESC=	Demo version of the game data
+DM_DESC=	Deathmatch maps
 
 DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DEMO)
+.if ${PORT_OPTIONS:MDEMO}
 DISTFILES+=	zaerodemo${EXTRACT_SUFX}
 PLIST_SUB+=	DEMO=""
 .else
@@ -38,7 +35,7 @@ PLIST_SUB+=	DEMO="@comment "
 SUB_FILES+=	pkg-message
 .endif
 
-.if defined(WITH_DM)
+.if ${PORT_OPTIONS:MDM}
 DISTFILES+=	zaerodm${EXTRACT_SUFX}
 PLIST_SUB+=	DM=""
 .else
@@ -54,25 +51,25 @@ post-patch:
 do-install:
 	${MKDIR} ${Q2DIR}/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/${PORTNAME}
-.if defined(WITH_DEMO)
+.if ${PORT_OPTIONS:MDEMO}
 	${INSTALL_DATA} ${WRKSRC}/zaero/pak0.pak ${Q2DIR}/${PORTNAME}
 	${MKDIR} ${Q2DIR}/${PORTNAME}/sprites
 	${INSTALL_DATA} ${WRKSRC}/zaero/sprites/* ${Q2DIR}/${PORTNAME}/sprites
 .endif
 	${INSTALL_DATA} ${WRKSRC}/pak1.pak ${Q2DIR}/${PORTNAME}
-.if defined(WITH_DM)
+.if ${PORT_OPTIONS:MDM}
 	${INSTALL_DATA} ${WRKSRC}/zaero/pak2.pak ${Q2DIR}/${PORTNAME}
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/changelog.txt ${DOCSDIR}
 .endif
 
-.if !defined(WITH_DEMO)
+.if ! ${PORT_OPTIONS:MDEMO}
 post-install:
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/quake3/Makefile b/games/quake3/Makefile
index 25287a3f3385..ce4790705476 100644
--- a/games/quake3/Makefile
+++ b/games/quake3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	quake3
-# Date created:				23 August 2005
-# Whom:					pypt
-#
+# Created by: pypt
 # $FreeBSD$
-#
 
 PORTNAME=	quake3
 PORTVERSION=	1.32c
@@ -28,11 +24,15 @@ USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${REALVERSION}
 BUILD_WRKSRC=	${WRKSRC}/code/unix
 
-OPTIONS=	CLIENT "Build client" on \
-		DEDICATED "Build dedicated server" on \
-		GAMELIBS "Build game libraries (when not mandatory)" off \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		SMP "Build SMP (threaded) client" on
+OPTIONS_DEFINE=	GAMELIBS OPTIMIZED_CFLAGS
+OPTIONS_MULTI=	FLAVOR
+OPTIONS_MULTI_FLAVOR=	CLIENT DEDICATED THREADS
+FLAVOR_DESC=	Executable Selection
+CLIENT_DESC=	Build client
+DEDICATED_DESC=	Build dedicated server
+GAMELIBS_DESC=	Build game libraries (when not mandatory)
+
+OPTIONS_DEFAULT=	CLIENT DEDICATED OPTIMIZED_CFLAGS THREADS
 
 MAKE_ENV=	LIBDIR="${LIBDIR}"
 PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
@@ -41,13 +41,9 @@ LIBDIR=		${PREFIX}/lib/${PORTNAME}
 REALVERSION=	1.32b
 VM_ARCHS=	i386 powerpc
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && \
-    defined(WITHOUT_SMP)
-IGNORE=		needs at least one of CLIENT, DEDICATED and SMP options
-.endif
-
 .if ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 .endif
@@ -62,12 +58,12 @@ HAVE_VM_COMPILED=	yes
 MAKE_ENV+=	DLL_ONLY=true
 .endif
 
-.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP)
+.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MTHREADS}
 USE_GL=		yes
 USE_XORG=	xxf86dga
 .endif
 
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 MAKE_ENV+=	CLIENT=YES
 PLIST_SUB+=	CLIENT=""
 Q3BIN+=		quake3
@@ -75,7 +71,7 @@ Q3BIN+=		quake3
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if !defined(WITHOUT_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 MAKE_ENV+=	DEDICATED=YES
 PLIST_SUB+=	DEDICATED=""
 Q3BIN+=		q3ded
@@ -83,18 +79,18 @@ Q3BIN+=		q3ded
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
-.if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED)
+.if ${PORT_OPTIONS:MGAMELIBS) || !defined(HAVE_VM_COMPILED}
 MAKE_ENV+=	GAMELIBS=YES
 PLIST_SUB+=	GAMELIBS=""
 .else
 PLIST_SUB+=	GAMELIBS="@comment "
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	OPTIMIZED_CFLAGS=YES
 .endif
 
-.if !defined(WITHOUT_SMP)
+.if ${PORT_OPTIONS:MTHREADS}
 MAKE_ENV+=	SMP=YES \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 PLIST_SUB+=	SMP=""
@@ -115,7 +111,7 @@ do-install:
 .for bin in ${Q3BIN}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} ${PREFIX}/bin
 .endfor
-.if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED)
+.if ${PORT_OPTIONS:MGAMELIBS) || !defined(HAVE_VM_COMPILED}
 .for dir in baseq3 missionpack
 	${MKDIR} ${LIBDIR}/${dir}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${LIBDIR}/${dir}
diff --git a/games/scourge/Makefile b/games/scourge/Makefile
index fe75f126412c..56f5bb0bf008 100644
--- a/games/scourge/Makefile
+++ b/games/scourge/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Scourge
-# Date created:		2005-10-08
-# Whom:			Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
-#
 
 PORTNAME=	scourge
 PORTVERSION=	0.21.1
@@ -14,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/$/.src/}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
-COMMENT=	S.C.O.U.R.G.E. is a rogue-like game
+COMMENT=	Rogue-like game
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	${DATADIR}/config/scourge.cfg:${PORTSDIR}/games/scourge-data
@@ -33,11 +29,11 @@ SUB_FILES=	pkg-message
 PLIST_FILES=	bin/${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS=	DEBUG	"Produce an executable with debugging symbols"	off
+OPTIONS_DEFINE=	DEBUG
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
@@ -53,4 +49,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 51f9c8c2f3aa..50a8f3485564 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	scummvm-tools
-# Date created:				28 May 2003
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	scummvm-tools
 DISTVERSION=	1.0.0rc1
@@ -33,11 +29,13 @@ MAKE_JOBS_SAFE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CXXFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
 
-OPTIONS=	WX "Build wxWidgets GUI" On
+OPTIONS_DEFINE=	WXGTK
+OPTIONS_DEFAULT=	WXGTK
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_WX)
+.if ${PORT_OPTIONS:MWXGTK}
 USE_WX=		2.4+
 WX_CONFIG=	${LOCALBASE}/bin/wxgtk2-2.8-config
 WX_COMP=	wx:lib:build
@@ -48,7 +46,7 @@ PLIST_SUB=	WX="@comment "
 .endif
 
 post-patch:
-.if defined(WITH_WX)
+.if ${PORT_OPTIONS:MWXGTK}
 	@${REINPLACE_CMD} -e 's,wx-config,${WX_CONFIG},' ${WRKSRC}/Makefile
 .else
 	@${REINPLACE_CMD} -e '/tools_gui$$(EXEEXT)$$/d' ${WRKSRC}/Makefile
@@ -66,7 +64,7 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/$i ${PREFIX}/bin
 .endfor
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
diff --git a/games/steelstorm/Makefile b/games/steelstorm/Makefile
index 21cad2d32fdb..7ea58e7490c9 100644
--- a/games/steelstorm/Makefile
+++ b/games/steelstorm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	steelstorm
-# Date created:		10 Sep 2010
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	steelstorm
 DISTVERSION=	beta-r1591
@@ -40,26 +36,27 @@ ALL_TARGET=	# empty
 
 PORTDOCS=	README.txt
 
-OPTIONS=	OPTIMIZED_CFLAGS "Use optimized compiler flags" on \
-		CLIENT "Build client" on \
-		DEDICATED "Build dedicated server" on
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
+OPTIONS_MULTI=	FLAVOR
+OPTIONS_MULTI_FLAVOR=	CLIENT DEDICATED
+CLIENT_DESC=	Build client
+DEDICATED_DESC=	Dedicated server
+FLAVOR_DESC=	Executable Selection
+
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS CLIENT DEDICATED
 
 PLIST_FILES=	%%DATADIR%%/ssgamedata000001.pk3
 PLIST_DIRS=	%%DATADIR%%
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED)
-IGNORE=		needs at least one executable (CLIENT or DEDICATED)
-.endif
-
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 ALL_TARGET+=	cl-release
 USE_XORG+=	x11 xpm xext xxf86dga xxf86vm
 PLIST_FILES+=	bin/steelstorm
 .endif
 
-.if !defined(WITHOUT_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 ALL_TARGET+=	sv-release
 PLIST_FILES+=	bin/steelstorm-dedicated
 .endif
@@ -67,7 +64,7 @@ PLIST_FILES+=	bin/steelstorm-dedicated
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 		${BUILD_WRKSRC}/BSDmakefile ${BUILD_WRKSRC}/makefile.inc
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ! ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 	@${REINPLACE_CMD} -e '/^OPTIM_RELEASE=/ d' \
 		${BUILD_WRKSRC}/makefile.inc
 .endif
@@ -75,15 +72,15 @@ post-patch:
 		${BUILD_WRKSRC}/common.c
 
 do-install:
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-glx ${PREFIX}/bin/steelstorm
 .endif
-.if !defined(WITHOUT_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-dedicated ${PREFIX}/bin/steelstorm-dedicated
 .endif
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/gamedata/ssgamedata000001.pk3 ${DATADIR}/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}/
 .endif
diff --git a/games/teeworlds/Makefile b/games/teeworlds/Makefile
index ec0e7c6628d4..be1ec5a38688 100644
--- a/games/teeworlds/Makefile
+++ b/games/teeworlds/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	teewars
-# Date created:		17 Feb 2008
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	teeworlds
 PORTVERSION=	0.6.1
@@ -31,15 +27,16 @@ WRKSRC=		${WRKDIR}/teeworlds-b177-r50edfd37-source
 
 PORTDOCS=	readme.txt license.txt
 
-OPTIONS=	TEEWORLDS_SERVER_ONLY	"Build dedicated server only"	off
+OPTIONS_DEFINE=	SERVER
+SERVER_DESC=	Build dedicated server only
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "ia64"
 BROKEN=		Does not install on ia64: gets bus error
 .endif
 
-.if defined(WITH_TEEWORLDS_SERVER_ONLY)
+.if ${PORT_OPTIONS:MSERVER}
 BAM_TARGET=	server_release
 PLIST_SUB+=	CLIENT="@comment "
 PKGNAMESUFFX=	-server
@@ -75,17 +72,17 @@ do-build:
 		${BAM_WRKSRC}/bam -n -a -v ${_MAKE_JOBS:C/-j/-j /} ${BAM_TARGET}
 
 do-install:
-.if !defined(WITH_TEEWORLDS_SERVER_ONLY)
+.if ! ${PORT_OPTIONS:MSERVER}
 	${INSTALL_PROGRAM} ${WRKSRC}/teeworlds ${PREFIX}/bin
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/teeworlds_srv ${PREFIX}/bin
 	${MKDIR} ${DATADIR}
 	@cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/other/icons/Teeworlds.ico ${DATADIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/tyrquake/Makefile b/games/tyrquake/Makefile
index c96b9f05f1d6..3c6afab54e27 100644
--- a/games/tyrquake/Makefile
+++ b/games/tyrquake/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tyrquake
-# Date created:				13 May 2006
-# Whom:					alepulver
-#
+# Created by: alepulver
 # $FreeBSD$
-#
 
 PORTNAME=	tyrquake
 PORTVERSION=	0.59
@@ -20,18 +16,21 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 MAKE_ENV=	QBASEDIR="${Q1DIR}" X11BASE=${LOCALBASE}
 
-OPTIONS=	OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		X86_ASM "Enable x86 assembly code when possible" on
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
+OPTIONS_DEFINE_i386=	ASM
+ASM_DESC=	x86 assembly code when possible
+
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS ASM
 
 .include "${.CURDIR}/../quake-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ! ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	OPTIMIZED_CFLAGS=N
 .endif
 
-.if defined(WITHOUT_X86_ASM) || ${ARCH} != "i386"
+.if ! ${PORT_OPTIONS:MASM}
 MAKE_ENV+=	USE_X86_ASM=N
 .endif
 
@@ -42,7 +41,7 @@ do-install:
 .for file in tyr-quake tyr-glquake tyr-qwcl tyr-glqwcl tyr-qwsv
 	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
 .endif
@@ -52,4 +51,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index e47e36338f3b..c1784b9aa0e9 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xqf
-# Date created:				08 February 1999
-# Whom:					steve farrell
-#
+# Created by: steve farrell
 # $FreeBSD$
-#
 
 PORTNAME=	xqf
 PORTVERSION=	1.0.5
@@ -12,7 +8,7 @@ CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	A server browser for many popular 3D action games
+COMMENT=	Server browser for many popular 3D action games
 
 RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
 
@@ -26,31 +22,31 @@ MAN6=		xqf.6
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	GTK2 "GTK+ 2.0 support" on \
-		GEOIP "GeoIP support" on \
-		BZIP2 "bzip2 compression" on
+OPTIONS_DEFINE=	GTK2 GEOIP BZIP2
+OPTIONS_DEFAULT=	GTK2 GEOIP BZIP2
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gtk2
 .else
 USE_GNOME+=	gdkpixbuf
 .endif
 
-.if !defined(WITHOUT_GEOIP)
+.if ${PORT_OPTIONS:MGEOIP}
 LIB_DEPENDS+=	GeoIP.5:${PORTSDIR}/net/GeoIP
 .else
 CONFIGURE_ARGS+=	--disable-geoip
 .endif
 
-.if !defined(WITHOUT_BZIP2)
+.if ${PORT_OPTIONS:MBZIP2}
 CONFIGURE_ARGS+=	--enable-bzip2
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/xqfdocs.html ${DOCSDIR}
 .endif