27 files changed, 273 insertions, 264 deletions

diff --git a/graphics/acidwarp/Makefile b/graphics/acidwarp/Makefile
index a1d4494e1e2c..f4426003e150 100644
--- a/graphics/acidwarp/Makefile
+++ b/graphics/acidwarp/Makefile
@@ -23,11 +23,13 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_FILES=	bin/acidwarp
 PORTDOCS=	README TODO Thanks
 
-OPTION=		SETUID "Install with setuid bit set" on
+OPTIONS_DEFINE=	SETUID DOCS
+OPTIONS_DEFAULT=	SETUID
+SETUID_DESC=	Install with setuid bit set
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_SETUID)
+.if ${PORT_OPTIONS:MSETUID}
 BINMODE=	4555
 .endif
 
@@ -36,11 +38,11 @@ post-extract:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/acidwarp ${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/graphics/ale/Makefile b/graphics/ale/Makefile
index 1de19cbc2e99..719541b88c79 100644
--- a/graphics/ale/Makefile
+++ b/graphics/ale/Makefile
@@ -15,9 +15,9 @@ MASTER_SITES=	http://auricle.dyndns.org/ALE/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Anti-Lamenessing Engine
 
-OPTIONS=	DOUBLE "64bit Data Precision Support" off \
-		FFTW3 "FFTW3 Support" on \
-		IMAGEMAGICK "ImageMagick Support" on
+OPTIONS_DEFINE=	DOUBLE FFTW3 MAGICK
+OPTIONS_DEFAULT=	FFTW3 MAGICK
+DOUBLE_DESC=	64bit Data Precision Support
 
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
@@ -38,20 +38,20 @@ PORTSCOUT=	limitw:1,even
 BROKEN=		Does not build on alpha
 .endif
 
-.if defined(WITH_DOUBLE)
+.if ${PORT_OPTIONS:MDOUBLE}
 CONFIGURE_ARGS+=	--with-colors=double --with-coords=double
 .endif
 
-.if defined(WITHOUT_FFTW3)
-CONFIGURE_ARGS+=	--without-fftw3
-.else
+.if ${PORT_OPTIONS:MFFTW3}
 LIB_DEPENDS+=	fftw3:${PORTSDIR}/math/fftw3
+.else
+CONFIGURE_ARGS+=	--without-fftw3
 .endif
 
-.if defined(WITHOUT_IMAGEMAGICK)
-CONFIGURE_ARGS+=	--without-imagemagick
-.else
+.if ${PORT_OPTIONS:MMAGICK}
 LIB_DEPENDS+=	MagickWand.5:${PORTSDIR}/graphics/ImageMagick
+.else
+CONFIGURE_ARGS+=	--without-imagemagick
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index ac3ecc3a0c72..a64b68878eab 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -25,17 +25,19 @@ CPPFLAGS+=	-I${LOCALBASE}/include/libpng15
 
 MAN1=		autotrace.1
 
-OPTIONS=	MING "Enable swf interface" off \
-		PSTOEDIT "Convert postscript to other formats" on
+OPTIONS_DEFINE=	MING PSTOEDIT
+OPTIONS_DEFAULT=	PSTOEDIT
+MING_DESC=	Enable swf interface
+PSTOEDIT_DESC=	Convert postscript to other formats
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined (WITHOUT_MING)
+.if ${PORT_OPTIONS:MSETUIDMING}
 LIB_DEPENDS+=	ming.5:${PORTSDIR}/graphics/ming
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ming
 .endif
 
-.if !defined (WITHOUT_PSTOEDIT)
+.if ${PORT_OPTIONS:MPSTOEDIT}
 LIB_DEPENDS+=	pstoedit.0:${PORTSDIR}/graphics/pstoedit
 .endif
 
@@ -44,10 +46,10 @@ post-patch:
 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
 
-.if defined (WITH_PSTOEDIT)
+.if ${PORT_OPTIONS:MPSTOEDIT}
 	@${REINPLACE_CMD} -e '/$$PSTOEDIT_CONFIG/  s|--version|--modversion| ; \
 		s|$$PSTOEDIT_CONFIG $$pstoedit_args|pkg-config pstoedit| ; \
 		/^PSTOEDIT_CONFIG=/ s|=.*$$|=pkg-config| ' ${WRKSRC}/configure
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 1e9e85c9651d..687ea4c5a644 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -35,14 +35,16 @@ PLIST_SUB=	VER=${PORTVERSION}-1
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-1
 
-OPTIONS=	OPENEXR "Use OpenEXR" on
+OPTIONS_DEFINE=	OPENEXR
+OPTIONS_DEFAULT=	OPENEXR
+OPENEXR_DESC=	Use OpenEXR
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_OPENEXR)
+.if ${PORT_OPTIONS:MOPENEXR}
 LIB_DEPENDS+=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
     		fltk.1:${PORTSDIR}/x11-toolkits/fltk
 CONFIGURE_ARGS+=	--with-openexr-prefix=${LOCALBASE}
@@ -71,4 +73,4 @@ post-patch:
 	   ${REINPLACE_CMD} -e '/^#include <FL/s|.h>$$|.H>|; /^#include "FL/s|.h"$$|.H"|; \
 	   s|fl_file_chooser.H|Fl_File_Chooser.H|g; s|#include <Fl|#include <FL|g; s|<FL/gl.H>|<FL/gl.h>|'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile
index 72d8126b7dcf..abee44163953 100644
--- a/graphics/curator/Makefile
+++ b/graphics/curator/Makefile
@@ -17,14 +17,15 @@ COMMENT=	Static Image Gallery Generator for web or CD-ROM galleries
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
-OPTIONS=	PIL "Use Python Imaging Library instead of ImageMagick" off
+OPTIONS_DEFINE=	PIL
+PIL_DESC=	Use Python Imaging Library instead of ImageMagick
 
 PLIST_FILES=	bin/curator
 MAN1=		curator.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PIL)
