15 files changed, 171 insertions, 196 deletions

diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile
index 5e7daff7cd18..4da694c1b1b7 100644
--- a/archivers/squeeze/Makefile
+++ b/archivers/squeeze/Makefile
@@ -32,11 +32,11 @@ USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
 MAKE_JOB_SAFE=	yes
 
-OPTIONS=	GTKDOC "Enable GTK html documentation" off
+OPTIONS_DEFINE=		DOCS
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GTKDOC)
+.if ${PORT_OPTIONS:MDOCS}
 PLIST_SUB=	GTKDOC=""
 .else
 PLIST_SUB=	GTKDOC="@comment "
@@ -44,7 +44,7 @@ PLIST_SUB=	GTKDOC="@comment "
 
 post-patch:
 # Needed to remove gtk-doc installation
-.if !defined(WITH_GTKDOC)
+.if emty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} -e "s|docs||g" ${WRKSRC}/Makefile.in
 .endif
 
diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index 80a0849e63a2..e8dc4caf00f3 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -30,20 +30,13 @@ USE_XFCE=	configenv
 CONFIGURE_ARGS=	--enable-xdg-cache \
 		--disable-gtk-doc-html
 
-OPTIONS=	NLS "Enable Native Language Support" on \
-		APIDOCS "Install api documentation" off \
-		PIXBUF "Enable gdk-pixbuf plugin thumbnailer" on \
-		FONTS "Enable fonts plugin thumbnailer" on \
-		JPEG "Enable JPEG and EXIF plugin thumbnailer" on \
-		FFMPEG "Enable FFMPEG plugin thumbnailer" off \
-		POPPLER "Enable PDF/PS plugin thumbnailer" on \
-		GSTREAMER "Enable videos plugin thumbnailer" on \
-		ODF "Enable ODF plugin thumbnailer" on \
-		RAW "Enable RAW plugin thumbnailer" off \
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_NLS)
+OPTIONS_DEFINE=	DOCS NLS PIXBUF FONTS JPEG FFMPEG POPPLER GSTREAMER ODF RAW
+OPTIONS_DEFAULT=	PIXBUF FONTS JEPG POPPLER GSTREAMER ODF
+FONTS_DESC=	Enable fonts plugin thumbnailer
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -52,15 +45,15 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITHOUT_APIDOCS)
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.else
+.if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
+.else
+CONFIGURE_ARGS+=--without-html-dir
+PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
-.if !defined(WITHOUT_PIXBUF)
+.if ${PORT_OPTIONS:MPIXBUF}
 USE_GNOME+=	gdkpixbuf2
 CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF=""
@@ -69,7 +62,7 @@ CONFIGURE_ARGS+=--disable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF="@comment "
 .endif
 
-.if !defined(WITHOUT_FONTS)
+.if ${PORT_OPTIONS:MFONTS}
 CONFIGURE_ARGS+=--enable-font-thumbnailer
 PLIST_SUB+=	FONTS=""
 .else
@@ -77,7 +70,7 @@ CONFIGURE_ARGS+=--disable-font-thumbnailer
 PLIST_SUB+=	FONTS="@comment "
 .endif
 
-.if !defined(WITHOUT_JPEG)
+.if ${PORT_OPTIONS:MJPEG}
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		exif.12:${PORTSDIR}/graphics/exif
 CONFIGURE_ARGS+=--enable-jpeg-thumbnailer
@@ -87,7 +80,7 @@ CONFIGURE_ARGS+=--disable-jpeg-thumbnailer
 PLIST_SUB+=	JPEG="@comment "
 .endif
 
