Convert to new options framework

13 files changed, 109 insertions, 108 deletions

diff --git a/audio/xmms-eq/Makefile b/audio/xmms-eq/Makefile
index c30246f91d36..cac6c6e359d8 100644
--- a/audio/xmms-eq/Makefile
+++ b/audio/xmms-eq/Makefile
@@ -25,21 +25,22 @@ GNU_CONFIGURE=	yes
 PLIST_FILES=	lib/xmms/Effect/libeq.la \
 		lib/xmms/Effect/libeq.so
 
-OPTIONS=	BENCHMARK "Enable counting the cycles used by the IIR" off \
-		EXT_INS "Use MMX/SSE/SSE2 instructions if available" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on
+OPTIONS_DEFINE=	BENCHMARK EXT_INS OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	EXT_INS OPTIMIZED_CFLAGS
+BENCHMARK_DESC=	Enable counting the cycles used by the IIR
+EXT_INS_DESC=	Use MMX/SSE/SSE2 instructions if available
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_BENCHMARK)
+.if ${PORT_OPTIONS:MBENCHMARK}
 CONFIGURE_ARGS+=	--enable-benchmark
 .endif
 
-.if defined(WITHOUT_EXT_INS) || defined(PACKAGE_BUILDING)
+.if empty(PORT_OPTIONS:MEXT_INS) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--disable-autodetect
 .endif
 
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3||g; \
 		s|-fomit-frame-pointer||g; \
@@ -53,4 +54,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile
index 0b9e049250ad..398c5c58c705 100644
--- a/audio/yammi/Makefile
+++ b/audio/yammi/Makefile
@@ -17,7 +17,8 @@ COMMENT=	A QT-based music manager with fuzzy search
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 		tag.1:${PORTSDIR}/audio/taglib
 
-OPTIONS=	XMMS "XMMS backend support" off
+OPTIONS_DEFINE=	XMMS
+XMMS_DESC=	XMMS backend support
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
@@ -25,9 +26,9 @@ USE_AUTOTOOLS=	autoconf:env automake:env libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gstreamer
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_XMMS)
+.if ${PORT_OPTIONS:MXMMS}
 CONFIGURE_ARGS+=--enable-xmms
 BUILD_DEPENDS+=	xmms-config:${PORTSDIR}/multimedia/xmms
 LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
@@ -47,4 +48,4 @@ pre-configure:
 	@cd ${WRKSRC}/admin && ${RM} -f ltmain.sh && ${CP} -f ${LTMAIN} .
 	@cd ${WRKSRC} && ${GMAKE} -f admin/Makefile.common
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/benchmarks/mdtest/Makefile b/benchmarks/mdtest/Makefile
index e557fead1426..b82e6e566b8f 100644
--- a/benchmarks/mdtest/Makefile
+++ b/benchmarks/mdtest/Makefile
@@ -16,7 +16,8 @@ COMMENT=	A filesystem metadata benchmark utility
 
 LICENSE=	GPLv2
 
-OPTIONS=	OPENMPI "Use openmpi instead of mpich2" off
+OPTIONS_DEFINE=	OPENMPI EXAMPLES
+OPENMPI_DESC=	Use openmpi instead of mpich2
 
 MAN1=		${PORTNAME}.1
 PORTEXAMPLES=	*
@@ -24,9 +25,9 @@ PLIST_FILES=	bin/${PORTNAME}
 
 CFLAGS+=	-DDarwin
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_OPENMPI)
+.if ${PORT_OPTIONS:MOPENMPI}
 BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi
 RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
 MPICC=		${LOCALBASE}/mpi/openmpi/bin/mpicc