+.if ${PORT_OPTIONS:MPIL}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
 .else
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
@@ -33,4 +34,4 @@ RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/curator.1 ${PREFIX}/man/man1/curator.1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index 8292760c0c53..703cce7594d6 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -24,8 +24,8 @@ LIB_DEPENDS=	arc.1:${PORTSDIR}/archivers/libarc \
 		theora.0:${PORTSDIR}/multimedia/libtheora
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-OPTIONS=	SIMD "Enable x86 SIMD (MMX/SSE)" off \
-		AVCODEC "Enable libavcodec support" off
+OPTIONS_DEFINE=	SIMD AVCODEC
+AVCODEC_DESC=	Enable libavcodec support
 
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
@@ -49,7 +49,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if ${ARCH} == "i386"
 CONFIGURE_ARGS+=	--enable-spi --enable-dmo
-.if !defined(WITH_SIMD)
+.if empty(PORT_OPTIONS:MSIMD)
 CONFIGURE_ARGS+=	--disable-mmx --disable-sse
 .endif
 .endif
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=	--disable-mmx --disable-sse
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
 
-.if defined(WITH_AVCODEC)
+.if ${PORT_OPTIONS:MAVCODEC}
 LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
 PLIST_SUB+=	AVCODEC=""
 .else
diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index da44f6834684..d3c5cdb4a011 100644
--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@@ -14,9 +14,10 @@ MASTER_SITES=	http://releases.navi.cx/fyre/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Chaos map rendering system with GTK+-2 interface
 
-OPTIONS=	OPT_CFLAGS "Enable additional optimizations (x86 only)" off \
-		OPENEXR "Enable OpenEXR suport" on \
-		GNET "Enable GNet support" on
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS OPENEXR GNET DOCS
+OPTIONS_DEFAULT=	OPENEXR GNET
+OPENEXR_DESC=	Enable OpenEXR suport
+GNET_DESC=	Enable GNet support
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
@@ -30,27 +31,27 @@ MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386" && defined(WITH_OPT_CFLAGS)
+.if ${ARCH} == "i386" && !empty(PORT_OPTIONS:MOPT_CFLAGS)
 CFLAGS+=	-march=native -O3 -ffast-math -fomit-frame-pointer
 .endif
 
-.if defined(WITHOUT_OPENEXR)
-CONFIGURE_ARGS+=--disable-openexr
-.else
+.if ${PORT_OPTIONS:MOPENEXR}
 LIB_DEPENDS+=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR
+.else
+CONFIGURE_ARGS+=--disable-openexr
 .endif
 
-.if defined(WITHOUT_GNET)
-CONFIGURE_ARGS+=--disable-gnet
-.else
+.if ${PORT_OPTIONS:MGNET}
 LIB_DEPENDS+=	gnet-2.0.0:${PORTSDIR}/net/gnet2
+.else
+CONFIGURE_ARGS+=--disable-gnet
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/-O3/s|^|#|g' ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 1f3c022b0623..69c98d707cc2 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -17,7 +17,8 @@ COMMENT=	An interactive viewer for 3- and 4-D geometric objects
 NOT_FOR_ARCHS=	amd64
 NOT_FOR_ARCHS_REASON=	Segfaults on amd64
 
-OPTIONS=	MOTION_AVG "Use experimental motion averaging code" off
+OPTIONS_DEFINE=	MOTION_AVG DOCS EXAMPLES
+MOTION_AVG_DESC=	Use experimental motion averaging code
 
 USE_BZIP2=	yes
 USE_MOTIF=	yes
@@ -41,9 +42,9 @@ INFO=		geomview
 # Allow user to specify "make install MAPLE_LIB=foo" as geomview wants
 MAKE_ENV=	CPU=FreeBSD MAPLE_LIB=${MAPLE_LIB}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MOTION_AVG)
+.if ${PORT_OPTIONS:MMOTION_AVG}
 CONFIGURE_ARGS+=	--enable-motion-averaging
 .endif
 
@@ -63,7 +64,7 @@ post-install:
 	cd ${WRKSRC}/doc && ${INSTALL_MAN} *.3gv ${MAN3PREFIX}/man/man3
 	cd ${WRKSRC}/doc && ${INSTALL_MAN} *.5gv ${MAN5PREFIX}/man/man5
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.info ${PREFIX}/${INFO_PATH}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in OOGL.m.txt README README.gvplot geomview.pdf geomview-pt_BR.pdf \
 	oogltour oogltour-pt_BR
@@ -80,10 +81,10 @@ post-install:
 		&& ${INSTALL_DATA} *.html ${DOCSDIR}/html/pt_BR
 	cd ${DOCSDIR}/html/pt_BR && ${LN} -sf ../figs .
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.c ${EXAMPLESDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.tcl ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/giftool/Makefile b/graphics/giftool/Makefile
index 6ffed97b66c2..62de15e830e2 100644
--- a/graphics/giftool/Makefile
+++ b/graphics/giftool/Makefile
@@ -21,24 +21,26 @@ NO_WRKSUBDIR=	yes
 ALL_TARGET=	giftool
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
 
-OPTIONS=	RETVALUE "Return value patch" on \
-		MALLOCSIZE "Improve malloc size" on
+OPTIONS_DEFINE=	RETVALUE MALLOCSIZE DOCS
+OPTIONS_DEFAULT=	RETVALUE MALLOCSIZE
+RETVALUE_DESC=	Return value patch
+MALLOCSIZE_DESC=	Improve malloc size
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	COPYRIGHT README
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_RETVALUE)
+.if ${PORT_OPTIONS:MRETVALUE}
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aa
 .endif
-.if defined(WITH_MALLOCSIZE)
+.if ${PORT_OPTIONS:MMALLOCSIZE}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ab
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/giftool ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
 .endif
@@ -46,4 +48,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile
index db2840d13d2f..446a6a7e077a 100644
--- a/graphics/glide3/Makefile
+++ b/graphics/glide3/Makefile
@@ -34,7 +34,8 @@ ONLY_FOR_ARCHS=		i386
 # Glide3 DOES NOT work with CFLAGS greater than -O2
 CFLAGS+=	-O
 