-.if !defined(WITHOUT_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
 LIB_DEPENDS+=	ffmpegthumbnailer.4:${PORTSDIR}/multimedia/ffmpegthumbnailer
 CONFIGURE_ARGS+=--enable-ffmpeg-thumbnailer
 PLIST_SUB+=	FFMPEG=""
@@ -96,7 +89,7 @@ CONFIGURE_ARGS+=--disable-ffmpeg-thumbnailer
 PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
-.if !defined(WITHOUT_POPPLER)
+.if ${PORT_OPTIONS:MPOPPLER}
 LIB_DEPENDS+=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
 CONFIGURE_ARGS+=--enable-poppler-thumbnailer
 PLIST_SUB+=	POPPLER=""
@@ -105,7 +98,7 @@ CONFIGURE_ARGS+=--disable-poppler-thumbnailer
 PLIST_SUB+=	POPPLER="@comment "
 .endif
 
-.if !defined(WITHOUT_GSTREAMER)
+.if ${PORT_OPTIONS:MGSTREAMER}
 USE_GSTREAMER=	yes
 CONFIGURE_ARGS+=--enable-gstreamer-thumbnailer
 PLIST_SUB+=	GSTREAMER=""
@@ -114,7 +107,7 @@ CONFIGURE_ARGS+=--disable-gstreamer-thumbnailer
 PLIST_SUB+=	GSTREAMER="@comment "
 .endif
 
-.if !defined(WITHOUT_ODF)
+.if ${PORT_OPTIONS:MODF}
 USE_GNOME+=	libgsf
 CONFIGURE_ARGS+=--enable-odf-thumbnailer
 PLIST_SUB+=	ODF=""
@@ -123,7 +116,7 @@ CONFIGURE_ARGS+=--disable-odf-thumbnailer
 PLIST_SUB+=	ODF="@comment "
 .endif
 
-.if defined(WITH_RAW)
+.if ${PORT_OPTIONS:MRAW}
 LIB_DEPENDS+=	openraw.6:${PORTSDIR}/graphics/libopenraw
 CONFIGURE_ARGS+=--enable-raw-thumbnailer
 PLIST_SUB+=	RAW=""
@@ -132,4 +125,4 @@ CONFIGURE_ARGS+=--disable-raw-thumbnailer
 PLIST_SUB+=	RAW="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index ab2f255895c2..035566b4567c 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -23,12 +23,11 @@ USE_XFCE=	configenv libutil
 
 CONFIGURE_ARGS+=--disable-gtk-doc-html
 
-OPTIONS=	NLS	"Enable Native Language Support"	on \
-		APIDOCS	"Install api documentation"		off
+OPTIONS_DEFINE=		DOCS NLS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -37,12 +36,12 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITHOUT_APIDOCS)
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.else
+.if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
+.else
+CONFIGURE_ARGS+=--without-html-dir
+PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index df7993eecccd..e7e55163acd9 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -16,13 +16,6 @@ COMMENT=	Xfce 4 settings application
 
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
-OPTIONS=	XKLAVIER	"Keyboard layout settings"		off \
-		XCURSOR		"Enable cursor themes support"		on \
-		XRANDR		"Enable Xrandr support"			on \
-		NOTIFY		"Enable notification support"		on \
-		NLS		"Enable Native Language Support"	on \
-		SOUND		"Enable sound control"	off
-
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -34,25 +27,29 @@ USE_XFCE=	configenv garcon libexo libmenu libutil xfconf
 USE_XORG=	inputproto x11 xi
 
 CONFIGURE_ARGS=	--enable-pluggable-dialogs \
-	--enable-gio-unix
+		--enable-gio-unix
+
+OPTIONS_DEFINE=		XKLAVIER XCURSOR XRANDR NOTIFY NLS SOUND
+OPTIONS_DEFAULT=	XCURSOR XRANDR NOTIFY NLS SOUND
+SOUND_DESC=		Enable sound control
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_XKLAVIER)
+.if ${PORT_OPTIONS:MXKLAVIER}
 LIB_DEPENDS+=	xklavier.12:${PORTSDIR}/x11/libxklavier
 CONFIGURE_ARGS+=--enable-libxklavier
 .else
 CONFIGURE_ARGS+=--disable-libxklavier
 .endif
 
-.if defined(WITH_XCURSOR)
+.if ${PORT_OPTIONS:MXCURSOR}
 USE_XORG+=	xcursor
 CONFIGURE_ARGS+=--enable-xcursor
 .else
 CONFIGURE_ARGS+=--disable-xcursor
 .endif
 
-.if defined(WITH_XRANDR)
+.if ${PORT_OPTIONS:MXRANDR}
 USE_XORG+=	xrandr
 CONFIGURE_ARGS+=--enable-xrandr
 PLIST_SUB+=	XRANDR=""
@@ -61,14 +58,14 @@ CONFIGURE_ARGS+=--disable-xrandr
 PLIST_SUB+=	XRANDR="@comment "
 .endif
 