@@ -42,9 +43,9 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@(cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile
index 63269bc056f3..0fa7d496a8ae 100644
--- a/benchmarks/postal/Makefile
+++ b/benchmarks/postal/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Benchmark SMTP/POP servers
 
 LICENSE=	GPLv3
 
-OPTIONS=	SSL "Build with OpenSSL support" on
+OPTIONS_DEFINE=	SSL
+OPTIONS_DEFAULT=	SSL
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
@@ -29,15 +30,15 @@ PLIST_FILES=	sbin/bhm sbin/postal bin/postal-list sbin/rabid
 MAN1=	postal-list.1
 MAN8=	bhm.8 postal.8 rabid.8
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 CONFIGURE_ARGS=	--disable-gnutls
 
-.if !defined(WITH_SSL)
+.if empty(PORT_OPTIONS:MSSL)
 CONFIGURE_ARGS+=	--disable-openssl
 .endif
 
 CFLAGS+=	${PTHREAD_CFLAGS} -Wno-long-long
 LDFLAGS+=	${PTHREAD_LIBS}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile
index c7be93c5ecc2..625ff29cb412 100644
--- a/benchmarks/sysbench/Makefile
+++ b/benchmarks/sysbench/Makefile
@@ -19,26 +19,26 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_AUTOTOOLS=	libtool
 
-OPTIONS=	LARGEFILE "Enable Largefile support" on \
-		MYSQL "Enable MySQL support" on \
-		POSTGRESQL "Enable PostgreSQL support" off
+OPTIONS_DEFINE=	LARGEFILE MYSQL PGSQL DOCS
+OTPIONS_DEFAULT=	LARGEFILE MYSQL
+LARGEFILE_DESC=	Enable Largefile support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_LARGEFILE)
-CONFIGURE_ARGS+=	--disable-largefile
-.else
+.if ${PORT_OPTIONS:MLARGEFILE}
 CONFIGURE_ARGS+=	--enable-largefile
+.else
+CONFIGURE_ARGS+=	--disable-largefile
 .endif
 
-.if defined(WITHOUT_MYSQL)
-CONFIGURE_ARGS+=	--with-mysql=no
-.else
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql
+.else
+CONFIGURE_ARGS+=	--with-mysql=no
 .endif
 
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPOSTGRESQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-pgsql
 .else
@@ -49,10 +49,10 @@ post-configure:
 	@${REINPLACE_CMD} -e 's/^program_transform_name/#/' \
 		${WRKSRC}/Makefile ${WRKSRC}/sysbench/Makefile
 
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${RM} ${DOCSDIR}/manual.html
 	${RMDIR} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index e8a8572c3183..2431fdf6d412 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -15,7 +15,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical signal trace waveform viewer
 
-OPTIONS=	EMACS "Install Emacs supplimentary files" on
+OPTIONS_DEFINE=	EMACS
+OPTIONS_DEFAULT=	EMACS
+EMACS_DESC=	Install Emacs supplimentary files
 
 GNU_CONFIGURE=	yes
 USE_MOTIF=	yes
@@ -30,8 +32,8 @@ ELFILES=	dinotrace.el sim-log.el
 EMACSLISPDIR=	${PREFIX}/share/emacs/site-lisp
 XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
 
-.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_EMACS)
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MEMACS}
 RUN_DEPENDS+=	${VERILOGEL_FILE}:${PORTSDIR}/cad/verilog-mode.el
 PLIST_SUB+=	EMACS=""
 .else
@@ -39,7 +41,7 @@ PLIST_SUB+=	EMACS="@comment "
 .endif
 
 post-install:
-.if !defined(WITHOUT_EMACS)
+.if ${PORT_OPTIONS:MEMACS}
 	${MKDIR} ${DATADIR}/
 	${MKDIR} ${XEMACSLISPDIR}
 . for FILE in ${ELFILES}
@@ -50,4 +52,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile
index 08458e983f9b..1a4d357da64c 100644
--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@@ -29,50 +29,45 @@ SUB_LIST+=	LIBFILES="${LIBFILES}" \
 		JARFILE="${JARFILE}"
 SUB_FILES=	electric-ng
 