-OPTIONS=	VOODOO3 "Enable this if you have a Voodoo3 or Banshee card" off
+OPTIONS_DEFINE=	VOODOO3
+VOODOO3_DESC=	Enable this if you have a Voodoo3 or Banshee card
 
 .include <bsd.port.pre.mk>
 
@@ -42,7 +43,7 @@ OPTIONS=	VOODOO3 "Enable this if you have a Voodoo3 or Banshee card" off
 BROKEN=		Does not compile on recent FreeBSD-9
 .endif
 
-.if defined(WITH_VOODOO3)
+.if ${PORT_OPTIONS:MVOODOO3}
 PKGNAMESUFFIX=	-v3
 CONFIGURE_ARGS+=	--enable-fx-glide-hw=h3
 .else
diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile
index 787578966380..ec51ee43876b 100644
--- a/graphics/gmt/Makefile
+++ b/graphics/gmt/Makefile
@@ -31,50 +31,50 @@ USE_XORG=	x11 xaw xmu xt
 PORTDOCS=	*
 PORTDATA=	*
 
-OPTIONS=	SHARED "Build shared (dynamic) libraries" on \
-		EPS "defaults .eps, otherwise .ps" off \
-		DEBUG "Compile for debugging code" off \
-		DEVDEBUG "Extra debugging for developers" off \
-		IMPERIAL "Choose Imperial (inch) units over metric (cm)" off \
-		GDAL "Compile in experimental GDAL support" on \
-		NETCDF "With netCDF (7) support" on \
-		OCTAVE "With OCTAVE support" off
+OPTIONS_DEFINE=	SHARED EPS DEBUG IMPERIAL GDAL NETCDF OCTAVE
+OPTIONS_DEFAULT=	SHARED GDAL NETCDF
+SHARED_DESC=	Build shared (dynamic) libraries
+EPS_DESC=	defaults .eps, otherwise .ps
+IMPERIAL_DESC=	Choose Imperial (inch) units over metric (cm)
+GDAL_DESC=	Compile in experimental GDAL support
+NETCDF_DESC=	With netCDF (7) support
+OCTAVE_DESC=	With OCTAVE support
 
 .include "Makefile.man"
 .include <bsd.port.options.mk>
 
-.if defined(WITH_NETCDF)
+.if ${PORT_OPTIONS:MNETCDF}
 LIB_DEPENDS+=		netcdf:${PORTSDIR}/science/netcdf4
 CONFIGURE_ARGS+=	--enable-netcdf
 .endif
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--enable-debug --enable-devdebug
 .endif
 
-.if defined(WITH_DEVDEBUG)
+.if ${PORT_OPTIONS:MDEVDEBUG}
 CONFIGURE_ARGS+=	--enable-devdebug
 .endif
 
-.if defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
 USE_LDCONFIG=		yes
 CONFIGURE_ARGS+=	--enable-shared
 .endif
 
-.if defined(WITH_IMPERIAL)
+.if ${PORT_OPTIONS:MIMPERIAL}
 CONFIGURE_ARGS+=	--enable-US
 .endif
 
-.if defined(WITH_EPS)
+.if ${PORT_OPTIONS:MEPS}
 CONFIGURE_ARGS+=	--enable-eps
 .endif
 
-.if defined(WITH_GDAL)
+.if ${PORT_OPTIONS:MGDAL}
 LIB_DEPENDS+=		gdal.17:${PORTSDIR}/graphics/gdal
 CONFIGURE_ARGS+=	--enable-gdal
 .endif
 
-.if defined(WITH_OCTAVE)
+.if ${PORT_OPTIONS:MOCTAVE}
 RUN_DEPENDS+=		octave:${PORTSDIR}/math/octave
 CONFIGURE_ARGS+=	--enable-octave
 CONFIGURE_ARGS+=	--enable-mex
diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile
index 2ee4580f1280..8df69d4ac695 100644
--- a/graphics/grx/Makefile
+++ b/graphics/grx/Makefile
@@ -26,19 +26,16 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 ALL_TARGET=	libs
 INSTALL_TARGET=	install install-bin install-fonts install-info
 
-OPTIONS=	BGI "Enable BGI support" on \
-		BMP "Enable BMP support" on \
-		JPEG "Enable JPEG support" off \
-		PNG "Enable PNG support" on \
-		PRINT "Enable printing support" on \
-		TIFF "Enable TIFF support" off \
-		ZLIB "Enable zlib support" on
+OPTIONS_DEFINE=	BGI BMP JPEG PNG PRINT TIFF ZLIB
+OPTIONS_DEFAULT=	ZLIB BGI BMP PNG PRINT
+BGI_DESC=	Enable BGI support
+BMP_DESC=	Enable BMP support
 
 INFO=		grx
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_BGI)
+.if ${PORT_OPTIONS:MBGI}
 CONFIGURE_ARGS+=--enable-bgi
 PLIST_SUB+=	BGI=""
 .else
@@ -46,27 +43,27 @@ CONFIGURE_ARGS+=--disable-bgi
 PLIST_SUB+=	BGI="@comment "
 .endif
 
-.if defined(WITH_BMP)
+.if ${PORT_OPTIONS:MBMP}
 CONFIGURE_ARGS+=--enable-bmp
 .else
 CONFIGURE_ARGS+=--disable-bmp
 .endif
 
-.if defined(WITH_JPEG)
+.if ${PORT_OPTIONS:MJPEG}
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 CONFIGURE_ARGS+=--enable-jpeg
 .else
 CONFIGURE_ARGS+=--disable-jpeg
 .endif
 
-.if defined(WITH_PNG)
+.if ${PORT_OPTIONS:MPNG}
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 CONFIGURE_ARGS+=--enable-png
 .else
 CONFIGURE_ARGS+=--disable-png
 .endif
 
-.if defined(WITH_PRINT)
+.if ${PORT_OPTIONS:MPRINT}
 CONFIGURE_ARGS+=--enable-print
 PLIST_SUB+=	PRINT=""
 .else
@@ -74,14 +71,14 @@ CONFIGURE_ARGS+=--disable-print
 PLIST_SUB+=	PRINT="@comment "
 .endif
 