-.if defined(WITH_NOTIFY)
+.if ${PORT_OPTIONS:MNOTIFY}
 LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--enable-libnotify
 .else
 CONFIGURE_ARGS+=--disable-libnotify
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -77,7 +74,7 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITH_SOUND)
+.if ${PORT_OPTIONS:MSOUND}
 LIB_DEPENDS+=	canberra.0:${PORTSDIR}/audio/libcanberra
 CONFIGURE_ARGS+=--enable-sound-settings
 .else
@@ -96,4 +93,4 @@ post-patch:
 post-install:
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 1fdd8d88373e..69e2c25d25b1 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -26,19 +26,18 @@ USE_LDCONFIG=	yes
 USE_XFCE=	configenv libexo libmenu libutil
 USE_XORG=	sm x11
 
-OPTIONS=	DBUS		"Enable D-BUS support"				on  \
-		NLS		"Enable Native Language Support"		on  \
-		STARTUP		"Enable startup notification support"		on  \
-		NOTIFY		"Enable mount notifications support"		on  \
-		APIDOCS		"Install api documentation"			off  \
-		PLUG_APR	"Thunar Advanced Properties plugin"		on  \
-		PLUG_APR_EXIF	"Exif support for the APR plugin"		off \
-		PLUG_SBR	"Thunar Simple Builtin Renamers plugin"		on  \
-		PLUG_SBR_PCRE	"Regular expression support for the SBR plugin"	off \
-		PLUG_TPA	"Thunar Trash Panel Applet plugin"		on  \
-		PLUG_UCA	"Thunar User Customizable Actions plugin"	on  \
-		PLUG_WALL	"Thunar Wallpaper plugin"			on \
-		GVFS		"Add support for remote access"			on
+OPTIONS_DEFINE=	 STARTUP DBUS NLS DOCS PLUG_APR PLUG_APR_EXIF PLUG_SBR PLUG_SBR_PCRE PLUG_TPA PLUG_UCA PLUG_WALL GVFS
+OPTIONS_DEFAULT= STARTUP DBUS NOTIFY PLUG_APR PLUG_SBR PLUG_SBR_PCRE PLUG_UCA PLUG_WALL GVFS
+STARTUP_DESC=	Enable startup notification support
+PLUG_APR_DESC=	Thunar Advanced Properties plugin
+PLUG_APR_EXIF_DESC=	Exif support for the APR plugin
+PLUG_PLUG_SBR_DESC=	Thunar Simple Builtin Renamers plugin
+PLUG_PLUG_SBR_PCRE_DESC=	Regular expression support for the SBR plugin
+PLUG_TPA_DESC=		Thunar Trash Panel Applet plugin
+PLUG_UCA_DESC=		Thunar User Customizable Actions plugin
+PLUG_WALL_DESC=		Thunar Wallpaper plugin
+
+.include <bsd.port.options.mk>
 
 CONFIGURE_ARGS+=	--disable-gtk-doc-html \
 		--enable-gio-unix \
@@ -46,9 +45,9 @@ CONFIGURE_ARGS+=	--disable-gtk-doc-html \
 
 MAN1=		Thunar.1
 
-.include  <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 CONFIGURE_ARGS+=--enable-dbus
 PLIST_SUB+=	WITH_DBUS=""
@@ -57,7 +56,7 @@ CONFIGURE_ARGS+=--disable-dbus
 PLIST_SUB+=	WITH_DBUS="@comment "
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -66,25 +65,25 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if !defined(WITHOUT_NOTIFY)
+.if ${PORT_OPTIONS:MNOTIFY}
 LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--enable-notifications
 .else
 CONFIGURE_ARGS+=--disable-notifications
 .endif
 
-.if defined(WITHOUT_APIDOCS)
-CONFIGURE_ARGS+=	--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.else
+.if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
+.else
+CONFIGURE_ARGS+=	--without-html-dir
+PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
-.if !defined(WITHOUT_PLUG_APR)
+.if ${PORT_OPTIONS:MPLUG_APR}
 CONFIGURE_ARGS+=--enable-apr-plugin
 PLIST_SUB+=	PLUGIN_APR=""
