Convert to new options framework

54 files changed, 613 insertions, 619 deletions

diff --git a/games/abe/Makefile b/games/abe/Makefile
index 5b1715a95b31..5ebb76a609e7 100644
--- a/games/abe/Makefile
+++ b/games/abe/Makefile
@@ -25,8 +25,9 @@ CONFIGURE_ARGS=	--with-data-dir=${DATADIR}
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
-OPTIONS=	GOD_MODE "Enable God Mode (toggle with 'g')" off \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on
+OPTIONS_DEFINE=	GOD_MODE OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
+GOD_MODE_DESC=	Enable God Mode (toggle with 'g')
 
 post-install:
 	@${MKDIR} ${DATADIR}
@@ -34,15 +35,15 @@ post-install:
 	@${CP} -R ${WRKSRC}/${d} ${DATADIR}
 .endfor
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GOD_MODE) || defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MGOD_MODE} || !empty{PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 post-patch:
-.   if defined(WITH_GOD_MODE)
+.   if ${PORT_OPTIONS:MGOD_MODE}
 	@${REINPLACE_CMD} -e 's|\(#define GOD_MODE\) 0|\1 1|' \
 		${WRKSRC}/src/Game.h
 .   endif
-.   if defined(WITHOUT_OPTIMIZED_CFLAGS)
+.   if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 	@${REINPLACE_CMD} -e 's|-O2||g ; \
 		s|-fomit-frame-pointer||g ; \
 		s|-ffast-math||g ; \
@@ -51,4 +52,4 @@ post-patch:
 .   endif
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/alephone-data/Makefile b/games/alephone-data/Makefile
index ef9699c42502..e8eba9191f10 100644
--- a/games/alephone-data/Makefile
+++ b/games/alephone-data/Makefile
@@ -24,17 +24,21 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 NO_CDROM=	Bungie/Microsoft do not allow charging for Marathon data files
 
-OPTIONS=	MARATHON "Install Marathon data" on \
-		DURANDAL "Install Marathon 2: Durandal data" on \
-		INFINITY "Install Marathon Infinity data" on
+OPTIONS_MULTI=	AO
+OPTIONS_MULTI_AO=	MARATHON DURANDAL INFINITY
+OPTIONS_DEFAULT=	MARATHON DURANDAL INFINITY
+
+MARATHON_DESC=	Install Marathon data
+DURANDAL_DESC=	Install Marathon 2: Durandal data
+INFINITY_DESC=	Install Marathon Infinity data
 
 SUB_FILES=	wrapper
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 DATADIR!=	cd ${PORTSDIR}/games/alephone && ${MAKE} -V DATADIR
 
-.if !defined(WITHOUT_MARATHON)
+.if ${PORT_OPTIONS:MMARATHON}
 DISTFILES+=	M1A1${EXTRACT_SUFX}
 PLIST_SUB+=	MARATHON=""
 AO_PACKS+=	marathon
@@ -44,7 +48,7 @@ DESKTOP_ENTRIES+="Marathon" "" "" "alephone-marathon" \
 PLIST_SUB+=	MARATHON="@comment "
 .endif
 
-.if !defined(WITHOUT_DURANDAL)
+.if ${PORT_OPTIONS:MDURANDAL}
 DISTFILES+=	Marathon2${EXTRACT_SUFX}
 PLIST_SUB+=	DURANDAL=""
 AO_PACKS+=	durandal
@@ -54,7 +58,7 @@ DESKTOP_ENTRIES+="Marathon 2: Durandal" "" "" "alephone-durandal" \
 PLIST_SUB+=	DURANDAL="@comment "
 .endif
 
-.if !defined(WITHOUT_INFINITY)
+.if ${PORT_OPTIONS:MINFINITY}
 DISTFILES+=	MarathonInfinity${EXTRACT_SUFX}
 PLIST_SUB+=	INFINITY=""
 AO_PACKS+=	infinity
@@ -64,18 +68,14 @@ DESKTOP_ENTRIES+="Marathon Infinity" "" "" "alephone-infinity" \
 PLIST_SUB+=	INFINITY="@comment "
 .endif
 
-.if empty(AO_PACKS)
-IGNORE=		needs at least one game option (MARATHON, DURANDAL and INFINITY)
-.endif
-
 post-extract:
-.if !defined(WITHOUT_MARATHON)
+.if ${PORT_OPTIONS:MMARATHON}
 	@cd ${WRKSRC} && ${MV} M1A1 marathon
 .endif
-.if !defined(WITHOUT_DURANDAL)
+.if ${PORT_OPTIONS:MDURANDAL}
 	@cd ${WRKSRC} && ${MV} "Marathon 2" durandal
 .endif
-.if !defined(WITHOUT_INFINITY)
+.if ${PORT_OPTIONS:MINFINITY}
 	@cd ${WRKSRC} && ${MV} "Marathon Infinity" infinity
 .endif
 
@@ -95,4 +95,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/alephone-scenarios/Makefile b/games/alephone-scenarios/Makefile
index fb1ff896488b..6fcbcc378e28 100644
--- a/games/alephone-scenarios/Makefile
+++ b/games/alephone-scenarios/Makefile
@@ -29,21 +29,24 @@ USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	EMR "Install Excalibur: Morgana's Revenge data" off \
-		ETERNAL "Install Eternal X data" off \
-		EVIL "Install Marathon Evil data" on \
-		RED "Install Marathon Red data" on \
-		RUBICON "Install Rubicon X data" off \
-		TI "Install Tempus Irae data" off \
-		GRAY "Install The gray incident data" off
+OPTIONS_MULTI=	PACKS
+OPTIONS_MULTI_PACKS=	EMR ETERNAL EVIL RED RUBICON TI GRAY
+OPTIONS_DEFAULT=	EMR ETERNAL EVIL RED RUBICON TI GRAY
+EMR_DESC=	Install Excalibur: Morgana's Revenge data
+ETERNAL_DESC=	Install Eternal X data
+EVIL_DESC=	Install Marathon Evil data
+RED_DESC=	Install Marathon Red data
+RUBICON_DESC=	Install Rubicon X data
+TI_DESC=	Install Tempus Irae data
+GRAY_DESC=	Install The gray incident data
 
 SUB_FILES=	wrapper
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 DATADIR!=	cd ${PORTSDIR}/games/alephone && ${MAKE} -V DATADIR
 
-.if defined(WITH_EMR)
+.if ${PORT_OPTIONS:MEMR}
 FETCH_ARGS=	-Fpr
 EMR_FILE=	emr-3.0-0602.tgz
 DISTFILES+=	${EMR_FILE}:emr
@@ -55,7 +58,7 @@ DESKTOP_ENTRIES+="Excalibur: Morgana's Revenge" "" "" "alephone-emr" \
 PLIST_SUB+=	EMR="@comment "
 .endif
 
-.if defined(WITH_ETERNAL)
+.if ${PORT_OPTIONS:METERNAL}
 DISTFILES+=	EternalXv103Full${EXTRACT_SUFX}:eternal
 EXTRACT_ONLY+=	EternalXv103Full${EXTRACT_SUFX}
 PLIST_SUB+=	ETERNAL=""
@@ -66,7 +69,7 @@ DESKTOP_ENTRIES+="Eternal X" "" "" "alephone-eternal" \
 PLIST_SUB+=	ETERNAL="@comment "
 .endif
 
-.if !defined(WITHOUT_EVIL)
+.if ${PORT_OPTIONS:MEVIL}
 DISTFILES+=	MarathonEvil${EXTRACT_SUFX}:bungie
 EXTRACT_ONLY+=	MarathonEvil${EXTRACT_SUFX}
 PLIST_SUB+=	EVIL=""
@@ -77,7 +80,7 @@ DESKTOP_ENTRIES+="Evil" "" "" "alephone-evil" \
 PLIST_SUB+=	EVIL="@comment "
 .endif
 
-.if !defined(WITHOUT_RED)
+.if ${PORT_OPTIONS:MRED}
 DISTFILES+=	MarathonRED${EXTRACT_SUFX}:bungie
 EXTRACT_ONLY+=	MarathonRED${EXTRACT_SUFX}
 PLIST_SUB+=	RED=""
@@ -88,7 +91,7 @@ DESKTOP_ENTRIES+="Marathon Red" "" "" "alephone-red" \
 PLIST_SUB+=	RED="@comment "
 .endif
 
-.if defined(WITH_RUBICON)
+.if ${PORT_OPTIONS:MRUBICON}
 DISTFILES+=	marathonRubiconX${EXTRACT_SUFX}:rubicon
 EXTRACT_ONLY+=	marathonRubiconX${EXTRACT_SUFX}
 PLIST_SUB+=	RUBICON=""
@@ -99,7 +102,7 @@ DESKTOP_ENTRIES+="Rubicon X" "" "" "alephone-rubicon" \
 PLIST_SUB+=	RUBICON="@comment "
 .endif
 
-.if defined(WITH_TI)
+.if ${PORT_OPTIONS:MTI}
 DISTFILES+=	Tempus_Irae${EXTRACT_SUFX}:nardofiles
 EXTRACT_ONLY+=	Tempus_Irae${EXTRACT_SUFX}
 PLIST_SUB+=	TI=""
@@ -110,7 +113,7 @@ DESKTOP_ENTRIES+="Tempus Irae" "" "" "alephone-tempus_irae" \
 PLIST_SUB+=	TI="@comment "
 .endif
 
-.if defined(WITH_GRAY)
+.if ${PORT_OPTIONS:MGRAY}
 DISTFILES+=	tgi${EXTRACT_SUFX}:gray
 EXTRACT_ONLY+=	tgi${EXTRACT_SUFX}
 PLIST_SUB+=	GRAY=""
@@ -121,12 +124,8 @@ DESKTOP_ENTRIES+="The Gray Incident" "" "" "alephone-gray" \
 PLIST_SUB+=	GRAY="@comment "
 .endif
 
-.if empty(AO_PACKS)
-IGNORE=		needs at least one option
-.endif
-
 post-extract:
-.if defined(WITH_EMR)
+.if ${PORT_OPTIONS:MEMR}
 	@${TAR} zxf ${DISTDIR}/${DIST_SUBDIR}/${EMR_FILE} -C ${WRKDIR}
 	@${MKDIR} ${WRKSRC}/emr
 	@cd ${WRKSRC}/${EMR_FILE:S/-0602.tgz//} && \
@@ -134,28 +133,28 @@ post-extract:
 		${MV} share-doc-emr ../emr/docs && \
 		${MV} README ../emr/docs
 .endif
-.if defined(WITH_ETERNAL)
+.if ${PORT_OPTIONS:METERNAL}
 	@cd ${WRKSRC} && ${MV} "Eternal X 1.0.3" eternal
 	@cd ${WRKSRC}/eternal && \
 		${FIND} . -type d -print0 | ${XARGS} -0 ${CHMOD} 755 && \
 		${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} 644
 .endif
-.if !defined(WITHOUT_EVIL)
+.if ${PORT_OPTIONS:MEVIL}
 	@cd ${WRKSRC} && ${MV} "Marathon EVIL" evil
 .endif
-.if !defined(WITHOUT_RED)
+.if ${PORT_OPTIONS:MRED}
 	@cd ${WRKSRC} && ${MV} "Marathon RED" red
 .endif
-.if defined(WITH_RUBICON)
+.if ${PORT_OPTIONS:MRUBICON}
 	@cd ${WRKSRC} && ${MV} "Rubicon X "?? rubicon
 .endif
-.if defined(WITH_TI)
+.if ${PORT_OPTIONS:MTI}
 	@cd ${WRKSRC} && ${MV} Tempus_Irae tempus_irae
 	@cd ${WRKSRC}/tempus_irae && \
 		${FIND} . -type d -print0 | ${XARGS} -0 ${CHMOD} 755 && \
 		${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} 644
 .endif
-.if defined(WITH_GRAY)
+.if ${PORT_OPTIONS:MGRAY}
 	@cd ${WRKSRC} && ${MV} "The Gray Incident" gray
 .endif
 
@@ -172,7 +171,7 @@ do-install:
 		${FIND} . -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE} && \
 		${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
 .endfor
-.if defined(WITH_RUBICON)
+.if ${PORT_OPTIONS:MRUBICON}
 	@${LN} -s ${DATADIR}/[A-Z]* ${DATADIR}/rubicon
 .endif
 
@@ -181,4 +180,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/alienwave/Makefile b/games/alienwave/Makefile
index c8983869cb53..61b56463ec24 100644
--- a/games/alienwave/Makefile
+++ b/games/alienwave/Makefile
@@ -23,38 +23,35 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="-c ${CFLAGS}"
 PLIST_FILES=	bin/alienwave
 PORTDOCS=	README STORY TO_DO
 
-OPTIONS=	RANDOM_LEVELS	"Enable random waves" off \
-		LEVEL_EASY	"Killing Xzarna: easy (default: medium)" off \
-		LEVEL_HARD	"Killing Xzarna: hard (default: medium)" off
+OPTIONS_DEFINE=	RANDOM_LEVELS LEVEL DOCS
+OPTIONS_SINGLE=	LEVEL
+OPTIONS_SINGLE_LEVEL=	LEVEL_EASY LEVEL_HARD
+RANDOM_LEVELS_DESC=	Enable random waves
+LEVEL_DESC=	Choose a level different from medium
+LEVEL_EASY_DESC=	Killing Xzarna: easy
+LEVEL_HARD_DESC=	Killing Xzarna: hard
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_LEVEL_EASY)
+.if ${PORT_OPTIONS:MLEVEL_EASY}
 CFLAGS+=	-DLEV_EASY
 .endif
 
-.if defined(WITH_LEVEL_HARD)
+.if ${PORT_OPTIONS:MLEVEL_HARD}
 CFLAGS+=	-DLEV_HARD
 .endif
 
-.if defined(WITH_RANDOM_LEVELS)
+.if ${PORT_OPTIONS:MRANDOM_LEVELS}
 CFLAGS+=	-DRANDOM_LEVELS
 .endif
 
-.if defined(WITH_LEVEL_EASY) && defined(WITH_LEVEL_HARD)
-pre-everything::
-	@${ECHO_CMD} "The LEVEL_EASY and LEVEL_HARD options are mutually exclusive."
-	@${ECHO_CMD} "Please run 'make config' again."
-	@${FALSE}
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/alienwave ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .  for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .  endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/annelid/Makefile b/games/annelid/Makefile
index e78cb07c1079..8c01bde57ef6 100644
--- a/games/annelid/Makefile
+++ b/games/annelid/Makefile
@@ -26,7 +26,8 @@ USE_SDL=	sdl
 USE_GL=		gl
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	OPTIMIZED_CFLAGS "Enable compilation optimizations" on
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 
 SUB_FILES=	${PORTNAME}-sh
 
@@ -35,7 +36,7 @@ DATAFILES=	annelid.dat apple.tga apple.wav backd.tga backn.tga font.dat \
 		score.wav segment.tga shrink.wav slow.wav speed.wav title.tga \
 		vortex.wav
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-patch:
 # Fix Makefile.
@@ -49,7 +50,7 @@ post-patch:
 		${WRKSRC}/*.cpp ${WRKSRC}/*.h
 
 # Enable/disable compilation optimizations.
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
 	@${REINPLACE_CMD} -e 's|$$(OPT)||' ${WRKSRC}/${MAKEFILE}
 .endif
 
@@ -66,4 +67,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/awale/Makefile b/games/awale/Makefile
index 283d11d788f1..4b4eb51ae669 100644
--- a/games/awale/Makefile
+++ b/games/awale/Makefile
@@ -13,18 +13,20 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	African board game
 
-OPTIONS=	GUI "Installs Tcl/Tk GUI" on
+OPTIONS_DEFINE=	GUI DOCS
+OPTIONS_DEFAULT=	GUI
+GUI_DESC=	Installs Tcl/Tk GUI
 
 MAN6=		${PORTNAME}.6
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_GUI)
-PLIST_SUB+=	GUI="@comment "
-.else
+.if ${PORT_OPTIONS:MGUI}
 USE_TK_WRAPPER=	yes
 MAN6+=		x${PORTNAME}.6
 PLIST_SUB+=	GUI=""
+.else
+PLIST_SUB+=	GUI="@comment "
 .endif
 
 post-patch:
@@ -42,12 +44,12 @@ do-install:
 .for f in README *.bmp *.gif *.ico *.png
 	${INSTALL_DATA} ${WRKSRC}/src/${f} ${DATADIR}
 .endfor
-.if !defined(WITHOUT_GUI)
+.if ${PORT_OPTIONS:MGUI}
 	${INSTALL_SCRIPT} ${WRKSRC}/src/x${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/x${PORTNAME}.6 ${MAN6PREFIX}/man/man6
 	${INSTALL_SCRIPT} ${WRKSRC}/src/xawale.tcl ${DATADIR}
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for f in AUTHORS ChangeLog NEWS README THANKS
 	cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${DOCSDIR}
diff --git a/games/bomns/Makefile b/games/bomns/Makefile
index 789718158e08..3b3950887d18 100644
--- a/games/bomns/Makefile
+++ b/games/bomns/Makefile
@@ -24,20 +24,21 @@ CPPFLAGS+=	`${SDL_CONFIG} --cflags`
 LDFLAGS+=	`${SDL_CONFIG} --libs`
 CONFIGURE_ARGS=	--program-transform-name=
 
-OPTIONS=	EDITOR "Enable building of the map editor" on \
-		LAUNCHER "Enable building of the GTK2 launcher" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on
+OPTIONS_DEFINE=	EDITOR LAUNCHER OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	EDITOR LAUNCHER OPTIMIZED_CFLAGS
+EDITOR_DESC=	Enable building of the map editor
+LAUNCHER_DESC=	Enable building of the GTK2 launcher
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_EDITOR)
+.if ${PORT_OPTIONS:MEDITOR}
 PLIST_SUB+=	EDITOR=""
 .else
 CONFIGURE_ARGS+=--disable-editor
 PLIST_SUB+=	EDITOR="@comment "
 .endif
 
-.if !defined(WITHOUT_LAUNCHER)
+.if ${PORT_OPTIONS:MLAUNCHER}
 USE_GNOME=	gtk20
 PLIST_SUB+=	LAUNCHER=""
 .else
@@ -61,8 +62,8 @@ post-patch:
 .endfor
 
 # Enable/disable compilation optimizations.
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
 	@${REINPLACE_CMD} -e 's|-O2||' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/cube/Makefile b/games/cube/Makefile
index 63c78de54904..64dfc07c9b4e 100644
--- a/games/cube/Makefile
+++ b/games/cube/Makefile
@@ -26,22 +26,21 @@ CFLAGS+=	-fsigned-char
 ALL_TARGET=	#empty
 MALE_JOBS_SAFE=	yes
 
-OPTIONS=	CLIENT		"Build client"			on \
-		DEDICATED	"Build dedicated server"	on \
-		OPT		"Optimized CFLAGS"		off
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
+OPTIONS_MULTI=	TYPE
+OPTIONS_MULTI_TYPE=	CLIENT DEDICATED
+OPTIONS_DEFAULT=	CLIENT DEDICATED
+CLIENT_DESC=	Build client
+DEDICATED_DESC=	Build dedicated server
 
 SUB_FILES=	cube_client cube_server
 
 CUBE_DATA=	${PORTNAME}_${PORTVERSION:S/./_/g}_unix.tar.gz
 CUBE_SRC=	${PORTNAME}_${PORTVERSION:S/./_/g}_src.zip
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED)
-IGNORE=		needs at least one executable (CLIENT and DEDICATED)
-.endif
-
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 USE_GL=		yes
 USE_SDL=	image mixer sdl
 ALL_TARGET+=	client
@@ -51,7 +50,7 @@ CUBE_BIN+=	client
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if !defined(WITHOUT_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 ALL_TARGET+=	server
 PLIST_SUB+=	DEDICATED=""
 CUBE_BIN+=	server
@@ -59,7 +58,7 @@ CUBE_BIN+=	server
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
-.if defined(WITH_OPT)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -fomit-frame-pointer
 .endif
 
@@ -74,10 +73,10 @@ do-install:
 	${MKDIR} ${DATADIR}
 	@(cd ${WRKDIR}/cube && ${COPYTREE_SHARE} "data packages" ${DATADIR}/)
 	${INSTALL_DATA} ${WRKDIR}/cube/autoexec.cfg ${DATADIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/cube/readme.html ${DOCSDIR}
 	@(cd ${WRKDIR}/cube/docs && ${COPYTREE_SHARE} \* ${DOCSDIR}/)
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/demonquake/Makefile b/games/demonquake/Makefile
index f7d38b07cbcb..2168dbaab7a4 100644
--- a/games/demonquake/Makefile
+++ b/games/demonquake/Makefile
@@ -26,9 +26,9 @@ USE_GL=		gl
 USE_XORG=	xpm xxf86dga
 USE_BZIP2=	yes
 
-OPTIONS=	GLX "Build OpenGL client" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		SDL "Build SDL client" on
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
+OPTIONS_MULTI=	CLIENT
+OPTIONS_MULTI_CLIENT=	OPENGL SDL
 
 ALL_TARGET=	release
 
@@ -37,36 +37,32 @@ PLIST_DIRS=	%%Q1DIR%%/${PORTNAME}
 
 .include "${.CURDIR}/../quake-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_GLX) && defined(WITHOUT_SDL)
-IGNORE=		needs at least one binary (GLX and SDL)
-.endif
-
-.if !defined(WITHOUT_GLX)
+.if ${PORT_OPTIONS:MOPENGL}
 MAKE_ENV+=	BUILD_DEMONQUAKE=YES
 PLIST_FILES+=	bin/${PORTNAME}-glx
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	OPTIMIZE=YES
 .endif
 
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
 MAKE_ENV+=	BUILD_DEMONQUAKE_SDL=YES
 PLIST_FILES+=	bin/${PORTNAME}-sdl
 .endif
 
 do-install:
-.if !defined(WITHOUT_GLX)
+.if ${PORT_OPTIONS:MOPENGL}
 	${INSTALL_PROGRAM} ${WRKSRC}/quake/${PORTNAME}-glx ${PREFIX}/bin
 .endif
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 	${INSTALL_PROGRAM} ${WRKSRC}/quake/${PORTNAME}-sdl ${PREFIX}/bin
 .endif
 	${MKDIR} ${Q1DIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKDIR}/DemonQuake-data/${PORTNAME}/pak0.pak \
 		${Q1DIR}/${PORTNAME}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/doom-data/Makefile b/games/doom-data/Makefile
index 461807d9db10..c4c77ef369eb 100644
--- a/games/doom-data/Makefile
+++ b/games/doom-data/Makefile
@@ -23,18 +23,18 @@ USE_BZIP2=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	DOOM "Install Doom shareware data" on \
-		HERETIC "Install Heretic shareware data" off \
-		HEXEN "Install Hexen shareware data" off \
-		STRIFE "Install Strife shareware data" off
+OPTIONS_DEFINE=	DOOM HERETIC HEXEN STRIFE
+OPTIONS_DEFAULT=	DOOM
+DOOM_DESC=	Install Doom shareware data
+HERETIC_DESC=	Install Heretic shareware data
+HEXEN_DESC=	Install Hexen shareware data
+STRIFE_DESC=	Install Strife shareware data
 
 SUB_FILES=	pkg-message
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=	${DMDIR}
 
-LIST=		DOOM HERETIC HEXEN STRIFE
-
 DOOM_WAD=	doom1.wad
 HERETIC_WAD=	heretic1.wad
 HEXEN_WAD=	hexen.wad
@@ -42,10 +42,10 @@ STRIFE_WAD=	strife0.wad
 
 .include "Makefile.include"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.for f in ${LIST}
-.   if defined(WITH_${f}) || !defined(WITHOUT_${f})
+.for f in ${OPTIONS_DEFINE}
+.if ${PORT_OPTIONS:M${f}}
 DISTFILES+=	${${f}_WAD}${EXTRACT_SUFX}
 PLIST_SUB+=	${f}=""
 .   else
@@ -59,8 +59,8 @@ PLIST_SUB+=	${f}="@comment "
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
-.for f in ${LIST}
-.   if defined(WITH_${f}) || !defined(WITHOUT_${f})
+.for f in ${OPTIONS_DEFINE}
+.   if ${PORT_OPTIONS:M${f}}
 	@${BZIP2_CMD} -dc ${_DISTDIR}/${${f}_WAD}${EXTRACT_SUFX} > \
 		${WRKDIR}/${${f}_WAD}
 .   endif
@@ -68,8 +68,8 @@ do-extract:
 
 do-install:
 	@${MKDIR} ${DATADIR}
-.for f in ${LIST}
-.   if defined(WITH_${f}) || !defined(WITHOUT_${f})
+.for f in ${OPTIONS_DEFINE}
+.   if ${PORT_OPTIONS:M${f}}
 	${INSTALL_DATA} ${WRKSRC}/${${f}_WAD} ${DATADIR}
 .   endif
 .endfor
@@ -79,4 +79,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/doom-hr/Makefile b/games/doom-hr/Makefile
index c90bbd7eb6f2..7605ce3e10ab 100644
--- a/games/doom-hr/Makefile
+++ b/games/doom-hr/Makefile
@@ -26,8 +26,10 @@ USE_CRLF=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	DEMO_NM "Install demos with -nomonsters" on \
-		DEMO_UV "Install Ultra-Violence demos" on
+OPTIONS_DEFINE=	DEMO_NM DEMO_UV DOCS
+OPTIONS_DEFAULT=	DEMO_NM DEMO_UV
+DEMO_NM_DESC=	Install demos with -nomonsters
+DEMO_UV_DESC=	Install Ultra-Violence demos
 
 DATADIR=	${DMDIR}/${PORTNAME}
 
@@ -36,16 +38,16 @@ post-extract:
 
 .include "${.CURDIR}/../doom-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_DEMO_NM)
+.if ${PORT_OPTIONS:MDEMO_NM}
 DISTFILES+=	hrhelp${EXTRACT_SUFX}
 PLIST_SUB+=	DEMO_NM=""
 .else
 PLIST_SUB+=	DEMO_NM="@comment "
 .endif
 
-.if !defined(WITHOUT_DEMO_UV)
+.if ${PORT_OPTIONS:MDEMO_UV}
 DISTFILES+=	hruvlmp2${EXTRACT_SUFX}
 PLIST_SUB+=	DEMO_UV=""
 .else
@@ -55,12 +57,12 @@ PLIST_SUB+=	DEMO_UV="@comment "
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.wad ${DATADIR}
-.if !defined(WITHOUT_DEMO_NM) || !defined(WITHOUT_DEMO_UV)
+.if ${PORT_OPTIONS:MDEMO_NM} || !empty(PORT_OPTIONS:MDEMO_UV)
 	${INSTALL_DATA} ${WRKSRC}/*.lmp ${DATADIR}
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile
index 801d809a18b3..6b8d91181496 100644
--- a/games/doomlegacy/Makefile
+++ b/games/doomlegacy/Makefile
@@ -26,7 +26,9 @@ MAKE_ENV=	FREEBSD=1 FBSD_SDL=1 PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 WRKSRC=		${WRKDIR}/doomlegacy_${PORTVERSION}_src
 
-OPTIONS=	X86_ASM "Enable use of x86 assembly code" on
+OPTIONS_DEFINE=	X86_ASM DOCS
+OPTIONS_DEFAULT=	X86_ASM
+X86_ASM_DESC=	Enable use of x86 assembly code
 
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 SUB_FILES=	legacy
@@ -37,7 +39,7 @@ WADFILE=	legacy_dat.zip
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_X86_ASM) && ${ARCH} == "i386"
+.if ${PORT_OPTIONS:MX86_ASM} && ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 MAKE_ARGS+=	USEASM=1
 .endif
@@ -66,7 +68,7 @@ do-install:
 		${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/bin/legacy.dat ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/legacy ${PREFIX}/bin/${PORTNAME}
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 . for f in *.html *.txt *.cfg README_SDL copying
 	${INSTALL_DATA} ${WRKSRC}/_doc/${f} ${DOCSDIR}
diff --git a/games/duke3d-data/Makefile b/games/duke3d-data/Makefile
index d20318d39c87..c6088e74bd71 100644
--- a/games/duke3d-data/Makefile
+++ b/games/duke3d-data/Makefile
@@ -26,15 +26,16 @@ USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	SHAREWARE "Install shareware game data version 1.3" off
+OPTIONS_DEFINE=	SHAREWARE
+SHAREWARE_DESC=	Install shareware game data version 1.3
 
 DATADIR=	${DN3DDIR}
 
 .include "Makefile.include"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SHAREWARE)
+.if ${PORT_OPTIONS:MSHAREWARE}
 DISTFILES+=	3dduke13.zip
 PLIST_SUB+=	SHAREWARE=""
 .else
@@ -42,14 +43,14 @@ PLIST_SUB+=	SHAREWARE="@comment "
 SUB_FILES+=	pkg-message
 .endif
 
-.if defined(WITH_SHAREWARE)
+.if ${PORT_OPTIONS:MSHAREWARE}
 post-extract:
 	@cd ${WRKSRC} && ${UNZIP_CMD} -qo DN3DSW13.SHR
 .endif
 
 do-install:
 	${MKDIR} ${DATADIR}
-.if defined(WITH_SHAREWARE)
+.if ${PORT_OPTIONS:MSHAREWARE}
 	${INSTALL_DATA} ${WRKSRC}/DUKE3D.GRP ${DATADIR}/duke3d.grp
 .else
 
@@ -59,4 +60,4 @@ post-install:
 	@${ECHO_CMD}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/endgame-singularity/Makefile b/games/endgame-singularity/Makefile
index 4a9193f8c972..6ea37266f369 100644
--- a/games/endgame-singularity/Makefile
+++ b/games/endgame-singularity/Makefile
@@ -25,11 +25,13 @@ USE_SDL=	image mixer
 PORTDOCS=	AUTHORS Changelog README.txt TODO
 PROJECTHOST=	${PKGNAMEPREFIX}${PORTNAME}
 
-OPTIONS=	MUSIC "Install original music pack" on
+OPTIONS_DEFINE=	MUSIC DOCS
+OPTIONS_DEFAULT=	MUSIC
+MUSIC_DESC=	Install original music pack
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_MUSIC)
+.if ${PORT_OPTIONS:MMUSIC}
 RUN_DEPENDS+=	endgame-singularity-music>=006:${PORTSDIR}/games/endgame-singularity-music
 .endif
 
@@ -70,9 +72,9 @@ post-build:
 post-install:
 	@cd ${WRKSRC}/data/&&${COPYTREE_SHARE} . ${DATADIR}/
 	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${PREFIX}/bin/${PORTNAME}
-.ifndef NOPORTDOCS
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}/
 	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index 69af1dd44a2f..e6ee21defe47 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -27,17 +27,18 @@ ALL_TARGET=	release
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CFLAGS+=	-DMAP_ANONYMOUS=MAP_ANON
 
-OPTIONS=	CLIENT "Build client" on \
-		CURL "Enable curl support" on \
-		CURL_DLOPEN "Enable dynamic loading of curl" on \
-		GAMELIBS "Build game libraries (when not mandatory)" off \
-		DEDICATED "Build dedicated server" on \
-		OPENAL "Enable OpenAL (3D sound) support" off \
-		OPENAL_DLOPEN "Enable dynamic loading of OpenAL" off \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		SMP "Build SMP (threaded) client" on \
-		VOIP "Enable Voice Over IP" off \
-		VORBIS "Enable Ogg Vorbis codec support" on
+OPTIONS_DEFINE=	CURL CURL_DLOPEN GAMELIBS OPENAL OPENAL_DLOPEN VOIP VORBIS OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	CLIENT CURL CURL_DLOPEN DEDICATED OPTIMIZED_CFLAGS SMP VORBIS
+OPTIONS_MULTI=	TYPE 
+OPTIONS_MULTI_TYPE=	CLIENT DEDICATED SMP
+CLIENT_DESC=	Build client
+CURL_DLOPEN_DESC=	Enable dynamic loading of curl
+GAMELIBS_DESC=	Build game libraries (when not mandatory)
+DEDICATED_DESC=	Build dedicated server
+OPENAL_DESC=	Enable OpenAL (3D sound) support
+OPENAL_DLOPEN_DESC=	Enable dynamic loading of OpenAL
+SMP_DESC=	Build SMP (threaded) client
+VOIP_DESC=	Enable Voice Over IP
 
 MAKE_ENV=	DEFAULT_BASEDIR="${Q3DIR}" LIBDIR="${LIBDIR}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -50,11 +51,6 @@ VM_ARCHS=	amd64 i386
 
 .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
-
 .for i in ${ARCH}
 .   if ${VM_ARCHS:M${i}} != ""
 HAVE_VM_COMPILED=	yes
@@ -65,38 +61,38 @@ HAVE_VM_COMPILED=	yes
 MAKE_ENV+=	HAVE_VM_COMPILED=true
 .endif
 
-.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP)
+.if ${PORT_OPTIONS:MCLIENT} || !empty(PORT_OPTIONS:MSMP)
 # curl
-.   if defined(WITH_CURL)
+.   if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
 MAKE_ENV+=	USE_CURL=1
-.       if defined(WITH_CURL_DLOPEN)
+.       if ${PORT_OPTIONS:MCURL_DLOPEN)
 MAKE_ENV+=	USE_CURL_DLOPEN=1
 .       endif
 .   endif
 # OpenAL
-.   if defined(WITH_OPENAL)
+.   if ${PORT_OPTIONS:MOPENAL}
 USE_OPENAL=	al
 MAKE_ENV+=	USE_OPENAL=1
-.       if defined(WITH_OPENAL_DLOPEN)
+.       if ${PORT_OPTIONS:MOPENAL_DLOPEN)
 MAKE_ENV+=	USE_OPENAL_DLOPEN=1
 .       endif
 .   endif
 # SDL
 USE_SDL=	sdl
 # VOIP
-.   if defined(WITH_VOIP)
+.   if ${PORT_OPTIONS:MVOIP}
 LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
 MAKE_ENV+=	USE_VOIP=1
 .   endif
 # Vorbis
-.   if defined(WITH_VORBIS)
+.   if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 MAKE_ENV+=	USE_CODEC_VORBIS=1
 .   endif
 .endif
 
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 MAKE_ENV+=	BUILD_CLIENT=1
 PLIST_SUB+=	CLIENT=""
 Q3BIN+=		evq3
@@ -104,7 +100,7 @@ Q3BIN+=		evq3
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if !defined(WITHOUT_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 MAKE_ENV+=	BUILD_SERVER=1
 PLIST_SUB+=	DEDICATED=""
 Q3BIN+=		evq3ded
@@ -112,18 +108,18 @@ Q3BIN+=		evq3ded
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
-.if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED)
+.if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED)
 MAKE_ENV+=	BUILD_GAME_SO=1
 PLIST_SUB+=	GAMELIBS=""
 .else
 PLIST_SUB+=	GAMELIBS="@comment "
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	USE_OPTIMIZED_CFLAGS=1
 .endif
 
-.if !defined(WITHOUT_SMP)
+.if ${PORT_OPTIONS:MSMP}
 MAKE_ENV+=	BUILD_CLIENT_SMP=1
 PLIST_SUB+=	SMP=""
 Q3BIN+=		evq3-smp
@@ -146,13 +142,13 @@ do-install:
 .for bin in ${Q3BIN}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/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} ${WRKSRC}/build/release/${dir}/*.so ${LIBDIR}/${dir}
 . endfor
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
diff --git a/games/exmars/Makefile b/games/exmars/Makefile
index 1bb57e4dac77..a1d8fa1e7b95 100644
--- a/games/exmars/Makefile
+++ b/games/exmars/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Memory Array Redcode Simulator, just like exhaust and pMARS
 REINPLACE_ARGS=	-i ''
 ALL_TARGET=	${PORTNAME}
 
-OPTIONS=	OPTIMIZED_CFLAGS "Enable compilaton optimizations (>= 5.X)" on
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 
 do-install:
 # Program.
@@ -54,7 +55,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|\($${OPT}\)|${CFLAGS} \1|' ${WRKSRC}/${MAKEFILE}
 
 # Enable/disable compilation optimizations.
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
 	@${REINPLACE_CMD} -e 's|$${OPT}||' ${WRKSRC}/${MAKEFILE}
 .endif
 
diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile
index 7a00fcb57635..19b367c8ca8b 100644
--- a/games/ezquake/Makefile
+++ b/games/ezquake/Makefile
@@ -35,9 +35,10 @@ MAKE_ENV+=	${v}="${${v}}"
 .endfor
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:S/.//}_stable_sources
 
-OPTIONS=	GLX "Build GLX client" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		X11 "Build X11 client" on
+OPTIONS_MULTI=	OUTPUT
+OPTIONS_MULTI_OUTPUT=	X11 OPENGL
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	OPENGL X11 OPTIMIZED_CFLAGS
 
 .include "${.CURDIR}/../quake-data/Makefile.include"
 
@@ -47,11 +48,7 @@ OPTIONS=	GLX "Build GLX client" on \
 BROKEN=		Does not install on powerpc: signal 2
 .endif
 
-.if defined(WITHOUT_GLX) && defined(WITHOUT_X11)
-IGNORE=		needs at least one interface (GLX or X11)
-.endif
-
-.if !defined(WITHOUT_GLX)
+.if ${PORT_OPTIONS:MOPENGL}
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 USE_GL=		yes
 ALL_TARGET+=	glx
@@ -60,7 +57,7 @@ PLIST_SUB+=	GLX=""
 PLIST_SUB+=	GLX="@comment "
 .endif
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	xxf86dga
 ALL_TARGET+=	x11
 PLIST_SUB+=	X11=""
@@ -68,7 +65,7 @@ PLIST_SUB+=	X11=""
 PLIST_SUB+=	X11="@comment "
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	USE_OPTIMIZED_CFLAGS=YES
 .else
 MAKE_ENV+=	USE_OPTIMIZED_CFLAGS=NO
@@ -91,11 +88,11 @@ do-install:
 	${MKDIR} ${DATADIR}/${dir}
 	${CP} -r ${WRKDIR}/${dir}/* ${DATADIR}/${dir}
 .endfor
-.if !defined(WITHOUT_GLX)
+.if ${PORT_OPTIONS:MOPENGL}
 	${INSTALL_PROGRAM} ${WRKSRC}/release/ezquake-gl.glx \
 		${PREFIX}/bin/ezquake-glx
 .endif
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 	${INSTALL_PROGRAM} ${WRKSRC}/release/ezquake.x11 \
 		${PREFIX}/bin/ezquake-x11
 .endif
diff --git a/games/fmars/Makefile b/games/fmars/Makefile
index e49301f9578b..297e4d13b1a3 100644
--- a/games/fmars/Makefile
+++ b/games/fmars/Makefile
@@ -23,7 +23,8 @@ USE_GMAKE=	yes
 
 ALL_TARGET=	x${PORTNAME}
 
-OPTIONS=	OPTIMIZED_CFLAGS "Enable compilation optimizations" on
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 
 .include <bsd.port.pre.mk>
 
@@ -34,7 +35,7 @@ post-patch:
 		${WRKSRC}/${MAKEFILE}
 
 # Enable/disable compilation optimizations.
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
 	@${REINPLACE_CMD} -e 's|$$(OPT)||' ${WRKSRC}/${MAKEFILE}
 .endif
 
@@ -49,7 +50,7 @@ do-install:
 .endfor
 
 # Documentation (optional).
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index e8d668ea5254..6e651f0e3d05 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -17,7 +17,8 @@ COMMENT=	A program that automatically solves games of Freecell
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-OPTIONS=	TCMALLOC "Use Google's TCMalloc" off
+OPTIONS_DEFINE=	TCMALLOC DOCS EXAMPLES
+TCMALLOC_DESC=	Use Google's TCMalloc
 
 USE_BZIP2=	yes
 USE_PERL5_BUILD=yes
@@ -35,7 +36,7 @@ MAN6=		fc-solve-board_gen.6 fc-solve.6 \
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_TCMALLOC)
+.if ${PORT_OPTIONS:MTCMALLOC}
 LIB_DEPENDS+=	tcmalloc.2:${PORTSDIR}/devel/google-perftools
 .else
 CMAKE_ARGS+=	-DFCS_AVOID_TCMALLOC:BOOL=ON
@@ -50,14 +51,14 @@ post-patch:
 .endfor
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for f in AUTHORS.txt HACKING.txt INSTALL.txt NEWS.txt README.txt \
 	README.win32.txt TODO.txt USAGE.txt
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 .for f in ctypes-test.py
 	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${EXAMPLESDIR}
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index d0650d265095..e18cd37d40d3 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -25,15 +25,15 @@ CFLAGS+=	${PTHREAD_CFLAGS}
 
 MAN6=	freesci-tools.6 freesci.6
 
-OPTIONS=	CONSOLE		 "With console support"			off \
-		SDL		 "With SDL support"			off \
-		GGI		 "With GGI support"			off \
-		DIRECTFB	 "With DirectFB support"		off \
-		OPTIMIZED_CFLAGS "Build with code optimizations"	off
+OPTIONS_DEFINE=	CONSOLE SDL GGI DIRECTFB OPTIMIZED_CFLAGS
+
+CONSOLE_DESC=	With console support
+GGI_DESC=	With GGI support
+DIRECTFB_DESC=	With DirectFB support
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=		-O3 -fexpensive-optimizations -fomit-frame-pointer -funroll-loops \
 		-fstrict-aliasing
 .if ${ARCH} != "alpha"
@@ -42,24 +42,24 @@ CFLAGS+=	-ffast-math
 .endif
 
 .if ${HAVE_SDL:Msdl}!=""
-WITH_SDL=	yes
+PORT_OPTIONS+=	SDL
 .endif
 .if exists(${LOCALBASE}/lib/libggi.so.2)
-WITH_GGI=	yes
+PORT_OPTIONS+=	GGI
 .endif
 
-.if defined(WITH_CONSOLE)
+.if ${PORT_OPTIONS:MCONSOLE}
 CONFIGURE_ARGS+=	--with-console
 .endif
 
-.if defined(WITH_SDL) && !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	yes
 CONFIGURE_ARGS=		--with-sdl-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-sdl
 .endif
 
-.if defined(WITH_DIRECTFB) && !defined(WITHOUT_DIRECTFB)
+.if ${PORT_OPTIONS:MDIRECTFB}
 LIB_DEPENDS+=	directfb-1.4.5:${PORTSDIR}/devel/directfb
 CONFIGURE_ARGS+=	--with-directfb-include=${LOCALBASE}/include/directfb \
 			--with-directfb-libraries=${LOCALBASE}/lib
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+=	--with-directfb-include=${LOCALBASE}/include/directfb \
 CONFIGURE_ARGS+=	--without-directfb
 .endif
 
-.if defined(WITH_GGI) && !defined(WITHOUT_GGI)
+.if ${PORT_OPTIONS:MGGI}
 LIB_DEPENDS+=	ggi.2:${PORTSDIR}/graphics/libggi
 CONFIGURE_ARGS+=	--with-ggi-dir=${LOCALBASE}
 .else
@@ -78,7 +78,7 @@ pre-configure:
 	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${PREFIX}/share/games/freesci
 	@${INSTALL_DATA} ${WRKSRC}/doc/sci.sgml ${WRKSRC}/doc/freesci.sgml \
 		${WRKSRC}/doc/game-list.sgml ${WRKSRC}/doc/sci-kernel.sgml \
diff --git a/games/fteqw/Makefile b/games/fteqw/Makefile
index 79b5a60ae791..ac2283be3ea3 100644
--- a/games/fteqw/Makefile
+++ b/games/fteqw/Makefile
@@ -19,48 +19,45 @@ USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	DEDICATED "Build dedicated server" on \
-		GL "Build OpenGL (hardware) client" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		SDL "Build SDL (software) client" on
+OPTIONS_MULTI=	EXE
+OPTIONS_EXE=	DEDICATED OPENGL SDL
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	DEDICATED OPENGL OPTIMIZED_CFLAGS SDL
+DEDICATED_DESC=	Build dedicated server
 
 SUB_FILES=	pkg-message
 
 .include "${.CURDIR}/../quake-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_DEDICATED) && defined(WITHOUT_GL) && defined(WITHOUT_SDL)
-IGNORE=		needs at least one executable (DEDICATED, GL or SDL)
-.endif
-
-.if !defined(WITHOUT_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 ALL_TARGET+=	sv-rel
 PLIST_FILES+=	bin/fteqw-sv
 FTE_TARGETS+=	fteqw.sv
 .endif
 
-.if !defined(WITHOUT_GL) || !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MGL} || !empty(PORT_OPTIONS:MSDL)
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
 		vorbis.4:${PORTSDIR}/audio/libvorbis
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
 .endif
 
-.if !defined(WITHOUT_GL)
+.if ${PORT_OPTIONS:MGL}
 USE_GL=		yes
 ALL_TARGET+=	gl-rel
 PLIST_FILES+=	bin/fteqw-gl
 FTE_TARGETS+=	fteqw.gl
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	OPTIMIZED_CFLAGS=true
 .endif
 
 # SDL is used instead of the native X11 software version as it reports a
 # memory allocation error at startup. It also fails with USEASM=true.
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
 ALL_TARGET+=	sw-rel
 PLIST_FILES+=	bin/fteqw-sdl
@@ -83,4 +80,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/galaxyhack/Makefile b/games/galaxyhack/Makefile
index c59beb7f5c59..694aa69a3352 100644
--- a/games/galaxyhack/Makefile
+++ b/games/galaxyhack/Makefile
@@ -27,16 +27,17 @@ WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
 CXXFLAGS+=	-DBOOST_FILESYSTEM_VERSION=2
 
-OPTIONS=	FLEETS "Install additional fleets" off \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on
+OPTIONS_DEFINE=	FLEETS OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
+FLEETS_DESC=	Install additional fleets
 
 ALL_TARGET=	${PORTNAME}
 SUB_FILES=	${PORTNAME}-sh
 FLEETS_FILE=	gh_fleets_020906.zip
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_FLEETS)
+.if ${PORT_OPTIONS:MFLEETS}
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 DISTFILES+=	${FLEETS_FILE}
 PLIST_SUB+=	FLEETS=""
@@ -44,7 +45,7 @@ PLIST_SUB+=	FLEETS=""
 PLIST_SUB+=	FLEETS="@comment "
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	OPTIMIZED_CFLAGS=YES
 .endif
 
@@ -56,7 +57,7 @@ do-install:
 .for d in fleets gamedata graphics music standardpictures
 	${CP} -R ${WRKSRC}/../${d} ${DATADIR}
 .endfor
-.if defined(WITH_FLEETS)
+.if ${PORT_OPTIONS:MFLEETS}
 	@${UNZIP_CMD} -o ${DISTDIR}/${FLEETS_FILE} -x "*/CVS/*" "*/.svn/*" \
 		-d ${DATADIR}
 .endif
@@ -68,4 +69,4 @@ post-install:
 	@${FIND} ${DATADIR} -type d -print0 | \
 		${XARGS} -0 ${CHMOD} ${BINMODE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/glbsp/Makefile b/games/glbsp/Makefile
index 2ef951bed4e3..d0a9215bbe42 100644
--- a/games/glbsp/Makefile
+++ b/games/glbsp/Makefile
@@ -18,22 +18,23 @@ COMMENT=	BSP node builder for OpenGL ports of the DOOM game engine
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/[[:alpha:]]//}
 
-OPTIONS=	GUI "Build FLTK based GUI" off \
-		PLUGIN "Build plugin used in DOOM engines" off
+OPTIONS_DEFINE=	GUI PLUGIN DOCS
+GUI_DESC=	Build FLTK based GUI
+PLUGIN_DESC=	Build plugin used in DOOM engines
 
 MAN1=		glbsp.1
 PORTDOCS=	README.txt USAGE.txt
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.ifdef (WITH_GUI)
+.if ${PORT_OPTIONS:MGUI}
 LIB_DEPENDS+=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 PLIST_SUB=	GUI_VERSION=""
 .else
 PLIST_SUB=	GUI_VERSION="@comment "
 .endif
 
-.ifdef (WITH_PLUGIN)
+.if ${PORT_OPTIONS:MPLUGIN}
 PLIST_SUB+=	PLUGIN=""
 .else
 PLIST_SUB+=	PLUGIN="@comment "
@@ -44,26 +45,26 @@ post-patch:
 		${WRKSRC}/Makefile ${WRKSRC}/Plugin_unx.mak
 
 post-build:
-.ifdef (WITH_GUI)
+.if ${PORT_OPTIONS:MGUI}
 	${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} -f GUI_unx.mak all
 .endif
-.ifdef (WITH_PLUGIN)
+.if ${PORT_OPTIONS:MPLUGIN}
 	${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} -f Plugin_unx.mak all
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/glbsp ${PREFIX}/bin
-.ifdef (WITH_GUI)
+.if ${PORT_OPTIONS:MGUI}
 	${INSTALL_PROGRAM} ${WRKSRC}/glBSPX ${PREFIX}/bin
 .endif
-.ifdef (WITH_PLUGIN)
+.if ${PORT_OPTIONS:MPLUGIN}
 	${INSTALL_DATA} ${WRKSRC}/libglbsp.a ${PREFIX}/lib
 .endif
 
 	${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/|} ${MANPREFIX}/man/man1
-.ifndef (NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/joequake/Makefile b/games/joequake/Makefile
index 0c2b46676a5a..92dacb5bc3ef 100644
--- a/games/joequake/Makefile
+++ b/games/joequake/Makefile
@@ -27,22 +27,19 @@ USE_ZIP=	yes
 
 MAKEFILE=	Makefile.linux
 
-OPTIONS=	GLX "Build GLX client" on \
-		HUD "High quality HUD images (for OpenGL)" off \
-		HUD_SA "Same for Scourge of Armagon (hipnotic)" off \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		X11 "Build X11 client" on \
-		X86_ASM "Enable x86 assembly code" on
+OPTIONS_MULTI=	UI
+OPTIONS_MULTI_UI=	OPENGL X11
+OPTIONS_DEFINE=	HUD HUD_SA OPTIMIZED_CFLAGS X86_ASM
+OPTIONS_DEFAULT=	OPENGL OPTIMIZED_CFLAGS X11 X86_ASM
+HUD_DESC=	High quality HUD images (for OpenGL)
+HUD_SA_DESC=	Same for Scourge of Armagon (hipnotic)
+X86_ASM_DESC= Enable x86 assembly code
 
 .include "${.CURDIR}/../quake-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_GLX) && defined(WITHOUT_X11)
-IGNORE=		needs at least one interface (GLX or X11)
-.endif
-
-.if !defined(WITHOUT_GLX)
+.if ${PORT_OPTIONS:MOPENGL}
 USE_GL=		yes
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 ALL_TARGET+=	glx
@@ -51,35 +48,35 @@ PLIST_SUB+=	GLX=""
 PLIST_SUB+=	GLX="@comment "
 .endif
 
-.if defined(WITH_HUD)
+.if ${PORT_OPTIONS:MHUD}
 DISTFILES+=	joequake_wad${EXTRACT_SUFX}
 PLIST_SUB+=	HUD=""
 .else
 PLIST_SUB+=	HUD="@comment "
 .endif
 
-.if defined(WITH_HUD_SA)
+.if ${PORT_OPTIONS:MHUD_SA}
 DISTFILES+=	hipnotic_wad${EXTRACT_SUFX}
 PLIST_SUB+=	HUD_SA=""
 .else
 PLIST_SUB+=	HUD_SA="@comment "
 .endif
 
-.if defined(WITH_HUD) || defined(WITH_HUD_SA)
+.if ${PORT_OPTIONS:MHUD} || !empty(PORT_OPTIONS:MHUD_SA)
 PLIST_SUB+=	HUD_DIR=""
 .else
 PLIST_SUB+=	HUD_DIR="@comment "
 .endif
 
 .for f in OPTIMIZED_CFLAGS X86_ASM
-.   if !defined(WITHOUT_${f})
+.   if ${PORT_OPTIONS:M${f}}
 MAKE_ENV+=	USE_${f}=YES
 .   else
 MAKE_ENV+=	USE_${f}=NO
 .   endif
 .endfor
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	xxf86dga
 ALL_TARGET+=	x11
 PLIST_SUB+=	X11=""
@@ -90,19 +87,19 @@ PLIST_SUB+=	X11="@comment "
 do-install:
 	${MKDIR} ${Q1DIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/pak0.pak ${Q1DIR}/${PORTNAME}
-.if !defined(WITHOUT_GLX)
+.if ${PORT_OPTIONS:MOPENGL}
 	${INSTALL_PROGRAM} ${WRKSRC}/release_glx/joequake-gl.glx \
 		${PREFIX}/bin/joequake-glx
 .endif
-.if defined(WITH_HUD) || defined(WITH_HUD_SA)
+.if ${PORT_OPTIONS:MHUD} || !empty(PORT_OPTIONS:MHUD_SA)
 	${MKDIR} ${Q1DIR}/${PORTNAME}/textures/wad
 	${INSTALL_DATA} ${WRKDIR}/wad/* ${Q1DIR}/${PORTNAME}/textures/wad
 .endif
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 	${INSTALL_PROGRAM} ${WRKSRC}/release_x11/joequake.x11 \
 		${PREFIX}/bin/joequake-x11
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/*.txt ${DOCSDIR}
 .endif
@@ -112,4 +109,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/kmquake2/Makefile b/games/kmquake2/Makefile
index 58956ce485ed..36b3be82b927 100644
--- a/games/kmquake2/Makefile
+++ b/games/kmquake2/Makefile
@@ -31,19 +31,22 @@ USE_XORG=	xxf86dga
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/KMQuake2_${PORTVERSION:S/.//}_src_unix
 
-OPTIONS=	3ZB2 "Build 3zb2 modification (bots)" off \
-		CLIENT "Build client" on \
-		CTF "Build CTF (Capture The Flag) modification" off \
-		DEDICATED "Build dedicated server" on \
-		GAME "Build a main game .so file (required)" on \
-		HYBRID "Build Rogue-Xatrix hybrid modification" off \
-		LIGHTS "Build Lights modification with bots" off \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		PAX "Build Pax Imperia modification" off \
-		ROGUE "Build Ground Zero (Rogue) mission pack" off \
-		SDL "Build SDL client" on \
-		XATRIX "Build The Reckoning (Xatrix) mission pack" off \
-		ZAERO "Build Zaero mission pack" off
+OPTIONS_MULTI=	EXE
+OPTIONS_MULTI_EXE=	CLIENT DEDICATED SDL
+OPTIONS_DEFINE=	3ZB2 CFT GAME HYBRID LIGHTS OPTIMIZED_CFLAGS PAX ROGUE XMATRIX ZAERO DOCS
+OPTIONS_DEFAULT=	CLIENT DEDICATED OPTIMIZED_CFLAGS SDL GAME
+CLIENT_DESC=	Build client
+CFT_DESC=	Build CTF (Capture The Flag) modification
+3ZB2_DESC=	Build 3zb2 modification (bots)
+CTF_DESC=	Build CTF (Capture The Flag) modification
+DEDICATED_DESC=	Build dedicated server
+GAME_DESC=	Build a main game .so file (required)
+HYBRID_DESC=	Build Rogue-Xatrix hybrid modification
+LIGHTS_DESC=	Build Lights modification with bots
+PAX_DESC=	Build Pax Imperia modification
+ROGUE_DESC=	Build Ground Zero (Rogue) mission pack
+XMATRIX_DESC=	Build The Reckoning (Xatrix) mission pack
+ZAERO_DESC=	Build Zaero mission pack
 
 ALL_TARGET=	release
 
@@ -62,15 +65,10 @@ MOD_LIST=	3ZB2 CTF HYBRID LIGHTS PAX ROGUE XATRIX ZAERO
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && \
-    defined(WITHOUT_SDL)
-IGNORE=		needs at least one executable (CLIENT, DEDICATED and SDL)
-.endif
+.include <bsd.port.options.mk>
 
 .for mod in ${MOD_LIST}
-.   if defined(WITH_${mod})
+.   if ${PORT_OPTIONS:M${mod}}
 MOD_REQUESTED+=	${mod:L}
 MAKE_ENV+=	BUILD_${mod}=YES
 PLIST_SUB+=	${mod}=""
@@ -86,7 +84,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-addons__Makefile
 MAKE_ENV+=	KMQ2_ADDONS="${KMQ2_ADDONS:S/-1${EXTRACT_SUFX}//}"
 .endif
 
-.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MCLIENT} || !empty(PORT_OPTIONS:MSDL)
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
 		vorbis.4:${PORTSDIR}/audio/libvorbis
@@ -94,7 +92,7 @@ USE_OPENAL=	al
 USE_GL=		yes
 .endif
 
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 MAKE_ENV+=	BUILD_KMQUAKE2=YES
 PLIST_SUB+=	CLIENT=""
 Q2BIN+=		${PORTNAME}
@@ -102,7 +100,7 @@ Q2BIN+=		${PORTNAME}
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if !defined(WITHOUT_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 MAKE_ENV+=	BUILD_KMQUAKE2_DEDICATED=YES
 PLIST_SUB+=	DEDICATED=""
 Q2BIN+=		${PORTNAME}-ded
@@ -110,18 +108,18 @@ Q2BIN+=		${PORTNAME}-ded
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
-.if !defined(WITHOUT_GAME)
+.if ${PORT_OPTIONS:MGAME}
 MAKE_ENV+=	BUILD_GAME=YES
 PLIST_SUB+=	GAME=""
 .else
 PLIST_SUB+=	GAME="@comment "
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	OPTIMIZED_CFLAGS=YES
 .endif
 
-.if defined(WITH_PAX)
+.if ${PORT_OPTIONS:MPAX}
 DISTFILES+=	${PAX_DATA}:pax \
 		${PAX_PATCH}:paxpatch
 PLIST_SUB+=	PAX=""
@@ -129,7 +127,7 @@ PLIST_SUB+=	PAX=""
 PLIST_SUB+=	PAX="@comment "
 .endif
 
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
 MAKE_ENV+=	BUILD_KMQUAKE2_SDL=YES
 PLIST_SUB+=	SDL=""
@@ -155,7 +153,7 @@ post-extract:
 		baseq2/kmquake2.pk3 -d ${WRKSRC}/quake2
 	@${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${KMQ2_FLARES} -C ${WRKSRC}
 	@${CHMOD} go-w ${WRKSRC}/quake2/baseq2/kmquake2.pk3
-.if defined(WITH_PAX)
+.if ${PORT_OPTIONS:MPAX}
 	@${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${PAX_DATA} \
 		-x "*.dll" "*.bat" -d ${WRKSRC}/quake2/pax
 	@${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${PAX_PATCH} \
@@ -167,19 +165,19 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/quake2/${bin} ${PREFIX}/bin
 .endfor
 	${MKDIR} ${LIBDIR}/baseq2
-.if !defined(WITHOUT_GAME)
+.if ${PORT_OPTIONS:MGAME}
 	${CP} -Rp ${WRKSRC}/quake2/baseq2/* ${LIBDIR}/baseq2
 .endif
 .if defined(MOD_REQUESTED)
 	${CP} -Rp ${WRKDIR}/${KMQ2_ADDONS:S/-1${EXTRACT_SUFX}//}/quake2/* \
 		${LIBDIR}
 .endif
-.if defined(WITH_PAX)
+.if ${PORT_OPTIONS:MPAX}
 	${CP} -R ${WRKSRC}/quake2/pax ${LIBDIR}
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} Readme.unix kmquake2.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/kuklomenos/Makefile b/games/kuklomenos/Makefile
index 68ab2a4951dc..17162234a95b 100644
--- a/games/kuklomenos/Makefile
+++ b/games/kuklomenos/Makefile
@@ -17,7 +17,8 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
-OPTIONS=	VORBIS "Enable Ogg/Vorbis support" on
+OPTIONS_DEFINE=	VORBIS
+OPTIONS_DEFAULT=	VORBIS
 
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
@@ -28,12 +29,12 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_VORBIS)
-CONFIGURE_ARGS+=--disable-sound
-PLIST_SUB+=	VORBIS="@comment "
-.else
+.if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	VORBIS=""
+.else
+CONFIGURE_ARGS+=--disable-sound
+PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 post-patch:
diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile
index 4ce14a971309..149aa6138157 100644
--- a/games/lgeneral/Makefile
+++ b/games/lgeneral/Makefile
@@ -20,8 +20,9 @@ LICENSE=	GPLv2
 
 CONFLICTS=	lgeneral-data-[0-9]*
 
-OPTIONS=	SOUND "Enable sound support" on \
-		NLS "Enable native language support" on
+OPTIONS_DEFINE=	SOUND NLS DOCS
+OPTIONS_DEFAULT=	SOUND
+SOUND_DESC=	Enable sound support
 
 USE_SDL=	sdl
 USE_GMAKE=	yes
@@ -36,19 +37,19 @@ MAN6=		lgeneral.6
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_SOUND)
-CONFIGURE_ARGS+=--disable-sound
-.else
+.if ${PORT_OPTIONS:MSOUND}
 USE_SDL+=	mixer
+.else
+CONFIGURE_ARGS+=--disable-sound
 .endif
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
 CONFIGURE_ENV+=	am_cv_func_iconv=no
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
 .endif
 
 .include <bsd.port.pre.mk>
@@ -65,7 +66,7 @@ post-install:
 	@${FIND} ${DATADIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 	@${FIND} ${DATADIR} -type d | ${XARGS} ${CHMOD} a+rx
 	@${FIND} ${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.* ${DOCSDIR}
 .endif
diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index 32eb979e7414..e9c03cb2947c 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -24,14 +24,15 @@ NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	NO_CDKEY "Use older version which doesn't require cd key" off
+OPTIONS_DEFINE=	NO_CDKEY
+NO_CDKEY_DESC=	Use older version which doesn't require cd key
 
 DATADIR=	${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME}
 SUB_FILES=	doom3 doom3-ded pkg-message
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_NO_CDKEY)
+.if ${PORT_OPTIONS:MNO_CDKEY}
 MASTER_SITE_SUBDIR=	doom3/linux/old
 PORTVERSION=	1.1.1286
 PORTEPOCH=	0
@@ -45,7 +46,7 @@ do-extract:
 	@cd ${WRKDIR} && ${TAIL} +374 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -
 
-.if !defined(WITH_NO_CDKEY)
+.if empty(PORT_OPTIONS:MNO_CDKEY)
 post-extract:
 	@${RM} ${WRKSRC}/pb/PB_EULA.txt
 .endif
@@ -56,7 +57,7 @@ do-install:
 		${INSTALL_DATA} game01.pk4 pak*.pk4 ${DATADIR}/base
 	cd ${WRKSRC}/bin/Linux/x86 && \
 		${INSTALL_PROGRAM} doom.x86 doomded.x86 ${DATADIR}
-.if !defined(WITH_NO_CDKEY)
+.if empty(PORT_OPTIONS:MNO_CDKEY)
 	${MKDIR} ${DATADIR}/d3xp
 	cd ${WRKSRC}/d3xp && \
 		${INSTALL_DATA} game01.pk4 pak*.pk4 ${DATADIR}/d3xp
@@ -73,4 +74,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/linux-enemyterritory-etpub/Makefile b/games/linux-enemyterritory-etpub/Makefile
index 36a59f3e0bf7..55bedceefb12 100644
--- a/games/linux-enemyterritory-etpub/Makefile
+++ b/games/linux-enemyterritory-etpub/Makefile
@@ -23,7 +23,8 @@ RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 USE_ZIP=	yes
 USE_LINUX=	yes
 
-OPTIONS=	OMNIBOT "Install Omni-Bot for bot support" off
+OPTIONS_DEFINE=	OMNIBOT DOCS
+OMNIBOT_DESC=	Install Omni-Bot for bot support
 
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/enemyterritory-${PORTNAME}
@@ -31,9 +32,9 @@ DOCSDIR=	${PREFIX}/share/doc/enemyterritory-${PORTNAME}
 CLIENT_PK3=	${PORTNAME}_client-20070801.pk3
 PLIST_SUB=	CLIENT_PK3="${CLIENT_PK3}"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_OMNIBOT)
+.if ${PORT_OPTIONS:MOMNIBOT}
 RUN_DEPENDS+=	et-omni-bot:${PORTSDIR}/games/linux-enemyterritory-omni-bot
 .endif
 
@@ -60,7 +61,7 @@ do-install:
 .for f in PHP etadmin_mod
 	${CP} -R ${WRKSRC}/extra/${f} ${DATADIR}/extra
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .   for f in ChangeLog.txt Install.txt Upgrade-0.8.txt
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
@@ -68,4 +69,4 @@ do-install:
 	${CP} -R ${WRKSRC}/docs ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile
index 04aa3c849908..cc9f98dcaee9 100644
--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@@ -22,10 +22,15 @@ USE_ZIP=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	CLIENT "Install client" on \
-		DEDICATED "Install dedicated server" on \
-		PUNKBUSTER "Install PunkBuster" on \
-		SMP "Install SMP (threaded) client" on
+OPTIONS_MULTI=	TYPE
+OPTIONS_MULTI_TYPE=	CLIENT DEDICATED SMP
+OPTIONS_DEFINE=	PUNKBUSTER DOCS
+OPTIONS_DEFAULT=	CLIENT DEDICATED PUNKBUSTER SMP
+
+CLIENT_DESC=	Install client
+DEDICATED_DESC=	Install dedicated server
+PUNKBUSTER_DESC=	Install PunkBuster
+SMP_DESC=	Install SMP (threaded) client
 
 PLIST_SUB+=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
@@ -48,34 +53,29 @@ post-extract:
 
 .include "${.CURDIR}/../quake3-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && \
-    defined(WITHOUT_SMP)
-IGNORE=		needs at least one of the CLIENT, DEDICATED and SMP options
-.endif
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 PROGS+=		q3ded
 PLIST_SUB+=	DEDICATED=""
 .else
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 PROGS+=		quake3.x86
 PLIST_SUB+=	CLIENT=""
 .else
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if !defined(WITHOUT_PUNKBUSTER)
+.if ${PORT_OPTIONS:MPUNKBUSTER}
 PLIST_SUB+=	PUNKBUSTER=""
 .else
 PLIST_SUB+=	PUNKBUSTER="@comment "
 .endif
 
-.if !defined(WITHOUT_SMP)
+.if ${PORT_OPTIONS:MSMP}
 PROGS+=		quake3-smp.x86
 PLIST_SUB+=	SMP=""
 .else
@@ -95,18 +95,18 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/${f} ${LIBDIR}/${f:R}
 	@${INSTALL_SCRIPT} ${WRKDIR}/${f:R} ${PREFIX}/bin/linux-${f:R}
 .endfor
-.if !defined(WITHOUT_PUNKBUSTER)
+.if ${PORT_OPTIONS:MPUNKBUSTER}
 	@${CP} -Rp ${WRKSRC}/pb ${DATADIR}
 	@${RM} ${DATADIR}/pb/PB_EULA.txt
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README-linux.txt ${DOCSDIR}
 	@${CP} -Rp ${WRKSRC}/Docs/LinuxFAQ ${DOCSDIR}
-.   if !defined(WITHOUT_PUNKBUSTER)
+.   if ${PORT_OPTIONS:MPUNKBUSTER}
 	@${CP} -Rp ${WRKSRC}/Docs/PunkBuster ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/pb/PB_EULA.txt ${DOCSDIR}/PunkBuster
 .   endif
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/nehquake/Makefile b/games/nehquake/Makefile
index 62d81ee4ce4b..26523ecdace0 100644
--- a/games/nehquake/Makefile
+++ b/games/nehquake/Makefile
@@ -22,26 +22,26 @@ USE_GL=		gl
 USE_XORG=	xxf86dga
 USE_GMAKE=	yes
 
-OPTIONS=	OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		SDL "Build SDL client" on \
-		X86_ASM "Enable x86 assembly code" on
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS SDL X86_ASM
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS SDL X86_ASM
+X86_ASM_DESC=	Enable x86 assembly code
 
 ALL_TARGET=	release
 SUB_FILES=	pkg-message
 
 .include "${.CURDIR}/../quake-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .for f in OPTIMIZED_CFLAGS X86_ASM
-.   if !defined(WITHOUT_${f})
+.   if ${PORT_OPTIONS:M${f}}
 MAKE_ENV+=	USE_${f}=YES
 .   else
 MAKE_ENV+=	USE_${f}=NO
 .   endif
 .endfor
 
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
 MAKE_ENV+=	BUILD_SDL=YES
 PLIST_SUB+=	SDL=""
@@ -51,7 +51,7 @@ PLIST_SUB+=	SDL="@comment "
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/nehahra ${PREFIX}/bin
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 	${INSTALL_PROGRAM} ${WRKSRC}/release/nehahra-sdl ${PREFIX}/bin
 .endif
 	${MKDIR} ${Q1DIR}/nehahra
@@ -61,4 +61,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/odamex/Makefile b/games/odamex/Makefile
index 2d92b0af288b..427028bd1888 100644
--- a/games/odamex/Makefile
+++ b/games/odamex/Makefile
@@ -18,12 +18,14 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer
 
-OPTIONS=	LAUNCHER "Enable GUI launcher program" off \
-		MIDI	 "Enable MIDI support (timidity)" off
+OPTIONS_DEFINE= LAUNCHER MIDI
 
-.include <bsd.port.pre.mk>
+LAUNCHER_DESC=	Enable GUI launcher program
+MIDI_DESC=	Enable MIDI support (timidity)
 
-.if defined(WITH_LAUNCHER)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLAUNCHER}
 USE_WX=		2.6+
 MAKE_ENV+=	WXRC_CMD="${WXRC_CMD}" WITH_LAUNCHER=yes
 PLIST_SUB+=	LAUNCHER=""
@@ -31,7 +33,7 @@ PLIST_SUB+=	LAUNCHER=""
 PLIST_SUB+=	LAUNCHER="@comment "
 .endif
 
-.if defined(WITH_MIDI)
+.if ${PORT_OPTIONS:MMIDI}
 RUN_DEPENDS+=	timidity:${PORTSDIR}/audio/timidity
 .endif
 
@@ -41,7 +43,7 @@ post-patch:
 		${WRKSRC}/client/src/d_main.cpp \
 		${WRKSRC}/server/src/d_main.cpp
 
-.if defined(WITH_LAUNCHER)
+.if ${PORT_OPTIONS:MLAUNCHER}
 	@${REINPLACE_CMD} -e 's|\./odamex|odamex|' \
 		${WRKSRC}/odalaunch/src/misc.cpp
 .endif
@@ -50,16 +52,16 @@ do-install:
 .for f in odamex odasrv
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
 .endfor
-.if defined(WITH_LAUNCHER)
+.if ${PORT_OPTIONS:MLAUNCHER}
 	${INSTALL_PROGRAM} ${WRKSRC}/odalaunch/odalaunch ${PREFIX}/bin
 .endif
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/odamex.wad ${DATADIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include "${.CURDIR}/../doom-data/Makefile.include"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index eeb670e0665e..90566879e58c 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -36,27 +36,30 @@ TERRAIN_VER=	20080206
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS=	JOYSTICK "Enable joystick support through linux-js" off \
-		SDL	"SDL support for input and sound" on \
-		PLIB	"Enable sound support through plib" off \
-		GUI	"Enable FLTK GUI" on
+OPTIONS_DEFINE=	JOYSTICK SDL PLIB GUI
+OPTIONS_DEFAULT=	SDL GUI
 
-.include <bsd.port.pre.mk>
+JOYSTICK_DESC=	Enable joystick support through linux-js
+SDL_DESC=	SDL support for input and sound
+PLIB_DESC=	Enable sound support through plib
+GUI_DESC=	Enable FLTK GUI
 
-.if defined(WITH_JOYSTICK)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MJOYSTICK}
 BUILD_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
 RUN_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
 .endif
 
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl mixer
 .endif
 
-.if defined(WITHOUT_PLIB)
+.if ${PORT_OPTIONS:MPLIB}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 .endif
 
-.if !defined(WITHOUT_GUI)
+.if ${PORT_OPTIONS:MGUI}
 LIB_DEPENDS+=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 .endif
 
@@ -81,16 +84,16 @@ post-patch:
 	@${REINPLACE_CMD} -e '/FIND_PACKAGE(/ s|)| REQUIRED)|' \
 		${WRKSRC}/CMakeModules/libraries.cmake
 	@${REINPLACE_CMD} -e '/COMPILE_WITH_OSSIM/ d' ${WRKSRC}/CMakeLists.txt
-.if !defined(WITH_JOYSTICK)
+.if empty(PORT_OPTIONS:MJOYSTICK)
 	@${REINPLACE_CMD} -e '/COMPILE_WITH_LINUX_JOYSTICK/ d' ${WRKSRC}/CMakeLists.txt
 .endif
-.if defined(WITHOUT_SDL)
+.if empty(PORT_OPTIONS:MSDL)
 	@${REINPLACE_CMD} -e '/COMPILE_WITH_SDL/ d' ${WRKSRC}/CMakeLists.txt
 .endif
-.if !defined(WITH_PLIB)
+.if empty(PORT_OPTIONS:MPLIB)
 	@${REINPLACE_CMD} -e '/COMPILE_WITH_PLIB/ d' ${WRKSRC}/CMakeLists.txt
 .endif
-.if defined(WITHOUT_GUI)
+.if empty(PORT_OPTIONS:MGUI)
 	@${REINPLACE_CMD} -e '/COMPILE_WITH_FLTK/ d' ${WRKSRC}/CMakeLists.txt
 .endif
 	@${REINPLACE_CMD} -e 's|string sDataDir|&="${DATADIR}/data/"|'\
@@ -106,4 +109,4 @@ post-install:
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} "*" ${DOCSDIR}/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/pmars-sdl/Makefile b/games/pmars-sdl/Makefile
index 917a60d818e4..3cb7ff160bb4 100644
--- a/games/pmars-sdl/Makefile
+++ b/games/pmars-sdl/Makefile
@@ -20,10 +20,11 @@ USE_SDL=	sdl
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-OPTIONS=	ICWS94 "Enable ICWS'94 support" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		PERMUTATE "Enable the -P switch" on \
-		SMALLMEM "Use 16-bit addresses (smaller)" off
+OPTIONS_DEFINE=	ICWS94 OPTIMIZED_CFLAGS PERMUTATE SMALLMEM
+OPTIONS_DEFAULT=	ICWS94 OPTIMIZED_CFLAGS PERMUTATE
+ICWS94_DESC=	Enable ICWS'94 support
+PERMUTATE_DESC=	Enable the -P switch
+SMALLMEM_DESC=	Use 16-bit addresses (smaller)
 
 MAKE_ARGS+=	CFLAGS+="${CFLAGS}" \
 		CFLAGS+="-fno-builtin" \
@@ -33,21 +34,21 @@ MAKE_ARGS+=	CFLAGS+="${CFLAGS}" \
 
 PLIST_FILES=	bin/${PORTNAME}${PKGNAMESUFFIX}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_ICWS94)
+.if ${PORT_OPTIONS:MICWS94}
 MAKE_ARGS+=	CFLAGS+="-DEXT94"
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ARGS+=	CFLAGS+="-O3 -fomit-frame-pointer"
 .endif
 
-.if !defined(WITHOUT_PERMUTATE)
+.if ${PORT_OPTIONS:MPERMUTATE}
 MAKE_ARGS+=	CFLAGS+="-DPERMUTATE"
 .endif
 
-.if defined(WITH_SMALLMEM)
+.if ${PORT_OPTIONS:MSMALLMEM}
 MAKE_ARGS+=	CFLAGS+="-DSMALLMEM"
 .endif
 
@@ -55,4 +56,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
 		${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/pmars/Makefile b/games/pmars/Makefile
index 8271d0bc3313..920e01f00159 100644
--- a/games/pmars/Makefile
+++ b/games/pmars/Makefile
@@ -16,26 +16,24 @@ COMMENT=	A portable corewar system with ICWS'94 extensions
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-OPTIONS=	CURSES "Build the console (graphical) interface" on \
-		ICWS94 "Enable ICWS'94 support" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		PERMUTATE "Enable the -P switch" on \
-		SERVER "Build the command-line interface" on \
-		SMALLMEM "Use 16-bit addresses (smaller)" off \
-		X11 "Build the X11 (graphical) interface" on
+OPTIONS_MULTI=	INT
+OPTIONS_MULTI_INT=	CURSES SERVER X11
+OPTIONS_DEFINE=	ICWS94 OPTIMIZED_CFLAGS PERMUTATE SMALLMEM DOCS
+OPTIONS_DEFAULT=	CURSES ICWS94 OPTIMIZED_CFLAGS PERMUTATE SERVER X11
+CURSES_DESC=	Build the console (graphical) interface
+ICWS94_DESC=	Enable ICWS'94 support
+PERMUTATE_DESC=	Enable the -P switch
+SERVER_DESC=	Build the command-line interface
+SMALLMEM_DESC=	Use 16-bit addresses (smaller)
 
 MAKE_ARGS+=	CFLAGS+="${CFLAGS}" \
 		CFLAGS+="-fno-builtin"
 
 MAN6=		pmars.6
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_CURSES) && defined(WITHOUT_SERVER) && defined(WITHOUT_X11)
-IGNORE=		needs at least one interface (CURSES, SERVER or X11)
-.endif
-
-.if !defined(WITHOUT_CURSES)
+.if ${PORT_OPTIONS:MCURSES}
 TARGETS+=	curses
 CURSES_ARGS+=	CFLAGS+="-DGRAPHX" \
 		LIB+="-lcurses"
@@ -44,19 +42,19 @@ PLIST_SUB+=	CURSES=""
 PLIST_SUB+=	CURSES="@comment "
 .endif
 
-.if !defined(WITHOUT_ICWS94)
+.if ${PORT_OPTIONS:MICWS94}
 MAKE_ARGS+=	CFLAGS+="-DEXT94"
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ARGS+=	CFLAGS+="-O3 -fomit-frame-pointer"
 .endif
 
-.if !defined(WITHOUT_PERMUTATE)
+.if ${PORT_OPTIONS:MPERMUTATE}
 MAKE_ARGS+=	CFLAGS+="-DPERMUTATE"
 .endif
 
-.if !defined(WITHOUT_SERVER)
+.if ${PORT_OPTIONS:MSERVER}
 TARGETS+=	server
 SERVER_ARGS+=	CFLAGS+="-DSERVER"
 PLIST_SUB+=	SERVER=""
@@ -64,11 +62,11 @@ PLIST_SUB+=	SERVER=""
 PLIST_SUB+=	SERVER="@comment "
 .endif
 
-.if defined(WITH_SMALLMEM)
+.if ${PORT_OPTIONS:MSMALLMEM}
 MAKE_ARGS+=	CFLAGS+="-DSMALLMEM"
 .endif
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11
 TARGETS+=	x11
 X11_ARGS+=	CFLAGS+="-DXWINGRAPHX" \
@@ -91,11 +89,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${f} ${PREFIX}/bin
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/../doc/pmars.6 ${PREFIX}/man/man6
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .   for f in README config doc warriors
 	${CP} -R ${WRKSRC}/../${f} ${DOCSDIR}
 .   endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index 178ec16032d8..9ef681656d0a 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -23,6 +23,8 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	OPENGL
+OPTIONS_DEFAULT=	OPENGL
 OPTIONS=	GL "Enable OpenGL support" on
 
 MAN5=		boom.cfg.5
@@ -33,12 +35,12 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include "${.CURDIR}/../doom-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GL)
+.if ${PORT_OPTIONS:MOPENGL}
 USE_GL=		yes
 .else
 CONFIGURE_ARGS+=--disable-gl
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/q3cellshading/Makefile b/games/q3cellshading/Makefile
index e111eee0f396..653bcc76be49 100644
--- a/games/q3cellshading/Makefile
+++ b/games/q3cellshading/Makefile
@@ -23,11 +23,14 @@ USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 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_MULTI=	EXE
+OPTIONS_MULTI_EXE=	CLIENT DEDICATED SMP
+OPTIONS_DEFINE=	GAMELIBS OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	CLIETN DEDICATED OPTIMIZED_CFLAGS SMP
+CLIENT_DESC=	Build client
+DEDICATED_DESC=	Build dedicated server
+GAMELIBS_DESC=	Build game libraries (when not mandatory)
+SMP_DESC=	Build SMP (threaded) client
 
 MAKE_ENV=	LIBDIR="${LIBDIR}"
 PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
@@ -37,11 +40,6 @@ VM_ARCHS=	i386 powerpc
 
 .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
@@ -56,12 +54,12 @@ HAVE_VM_COMPILED=	yes
 MAKE_ENV+=	DLL_ONLY=true
 .endif
 
-.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP)
+.if ${PORT_OPTIONS:MCLIENT} || !empty(PORT_OPTIONS:MSMP)
 USE_GL=		yes
 USE_XORG=	xxf86dga
 .endif
 
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 MAKE_ENV+=	CLIENT=YES
 PLIST_SUB+=	CLIENT=""
 Q3BIN+=		quake3
@@ -69,7 +67,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
@@ -77,18 +75,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:MSMP}
 MAKE_ENV+=	SMP=YES \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 PLIST_SUB+=	SMP=""
@@ -110,7 +108,7 @@ do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} \
 		${PREFIX}/bin/${bin:C/(quake3|q3)/\1cel/}
 .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/scare/Makefile b/games/scare/Makefile
index 0c6c81f2bbab..4dd49bd46356 100644
--- a/games/scare/Makefile
+++ b/games/scare/Makefile
@@ -22,7 +22,8 @@ COMMENT=	ADRIFT-compatible interactive games interpreter
 
 LICENSE=	GPLv2
 
-OPTIONS=	XGLK "Use the xglk graphics library" off
+OPTIONS_DEFINE=	XGLK
+XGLK_DESC=	Use the xglk graphics library
 
 USE_ZIP=	yes
 MAKE_JOBS_SAFE=yes
@@ -31,7 +32,7 @@ PLIST_FILES=	bin/scare
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_XGLK)
+.if ${PORT_OPTIONS:MXGLK}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libxglk.a:${PORTSDIR}/games/xglk
 RUN_DEPENDS+=	${LOCALBASE}/lib/libxglk.a:${PORTSDIR}/games/xglk
 ALL_TARGET=	scare glkscare
@@ -50,7 +51,7 @@ post-patch:
 
 do-configure:
 	@${MKDIR} ${WRKDIR}/xglk
-.if defined(WITH_XGLK)
+.if ${PORT_OPTIONS:MXGLK}
 	@${LN} -sf ${LOCALBASE}/include/xglk/*.h ${WRKDIR}/xglk
 	@${LN} -sf ${LOCALBASE}/share/xglk/Make.xglk ${WRKDIR}/xglk
 .else
@@ -59,7 +60,7 @@ do-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/source/scare ${PREFIX}/bin
-.if defined(WITH_XGLK)
+.if ${PORT_OPTIONS:MXGLK}
 	${INSTALL_PROGRAM} ${WRKSRC}/source/glkscare ${PREFIX}/bin
 .endif
 
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 157ab9541d30..6a88b37024f8 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	GLEW.1:${PORTSDIR}/graphics/glew \
 		fftw3f.6:${PORTSDIR}/math/fftw3-float \
 		expat.6:${PORTSDIR}/textproc/expat2
 
-OPTIONS=	MYSQL "Enable MySQL support" off
+OPTIONS_DEFINE=	MYSQL
 
 WRKSRC=		${WRKDIR}/scorched
 
@@ -51,7 +51,7 @@ SCORCH_REVISION=	# none
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql
 .endif
diff --git a/games/sdlquake2/Makefile b/games/sdlquake2/Makefile
index 50fe684b20b7..2282451d9b8c 100644
--- a/games/sdlquake2/Makefile
+++ b/games/sdlquake2/Makefile
@@ -19,9 +19,11 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
-OPTIONS=	CLIENT "Build client" on \
-		DEDICATED "Build dedicated server" on \
-		GAME "Build a main game .so file" off
+OPTIONS_DEFINE=	CLIENT DEDICATED GAME
+OPTIONS_DEFAULT=	CLIENT DEDICATED
+CLIENT_DESC=	Build client
+DEDICATED_DESC=	Build dedicated server
+GAME_DESC=	Build a main game .so file
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 MAKE_ENV=	LIBDIR="${LIBDIR}"
@@ -29,9 +31,9 @@ PLIST_SUB=	LIBDIR=${LIBDIR:S/${PREFIX}\///}
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 USE_GL=		yes
@@ -43,14 +45,14 @@ PLIST_SUB+=	CLIENT=""
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if defined(WITH_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 MAKE_ENV+=	BUILD_DEDICATED=YES
 PLIST_SUB+=	DEDICATED=""
 .else
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
-.if defined(WITH_GAME)
+.if ${PORT_OPTIONS:MGAME}
 MAKE_ENV+=	BUILD_GAME=YES
 PLIST_SUB+=	GAME=""
 .else
@@ -59,14 +61,14 @@ PLIST_SUB+=	GAME="@comment "
 
 do-install:
 	${MKDIR} ${LIBDIR}/baseq2
-.if defined(WITH_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 	${INSTALL_PROGRAM} ${WRKSRC}/quake2 ${PREFIX}/bin/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/ref_sdlgl.so ${LIBDIR}
 .endif
-.if defined(WITH_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 	${INSTALL_PROGRAM} ${WRKSRC}/q2ded ${PREFIX}/bin/${PORTNAME}-ded
 .endif
-.if defined(WITH_GAME)
+.if ${PORT_OPTIONS:MGAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/baseq2/game.so ${LIBDIR}/baseq2
 .endif
 
@@ -75,4 +77,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/species/Makefile b/games/species/Makefile
index c01f4d442658..ffecbe1a6eb6 100644
--- a/games/species/Makefile
+++ b/games/species/Makefile
@@ -19,11 +19,12 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS=	VISITOOL "Buil GUI tool for displaying evolution" off
+OPTIONS_DEFINE=	VISITOOL
+VISITOOL_DESC=	Buil GUI tool for displaying evolution
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_VISITOOL)
+.if ${PORT_OPTIONS:MVISITOOL}
 USE_WX=		2.4
 ALL_TARGET=	all visitool
 PLIST_SUB+=	VISITOOL=""
@@ -36,9 +37,9 @@ do-install:
 	${MKDIR} ${DATADIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} koen.* species.ini *.rc ${DATADIR}
 	cd ${WRKSRC} && ${CP} -r bench evolver_hill wilfiz ${DATADIR}
-.if defined(WITH_VISITOOL)
+.if ${PORT_OPTIONS:MVISITOOL}
 	${INSTALL_PROGRAM} ${WRKSRC}/visitool \
 		${PREFIX}/bin/${PORTNAME}-visitool
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index f54275d67301..387b9ca87598 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -18,10 +18,9 @@ COMMENT=	Free cross-platform real-time strategy gaming engine
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
-OPTIONS=	MIKMOD "Enable Mikmod support" off \
-		MNG "Enable MNG support" off \
-		THEORA "Enable Theora support" off \
-		VORBIS "Enable Ogg Vorbis support" on
+OPTIONS_DEFINE=	MIKMOD MNG THEORA VORBIS DOCS
+OPTIONS_DEFAULT=	VORBIS
+MNG_DESC=	Enable MNG support
 
 LICENSE=	GPLv2
 USE_GCC=	4.4+
@@ -41,30 +40,30 @@ MAKE_JOBS_UNSAFE=	yes
 PORTDOCS=	*
 PLIST_FILES=	bin/stratagus
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MIKMOD)
+.if ${PORT_OPTIONS:MMIKMOD}
 LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
 CONFIGURE_ARGS+=--with-mikmod
 .else
 CONFIGURE_ARGS+=--without-mikmod
 .endif
 
-.if defined(WITH_MNG)
+.if ${PORT_OPTIONS:MMNG}
 LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng
 CONFIGURE_ARGS+=--with-mng
 .else
 CONFIGURE_ARGS+=--without-mng
 .endif
 
-.if defined(WITH_THEORA)
+.if ${PORT_OPTIONS:MTHEORA}
 LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
 CONFIGURE_ARGS+=--with-theora
 .else
 CONFIGURE_ARGS+=--without-theora
 .endif
 
-.if defined(WITH_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=--with-vorbis
 .else
@@ -76,7 +75,7 @@ pre-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/stratagus ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC}/doc; ${COPYTREE_SHARE} . ${DOCSDIR})
 .endif
@@ -84,4 +83,4 @@ do-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/tenebrae/Makefile b/games/tenebrae/Makefile
index a548a6a3c500..412ada7bc998 100644
--- a/games/tenebrae/Makefile
+++ b/games/tenebrae/Makefile
@@ -25,16 +25,18 @@ USE_XORG=	xxf86dga
 USE_GL=		gl
 USE_SDL=	yes
 
-OPTIONS=	X86_ASM "Enable use of x86 assembly code" on
+OPTIONS_DEFINE=	X86_ASM DOCS
+OPTIONS_DEFAULT=	X86_ASM
+X86_ASM_DESC=	Enable use of x86 assembly code
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_0
 BUILD_WRKSRC=	${WRKSRC}/linux
 MAKEFILE=	Makefile.i386linux
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_X86_ASM)
+.if ${PORT_OPTIONS:MX86_ASM}
 MAKE_ENV+=	USE_ASM=1
 .endif
 
@@ -50,7 +52,7 @@ do-install:
 		${PREFIX}/bin
 	@${MKDIR} ${Q1DIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/Pak0.pak ${Q1DIR}/${PORTNAME}
-.ifndef (NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${TR} -d '\r' <${WRKDIR}/Tenebrae_Readme.txt \
 		>${DOCSDIR}/Tenebrae_Readme.txt
@@ -63,4 +65,4 @@ post-install:
 
 .include "${.CURDIR}/../quake-data/Makefile.include"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/tremor/Makefile b/games/tremor/Makefile
index 16b7b7893e0e..685cecf7311b 100644
--- a/games/tremor/Makefile
+++ b/games/tremor/Makefile
@@ -30,39 +30,36 @@ USE_XORG=	x11 xxf86dga
 USE_GMAKE=	yes
 ALL_TARGET=	release
 
-OPTIONS=	GLX "Build OpenGL X11 client" on \
-		GOODIES "Extra graphics, DM maps and models" off \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		SDL "Build SDL client" on \
-		TEXTURES "Collection of extra textures" off
+OPTIONS_MULTI=	OUTPUT
+OPTIONS_MULTI_OUTPUT=	OPENGL SDL
+OPTIONS_DEFINE=	GOODIES	OPTIMIZED_CFLAGS TEXTURES
+OPTIONS_DEFAULT=	OPENGL OPTIMIZED_CFLAGS
+GOODIES_DESC=	Extra graphics, DM maps and models
+TEXTURES_DESC=	Collection of extra textures
 
 .include "${.CURDIR}/../quake-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_GLX) && defined(WITHOUT_SDL)
-IGNORE=		needs at least one executable (GLX and SDL)
-.endif
-
-.if !defined(WITHOUT_GLX)
+.if ${PORT_OPTIONS:MOPENGL}
 MAKE_ENV+=	BUILD_TREMOR=YES
 PLIST_SUB+=	GLX=""
 .else
 PLIST_SUB+=	GLX="@comment "
 .endif
 
-.if defined(WITH_GOODIES)
+.if ${PORT_OPTIONS:MGOODIES}
 DISTFILES+=	tremor_goodies.zip:data
 PLIST_SUB+=	GOODIES=""
 .else
 PLIST_SUB+=	GOODIES="@comment "
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	OPTIMIZE=YES
 .endif
 
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
 MAKE_ENV+=	BUILD_TREMOR_SDL=YES
 PLIST_SUB+=	SDL=""
@@ -70,7 +67,7 @@ PLIST_SUB+=	SDL=""
 PLIST_SUB+=	SDL="@comment "
 .endif
 
-.if defined(WITH_TEXTURES)
+.if ${PORT_OPTIONS:MTEXTURES}
 DISTFILES+=	tremor_texture_packX.zip:data
 PLIST_SUB+=	TEXTURES=""
 .else
@@ -82,23 +79,23 @@ post-extract:
 		base/*.cfg.bak base/tremor0.pak "base/textures/*" -d ${WRKDIR}
 	@cd ${WRKDIR}/base && ${MV} config.cfg.bak config.cfg && \
 		${MV} autoexec.cfg.bak autoexec.cfg
-.if defined(WITH_GOODIES)
+.if ${PORT_OPTIONS:MGOODIES}
 	@${UNZIP_CMD} -qL ${DISTDIR}/${DIST_SUBDIR}/tremor_goodies.zip \
 		-d ${WRKDIR}
 .endif
-.if defined(WITH_TEXTURES)
+.if ${PORT_OPTIONS:MTEXTURES}
 	@${UNZIP_CMD} -q ${DISTDIR}/${DIST_SUBDIR}/tremor_texture_packX.zip \
 		-d ${WRKDIR}
 .endif
 
 do-install:
-.if !defined(WITHOUT_GLX)
+.if ${PORT_OPTIONS:MOPENGL}
 	${INSTALL_PROGRAM} ${WRKSRC}/quake/${PORTNAME}-glx ${PREFIX}/bin
 .endif
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 	${INSTALL_PROGRAM} ${WRKSRC}/quake/${PORTNAME}-sdl ${PREFIX}/bin
 .endif
 	${MKDIR} ${Q1DIR}/${PORTNAME}
 	${CP} -R ${WRKDIR}/base/* ${Q1DIR}/${PORTNAME}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile
index 9f392b41955f..89b6bad1debc 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -20,8 +20,8 @@ COMMENT=	Educational arcade game starring Tux
 
 LICENSE=	GPLv3 # (or later)
 
-OPTIONS=	NLS "Enable Native Language Support" on \
-		RSVG "Enable libRSVG support" on
+OPTIONS_DEFINE=	NLS SVG DOCS
+OPTIONS_DEFAULT=	SVG
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_w_fonts-${PORTVERSION}
 
@@ -47,17 +47,17 @@ T4K_WRKSRC=	${WRKDIR}/${T4K_NAME}-${T4K_VERSION}
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
+PLIST_SUB+=	NLS=""
+.else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
-.else
-PLIST_SUB+=	NLS=""
 .endif
 
-.if defined(WITHOUT_RSVG)
-CONFIGURE_ARGS+=--without-rsvg
-.else
+.if ${PORT_OPTIONS:MSVG}
 USE_GNOME+=	librsvg2
+.else
+CONFIGURE_ARGS+=--without-rsvg
 .endif
 
 # use multiple make jobs for T4K_WRKSRC
@@ -86,7 +86,7 @@ pre-build:
 		${MAKEFILE} ${_make_jobs} ${ALL_TARGET})
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in OFL README README_DATA_LICENSES TODO changelog
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index b9d84459d86b..87cb574e1a6e 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -21,8 +21,8 @@ LICENSE=	GPLv3 # (or later)
 
 BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
 
-OPTIONS=	NLS "Enable Native Language Support" on \
-		RSVG "Enable libRSVG support" on
+OPTIONS_DEFINE=	NLS SVG DOCS
+OPTIONS_DEFAULT=	SVG
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_w_fonts-${PORTVERSION}
 
@@ -48,17 +48,17 @@ T4K_WRKSRC=	${WRKDIR}/${T4K_NAME}-${T4K_VERSION}
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
+PLIST_SUB+=	NLS=""
+.else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
-.else
-PLIST_SUB+=	NLS=""
 .endif
 
-.if defined(WITHOUT_RSVG)
-CONFIGURE_ARGS+=--without-rsvg
-.else
+.if ${PORT_OPTIONS:MSVG}
 USE_GNOME+=	librsvg2
+.else
+CONFIGURE_ARGS+=--without-rsvg
 .endif
 
 # use multiple make jobs for T4K_WRKSRC
@@ -97,7 +97,7 @@ pre-build:
 
 post-install:
 	@${ECHO_CMD} -n > ${ETCDIR}/.keep_me
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in AUTHORS ChangeLog OFL README TODO
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
diff --git a/games/uhexen2-extras/Makefile b/games/uhexen2-extras/Makefile
index 77a662be164f..ebe4fba50d40 100644
--- a/games/uhexen2-extras/Makefile
+++ b/games/uhexen2-extras/Makefile
@@ -22,28 +22,31 @@ RUN_DEPENDS=	${DATADIR}:${PORTSDIR}/games/uhexen2
 
 NO_BUILD=	yes
 
-OPTIONS=	HEXEN2_DEMOS "Install pre-recorded demos for Hexen II" on \
-		HEXEN2_LITS "Install colored light data for Hexen II" on \
-		HEXEN2_MODS "Install several mods for Hexen II" on \
-		HW_MODS "Install several mods for HexenWorld" on
+OPTIONS_MULTI=	EXTRA
+OPTIONS_MULTI_EXTRA=	HEXEN2_DEMOS HEXEN2_LITS HEXEN2_MODS HW_MODS
+OPTIONS_DEFAULT=	HEXEN2_DEMOS HEXEN2_LITS HEXEN2_MODS HW_MODS
+HEXEN2_DEMOS_DESC=	Install pre-recorded demos for Hexen II
+HEXEN2_LITS_DESC=	Install colored light data for Hexen II
+HEXEN2_MODS_DESC=	Install several mods for Hexen II
+HW_MODS_DESC=	Install several mods for HexenWorld
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_HEXEN2_DEMOS)
+.if ${PORT_OPTIONS:MHEXEN2_DEMOS}
 DISTFILES+=	hexen2-demos${EXTRACT_SUFX}
 PLIST_SUB+=	HEXEN2_DEMOS=""
 .else
 PLIST_SUB+=	HEXEN2_DEMOS="@comment "
 .endif
 
-.if defined(WITH_HEXEN2_LITS)
+.if ${PORT_OPTIONS:MHEXEN2_LITS}
 DISTFILES+=	hexen2-lit_files${EXTRACT_SUFX}
 PLIST_SUB+=	HEXEN2_LITS=""
 .else
 PLIST_SUB+=	HEXEN2_LITS="@comment "
 .endif
 
-.if defined(WITH_HEXEN2_MODS)
+.if ${PORT_OPTIONS:MHEXEN2_MODS}
 MASTER_SITES+=	SF/${PORTNAME}/HoT%20-%20Other%20content/hexen2%20mods:mods
 DISTFILES+=	apocbot-0.2.0${EXTRACT_SUFX}:mods \
 		fo4d${EXTRACT_SUFX}:mods \
@@ -53,7 +56,7 @@ PLIST_SUB+=	HEXEN2_MODS=""
 PLIST_SUB+=	HEXEN2_MODS="@comment "
 .endif
 
-.if defined(WITH_HW_MODS)
+.if ${PORT_OPTIONS:MHW_MODS}
 MASTER_SITES+=	SF/${PORTNAME}/HoT%20-%20Other%20content/hexenworld%20mods:hw_mods
 DISTFILES+=	dungeonbreak${EXTRACT_SUFX}:hw_mods \
 		hexarena${EXTRACT_SUFX}:hw_mods \
@@ -65,24 +68,20 @@ PLIST_SUB+=	HW_MODS=""
 PLIST_SUB+=	HW_MODS="@comment "
 .endif
 
-.if empty(DISTFILES)
-IGNORE=		needs at least one option selected
-.endif
-
 do-install:
-.if defined(WITH_HEXEN2_DEMOS)
+.if ${PORT_OPTIONS:MHEXEN2_DEMOS}
 	${INSTALL_DATA} ${WRKDIR}/data1/*demo* ${DATADIR}/data1
 .endif
-.if defined(WITH_HEXEN2_LITS)
+.if ${PORT_OPTIONS:MHEXEN2_LITS}
 	${MKDIR} ${DATADIR}/data1/maps
 	${INSTALL_DATA} ${WRKDIR}/data1/maps/*.lit ${DATADIR}/data1/maps
 .endif
-.if defined(WITH_HEXEN2_MODS)
+.if ${PORT_OPTIONS:MHEXEN2_MODS}
 .for f in apocbot fo4d hcbots
 	@(cd ${WRKDIR} && ${COPYTREE_SHARE} ${f} ${DATADIR})
 .endfor
 .endif
-.if defined(WITH_HW_MODS)
+.if ${PORT_OPTIONS:MHW_MODS}
 .for f in db hexarena hwctf rk siege
 	@(cd ${WRKDIR} && ${COPYTREE_SHARE} ${f} ${DATADIR})
 .endfor
@@ -91,4 +90,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/uhexen2/Makefile b/games/uhexen2/Makefile
index cb188a59efca..ac83fdca4a98 100644
--- a/games/uhexen2/Makefile
+++ b/games/uhexen2/Makefile
@@ -29,22 +29,22 @@ USE_SDL=	sdl mixer
 WANT_GNOME=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS=	DEMO "Install demo version of the game data" off \
-		HEXEN2 "Build Hexen II clients and servers" on \
-		HW "Build HexenWorld clients and servers" on \
-		LAUNCHER_GTK1 "Build graphical (GTK1) game launcher" on \
-		LAUNCHER_GTK2 "Build graphical (GTK2) game launcher" off \
-		X86_ASM "Enable use of optimized x86 assembly code" on
+OPTIONS_MULTI=	BIN
+OPTIONS_MULTI_BIN=	HEXEN2 HW
+OPTIONS_DEFINE=	DEMO LAUNCHER_GTK1 LAUNCHER_GTK2 X86_ASM DOCS
+OPTIONS_DEFALT=	HEXEN2 HW LAUNCHER_GTK1 X86_ASM
+DEMO_DESC=	Install demo version of the game data
+HEXEN2_DESC=	Build Hexen II clients and servers
+HW_DESC=	Build HexenWorld clients and servers
+LAUNCHER_GTK1_DESC=	Build graphical (GTK1) game launcher
+LAUNCHER_GTK2_DESC=	Build graphical (GTK2) game launcher
+X86_ASM_DESC=	Enable use of optimized x86 assembly code
 
 PORTSCOUT=	skipb:yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_HEXEN2) && defined(WITHOUT_HW)
-IGNORE=		needs at least one group of binaries (HEXEN2 and HW)
-.endif
-
-.if defined(WITH_DEMO)
+.if ${PORT_OPTIONS:MDEMO}
 MASTER_SITES+=	SF/${PORTNAME}/Hammer%20of%20Thyrion/${PORTVERSION}/Linux-demo-version:demo
 DISTFILES+=	hexen2demo-${PORTVERSION}-linux-i586${EXTRACT_SUFX}:demo
 MAKE_ENV+=	DEMO=yes
@@ -62,7 +62,7 @@ UH2_DATA=	default.cfg hexen.rc progs.dat progs2.dat strings.txt
 UH2_DATADIR=	${WRKDIR}
 .endif
 
-.if defined(WITH_HEXEN2)
+.if ${PORT_OPTIONS:MHEXEN2}
 MAKE_ENV+=	BUILD_HEXEN2=yes
 PLIST_SUB+=	HEXEN2=""
 UH2_BIN+=	engine/hexen2/glhexen2 \
@@ -71,8 +71,8 @@ UH2_BIN+=	engine/hexen2/glhexen2 \
 PLIST_SUB+=	HEXEN2="@comment "
 .endif
 
-.if defined(WITH_HW)
-. if !defined(WITH_DEMO)
+.if ${PORT_OPTIONS:MHW}
+. if empty(PORT_OPTIONS:MDEMO)
 MASTER_SITES+=	SF/${PORTNAME}/Hexen2%20GameData/hexenworld-pakfiles:hw
 DISTFILES+=	hexenworld-pakfiles-0.15${EXTRACT_SUFX}:hw
 . endif
@@ -85,7 +85,7 @@ UH2_BIN+=	engine/hexenworld/client/glhwcl \
 PLIST_SUB+=	HW="@comment "
 .endif
 
-.if defined(WITH_LAUNCHER_GTK1)
+.if ${PORT_OPTIONS:MLAUNCHER_GTK1}
 USE_GNOME+=	gtk12
 MAKE_ENV+=	BUILD_LAUNCHER_GTK1=yes
 PLIST_SUB+=	LAUNCHER_GTK1=""
@@ -93,7 +93,7 @@ PLIST_SUB+=	LAUNCHER_GTK1=""
 PLIST_SUB+=	LAUNCHER_GTK1="@comment "
 .endif
 
-.if defined(WITH_LAUNCHER_GTK2)
+.if ${PORT_OPTIONS:MLAUNCHER_GTK2}
 USE_GNOME+=	gtk20
 MAKE_ENV+=	BUILD_LAUNCHER_GTK2=yes
 PLIST_SUB+=	LAUNCHER_GTK2=""
@@ -101,7 +101,7 @@ PLIST_SUB+=	LAUNCHER_GTK2=""
 PLIST_SUB+=	LAUNCHER_GTK2="@comment "
 .endif
 
-.if defined(WITH_X86_ASM) && ${ARCH} == "i386"
+.if ${PORT_OPTIONS:MX86_ASM} && ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 MAKE_ENV+=	USE_X86_ASM=yes
 .endif
@@ -117,26 +117,26 @@ do-install:
 .for f in ${UH2_DATA}
 	${INSTALL_DATA} ${UH2_DATADIR}/data1/${f} ${DATADIR}/data1
 .endfor
-.if !defined(WITH_DEMO)
+.if empty(PORT_OPTIONS:MDEMO)
 	${INSTALL_DATA} ${WRKDIR}/patchdat/data1/* ${DATADIR}/data1
 	${CP} -R ${WRKDIR}/portals ${DATADIR}
 .endif
-.if defined(WITH_HW)
+.if ${PORT_OPTIONS:MHW}
 	${MKDIR} ${DATADIR}/hw
 	${INSTALL_DATA} ${UH2_DATADIR}/hw/* ${DATADIR}/hw
 .endif
-.if defined(WITH_LAUNCHER_GTK1)
+.if ${PORT_OPTIONS:MLAUNCHER_GTK1}
 	${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk1 ${PREFIX}/bin
 .endif
-.if defined(WITH_LAUNCHER_GTK2)
+.if ${PORT_OPTIONS:MLAUNCHER_GTK2}
 	${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk2 ${PREFIX}/bin
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
 .endif
 
-.if !defined(WITH_DEMO)
+.if empty(PORT_OPTIONS:MDEMO)
 post-install:
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
diff --git a/games/vavoom-extras/Makefile b/games/vavoom-extras/Makefile
index 12db97c9ca3c..50e772b39bbf 100644
--- a/games/vavoom-extras/Makefile
+++ b/games/vavoom-extras/Makefile
@@ -30,18 +30,17 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 NO_PACKAGE=	package could be up to 661MB; set FORCE_PACKAGE if you really want it
 
-OPTIONS=	MODELS "Install 3D models (17MB)" on \
-		SOUNDTRACKS "Install enhanced soundtracks (482MB)" on \
-		TEXTURES "Install high resolution textures (157MB)" on \
-		DHTP "Prefer Doom Hires Texture Pack (87MB)" off
+OPTIONS_MULTI=	EXTRA
+OPTIONS_MULTI_EXTRA=	MODELS SOUNDTRACKS TEXTURES DHTP
 
-.include <bsd.port.pre.mk>
+MODELS_DESC=	Install 3D models (17MB)
+SOUNDTRACKS_DESC=	Install enhanced soundtracks (482MB)
+TEXTURES_DESC=	Install high resolution textures (157MB)
+DHTP_DESC=	Prefer Doom Hires Texture Pack (87MB)
 
-.if !defined(WITH_MODELS) && !defined(WITH_SOUNDTRACKS) && !defined(WITH_TEXTURES) && !defined(WITH_DHTP)
-IGNORE=		needs at least one option selected
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MODELS)
+.if ${PORT_OPTIONS:MMODELS}
 DISTFILES+=	vmodels-doom-1.4.3.zip:vmd
 DISTFILES+=	vmodels-heretic-1.4.3.zip:vmhr
 DISTFILES+=	vmodels-hexen-1.4.3.zip:vmhx
@@ -51,14 +50,14 @@ PLIST_SUB+=	MODELS=""
 PLIST_SUB+=	MODELS="@comment "
 .endif
 
-.if defined(WITH_DHTP)
+.if ${PORT_OPTIONS:MDHTP}
 DISTFILES+=	vv-dhtp-20080808.pk3:dt
 PLIST_SUB+=	DHTP=""
 .else
 PLIST_SUB+=	DHTP="@comment "
 .endif
 
-.if defined(WITH_TEXTURES)
+.if ${PORT_OPTIONS:MTEXTURES}
 . for f in heretic hexen strife
 DISTFILES+=	vtextures-${f}-1.0${EXTRACT_SUFX}:vt10
 . endfor
@@ -67,7 +66,7 @@ PLIST_SUB+=	TEXTURES=""
 PLIST_SUB+=	TEXTURES="@comment "
 .endif
 
-.if defined(WITH_TEXTURES) && !defined(WITH_DHTP)
+.if ${PORT_OPTIONS:MTEXTURES} && empty(PORT_OPTIONS:MDHTP)
 . for f in plutonia tnt
 DISTFILES+=	vtextures-${f}-1.0${EXTRACT_SUFX}:vt10
 . endfor
@@ -79,7 +78,7 @@ PLIST_SUB+=	NODHTP=""
 PLIST_SUB+=	NODHTP="@comment "
 .endif
 
-.if defined(WITH_SOUNDTRACKS)
+.if ${PORT_OPTIONS:MSOUNDTRACKS}
 . for f in doom1 doom2 tnt plutonia heretic hexen
 DISTFILES+=	vmusic-${f}-1.0${EXTRACT_SUFX}:vmu
 . endfor
@@ -95,4 +94,4 @@ do-install:
 	cd ${WRKSRC} && ${FIND} basev -type f \
 		-exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile
index 64e1ad9ff315..841b28486dbf 100644
--- a/games/vavoom/Makefile
+++ b/games/vavoom/Makefile
@@ -20,50 +20,40 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 
-OPTIONS=	ALLEGRO "Use Allegro for hardware API" off \
-		FLAC "Enable FLAC support" off \
-		LAUNCHER "Build GUI launcher" on \
-		LIBMAD "Enable MP3 support" off \
-		MIKMOD "Enable MikMod support" off \
-		OPENAL "Enable OpenAL support" off \
-		OPENGL "Enable OpenGL support" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" off \
-		VORBIS "Enable Ogg Vorbis support" off \
-		SDL "Use SDL for hardware API" on \
-		WXUNICODE "Enable Unicode support" on
+OPTIONS_SINGLE=	HWAPI
+OPTIONS_SINGLE_HWAPI=	ALLEGRO SDL
+OPTIONS_DEFINE=	ALLEGRO FLAC LAUNCHER MAD MIKMOD OPENAL OPENGL OPTIMIZED_CFLAGS VORBIS SDL WXUNICODE DOCS
+OPTIONS_DEFAULT=	OPENGL SDL WXUNICODE
+ALLEGRO_DESC=	Use Allegro for hardware API
+LAUNCHER_DESC=	Build GUI launcher
+OPENAL_DESC=	Enable OpenAL support
+SDL_DESC=	Use SDL for hardware API
+WXUNICODE_DESC=	Enable Unicode support
 
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 # The `-fno-strict-aliasing' flag (default on FreeBSD 6.0+) produces
 # non-working code for `vcc', so we remove it here if present.
 CFLAGS:=	${CFLAGS:N-fno-strict-aliasing}
 CXXFLAGS:=	${CFLAGS:N-fno-strict-aliasing}
 
-.if !defined(WITH_ALLEGRO) && !defined(WITH_SDL)
-IGNORE=		needs ALLEGRO or SDL for hardware API
-.endif
-
-.if defined(WITH_ALLEGRO) && defined(WITH_SDL)
-IGNORE=		selected conflicting options ALLEGRO and SDL
-.endif
-
-.if defined(WITH_ALLEGRO)
+.if ${PORT_OPTIONS:MALLEGRO}
 LIB_DEPENDS+=	alleg.42:${PORTSDIR}/devel/allegro
 CMAKE_ARGS+=	-DWITH_ALLEGRO=Y
 .else
 CMAKE_ARGS+=	-DWITH_ALLEGRO=N
 .endif
 
-.if defined(WITH_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
 LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
 CMAKE_ARGS+=	-DWITH_FLAC=Y
 .else
 CMAKE_ARGS+=	-DWITH_FLAC=N
 .endif
 
-.if defined(WITH_LAUNCHER)
+.if ${PORT_OPTIONS:MLAUNCHER}
 USE_WX=		2.4+
 CMAKE_ARGS+=	-DENABLE_LAUNCHER=Y \
 		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}"
@@ -73,30 +63,30 @@ CMAKE_ARGS+=	-DENABLE_LAUNCHER=N
 PLIST_SUB+=	LAUNCHER="@comment "
 .endif
 
-.if defined(WITH_LIBMAD)
+.if ${PORT_OPTIONS:MMAD}
 LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
 CMAKE_ARGS+=	-DWITH_LIBMAD=Y
 .else
 CMAKE_ARGS+=	-DWITH_LIBMAD=N
 .endif
 
-.if defined(WITH_MIKMOD)
+.if ${PORT_OPTIONS:MMIKMOD}
 LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
 CMAKE_ARGS+=	-DWITH_MIKMOD=Y
 .else
 CMAKE_ARGS+=	-DWITH_MIKMOD=N
 .endif
 
-.if defined(WITH_OPENAL)
+.if ${PORT_OPTIONS:MOPENAL}
 USE_OPENAL=	al
 CMAKE_ARGS+=	-DWITH_OPENAL=Y
 .else
 CMAKE_ARGS+=	-DWITH_OPENAL=N
 .endif
 
-.if defined(WITH_OPENGL)
+.if ${PORT_OPTIONS:MOPENGL}
 USE_GL=		yes
-. if defined(WITH_ALLEGRO)
+. if ${PORT_OPTIONS:MALLEGRO}
 LIB_DEPENDS+=	agl.0:${PORTSDIR}/graphics/allegrogl
 BROKEN=		please use SDL instead of ALLEGRO, for OPENGL support
 . endif
@@ -105,25 +95,25 @@ CMAKE_ARGS+=	-DWITH_OPENGL=Y
 CMAKE_ARGS+=	-DWITH_OPENGL=N
 .endif
 
-.if defined(WITH_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
 .endif
 
-.if defined(WITH_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 CMAKE_ARGS+=	-DWITH_VORBIS=Y
 .else
 CMAKE_ARGS+=	-DWITH_VORBIS=N
 .endif
 
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	mixer sdl
 CMAKE_ARGS+=	-DWITH_SDL=Y
 .else
 CMAKE_ARGS+=	-DWITH_SDL=N
 .endif
 
-.if !defined(WITHOUT_WXUNICODE)
+.if ${PORT_OPTIONS:MWXUNICODE}
 WX_UNICODE=yes
 .endif
 
@@ -137,14 +127,14 @@ post-patch:
 		${WRKSRC}/utils/acc/strlist.c
 
 post-configure:
-.if defined(WITH_LAUNCHER)
+.if ${PORT_OPTIONS:MLAUNCHER}
 	@${REINPLACE_CMD} -e 's/-pthread;-D_THREAD_SAFE //; \
 			s/-isystem /-I/g' \
 		${WRKSRC}/utils/vlaunch/CMakeFiles/vlaunch.dir/flags.make
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/vavoom.txt ${DOCSDIR}
 .endif
@@ -154,4 +144,4 @@ post-install:
 
 .include "${PORTSDIR}/games/doom-data/Makefile.include"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/wolf3d/Makefile b/games/wolf3d/Makefile
index c0cc0eccbbdb..1f3282b6d976 100644
--- a/games/wolf3d/Makefile
+++ b/games/wolf3d/Makefile
@@ -20,9 +20,10 @@ COMMENT=	"Wolfenstein 3D Linux" by Steven Fuller (1992)
 
 USE_SDL=	sdl
 
-OPTIONS=	WOLF_SW "Install shareware data for Wolfenstein 3D" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		SPEAR_SW "Install shareware data for Spear of Destiny" off
+OPTIONS_DEFINE=	WOLF_SW OPTIMIZED_CFLAGS SPEAR_SW DOCS
+OPTIONS_DEFAULT=	WOLF_SW OPTIMIZED_CFLAGS
+WOLF_SW_DESC=	Install shareware data for Wolfenstein 3D
+SPEAR_SW_DESC=	Install shareware data for Spear of Destiny
 
 SUB_FILES=	pkg-message wolf3d
 
@@ -34,20 +35,20 @@ WS_CF=		-DWMODE=0
 SF_CF=		-DWMODE=3
 SS_CF=		-DWMODE=2
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_WOLF_SW)
+.if ${PORT_OPTIONS:MWOLF_SW}
 DISTFILES+=	wolfdata${EXTRACT_SUFX}:sw
 PLIST_SUB+=	WOLF_SW=""
 .else
 PLIST_SUB+=	WOLF_SW="@comment "
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	OPT_CF="-O2 -fomit-frame-pointer -ffast-math -funroll-loops"
 .endif
 
-.if defined(WITH_SPEAR_SW)
+.if ${PORT_OPTIONS:MSPEAR_SW}
 DISTFILES+=	speardata${EXTRACT_SUFX}:sw
 PLIST_SUB+=	SPEAR_SW=""
 .else
@@ -55,7 +56,7 @@ PLIST_SUB+=	SPEAR_SW="@comment "
 .endif
 
 post-extract:
-.if defined(WITH_SPEAR_SW)
+.if ${PORT_OPTIONS:MSPEAR_SW}
 	@${MV} ${WRKDIR}/audit.sdm ${WRKDIR}/audiot.sdm
 .endif
 
@@ -74,14 +75,14 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/wolf3d ${PREFIX}/bin/wolf3d
 
 	${MKDIR} ${DATADIR}
-.if !defined(WITHOUT_WOLF_SW)
+.if ${PORT_OPTIONS:MWOLF_SW}
 	${INSTALL_DATA} ${WRKDIR}/wolfdata/* ${DATADIR}
 .endif
-.if defined(WITH_SPEAR_SW)
+.if ${PORT_OPTIONS:MSPEAR_SW}
 	${INSTALL_DATA} ${WRKDIR}/*.sdm ${DATADIR}
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${MKDIR} ${DOCSDIR}/docs
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}/docs
@@ -95,4 +96,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile
index 07e8c9a37e7c..60c8cadc96c0 100644
--- a/games/xpilot-ng-server/Makefile
+++ b/games/xpilot-ng-server/Makefile
@@ -48,8 +48,9 @@ MAN6=		xpilot-ng-replay.6 \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-I${LOCALBASE}/include
 
-OPTIONS=	SDL "SDL/OpenGL client" on \
-		SOUND "Sound" off
+OPTIONS_DEFINE=	SDL SOUND
+OPTIONS_DEFAULT=	SDL
+SOUND_DESC=	Enable sound support
 
 DESKTOP_ENTRIES=	"Xpilot-ng X11" "Xpilot game client program" \
 			"" "xpilot-ng-x11" "Game;ArcadeGame;" false \
@@ -57,7 +58,7 @@ DESKTOP_ENTRIES=	"Xpilot-ng X11" "Xpilot game client program" \
 			"" "xpilot-ng-xp-mapedit" "Game;ArcadeGame;" false
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PKGNAMESUFFIX} == "-server"
 post-patch:
@@ -70,7 +71,7 @@ post-patch:
 		's| fonts||; s| textures||; s| shipshapes\.txt||' \
 		${WRKSRC}/lib/Makefile.in
 .else		# client
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	image sdl ttf
 USE_GL=		yes
 PLIST_SUB+=	SDL=""
@@ -82,7 +83,7 @@ CONFIGURE_ARGS+=--disable-sdl-client
 PLIST_SUB+=	SDL="@comment "
 .endif
 
-.if defined(WITH_SOUND)
+.if ${PORT_OPTIONS:MSOUND}
 USE_OPENAL=	al alut
 CONFIGURE_ARGS+=--enable-sound
 CPPFLAGS+=	${PTHREAD_CFLAGS}
@@ -100,10 +101,10 @@ post-patch:
 		's| maps||; s|defaults\.txt password\.txt robots\.txt||' \
 		${WRKSRC}/lib/Makefile.in
 	@${REINPLACE_CMD} -e 's| server||' ${WRKSRC}/src/Makefile.in
-.if defined(WITHOUT_SDL)
+.if empty(PORT_OPTIONS:MSDL)
 	@${REINPLACE_CMD} -e 's|xpilot-ng-sdl\.man||' \
 		${WRKSRC}/doc/man/Makefile.in
 .endif
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 9ee13ab917da..390cac99eff7 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -22,13 +22,13 @@ WANT_GNOME=	yes
 
 MAN6=		xpuyopuyo.6
 
-OPTIONS=	MIKMOD "libmikmod support" off \
-		ROTATE_FIXED "Fix position of one blob during rotation"	off \
-		AIBREED "Allow AI breeding" off
+OPTIONS_DEFINE=	MIKMOD ROTATE_FIXED AIBREED
+ROTATE_FIXED_DESC=	Fix position of one blob during rotation
+AIBREED_DESC=	Allow AI breeding
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MIKMOD) || exists(${LOCALBASE}/lib/libmikmod.a)
+.if ${PORT_OPTIONS:MMIKMOD} || exists(${LOCALBASE}/lib/libmikmod.a)
 LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
 CONFIGURE_ARGS+=--with-libmikmod-prefix=${LOCALBASE}
 .endif
@@ -40,10 +40,10 @@ PKGNAMESUFFIX=	-gnome
 CONFIGURE_ARGS+=	--without-gnome
 .endif
 
-.if defined(WITH_ROTATE_FIXED)
+.if ${PORT_OPTIONS:MROTATE_FIXED}
 CONFIGURE_ARGS+=--enable-rotate-fixed
 .endif
-.if defined(WITH_AIBREED)
+.if ${PORT_OPTIONS:MAIBREED}
 CONFIGURE_ARGS+=--enable-aibreed
 .endif
 
diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index 1db1b9f15b88..d87a85ac7554 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Multiplayer tank shoot-em-up
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS=	MIKMOD "Enable libmikmod support" on
+OPTIONS_DEFINE=	MIKMOD
+OPTIONS_DEFAULT=	MIKMOD
 
 USE_GNOME=	gtk20
 USE_PERL5=	yes
@@ -29,11 +30,11 @@ MAN6=		xscorch.6
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_MIKMOD)
-CONFIGURE_ARGS+=--disable-sound
-.else
+.if ${PORT_OPTIONS:MMIKMOD}
 LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
 CONFIGURE_ARGS+=--with-libmikmod-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--disable-sound
 .endif
 
 .include <bsd.port.mk>