-.if defined(WITH_TIFF)
+.if ${PORT_OPTIONS:MTIFF}
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 CONFIGURE_ARGS+=--enable-tiff
 .else
 CONFIGURE_ARGS+=--disable-tiff
 .endif
 
-.if defined(WITH_ZLIB) || defined(WITH_PNG)
+.if ${PORT_OPTIONS:MZLIB} || !empty(PORT_OPTIONS:MPNG)
 CONFIGURE_ARGS+=--enable-zlib
 .else
 CONFIGURE_ARGS+=--disable-zlib
@@ -108,4 +105,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|' -e 's|lib64|lib|' \
 		 ${WRKSRC}/src/makefile.[lx]*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile
index 3ad546c9b8ee..29c68030bc82 100644
--- a/graphics/ida/Makefile
+++ b/graphics/ida/Makefile
@@ -21,12 +21,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		exif.12:${PORTSDIR}/graphics/libexif
 
-OPTIONS=	GIF "Enable GIF support" on \
-		PCD "Enable PhotoCD support" off \
-		PNG "Enable PNG support" on \
-		SANE "Enable SANE support" off \
-		TIFF "Enable TIFF support" on \
-		WEBP "Enable WebP suport" off
+OPTIONS_DEFINE=	GIF PCF PNG SANE TIFF WEBP DOCS
+OPTIONS_DEFAULT=	GIF PNG TIFF
+PCD_DESC=	Enable PhotoCD support
+SANE_DESC=	Enable SANE support
 
 USE_MOTIF=	yes
 USE_PERL5_BUILD=yes
@@ -44,44 +42,44 @@ PLIST_FILES=	bin/exiftran bin/ida lib/X11/app-defaults/Ida
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_GIF)
-MAKE_ARGS+=	HAVE_LIBUNGIF=no
-.else
+.if ${PORT_OPTIONS:MGIF}
 LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
+.else
+MAKE_ARGS+=	HAVE_LIBUNGIF=no
 .endif
 
-.if defined(WITH_PCD)
+.if ${PORT_OPTIONS:MPCD}
 LIB_DEPENDS+=	pcd:${PORTSDIR}/graphics/libpcd
 .else
 MAKE_ARGS+=	HAVE_LIBPCD=no
 .endif
 
-.if defined(WITHOUT_PNG)
-MAKE_ARGS+=	HAVE_LIBPNG=no
-.else
+.if ${PORT_OPTIONS:MPNG}
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
+.else
+MAKE_ARGS+=	HAVE_LIBPNG=no
 .endif
 
-.if defined(WITH_SANE)
+.if ${PORT_OPTIONS:MSANE}
 LIB_DEPENDS+=	sane:${PORTSDIR}/graphics/sane-backends
 .else
 MAKE_ARGS+=	HAVE_LIBSANE=no
 .endif
 
-.if defined(WITHOUT_TIFF)
-MAKE_ARGS+=	HAVE_LIBTIFF=no
-.else
+.if ${PORT_OPTIONS:MTIFF}
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
+.else
+MAKE_ARGS+=	HAVE_LIBTIFF=no
 .endif
 
-.if defined(WITH_WEBP)
+.if ${PORT_OPTIONS:MWEBP}
 LIB_DEPENDS+=	webp:${PORTSDIR}/graphics/webp
 .else
 MAKE_ARGS+=	HAVE_LIBWEBP=no
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for a in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR}
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index 02e121885a9d..831912bc564e 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -43,11 +43,11 @@ WANT_GNOME=	yes
 USE_LDCONFIG=	yes
 MAN1=		k3d.1
 
-OPTIONS=	GNOME "Build for Gnome" off
+OPTIONS_DEFINE=	GNOME
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGNOME}
 USE_GNOME+=	libgnome
 CONFIGURE_ARGS+=--with-gnome
 PKGNAMESUFFIX=	-gnome
@@ -62,4 +62,4 @@ post-patch:
 		-e 's,/usr/local/lib,${LOCALBASE}/lib,' \
 		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 606cd98ae963..58a22fd593fa 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -42,26 +42,27 @@ MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 DO_NOT_COMPILE+=kooka kuickshow libkscan
 
-OPTIONS=	IMLIB "Build Kuickshow, a fast and versatile image viewer" off \
-		GPHOTO2 "Enable support for digital cameras" off \
-		SANE "Build Kooka, a SANE scanner frontend for KDE" off
+OPTIONS_DEFINE=	IMLIB2 GPHOTO2 SANE
+IMLIB2_DESC=	Build Kuickshow, a fast and versatile image viewer
+GPHOTO2_DESC=	Enable support for digital cameras
+SANE_DESC=	Build Kooka, a SANE scanner frontend for KDE
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_IMLIB)
+.if ${PORT_OPTIONS:MIMLIB}
 RUN_DEPENDS+=	kuickshow:${PORTSDIR}/graphics/kuickshow
-.elif defined(WITHOUT_IMLIB)
+.else
 CONFIGURE_ARGS+=--without-imlib-config
 .endif
 
-.if defined(WITH_GPHOTO2)
+.if ${PORT_OPTIONS:MGPHOTO2}
 RUN_DEPENDS+=	${LOCALBASE}/lib/kde3/kcm_kamera.la:${PORTSDIR}/graphics/kamera
-.elif defined(WITHOUT_GPHOTO2)
+.else
 CONFIGURE_ARGS+=--without-kamera
 .endif
 
-.if defined(WITH_SANE)
+.if ${PORT_OPTIONS:MSANE}
 RUN_DEPENDS+=	kooka:${PORTSDIR}/graphics/kooka
 .endif
 