-.if defined(WITH_PLUG_APR_EXIF)
+.if ${PORT_OPTIONS:MPLUG_APR_EXIF}
 LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
 CONFIGURE_ARGS+=--enable-exif
 .else
@@ -95,10 +94,10 @@ CONFIGURE_ARGS+=--disable-apr-plugin --disable-exif
 PLIST_SUB+=	PLUGIN_APR="@comment "
 .endif
 
-.if !defined(WITHOUT_PLUG_SBR)
+.if ${PORT_OPTIONS:MPLUG_SBR}
 CONFIGURE_ARGS+=--enable-sbr-plugin
 PLIST_SUB+=	PLUGIN_SBR=""
-.if defined(WITH_PLUG_SBR_PCRE)
+.if ${PORT_OPTIONS:MPLUG_SBR_PCRE}
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=--enable-pcre
 .else
@@ -109,7 +108,7 @@ CONFIGURE_ARGS+=--disable-sbr-plugin --disable-pcre
 PLIST_SUB+=	PLUGIN_SBR="@comment "
 .endif
 
-.if !defined(WITHOUT_PLUG_TPA)
+.if ${PORT_OPTIONS:MPLUG_TPA}
 CONFIGURE_ARGS+=--enable-tpa-plugin
 PLIST_SUB+=	PLUGIN_TPA=""
 USE_XFCE+=	panel
@@ -118,7 +117,7 @@ CONFIGURE_ARGS+=--disable-tpa-plugin
 PLIST_SUB+=	PLUGIN_TPA="@comment "
 .endif
 
-.if !defined(WITHOUT_PLUG_UCA)
+.if ${PORT_OPTIONS:MPLUG_UCA}
 CONFIGURE_ARGS+=--enable-uca-plugin
 PLIST_SUB+=	PLUGIN_UCA=""
 .else
@@ -126,7 +125,7 @@ CONFIGURE_ARGS+=--disable-uca-plugin
 PLIST_SUB+=	PLUGIN_UCA="@comment "
 .endif
 
-.if !defined(WITHOUT_PLUG_WALL)
+.if ${PORT_OPTIONS:MPLUG_WALL}
 CONFIGURE_ARGS+=--enable-wallpaper-plugin
 PLIST_SUB+=	PLUGIN_WALL=""
 .else
@@ -134,22 +133,18 @@ CONFIGURE_ARGS+=--disable-wallpaper-plugin
 PLIST_SUB+=	PLUGIN_WALL="@comment "
 .endif
 
-.if !defined(WITHOUT_STARTUP)
+.if ${PORT_OPTIONS:MSTARTUP}
 LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 CONFIGURE_ARGS+=--enable-startup-notification
 .else
 CONFIGURE_ARGS+=--disable-startup-notification
 .endif
 
-.if defined(WITH_GVFS)
+.if ${PORT_OPTIONS:MGVFS}
 USE_GNOME+=gvfs
 .endif
 
-.if (${OSVERSION} < 701000)
-CFLAGS+=	-DHAVE_SYS_MOUNT_H
-.endif
-
 post-install:
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 6b1c228c31b9..cc9de525868f 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -28,13 +28,13 @@ USE_XORG=	sm x11
 
 CONFIGURE_ARGS+=--disable-gtk-doc-html
 
-OPTIONS=	NLS	"Enable Native Language Support"	on  \
-		STARTUP	"Use libstartup-notification"		on  \
-		APIDOCS	"Install api documentation"		off
+OPTIONS_DEFINE=		DOCS NLS STARTUP
+OPTIONS_DEFAULT=	STARTUP
+STARTUP_DESC=		Use libstartup-notification
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -43,19 +43,19 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if !defined(WITHOUT_STARTUP)
+.if ${PORT_OPTIONS:MSTARTUP}
 LIB_DEPENDS+=	startup-notification-1:${PORTSDIR}/x11/startup-notification
 CONFIGURE_ARGS+=--enable-startup-notification
 .else
 CONFIGURE_ARGS+=--disable-startup-notification
 .endif
 
-.if defined(WITHOUT_APIDOCS)
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.else
+.if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
+.else
+CONFIGURE_ARGS+=--without-html-dir
+PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 83fea8624484..480769ff284d 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -30,21 +30,22 @@ USE_XFCE=	configenv garcon libmenu libutil libexo xfconf
 CONFIGURE_ARGS+=--enable-gio-unix \
 	--enable-notifications
 