-OPTIONS=	BSH	"Enable embedded java interpreter via BSH"	off \
-		3D	"Enable 3D visualization via Java3D"		off \
-		IRSIM	"Install IRSIM plugin"				off \
-		ANIM	"Install 3D animation plugin"			off \
-		AXIS	"Install 3D Axis Controller plugin"		off \
-		RUSSIAN	"Install Russian manual"			off
+OPTIONS_DEFINE=	BSH 3D IRSIM ANIM AXIS RUSSIAN
+BSH_DESC=	Enable embedded java interpreter via BSH
+3D_DESC=	Enable 3D visualization via Java3D
+IRSIM_DESC=	Install IRSIM plugin
+ANIM_DESC=	Install 3D animation plugin
+AXIS_DESC=	Install 3D Axis Controller plugin
+RUSSIAN_DESC=	Install Russian manual
 
 JARFILE=	${DISTNAME}${EXTRACT_SUFX}
 J3DLIB=		${LOCALBASE}/share/java/java3d/jar/j3dcore.jar
 PLUGINDIR=	${PREFIX}/libexec/electric/
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if exists(${JAVALIBDIR}/bsh.jar)
-WITH_BSH=	yes
-.endif
-.if defined(WITH_BSH)
+.if ${PORT_OPTIONS:MBSH} || exists(${JAVALIBDIR}/bsh.jar)
 RUN_DEPENDS+=	${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh
 LIBFILES+=	${JAVALIBDIR}/bsh.jar
 .endif
 
-.if defined(WITH_AXIS)
+.if ${PORT_OPTIONS:MAXIS}
 WITH_3D=	yes
 PLUGINS+=	electricJava3D-8.11
 .endif
 
-.if defined(WITH_ANIM)
+.if ${PORT_OPTIONS:MANIM}
 WITH_3D=	yes
 RUN_DEPENDS+=	${JAVALIBDIR}/jmf.jar:${PORTSDIR}/java/jmf
 PLUGINS+=	electricJMF-8.11
 .endif
 
-.if exists(${J3DLIB})
-WITH_3D=	yes
-.endif
-.if defined(WITH_3D)
+.if ${PORT_OPTIONS:M3D} || exists(${J3DLIB})
 RUN_DEPENDS+=	${J3DLIB}:${PORTSDIR}/java/java3d
 .endif
 
-.if defined(WITH_IRSIM)
+.if ${PORT_OPTIONS:MIRSIM}
 PLUGINS+=	electricIRSIM-8.11
 .endif
 
-.if defined(WITH_RUSSIAN)
+.if ${PORT_OPTIONS:MRUSSIAN}
 PLUGINS+=	electricRussianManual-8.11
 .endif
 
@@ -93,4 +88,4 @@ do-install:
 	${INSTALL_DATA} ${PLUGINS:S,^,${DISTDIR}/,:S,$,.jar,} ${PLUGINDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/electric/Makefile b/cad/electric/Makefile
index 93c257bd2c2a..107b36ed4af9 100644
--- a/cad/electric/Makefile
+++ b/cad/electric/Makefile
@@ -18,14 +18,14 @@ COMMENT=	A sophisticated electrical CAD system
 
 GNU_CONFIGURE=	yes
 
-OPTIONS=	QT	"Use QT gui (instead of Motif)" off \
-		T1LIB	"Use T1lib Type1 font library" on \
-		NLS	"Build with internationalization support" on \
-		OPT	"Build with optimized CFLAGS" off
+OPTIONS_DEFINE=	QT3 T1LIB NLS OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	T1LIB
+QT3_DESC=	Use QT gui (instead of Motif)
+T1LIB_DESC=	Use T1lib Type1 font library
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_QT)
+.if ${PORT_OPTIONS:MQT3}
 LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
 FEATURES+=	QT
 .else
@@ -33,17 +33,17 @@ USE_MOTIF=	yes
 FEATURES+=	MOTIF
 .endif
 
-.if !defined(WITHOUT_T1LIB)
+.if ${PORT_OPTIONS:MT1LIB}
 LIB_DEPENDS+=	t1.5:${PORTSDIR}/devel/t1lib
 FEATURES+=	T1LIB
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 FEATURES+=	INT
 .endif
 
-.if defined(WITH_OPT)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 FEATURES+=	OPT
 .endif
 
@@ -66,4 +66,4 @@ post-patch:
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/electric
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 0b01c3bf44af..aef5e98c0c8d 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -26,14 +26,14 @@ RUN_DEPENDS=	${DATADIR}/sym:${PORTSDIR}/cad/geda-symbols \
 
 NO_BUILD=	yes
 
-OPTIONS=	EXAMPLES	"Install gEDA's examples"	on \
-		DOCS		"Install gEDA's documentation"	on
+OPTIONS_DEFINE=	EXAMPLES DOCS
 
-.if !defined(WITHOUT_EXAMPLES)
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MEXAMPLES}
 RUN_DEPENDS+=	${EXAMPLESDIR}/README:${PORTSDIR}/cad/geda-examples
 .endif
 