diff --git a/graphics/mtpaint/Makefile b/graphics/mtpaint/Makefile
index 49a29be102b9..dd44eca98392 100644
--- a/graphics/mtpaint/Makefile
+++ b/graphics/mtpaint/Makefile
@@ -23,9 +23,9 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		gif.5:${PORTSDIR}/graphics/giflib \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-OPTIONS=	LCMS2 "Enable ICC color management support" on \
-		OPENJPEG "Enable OpenJPEG support" on \
-		NLS "Enable Native Language support" on
+OPTIONS_DEFINE=	LCMS2 OPENJPEG NLS
+OPTIONS_DEFAULT=	LCMS2 OPENJPEG
+OPENJPEG_DESC=	Enable OpenJPEG support
 
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
@@ -40,27 +40,27 @@ MAN1=		${PORTNAME}.1
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_LCMS2)
-CONFIGURE_ARGS+=nolcms
-.else
+.if ${PORT_OPTIONS:MLCMS2}
 LIB_DEPENDS+=	lcms2.2:${PORTSDIR}/graphics/lcms2
 CONFIGURE_ARGS+=lcms2
+.else
+CONFIGURE_ARGS+=nolcms
 .endif
 
-.if defined(WITHOUT_OPENJPEG)
-LIB_DEPENDS+=	jasper.4:${PORTSDIR}/graphics/jasper
-CONFIGURE_ARGS+=jasper
-.else
+.if ${PORT_OPTIONS:MOPENJPEG}
 LIB_DEPENDS+=	openjpeg.2:${PORTSDIR}/graphics/openjpeg
 CONFIGURE_ARGS+=jp2
+.else
+LIB_DEPENDS+=	jasper.4:${PORTSDIR}/graphics/jasper
+CONFIGURE_ARGS+=jasper
 .endif
 
-.if defined(WITHOUT_NLS)
-PLIST_SUB+=	NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=intl
 PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 do-install:
@@ -73,7 +73,7 @@ do-install:
 		${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.png \
 		${PREFIX}/share/pixmaps
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 .for lang in cs de es fr gl hu it ja nl pl pt pt_BR ru sk sv tl tr zh_CN zh_TW
 	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
diff --git a/graphics/pngquant/Makefile b/graphics/pngquant/Makefile
index ccb6b6c3f00c..6ccd140b97f7 100644
--- a/graphics/pngquant/Makefile
+++ b/graphics/pngquant/Makefile
@@ -20,9 +20,9 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
-OPTIONS=	OPTIMIZED_CFLAGS "Additional optimization" off \
-		OPENMP "Enable OpenMP support" off \
-		SSE2 "Enable x86 SSE2 optimization" off
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS OPENMP SSE2 DEBUG DOCS
+OPENMP_DESC=	Enable OpenMP support
+SSE2_DESC=	Enable x86 SSE2 optimization
 
 NO_WRKSUBDIR=	yes
 
@@ -40,30 +40,30 @@ PLIST_FILES=	bin/pngquant
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_DEBUG)
+.if empty(PORT_OPTIONS:MDEBUG)
 CFLAGS+=	-DNDEBUG
 .endif
 
-.if defined(WITH_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -fearly-inlining -fstrict-aliasing -ffast-math \
 		-funroll-loops -fomit-frame-pointer -fexpensive-optimizations \
 		-ffinite-math-only -funsafe-loop-optimizations -ftree-vectorize
 .endif
 
-.if defined(WITH_OPENMP)
+.if ${PORT_OPTIONS:MOPENMP}
 CFLAGS+=	${PTHREAD_CFLAGS} -fopenmp
 LDFLAGS+=	${PTHREAD_LIBS} -lgomp
 .endif
 
 # SSE2 support is always enabled on amd64
-.if defined(WITH_SSE2) && ${ARCH} == "i386"
+.if ${PORT_OPTIONS:MSSE2} && ${ARCH} == "i386"
 CFLAGS+=	-DUSE_SSE=1 -msse2
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pngquant ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/pngquant.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${DOCSDIR}
diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile
index f1999cdb0853..b7cf66d6a5c1 100644
--- a/graphics/podofo/Makefile
+++ b/graphics/podofo/Makefile
@@ -20,10 +20,9 @@ LICENSE_COMB=	multi
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
-OPTIONS=	JPEG "Enable JPEG support" on \
-		TIFF "Enable TIFF support" on \
-		PNG "Enable PNG support" on \
-		IMPOSE "Build impose tool (needs Lua)" off
+OPTIONS_DEFINE=	JPEG TIFF PNG IMPOSE
+OPTIONS_DEFAULT=	JPEG TIFF PNG
+IMPOSE_DESC=	Build impose tool (needs Lua)
 
 USE_CMAKE=	yes
 CMAKE_ARGS=	-DPODOFO_BUILD_SHARED:BOOL=TRUE \
@@ -39,22 +38,22 @@ MAN1=		podofobox.1 podofocountpages.1 podofocrop.1 \
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_JPEG)
+.if ${PORT_OPTIONS:MJPEG}
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 CMAKE_ARGS+=	-DWANT_LIBJPEG:BOOL=TRUE
 .endif
 
-.if !defined(WITHOUT_TIFF)
+.if ${PORT_OPTIONS:MTIFF}
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 CMAKE_ARGS+=	-DWANT_TIFF:BOOL=TRUE
 .endif
 
-.if !defined(WITHOUT_PNG)
+.if ${PORT_OPTIONS:MPNG}
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 CMAKE_ARGS+=	-DWANT_PNG:BOOL=TRUE
 .endif
 
-.if defined(WITH_IMPOSE)
+.if ${PORT_OPTIONS:MIMPOSE}
 USE_LUA=	5.1
 CMAKE_ARGS+=	-DWANT_LUA:BOOL=TRUE
 CPPFLAGS+=	-I${LUA_INCDIR}
diff --git a/graphics/potracegui/Makefile b/graphics/potracegui/Makefile
index d75ec18c7588..a236a8be2686 100644
--- a/graphics/potracegui/Makefile
+++ b/graphics/potracegui/Makefile
@@ -21,16 +21,18 @@ USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
-OPTIONS=	POTRACE "potrace backend" on \
-		AUTOTRACE "Autotrace backend" on
+OPTIONS_DEFINE=	POTRACE AUTOTRACE
+OPTIONS_DEFAULT=	POTRACE AUTOTRACE
+POTRACE_DESC=	potrace backend
+AUTOTRACE_DESC=	Autotrace backend
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_POTRACE)
+.if ${PORT_OPTIONS:MPOTRACE}
 RUN_DEPENDS+=	potrace:${PORTSDIR}/graphics/potrace
 .endif
 