-OPTIONS=	THUNAR	"Enable thunar support"		on \
-		NLS "Enable Native Language Support" on
+OPTIONS_DEFINE=		THUNAR NLS
+OPTIONS_DEFAULT=	THUNAR NLS
+THUNAR_DESC=	Enable thunar support
 
 MAN1=		xfdesktop.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_THUNAR)
+.if ${PORT_OPTIONS:MTHUNAR}
 CONFIGURE_ARGS+=--enable-thunarx --with-file-manager-fallback=Thunar
 USE_XFCE+=	thunar
 .else
 CONFIGURE_ARGS+=--disable-thunarx --without-file-manager-fallback
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -56,4 +57,4 @@ PLIST_SUB+=	NLS="@comment "
 post-install:
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index facd6adf37bb..982e4359f05a 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -31,14 +31,13 @@ USE_XFCE=	configenv garcon libexo libmenu libutil xfconf
 USE_XORG=	x11 sm
 
 CONFIGURE_ARGS+=--enable-gio-unix \
-	--disable-gtk-doc-html
+		--disable-gtk-doc-html
 
-OPTIONS=	NLS	"Enable Native Language Support" 	on \
-		APIDOCS	"Install api documentation"		off
+OPTIONS_DEFINE=		NLS DOCS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -47,15 +46,15 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITHOUT_APIDOCS)
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.else
+.if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
+.else
+CONFIGURE_ARGS+=--without-html-dir
+PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
 post-install:
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 7189d41b931a..78d3f46dce40 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -35,14 +35,13 @@ USE_XFCE=	configenv libmenu libutil panel xfconf
 USE_XORG=	x11 sm ice
 
 CONFIGURE_ARGS+=--enable-legacy-sm \
-	--disable-libgnome-keyring \
-	--with-xsession-prefix=${LOCALBASE}
+		--disable-libgnome-keyring \
+		--with-xsession-prefix=${LOCALBASE}
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-OPTIONS=	NLS	"Enable Native Language Support"	on \
-	GNUPG "Add support of GNU Privacy Guard" off
+OPTIONS_DEFINE=	NLS GNUPG
 
 .include <bsd.port.options.mk>
 
@@ -50,7 +49,7 @@ MAN1=		xfce4-session.1 xfce4-session-logout.1
 
 PLIST_SUB=	VERSION="4.6"
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=	NLS=""
@@ -59,7 +58,7 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITH_GNUPG)
+.if ${PORT_OPTIONS:MGNUPG}
 RUN_DEPENDS+=	gpg-agent:${PORTSDIR}/security/gnupg
 .endif
 
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 045ebc14354a..a1b923049a0b 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -33,30 +33,30 @@ USE_XFCE=	configenv libmenu libutil xfconf
 USE_XORG=	x11 sm xext xrandr xrender
 DATADIR=	${PREFIX}/share/xfwm4
 
-OPTIONS=	COMPOSITE	"Support the experimental X11 Composite extension"	on \
-		STARTUP 	"Enable startup notification support"			on \
-		REVMOUSE	"Reverse mouse workspace changing direction"		off
+OPTIONS_DEFINE=		COMPOSITE NOTIFY REVMOUSE
+OPTIONS_DEFAULT=	COMPOSITE NOTIFY
+REVMOUSE_DESC=		Reverse mouse workspace changing direction
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_COMPOSITE)
+.if ${PORT_OPTIONS:MCOMPOSITE}
 CONFIGURE_ARGS+=--enable-compositor
 .else
 CONFIGURE_ARGS+=--disable-compositor
 .endif
 
-.if !defined(WITHOUT_STARTUP)
+.if ${PORT_OPTIONS:MNOTIFY}
 LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 CONFIGURE_ARGS+=--enable-startup-notification
 .else
 CONFIGURE_ARGS+=--disable-startup-notification
 .endif
 
-.if defined(WITH_REVMOUSE)
+.if ${PORT_OPTIONS:MREVMOUSE}
 EXTRA_PATCHES=	${FILESDIR}/extrapatch-src__events.c
 .endif
 
 post-install:
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 2242417db6dd..a461bc1b0829 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -15,16 +15,14 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	The "meta-port" for the Xfce 4 desktop environment
 