-.if !defined(WITHOUT_DOCS)
+.if ${PORT_OPTIONS:MDOCS}
 RUN_DEPENDS+=	${DOCSDIR}/gedadocs.html:${PORTSDIR}/cad/geda-docs
 .endif
 
diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index 87b940e4ffe1..1f02f5e27be3 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -20,8 +20,10 @@ LICENSE_FILE=	${WRKSRC}/License
 
 RUN_DEPENDS=	gwave:${PORTSDIR}/cad/gwave
 
-OPTIONS=	NGSPICE "Use ng-spice as backend" on \
-		GNUCAP "Use gnucap as backend" off
+OPTIONS_DEFINE=	NGSPICE GNUCAP EXAMPLES DOCS
+OPTIONS_DEFAULT=	NGSPICE
+NGSPICE_DESC=	Use ng-spice as backend
+GNUCAP_DESC=	Use gnucap as backend
 
 USE_WX=		2.6+
 WX_UNICODE=	yes
@@ -34,13 +36,13 @@ PORTDOCS=	*
 PORTEXAMPLES=	*
 PLIST_FILES=	bin/gspiceui
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NGSPICE)
+.if ${PORT_OPTIONS:MNGSPICE}
 RUN_DEPENDS+=	ngspice:${PORTSDIR}/cad/ngspice_rework
 .endif
 
-.if defined(WITH_GNUCAP)
+.if ${PORT_OPTIONS:MGNUCAP}
 RUN_DEPENDS+=	gnucap:${PORTSDIR}/cad/gnucap
 .endif
 
@@ -56,14 +58,14 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/gspiceui ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/gspiceui.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONs:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for dir in html
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DOCSDIR} \
 		"! -name Makefile")
 .endfor
 .endif
-.if !defined(WITHOUT_EXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 .for dir in lib sch
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${EXAMPLESDIR} \
@@ -71,4 +73,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index 2f44e5032277..f19c4ef0dde3 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -23,9 +23,9 @@ USE_GMAKE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-OPTIONS=	PLOTUTILS "Use GNU plotutils for plotting" off \
-		GNUPLOT "Use gnuplot for plotting" on \
-		EXAMPLES "Install example spice files" off
+OPTIONS_DEFINE=	PLOTUTILS GNUPLOT EXAMPLES
+OPTIONS_DEFAULT=	GNUPLOT
+PLOTUTILS_DESC=	Enable plotting using plotutils
 
 DOCFILES=	Guile.notes \
 		gwave-concepts.txt \
@@ -38,25 +38,25 @@ DOCFILES=	Guile.notes \
 
 MAN1=		sp2sp.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PLOTUTILS)