-.if !defined(WITHOUT_AUTOTRACE)
+.if ${PORT_OPTIONS:MAUTOTRACE}
 RUN_DEPENDS+=	autotrace:${PORTSDIR}/graphics/autotrace
 .endif
 
@@ -39,4 +41,4 @@ post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${TOUCH}
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 7e8092e24402..473374fcd5ad 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -18,10 +18,11 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
-OPTIONS=	IMAGEMAGICK "Enable magick++ interface" on \
-		EMF "Enable emf interface" on \
-		MING "Enable swf interface" off \
-		PLOTUTILS "Enable libplot interface" on
+OPTIONS_DEFINE=	MAGICK EMF MING PLOTUTILS DOCS EXAMPLES
+OPTIONS_DEFAULT=	MAGICK EMF PLOTUTILS
+EMF_DESC=	Enable emf interface
+MING_DESC=	Enable swf interface
+PLOTUTILS_DESC=	Enable libplot interface
 
 USE_GNOME=	gnomehack pkgconfig
 USE_GHOSTSCRIPT=	yes
@@ -37,37 +38,37 @@ MAN1=		pstoedit.1
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_IMAGEMAGICK)
-CONFIGURE_ARGS+=	--without-magick
-PLIST_SUB+=	IMAGEMAGICK="@comment "
-.else
+.if ${PORT_OPTIONS:MMAGICK}
 LIB_DEPENDS+=	Magick++.5:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	IMAGEMAGICK=""
+.else
+CONFIGURE_ARGS+=	--without-magick
+PLIST_SUB+=	IMAGEMAGICK="@comment "
 .endif
 
-.if defined(WITHOUT_EMF)
-CONFIGURE_ARGS+=	--without-emf
-PLIST_SUB+=	EMF="@comment "
-.else
+.if ${PORT_OPTIONS:MEMF}
 LIB_DEPENDS+=	EMF.1:${PORTSDIR}/graphics/libemf
 CONFIGURE_ARGS+=	--with-libemf-include=${LOCALBASE}/include/libEMF
 PLIST_SUB+=	EMF=""
+.else
+CONFIGURE_ARGS+=	--without-emf
+PLIST_SUB+=	EMF="@comment "
 .endif
 
-.if defined(WITHOUT_MING)
-CONFIGURE_ARGS+=	--without-swf
-PLIST_SUB+=	MING="@comment "
-.else
+.if ${PORT_OPTIONS:MMING}
 LIB_DEPENDS+=	ming.5:${PORTSDIR}/graphics/ming
 PLIST_SUB+=	MING=""
+.else
+CONFIGURE_ARGS+=	--without-swf
+PLIST_SUB+=	MING="@comment "
 .endif
 
-.if defined(WITHOUT_PLOTUTILS)
-CONFIGURE_ARGS+=	--without-libplot
-PLIST_SUB+=	PLOTUTILS="@comment "
-.else
+.if ${PORT_OPTIONS:MPLOTUTILS}
 LIB_DEPENDS+=	plotter.4:${PORTSDIR}/graphics/plotutils
 PLIST_SUB+=	PLOTUTILS=""
+.else
+CONFIGURE_ARGS+=	--without-libplot
+PLIST_SUB+=	PLOTUTILS="@comment "
 .endif
 
 post-patch:
@@ -79,11 +80,11 @@ post-patch:
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/pstoedit.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.ps ${EXAMPLESDIR}
 .endif
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index 12e25407f3f9..a15b7435cad7 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -20,7 +20,9 @@ BUILD_DEPENDS=	${PYNUMPY} \
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
 
-OPTIONS=	TKINTER "Build with tkinter for X support" On
+OPTIONS_DEFINE=	TKINTER
+OPTIONS_DEFAULT=	TKINTER
+TKINTER_DESC=	Build with tkinter for X support
 OPTIONSFILE?=	${PORT_DBDIR}/${PORTNAME}/options
 
 USE_GL=		glut
@@ -33,7 +35,7 @@ USE_DOS2UNIX=	yes
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_TKINTER)
+.if ${PORT_OPTIONS:MTKINTER}
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 .endif
diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index f0fcc3ec5402..649ee82bc874 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -20,7 +20,8 @@ LICENSE=	ART20
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
-OPTIONS=	IMAGEMAGICK "ImageMagick graphics support" on
+OPTIONS_DEFINE=	MAGICK DOCS EXAMPLES
+OPTIONS_DEFAULT=	MAGICK
 
 USE_FORTRAN=	yes
 MAKE_ARGS=	INCDIRS="-I${LOCALBASE}/include" LIBDIRS="-L${LOCALBASE}/lib" \
@@ -41,12 +42,12 @@ FFLAGS+=	-fno-range-check -ffixed-line-length-132
 BROKEN=		Does not compile with GCC 4.2: internal compiler error
 .endif
 
-.if defined(WITHOUT_IMAGEMAGICK)
-PLIST_SUB+=	IMAGEMAGICK="@comment "
-.else
+.if ${PORT_OPTIONS:MMAGiCK}
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 CFLAGS+=	-DIMAGEPIPE
 PLIST_SUB+=	IMAGEMAGICK=""
+.else
+PLIST_SUB+=	IMAGEMAGICK="@comment "
 .endif
 
 do-install:
@@ -56,7 +57,7 @@ do-install:
 .for file in worms
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${file} ${PREFIX}/bin
 .endfor
-.if !defined(WITHOUT_IMAGEMAGICK)
+.if ${PORT_OPTIONS:MIMAGEMAGICK}
 .for file in label3d stereo3d
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${file} ${PREFIX}/bin
 .endfor
