6 files changed, 34 insertions, 33 deletions

diff --git a/emulators/advancemame/Makefile b/emulators/advancemame/Makefile
index 7e6e0164b5de..214cad405c22 100644
--- a/emulators/advancemame/Makefile
+++ b/emulators/advancemame/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-idirafter ${LOCALBASE}/include
 
-OPTIONS=	FREETYPE "Enable FreeType2 support" off \
-		SLANG "Enable sLang support (for video driver)" off
+OPTIONS_DEFINE=	FREETYPE SLANG DOCS
+SLANG_DESC=	Enable sLang support (for video driver)
 
 MAN1=		advdev.1 advj.1 advk.1 advm.1 advmame.1 advs.1
 
@@ -37,13 +37,13 @@ BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 BROKEN=		Does not compile on powerpc
 .endif
 
-.if defined(WITH_FREETYPE)
+.if ${PORT_OPTIONS:MFREETYPE}
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 .else
 CONFIGURE_ARGS+=--disable-freetype
 .endif
 
-.if defined(WITH_SLANG)
+.if ${PORT_OPTIONS:MSLANG}
 LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
 .else
 CONFIGURE_ARGS+=--disable-slang
@@ -52,7 +52,7 @@ CONFIGURE_ARGS+=--disable-slang
 post-patch:
 	@${REINPLACE_CMD} -Ee 's|^(pkg.*)/advance|\1/${PORTNAME}|' \
 		${WRKSRC}/advance/advance.mak
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/pkgdocdir/d' ${WRKSRC}/advance/advance.mak
 .endif
 
diff --git a/emulators/advancemenu/Makefile b/emulators/advancemenu/Makefile
index e49737656292..6c86df379023 100644
--- a/emulators/advancemenu/Makefile
+++ b/emulators/advancemenu/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	FREETYPE "Enable FreeType2 support" off \
-		SLANG "Enable sLang support (for video driver)" off
+OPTIONS_DEFINE=	FREETYPE SLANG DOCS
+SLANG_DESC=	Enable sLang support (for video driver)
 
 MAN1=		advmenu.1
 
@@ -34,13 +34,13 @@ MAN1=		advmenu.1
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
-.if defined(WITH_FREETYPE)
+.if ${PORT_OPTIONS:MFREETYPE}
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 .else
 CONFIGURE_ARGS+=--disable-freetype
 .endif
 
-.if defined(WITH_SLANG)
+.if ${PORT_OPTIONS:MSLANG}
 LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
 .else
 CONFIGURE_ARGS+=--disable-slang
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=--disable-slang
 post-patch:
 	@${REINPLACE_CMD} -Ee 's|^(pkg.*)/advance|\1/${PORTNAME}|; /pkgdir/d' \
 		${WRKSRC}/advance/advance.mak
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/pkgdocdir/d' ${WRKSRC}/advance/advance.mak
 .endif
 
diff --git a/emulators/advancemess/Makefile b/emulators/advancemess/Makefile
index 92205cb8b5d0..e96adb741aea 100644
--- a/emulators/advancemess/Makefile
+++ b/emulators/advancemess/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-idirafter ${LOCALBASE}/include
 
-OPTIONS=	FREETYPE "Enable FreeType2 support" off \
-		SLANG "Enable sLang support (for video driver)" off
+OPTIONS_DEFINE=	FREETYPE SLANG
+SLANG_DESC=	Enable sLang support (for video driver)
 
 MAN1=		advmess.1
 
@@ -34,13 +34,13 @@ MAN1=		advmess.1
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
-.if defined(WITH_FREETYPE)
+.if ${PORT_OPTIONS:MFREETYPE}
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 .else
 CONFIGURE_ARGS+=--disable-freetype
 .endif
 
-.if defined(WITH_SLANG)
+.if ${PORT_OPTIONS:MSLANG}
 LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
 .else
 CONFIGURE_ARGS+=--disable-slang
diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile
index 6ff45127a3b4..4fffcc2a4315 100644
--- a/emulators/generator-cbiere/Makefile
+++ b/emulators/generator-cbiere/Makefile
@@ -25,9 +25,9 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk12
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS=	OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		RAZE "Use RAZE z80 emulation (only for i386)" on \
-		SDL_AUDIO "Use SDL for audio" off
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS RAZE SDL
+RAZE_DESC=	Use RAZE z80 emulation (only for i386)
+SDL_DESC=	Use SDL for audio
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/
@@ -41,18 +41,18 @@ LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if empty(PORT_OPTIONS:MOPTIIMIZED_CFLAGS)
 CONFIGURE_ARGS+=	--without-gcc
 .endif
 
-.if !defined(WITHOUT_RAZE) && ${ARCH} == "i386"
+.if ${PORT_OPTIONS:MRAZE} && ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 CONFIGURE_ARGS+=--with-raze
 .else
 CONFIGURE_ARGS+=--with-cmz80
 .endif
 
-.if defined(WITH_SDL_AUDIO)
+.if ${PORT_OPTIONS:MSDL}
 CONFIGURE_ARGS+=--with-sdl-audio
 .endif
 
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index 28b3de210c98..d9afe2e18028 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -29,28 +29,28 @@ MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS=	OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		RAZE "Use RAZE z80 emulation (only for i386)" on \
-		SDL_AUDIO "Use SDL for audio" off
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS RAZE SDL
+RAZE_DESC=	Use RAZE z80 emulation (only for i386)
+SDL_DESC=	Use SDL for audio
 
 PLIST_FILES=	bin/${PORTNAME}-gtk
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CONFIGURE_ARGS+=--with-gcc=3
 .else
 CONFIGURE_ARGS+=--without-gcc
 .endif
 
-.if !defined(WITHOUT_RAZE) && ${ARCH} == "i386"
+.if ${PORT_OPTIONS:MRAZE} && ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 CONFIGURE_ARGS+=--with-raze
 .else
 CONFIGURE_ARGS+=--with-cmz80
 .endif
 
-.if defined(WITH_SDL_AUDIO)
+.if ${PORT_OPTIONS:MSDL}
 CONFIGURE_ARGS+=--with-sdl-audio
 .endif
 
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index dcccb1bb99ac..d1e2aad796d5 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	http://pages.cs.wisc.edu/~larus/SPIM/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MIPS32 Simulator
 
-OPTIONS=	GUI "Graphical user interface" on
+OPTIONS_DEFINE=	GUI DOCS
+OPTIONS_DEFAULT=	GUI
 
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}
@@ -26,9 +27,9 @@ PORTDOCS=	cycle.ps.gz spim.ps.gz SPIM.html
 PLIST_FILES=	bin/spim %%DATADIR%%/exceptions.s
 PLIST_DIRS=	%%DATADIR%%
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_GUI)
+.if ${PORT_OPTIONS:MGUI}
 USE_XORG=	x11 xaw
 BUILD_DEPENDS+=			imake:${PORTSDIR}/devel/imake
 PLIST_FILES+=	bin/xspim
@@ -36,7 +37,7 @@ MAN1+=		xspim.1
 .endif
 
 post-build:
-.if !defined(WITHOUT_GUI)
+.if ${PORT_OPTIONS:MGUI}
 	@(cd ${WRKSRC}/xspim && ${XMKMF} && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE})
 .endif
@@ -46,11 +47,11 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/Documentation/spim.man ${MANPREFIX}/man/man1/spim.1
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/CPU/exceptions.s ${DATADIR}/exceptions.s
-.if !defined(WITHOUT_GUI)
+.if ${PORT_OPTIONS:MGUI}
 	${INSTALL_PROGRAM} ${WRKSRC}/xspim/xspim ${PREFIX}/bin/xspim
 	${INSTALL_MAN} ${WRKSRC}/Documentation/xspim.man ${MANPREFIX}/man/man1/xspim.1
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/cycle.ps ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/spim.ps ${DOCSDIR}
@@ -58,4 +59,4 @@ do-install:
 	${GZIP_CMD} ${DOCSDIR}/cycle.ps ${DOCSDIR}/spim.ps
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>