-OPTIONS=	ICONS		"Install a full icon theme"		on  \
-		ORAGE		"Install the Xfce calendar application"	on  \
-		MOUSEPAD	"Install the Xfce text editor"		on  \
-		TERMINAL	"Install the Xfce terminal application"	on  \
-		APPFINDER	"Install the Xfce application finder"	on  \
-		MIXER		"Install the Xfce mixer application"	off  \
-		PRINT		"Install the Xfce printing helper"	off  \
-		SQUEEZE		"Install the Xfce archiver application"	on  \
-		GDM		"Install the login manager gdm"		off \
-		NOTIFYD		"Install the Xfce notification daemon"		on
+OPTIONS_DEFINE=	ICONS ORANGE MOUSEPAD TERMINAL APPFINDER MIXER PRINT SQUEEZE GDM NOTIFYD
+OPTIONS_DEFAULT=	ICONS ORANGE MOUSEPAD TERMINAL APPFINDER SQUEEZE NOTIFYD
+ORANGE_DESC=	Install the Xfce calendar application
+MOUSEPAD_DESC=	Install the Xfce text editor
+TERMINAL_DESC=	Install the Xfce terminal application
+APPFINDER_DESC=	Install the Xfce application finder
+SQUEEZE_DESC=	Install the Xfce archiver application
+NOTIFYD_DESC=	Install the Xfce notification daemon
 
 RUN_DEPENDS=	xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \
 		xfce4-session:${PORTSDIR}/x11-wm/xfce4-session \
@@ -36,59 +34,59 @@ RUN_DEPENDS=	xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \
 NO_BUILD=	yes
 LATEST_LINK=	xfce4
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if exists(${LOCALBASE}/sbin/gdm)
 WITH_GDM=	yes
 .endif
 
-.if defined(WITH_GDM)
+.if ${PORT_OPTIONS:MGDM}
 RUN_DEPENDS+=	${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm
 PLIST_FILES=	etc/gdm/Sessions/XFce4 \
 		etc/dm/Sessions/XFce4.desktop
 PLIST_DIRS=	etc/gdm/Sessions
 .endif
 
-.if !defined(WITHOUT_ICONS)
+.if ${PORT_OPTIONS:MICONS}
 RUN_DEPENDS+=	icons-tango-extras>=0.1.0:${PORTSDIR}/x11-themes/icons-tango-extras
 .endif
 
-.if !defined(WITHOUT_ORAGE)
+.if ${PORT_OPTIONS:MORAGE}
 RUN_DEPENDS+=	orage:${PORTSDIR}/deskutils/orage
 .endif
 
-.if !defined(WITHOUT_MOUSEPAD)
+.if ${PORT_OPTIONS:MMOUSEPAD}
 RUN_DEPENDS+=	mousepad:${PORTSDIR}/editors/mousepad
 .endif
 
-.if !defined(WITHOUT_TERMINAL)
+.if ${PORT_OPTIONS:MTERMINAL}
 RUN_DEPENDS+=	Terminal:${PORTSDIR}/x11/Terminal
 .endif
 
-.if !defined(WITHOUT_APPFINDER)
+.if ${PORT_OPTIONS:MAPPFINDER}
 RUN_DEPENDS+=	xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder
 .endif
 
-.if defined(WITH_MIXER)
+.if ${PORT_OPTIONS:MMIXER}
 RUN_DEPENDS+=	${LOCALBASE}/bin/xfce4-mixer:${PORTSDIR}/audio/xfce4-mixer
 .endif
 
-.if defined(WITH_PRINT)
+.if ${PORT_OPTIONS:MPRINT}
 RUN_DEPENDS+=	xfprint4:${PORTSDIR}/print/xfce4-print
 .endif
 
-.if !defined(WITHOUT_SQUEEZE)
+.if ${PORT_OPTIONS:MSQUEEZE}
 RUN_DEPENDS+=   squeeze:${PORTSDIR}/archivers/squeeze
 .endif
 
-.if !defined(WITHOUT_NOTIFYD)
+.if ${PORT_OPTIONS:MNOTIFYD}
 RUN_DEPENDS+=	xfce4-notifyd-config:${PORTSDIR}/deskutils/xfce4-notifyd
 .endif
 
 do-install:	# empty
 
 post-install:
-.if defined(WITH_GDM)
+.if ${PORT_OPTIONS:MGDM}
 	@${TEST} -d ${PREFIX}/etc/gdm/Sessions || \
 		${MKDIR} -p ${PREFIX}/etc/gdm/Sessions
 	@${INSTALL_SCRIPT} ${FILESDIR}/XFce4 ${PREFIX}/etc/gdm/Sessions
@@ -115,4 +113,4 @@ post-install:
 	@${ECHO} "================================================================"
 
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index b6efff544d1c..efb42fb413f8 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -33,24 +33,23 @@ USE_XFCE=	configenv libmenu libutil
 USE_XORG=	x11
 
 CONFIGURE_ARGS+=--enable-gio-unix \
-	--disable-gtk-doc-html
+		--disable-gtk-doc-html
 
-OPTIONS=	APIDOCS	"Install api documentation"		off \
-		NLS	"Enable Native Language Support"	on
+OPTIONS_DEFINE=	DOCS NLS
 
 MAN1=		exo-csource.1 exo-open.1
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_APIDOCS)
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.else
+.if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
+.else
+CONFIGURE_ARGS+=--without-html-dir
+PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index a76740b8c1e6..59938edff7ef 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -25,24 +25,22 @@ USE_XFCE=	configenv libutil xfconf
 INSTALLS_ICONS=	yes
 
 CONFIGURE_ARGS=	--disable-gtk-doc-html \