+.if ${PORT_OPTIONS:MPLOTUTILS}
 RUN_DEPENDS+=	graph:${PORTSDIR}/graphics/plotutils
 .endif
 
-.if !defined(WITHOUT_GNUPLOT)
+.if ${PORT_OPTIONS:MGNUPLOT}
 RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
 .endfor
 .endif
 
-.if defined(WITH_EXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 PLIST_SUB+=	EXAMPLES=""
@@ -64,4 +64,4 @@ PLIST_SUB+=	EXAMPLES=""
 PLIST_SUB+=	EXAMPLES="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/irsim/Makefile b/cad/irsim/Makefile
index b2078876af48..8643e5d51b9e 100644
--- a/cad/irsim/Makefile
+++ b/cad/irsim/Makefile
@@ -25,8 +25,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	PIC_CFLAGS="-fpic" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-OPTIONS=	SCHEME	"Enable built-in Scheme interpreter" on \
-		TCL	"Enable built-in  Tcl interpreter" off
+OPTIONS_SINGLE=	INTERPRETER
+OPTIONS_SINGLE_INTERPRETER=	TCL SCHEME
+OPTIONS_DEFAULT=	SCHEME
+SCHEME_DESC=	Enable built-in Scheme interpreter
+TCL_DESC=	Enable built-in Tcl interpreter
 
 MAN1=		irsim.1
 MAN3=		irsim-analyzer.3
@@ -34,15 +37,9 @@ MAN5=		netchange.5
 
 TK_VER=		8.4
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_TCL) && !defined(WITHOUT_SCHEME)
-IGNORE=		you should select only one interpreter
-.elif !defined(WITH_TCL) && defined(WITHOUT_SCHEME)
-IGNORE=		you should select at least one interpreter
-.endif
-
-.if defined(WITH_TCL)
+.if ${PORT_OPTIONS:MTCL}
 LIB_DEPENDS+=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
 			--with-tk=${LOCALBASE}/lib/tk${TK_VER} \
@@ -56,11 +53,11 @@ PLIST_SUB+=	TCL=""
 PLIST_SUB+=	TCL="@comment "
 .endif
 
-.if !defined(WITHOUT_SCHEME)
+.if ${PORT_OPTIONS:MSCHEME}
 CONFIGURE_ARGS+=	--with-interpreter=scheme
 PLIST_SUB+=	SCHEME=""
 .else
 PLIST_SUB+=	SCHEME="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/jspice3/Makefile b/cad/jspice3/Makefile
index 57b29a7b9237..861bc8c39f3c 100644
--- a/cad/jspice3/Makefile
+++ b/cad/jspice3/Makefile
@@ -18,12 +18,13 @@ COMMENT=	An adaptation of the Berkeley Spice3f4 with superconductivity
 
 CONFLICTS=	spice-[0-9]*
 
-OPTIONS=	X "Use X window system" on
+OPTIONS_DEFINE=	X11 EXAMPLES
+OPTIONS_DEFAULT=	X11
 WRKSRC=		${WRKDIR}/${PORTNAME}-2.5
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_X)
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11 xaw xt
 .endif
 
@@ -31,7 +32,7 @@ pre-configure:
 	@${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+g ;	\
 	 s+-O -g+${CFLAGS}+g;' \
 		${WRKSRC}/conf/unixconf/mkheader.0
-.if !defined(WITHOUT_X)
+.if ${PORT_OPTIONS:MX11}
 	@${REINPLACE_CMD} -e 's+#%%WITH_X%%++g' 		\
 		${WRKSRC}/conf/unixconf/mkheader.0
 .else
@@ -45,10 +46,10 @@ do-install:
 	@(cd ${WRKSRC}/src/bin;${SETENV} ${MAKE_ENV} ${MAKE} install)
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MV} ${PREFIX}/lib/jspice3/examples ${EXAMPLESDIR}
 .else
 	${RM} -R ${PREFIX}/lib/jspice3/examples
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>