@@ -64,13 +65,13 @@ do-install:
 	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANL} ${MANLPREFIX}/man/manl
 	@${MKDIR} ${DATADIR}/materials
 	cd ${WRKSRC}/materials && ${INSTALL_DATA} * ${DATADIR}/materials
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} R3D_manual.pdf ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/html
 	cd ${WRKSRC}/html && ${INSTALL_DATA} * ${DOCSDIR}/html
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@(cd ${WRKSRC}/examples && ${TAR} --exclude "CVS" -cf - . | \
 		${TAR} -C ${EXAMPLESDIR} --unlink -xf -)
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 800d65cd95b3..0dc1249a5e7f 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -47,13 +47,14 @@ INSTALLS_ICONS=	yes
 
 RTDIR=		${PREFIX}/libdata/${PORTNAME}
 
-OPTIONS=	OPTIMIZED_CFLAGS "Use optimized CFLAGS" on \
-		OPENMP "Enable multicore processing using OpenMP" on
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS OPENMP
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS OPENMP
+OPENMP_DESC=	Enable multicore processing using OpenMP
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -ffast-math -fexpensive-optimizations \
 		-funroll-loops -msse
 CXXFLAGS+=	-O3 -ffast-math -fexpensive-optimizations \
@@ -65,7 +66,7 @@ CXXFLAGS+=	-O3 -ffast-math -fexpensive-optimizations \
 #BROKEN=		Does not compile on ia64, powerpc, or sparc64
 #.endif
 
-.if !defined(WITHOUT_OPENMP)
+.if ${PORT_OPTIONS:MOPENMP}
 CMAKE_ARGS+=	-DOPTION_OMP:BOOL=ON
 .else
 CMAKE_ARGS+=	-DOPTION_OMP:BOOL=OFF
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 978345a3b3ef..0dbf51b52d8c 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -18,8 +18,9 @@ COMMENT=	OpenGL screensaver collection
 LIB_DEPENDS=	MagickWand.5:${PORTSDIR}/graphics/ImageMagick \
 		GLC.0:${PORTSDIR}/graphics/quesoglc
 
-OPTIONS=	FREEALUT "Enable freealut support" off \
-		GLEW "Enable GLEW support" off
+OPTIONS_DEFINE=	FREEALUT GLEW
+FREEALUT_DESC=	Enable freealut support
+GLEW_DESC=	Enable GLEW support
 
 USE_BZIP2=	yes
 USE_GL=		glut
@@ -36,18 +37,18 @@ MAN1=		biof.1 busyspheres.1 colorfire.1 cyclone.1 drempels.1 \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_FREEALUT)
+.if ${PORT_OPTIONS:MFREEALUT}
 USE_OPENAL=	alut
 .else
 CONFIGURE_ARGS+=	--disable-sound
 .endif
 
-.if defined(WITH_GLEW)
+.if ${PORT_OPTIONS:MGLEW}
 USE_GL+=	glew
 .else
 CONFIGURE_ENV+=	ac_cv_header_GL_glew_h=no
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 088b5eccac05..a99ce68d269c 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -22,13 +22,12 @@ LICENSE_COMB=	dual
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
-OPTIONS=	USB "USB support" on \
-		NLS "NLS support" on \
-		GPHOTO2 "gPhoto2 support" off \
-		SNMP "SNMP support" off \
-		AVAHI "Avahi support" off \
-		IEEE1284 "libieee1284 support" off \
-		IPV6 "IPV6 support" off
+OPTIONS_DEFINE=	USB NLS GPHOTO2 SNMP AVAHI IEEE1284 IPV6 DOCS
+OPTIONS_DEFAULT=	USB
+
+USB_DESC=	USB support
+GPHOTO2_DESC=	gPhoto2 support
+IEEE1284_DESC=	libieee1284 support
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -51,31 +50,31 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include "Makefile.man"
 .include <bsd.port.pre.mk>
 
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 MAKE_ENV+=	NOPORTDOCS=1
 .endif
 
-.if defined(WITHOUT_USB)
-CONFIGURE_ARGS+=	--disable-libusb
-.else
+.if ${PORT_OPTIONS:MUSB}
 .if ${OSVERSION} < 800069
 LIB_DEPENDS+=		usb-0.1.8:${PORTSDIR}/devel/libusb
 .endif
+.else
+CONFIGURE_ARGS+=	--disable-libusb
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-translations
-PLIST_SUB+=		NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=		yes
 PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-translations
+PLIST_SUB+=		NLS="@comment "
 .endif
 
-.if defined(WITHOUT_IPV6)
+.if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if defined(WITH_GPHOTO2)
+.if ${PORT_OPTIONS:MGPHOTO2}
 LIB_DEPENDS+=		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 MAN5+=			sane-gphoto2.5
 PLIST_SUB+=		GPHOTO2=""
@@ -84,18 +83,18 @@ CONFIGURE_ARGS+=	--with-gphoto2=no
 PLIST_SUB+=		GPHOTO2="@comment "
 .endif
 
-.if defined(WITH_SNMP)
+.if ${PORT_OPTIONS:MSNMP}
 LIB_DEPENDS+=		netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
 .else
 CONFIGURE_ARGS+=	--without-snmp
 .endif
 
-.if defined(WITH_AVAHI)
+.if ${PORT_OPTIONS:MAVAHI}
 LIB_DEPENDS+=		avahi-client.3:${PORTSDIR}/net/avahi-app
 CONFIGURE_ARGS+=	--enable-avahi
 .endif
 
-.if defined(WITH_IEEE1284)
+.if ${PORT_OPTIONS:MIEEE1284}
 LIB_DEPENDS+=		ieee1284.5:${PORTSDIR}/sysutils/libieee1284
 PLIST_SUB+=		IEEE1284=""
 .else
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 3a8b124a67e6..953fbd2aeffd 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -31,23 +31,19 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAN1=		scanadf.1 xcam.1 xscanimage.1
 SUB_FILES=	pkg-message
 