-	--with-vendor-info=FreeBSD
+		--with-vendor-info=FreeBSD
 
-OPTIONS=	APIDOCS	"Install api documentation"	off \
-		NLS	"Enable Native Language Support"	on \
-		STARTUP	"Enable startup notification"	on \
-		GLADEUI	"Enable Glade interface designer support"	off
+OPTIONS_DEFINE=		DOCS NLS NOTIFY GLADE
+OPTIONS_DEFAULT=	NOTIFY
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_APIDOCS)
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.else
+.if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
+.else
+CONFIGURE_ARGS+=--without-html-dir
+PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -51,18 +49,18 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if !defined(WITHOUT_STARTUP)
+.if ${PORT_OPTIONS:MNOTIFY}
 LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 CONFIGURE_ARGS+=--enable-startup-notification
 .else
 CONFIGURE_ARGS+=--disable-startup-notification
 .endif
 
-.if !defined(WITHOUT_GLADEUI)
+.if ${PORT_OPTIONS:MGLADE}
 LIB_DEPENDS+=	gladeui-1.10:${PORTSDIR}/devel/glade3
 CONFIGURE_ARGS+=--enable-gladeui
 .else
 CONFIGURE_ARGS+=--disable-gladeui
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 63aa1a74aaa3..e9719465beaa 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -25,12 +25,11 @@ USE_XFCE=	configenv
 
 CONFIGURE_ARGS+=--disable-gtk-doc-html
 
-OPTIONS=	NLS "Enable Native Language Support" on \
-	APIDOCS "Install api documentation" off
+OPTIONS_DEFINE=		NLS DOCS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -39,12 +38,12 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITHOUT_APIDOCS)
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.else
+.if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
+.else
+CONFIGURE_ARGS+=--without-html-dir
+PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 6c35952f44f4..12b48478788e 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -28,23 +28,21 @@ USE_XORG=	x11
 
 CONFIGURE_ARGS+=--disable-gtk-doc-html
 
-OPTIONS=	APIDOCS	"Install api documentation"	off \
-		PERL	"Install Perl bindings"			off \
-		NLS	"Enable Native Language Support"	on
+OPTIONS_DEFINE=		DOCS PERL NLS
 
 MAN3PREFIX?=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_APIDOCS)
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.else
+.if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
+.else
+CONFIGURE_ARGS+=--without-html-dir
+PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 MAN3=		Xfce4::Xfconf.3
 BUILD_DEPENDS+=	p5-ExtUtils-Depends>=0.300:${PORTSDIR}/devel/p5-ExtUtils-Depends \
 		p5-ExtUtils-PkgConfig>=1.12:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
@@ -57,7 +55,7 @@ CONFIGURE_ARGS+=--disable-perl-bindings
 PLIST_SUB+=	PERLBIND="@comment "
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -66,4 +64,4 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>