-OPTIONS=	GTK1 "GTK1 support (Default is GTK2)" off \
-		GIMP "also build xscanimage as a GIMP plug-in" off
+OPTIONS_DEFINE=	GTK1 GIMP
+GTK1_DESC=	GTK1 support (Default is GTK2)
+GIMP_DESC=	also build xscanimage as a GIMP plug-in
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GTK1)
+.if ${PORT_OPTIONS:MGTK1}
 USE_GNOME+=	gtk12
 CONFIGURE_ARGS+=	--disable-gtk2
-.if defined(WITH_GIMP)
-LIB_DEPENDS+=	gimp:${PORTSDIR}/graphics/gimp1
-CONFIGURE_ARGS+=	--enable-gimp12
-.else
 CONFIGURE_ARGS+=	--disable-gimp
-.endif
 .else
 USE_GNOME+=	gtk20
-.if defined(WITH_GIMP)
+.if ${PORT_OPTIONS:MGIMP}
 LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp
 CONFIGURE_ARGS+=	--enable-gimp
 .else
@@ -58,4 +54,4 @@ CONFIGURE_ARGS+=	--disable-gimp
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index a5ea0c7513b7..d00a3988f493 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -19,18 +19,17 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
-OPTIONS=	X11 "With X11" on \
-		GLIB "With Glib" on \
-		ACR_NEMA "With Acr/Nema 2.0" on \
-		ANALYZE "With Analyze (SPM)" on \
-		CONCORDE "With Concorde __ET" on \
-		DICOM "With DICOM 3.0" on \
-		DICOM_LJPEG "With DICOM 3.0 Lossless JPEG" on \
-		ECAT "With CTI ECAT 6/7" on \
-		GIF "With GIF87a/89a" on \
-		INTERFILE "With InterFile 3.3" on \
-		INW "With INW (RUG)" on \
-		PNG "With PNG" on
+OPTIONS_DEFINE=	X11 GLIB ACR_NEMA ANALYZE CONCORDE DICOM DICOM_LJPEG ECAT GIF INTERFILE INW PNG
+OPTIONS_DEFAULT=	X11 GLIB ACR_NEMA ANALYZE CONCORDE DICOM DICOM_LJPEG ECAT GIF INTERFILE INW PNG
+GLIB_DESC=	With Glib
+ACR_NEMA_DESC=	With Acr/Nema 2.0
+ANALYZE_DESC=	With Analyze (SPM)
+CONCORDE_DESC=	With Concorde __ET
+DICOM_DESC=	With DICOM 3.0
+DICOM_LJPEG_DESC=	With DICOM 3.0 Lossless JPEG
+ECAT_DESC=	With CTI ECAT 6/7
+INTERFILE_DESC=	With InterFile 3.3
+INW_DESC=	With INW (RUG)
 
 WANT_GNOME=	yes
 USE_SUBMAKE=	yes
@@ -47,61 +46,61 @@ MAN4=	m-acr.4 m-anlz.4 m-ecat.4 m-gif.4 m-intf.4 m-inw.4
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--disable-gui
-PLIST_SUB+=	X11="@comment "
-.else
+.if ${PORT_OPTIONS:MX11}
 USE_GNOME+=	gtk20
 PLIST_SUB+=	X11=""
 MAN1+=		xmedcon.1
+.else
+CONFIGURE_ARGS+=	--disable-gui
+PLIST_SUB+=	X11="@comment "
 .endif
 
-.if defined(WITHOUT_GLIB)
-CONFIGURE_ARGS+=	--disable-glib
-.else
+.if ${PORT_OPTIONS:MGLIB}
 USE_GNOME+=	glib20
+.else
+CONFIGURE_ARGS+=	--disable-glib
 .endif
 
-.if defined(WITHOUT_ACR_NEMA) || defined(WITHOUT_DICOM)
+.if empty(PORT_OPTIONS:MACR_NEMA) || empty(PORT_OPTIONS:MDICOM)
 CONFIGURE_ARGS+=	--disable-acr
 .endif
 
-.if defined(WITHOUT_GIF)
+.if empty(PORT_OPTIONS:MGIF)
 CONFIGURE_ARGS+=	--disable-gif
 .endif
 
-.if defined(WITHOUT_INW)
+.if empty(PORT_OPTIONS:MINW)
 CONFIGURE_ARGS+=	--disable-inw
 .endif
 
-.if defined(WITHOUT_ANALYZE)
+.if empty(PORT_OPTIONS:MANALYZE)
 CONFIGURE_ARGS+=	--disable-anlz
 .endif
 
-.if defined(WITHOUT_CONCORDE)
+.if empty(PORT_OPTIONS:MCONCORDE)
 CONFIGURE_ARGS+=	--disable-conc
 .endif
 
-.if defined(WITHOUT_ECAT)
+.if empty(PORT_OPTIONS:MECAT)
 CONFIGURE_ARGS+=	--disable-ecat
 .endif
 
-.if defined(WITHOUT_INTERFILE)
+.if empty(PORT_OPTIONS:MINTERFILE)
 CONFIGURE_ARGS+=	--disable-intf
 .endif
 
-.if defined(WITHOUT_DICOM) || defined(WITHOUT_DICOM_LJPEG)
+.if empty(PORT_OPTIONS:MDICOM) || empty(PORT_OPTIONS:MDICOM_LJPEG)
 CONFIGURE_ARGS+=	--disable-dicom
 .endif
 
-.if defined(WITHOUT_DICOM_LJPEG)
+.if empty(PORT_OPTIONS:MDICOM_LJPEG)
 CONFIGURE_ARGS+=	--disable-ljpg
 .endif
 
-.if defined(WITHOUT_PNG)
-CONFIGURE_ARGS+=	--disable-png
-.else
+.if ${PORT_OPTIONS:MPNG}
 LIB_DEPENDS+=		png15:${PORTSDIR}/graphics/png
+.else
+CONFIGURE_ARGS+=	--disable-png
 .endif
 
 post-patch:
@@ -113,7 +112,7 @@ post-patch:
 		${WRKSRC}/man/Makefile.in
 
 post-install:
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 .for file in xmedcon.png xmedconrc xmedconrc.linux
 	${INSTALL_DATA} ${WRKSRC}/etc/${file} ${PREFIX}/etc
 .endfor