Index: virtualbox-ose-devel/Makefile
===================================================================
--- virtualbox-ose-devel/Makefile	(revision 4410)
+++ virtualbox-ose-devel/Makefile	(working copy)
@@ -60,17 +60,14 @@
 VBOX_FRONTENDS=	VBoxHeadless
 VBOX_GUEST_VER=	4.1.16
 
-OPTIONS=	QT4 "Build with QT4 Frontend" on \
-		DEBUG "Build with debugging symbols" off \
-		GUESTADDITIONS "Build with Guest Additions" off \
-		DBUS "Build with D-Bus and HAL support" on \
-		PULSEAUDIO "Build with PulseAudio" off \
-		X11 "Build with X11 support" on \
-		UDPTUNNEL "Build with UDP tunnel support" on \
-		VDE "Build with VDE support" off \
-		VNC "Build with VNC support" off \
-		WEBSERVICE "Build Webservice" off \
-		NLS "Native language support" on
+OPTIONS_DEFINE=	QT4 DEBUG GUESTADDITIONS DBUS PULSEAUDIO UDPTUNNEL VDE VNC WEBSERVICE NLS X11
+OPTIONS_DEFAULT=	QT4 DBUS X11 UDPTUNNEL
+QT4_DESC=	Build with QT4 Frontend
+GUESTADDITIONS_DESC=	Build with Guest Additions
+UDPTUNNEL_DESC=	Build with UDP tunnel support
+VDE_DESC=	Build with VDE support
+VNC_DESC=	Build with VNC support
+WEBSERVICE_DESC=	Build Webservice
 
 .include <bsd.port.options.mk>
 
@@ -85,15 +82,15 @@
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 KMK_FLAGS=
 
-.if defined(WITHOUT_QT4) && !defined(WITHOUT_NLS)
+.if empty(PORT_OPTIONS:MQT4) && !empty(PORT_OPTIONS:MNLS)
 BROKEN=		NLS support requires QT4 frontend. Run 'make config' again!
 .endif
 
-.if defined(WITHOUT_X11) && !defined(WITHOUT_QT4)
+.if empty(PORT_OPTIONS_MX11) && !empty(PORT_OPTIONS:MQT4)
 BROKEN=		QT4 frontend requires X11 support. Run 'make config' again!
 .endif
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_SDL=	sdl
 USE_XORG=	xcursor xmu inputproto xinerama
 VBOX_FRONTENDS+=VBoxBFE VBoxSDL
@@ -103,7 +100,7 @@
 PLIST_SUB+=	X11="@comment "
 .endif
 
-.if !defined(WITHOUT_QT4)
+.if ${PORT_OPTIONS:MQT4}
 USE_QT_VER=	4
 QT_NONSTANDARD=	yes
 QT_COMPONENTS=	gui network moc_build uic_build rcc_build linguist
@@ -115,7 +112,7 @@
 PLIST_SUB+=	QT4="@comment "
 .endif
 
-.if defined(WITH_GUESTADDITIONS)
+.if ${PORT_OPTIONS:MGUESTADDITIONS}
 GUESTADDITIONS=	VBoxGuestAdditions_${VBOX_GUEST_VER}.iso
 GADISTFILES=	${GUESTADDITIONS}:guestadditions
 RESTRICTED=	for personal use only
@@ -126,39 +123,39 @@
 PLIST_SUB+=	GUESTADDITIONS="@comment "
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 KMK_FLAGS+=	BUILD_TYPE=debug
 .endif
 
-.if !defined(WITHOUT_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 .else
 CONFIGURE_ARGS+=--disable-dbus
 .endif
 
-.if !defined(WITH_PULSEAUDIO)
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.else
 CONFIGURE_ARGS+=--disable-pulse
-.else
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 .endif
 
-.if defined(WITH_VNC)
+.if ${PORT_OPTIONS:MVNC}
 LIB_DEPENDS+=	vncserver.0:${PORTSDIR}/net/libvncserver
 CONFIGURE_ARGS+=--enable-vnc
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITH_VDE)
+.if ${PORT_OPTIONS:MVDE}
 RUN_DEPENDS+=	vde_switch:${PORTSDIR}/net/vde2
 CONFIGURE_ARGS+=--enable-vde
 .endif
 
-.if defined(WITH_WEBSERVICE)
+.if ${PORT_OPTIONS:MWEBSERVICE}
 BUILD_DEPENDS+=	soapcpp2:${PORTSDIR}/devel/gsoap
 VBOX_WEB=	vboxwebsrv webtest
 USE_RC_SUBR+=	vboxwebsrv
@@ -215,16 +212,16 @@
 	@${ECHO} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_X11_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk
-.if defined(WITH_VNC)
+.if ${PORT_OPTIONS:MVNC}
 	@${ECHO} 'VBOX_WITH_EXTPACK_VNC = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${OSVERSION} < 800069
 	@${ECHO} 'VBOX_WITH_USB=' >> ${WRKSRC}/LocalConfig.kmk
 .endif
-.if defined(WITH_UDPTUNNEL)
+.if ${PORT_OPTIONS:MUDPTUNNEL}
 	@${ECHO} 'VBOX_WITH_UDPTUNNEL = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
-.if defined(WITH_WEBSERVICE)
+.if ${PORT_OPTIONS:MWEBSERVICE}
 	@${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> ${WRKSRC}/LocalConfig.kmk
@@ -256,7 +253,7 @@
 	${MKDIR} ${PREFIX}/lib/virtualbox
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 *.fd components VBoxExtPackHelperApp" ${PREFIX}/lib/virtualbox)
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	${MKDIR} ${DATADIR}/nls
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${DATADIR}/nls)
 .endif
@@ -275,19 +272,19 @@
 	${CHMOD} 0711 ${PREFIX}/lib/virtualbox/${f}
 .endfor
 
-.if defined(WITH_VNC)
-	${MKDIR ${PREFIX}/lib/virtualbox/ExtensionPacks
+.if ${PORT_OPTIONS:MVNC}
+	${MKDIR} ${PREFIX}/lib/virtualbox/ExtensionPacks
 	${MV} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/ExtensionPacks/VNC ${PREFIX}/lib/virtualbox/ExtensionPacks
 .endif
 
-.if defined(WITH_WEBSERVICE)
+.if ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} -p ${DATADIR}/sdk/bindings/webservice
 .for f in vboxweb.wsdl vboxwebService.wsdl
 	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/webservice/${f} ${DATADIR}/sdk/bindings/webservice/
 .endfor
 .endif
 
-.if defined(WITH_GUESTADDITIONS)
+.if ${PORT_OPTIONS:MGUESTADDITIONS}
 	${MKDIR} ${PREFIX}/lib/virtualbox/additions
 	${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/
 	${LN} -sf ${PREFIX}/lib/virtualbox/additions/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/VBoxGuestAdditions.iso
@@ -309,7 +306,7 @@
 	@${FIND} ${PREFIX}/include/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	@${FIND} ${PREFIX}/lib/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
-.if !defined(WITHOUT_QT4)
+.if ${PORT_OPTIONS:MQT4}
 	${MKDIR} ${PREFIX}/share/pixmaps/
 	${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/pixmaps/VBox.png
 	${MKDIR} ${PREFIX}/share/applications/
Index: virtualbox-ose/Makefile
===================================================================
--- virtualbox-ose/Makefile	(revision 4410)
+++ virtualbox-ose/Makefile	(working copy)
@@ -59,17 +59,14 @@
 VBOX_FRONTENDS=	VBoxHeadless
 VBOX_GUEST_VER=	${PORTVERSION}
 
-OPTIONS=	QT4 "Build with QT4 Frontend" on \
-		DEBUG "Build with debugging symbols" off \
-		GUESTADDITIONS "Build with Guest Additions" off \
-		DBUS "Build with D-Bus and HAL support" on \
-		PULSEAUDIO "Build with PulseAudio" off \
-		X11 "Build with X11 support" on \
-		UDPTUNNEL "Build with UDP tunnel support" on \
-		VDE "Build with VDE support" off \
-		VNC "Build with VNC support" off \
-		WEBSERVICE "Build Webservice" off \
-		NLS "Native language support" on
+OPTIONS_DEFINE=	QT4 DEBUG GUESTADDITIONS DBUS PULSEAUDIO UDPTUNNEL VDE VNC WEBSERVICE NLS X11
+OPTIONS_DEFAULT=	QT4 DBUS X11 UDPTUNNEL
+QT4_DESC=	Build with QT4 Frontend
+GUESTADDITIONS_DESC=	Build with Guest Additions
+UDPTUNNEL_DESC=	Build with UDP tunnel support
+VDE_DESC=	Build with VDE support
+VNC_DESC=	Build with VNC support
+WEBSERVICE_DESC=	Build Webservice
 
 .include <bsd.port.options.mk>
 
@@ -84,15 +81,15 @@
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 KMK_FLAGS=
 
-.if defined(WITHOUT_QT4) && !defined(WITHOUT_NLS)
+.if empty(PORT_OPTIONS:MQT4) && !empty(PORT_OPTIONS:MNLS)
 BROKEN=		NLS support requires QT4 frontend. Run 'make config' again!
 .endif
 
-.if defined(WITHOUT_X11) && !defined(WITHOUT_QT4)
+.if empty(PORT_OPTIONS:MX11) && !empty(PORT_OPTIONS:MQT4)
 BROKEN=		QT4 frontend requires X11 support. Run 'make config' again!
 .endif
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_SDL=	sdl
 USE_XORG=	xcursor xmu inputproto xinerama
 VBOX_FRONTENDS+=VBoxBFE VBoxSDL
@@ -102,7 +99,7 @@
 PLIST_SUB+=	X11="@comment "
 .endif
 
-.if !defined(WITHOUT_QT4)
+.if ${PORT_OPTIONS:MQT4}
 USE_QT_VER=	4
 QT_NONSTANDARD=	yes
 QT_COMPONENTS=	gui network moc_build uic_build rcc_build linguist
@@ -114,7 +111,7 @@
 PLIST_SUB+=	QT4="@comment "
 .endif
 
-.if defined(WITH_GUESTADDITIONS)
+.if ${PORT_OPTIONS:MGUESTADDITIONS}
 GUESTADDITIONS=	VBoxGuestAdditions_${VBOX_GUEST_VER}.iso
 GADISTFILES=	${GUESTADDITIONS}:guestadditions
 RESTRICTED=	for personal use only
@@ -125,39 +122,39 @@
 PLIST_SUB+=	GUESTADDITIONS="@comment "
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 KMK_FLAGS+=	BUILD_TYPE=debug
 KMK_BUILDTYPE=	debug
 .endif
 
-.if !defined(WITHOUT_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 .else
 CONFIGURE_ARGS+=--disable-dbus
 .endif
 
-.if !defined(WITH_PULSEAUDIO)
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.else
 CONFIGURE_ARGS+=--disable-pulse
-.else
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 .endif
 
-.if defined(WITH_VNC)
+.if ${PORT_OPTIONS:MVNC}
 LIB_DEPENDS+=	vncserver.0:${PORTSDIR}/net/libvncserver
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITH_VDE)
+.if ${PORT_OPTIONS:MVDE}
 RUN_DEPENDS+=	vde_switch:${PORTSDIR}/net/vde2
 CONFIGURE_ARGS+=--enable-vde
 .endif
 
-.if defined(WITH_WEBSERVICE)
+.if ${PORT_OPTIONS:MWEBSERVICE}
 BUILD_DEPENDS+=	soapcpp2:${PORTSDIR}/devel/gsoap
 VBOX_WEB=	vboxwebsrv webtest
 USE_RC_SUBR+=	vboxwebsrv
@@ -214,16 +211,16 @@
 	@${ECHO} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_X11_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk
-.if defined(WITH_VNC)
+.if ${PORT_OPTIONS:MVNC}
 	@${ECHO} 'VBOX_WITH_VNC = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${OSVERSION} < 800069
 	@${ECHO} 'VBOX_WITH_USB=' >> ${WRKSRC}/LocalConfig.kmk
 .endif
-.if defined(WITH_UDPTUNNEL)
+.if ${PORT_OPTIONS:MUDPTUNNEL}
 	@${ECHO} 'VBOX_WITH_UDPTUNNEL = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
-.if defined(WITH_WEBSERVICE)
+.if ${PORT_OPTIONS:MWEBSERVICE}
 	@${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> ${WRKSRC}/LocalConfig.kmk
@@ -255,7 +252,7 @@
 	${MKDIR} ${PREFIX}/lib/virtualbox
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 *.fd components VBoxExtPackHelperApp" ${PREFIX}/lib/virtualbox)
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	${MKDIR} ${DATADIR}/nls
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${DATADIR}/nls)
 .endif
@@ -274,14 +271,14 @@
 	${CHMOD} 0711 ${PREFIX}/lib/virtualbox/${f}
 .endfor
 
-.if defined(WITH_WEBSERVICE)
+.if ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} -p ${DATADIR}/sdk/bindings/webservice
 .for f in vboxweb.wsdl vboxwebService.wsdl
 	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/webservice/${f} ${DATADIR}/sdk/bindings/webservice/
 .endfor
 .endif
 
-.if defined(WITH_GUESTADDITIONS)
+.if ${PORT_OPTIONS:MGUESTADDITIONS}
 	${MKDIR} ${PREFIX}/lib/virtualbox/additions
 	${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/
 	${LN} -sf ${PREFIX}/lib/virtualbox/additions/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/VBoxGuestAdditions.iso
@@ -303,7 +300,7 @@
 	@${FIND} ${PREFIX}/include/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	@${FIND} ${PREFIX}/lib/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
-.if !defined(WITHOUT_QT4)
+.if ${PORT_OPTIONS:MQT4}
 	${MKDIR} ${PREFIX}/share/pixmaps/
 	${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/pixmaps/VBox.png
 	${MKDIR} ${PREFIX}/share/applications/
Index: virtualbox-ose-legacy/Makefile
===================================================================
--- virtualbox-ose-legacy/Makefile	(revision 4410)
+++ virtualbox-ose-legacy/Makefile	(working copy)
@@ -59,16 +59,14 @@
 VBOX_FRONTENDS=	VBoxHeadless
 VBOX_GUEST_VER=	${PORTVERSION}
 
-OPTIONS=	QT4 "Build with QT4 Frontend" on \
-		DEBUG "Build with debugging symbols" off \
-		GUESTADDITIONS "Build with Guest Additions" off \
-		DBUS "Build with D-Bus and HAL support" on \
-		PULSEAUDIO "Build with PulseAudio" off \
-		X11 "Build with X11 support" on \
-		VDE "Build with VDE support" off \
-		VNC "Build with VNC support" off \
-		WEBSERVICE "Build Webservice" off \
-		NLS "Native language support" on
+OPTIONS_DEFINE=	QT4 DEBUG GUESTADDITIONS DBUS PULSEAUDIO UDPTUNNEL VDE VNC WEBSERVICE NLS X11
+OPTIONS_DEFAULT=	QT4 DBUS X11 UDPTUNNEL
+QT4_DESC=	Build with QT4 Frontend
+GUESTADDITIONS_DESC=	Build with Guest Additions
+UDPTUNNEL_DESC=	Build with UDP tunnel support
+VDE_DESC=	Build with VDE support
+VNC_DESC=	Build with VNC support
+WEBSERVICE_DESC=	Build Webservice
 
 .include <bsd.port.options.mk>
 
@@ -83,15 +81,15 @@
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 KMK_FLAGS=
 
-.if defined(WITHOUT_QT4) && !defined(WITHOUT_NLS)
+.if empty(PORT_OPTIONS:MQT4) && !empty(PORT_OPTIONS:MNLS)
 BROKEN=		NLS support requires QT4 frontend. Run 'make config' again!
 .endif
 
-.if defined(WITHOUT_X11) && !defined(WITHOUT_QT4)
+.if empty(PORT_OPTIONS:MX11) && !empty(PORT_OPTIONS:MQT4)
 BROKEN=		QT4 frontend requires X11 support. Run 'make config' again!
 .endif
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_SDL=	sdl
 USE_XORG=	xcursor xmu inputproto xinerama
 VBOX_FRONTENDS+=VBoxBFE VBoxSDL
@@ -101,7 +99,7 @@
 PLIST_SUB+=	X11="@comment "
 .endif
 
-.if !defined(WITHOUT_QT4)
+.if ${PORT_OPTIONS:MQT4}
 USE_QT_VER=	4
 QT_NONSTANDARD=	yes
 QT_COMPONENTS=	gui network moc_build uic_build rcc_build linguist
@@ -113,7 +111,7 @@
 PLIST_SUB+=	QT4="@comment "
 .endif
 
-.if defined(WITH_GUESTADDITIONS)
+.if ${PORT_OPTIONS:MGUESTADDITIONS}
 GUESTADDITIONS=	VBoxGuestAdditions_${VBOX_GUEST_VER}.iso
 GADISTFILES=	${GUESTADDITIONS}:guestadditions
 RESTRICTED=	for personal use only
@@ -124,39 +122,39 @@
 PLIST_SUB+=	GUESTADDITIONS="@comment "
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 KMK_FLAGS+=	BUILD_TYPE=debug
 KMK_BUILDTYPE=	debug
 .endif
 
-.if !defined(WITHOUT_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 .else
 CONFIGURE_ARGS+=--disable-dbus
 .endif
 
-.if !defined(WITH_PULSEAUDIO)
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.else
 CONFIGURE_ARGS+=--disable-pulse
-.else
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 .endif
 
-.if defined(WITH_VNC)
+.if ${PORT_OPTIONS:MVNC}
 LIB_DEPENDS+=	vncserver.0:${PORTSDIR}/net/libvncserver
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITH_VDE)
+.if ${PORT_OPTIONS:MVDE}
 RUN_DEPENDS+=	vde_switch:${PORTSDIR}/net/vde2
 CONFIGURE_ARGS+=--enable-vde
 .endif
 
-.if defined(WITH_WEBSERVICE)
+.if ${PORT_OPTIONS:MWEBSERVICE}
 BUILD_DEPENDS+=	soapcpp2:${PORTSDIR}/devel/gsoap
 VBOX_WEB=	vboxwebsrv webtest
 USE_RC_SUBR+=	vboxwebsrv
@@ -209,13 +207,13 @@
 	@${ECHO} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_X11_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk
-.if defined(WITH_VNC)
+.if ${PORT_OPTIONS:MVNC}
 	@${ECHO} 'VBOX_WITH_VNC = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${OSVERSION} < 800069
 	@${ECHO} 'VBOX_WITH_USB=' >> ${WRKSRC}/LocalConfig.kmk
 .endif
-.if defined(WITH_WEBSERVICE)
+.if ${PORT_OPTIONS:MWEBSERVICE}
 	@${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> ${WRKSRC}/LocalConfig.kmk
@@ -247,7 +245,7 @@
 	${MKDIR} ${PREFIX}/lib/virtualbox
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 *.fd components VBoxExtPackHelperApp" ${PREFIX}/lib/virtualbox)
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	${MKDIR} ${DATADIR}/nls
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${DATADIR}/nls)
 .endif
@@ -266,14 +264,14 @@
 	${CHMOD} 0711 ${PREFIX}/lib/virtualbox/${f}
 .endfor
 
-.if defined(WITH_WEBSERVICE)
+.if ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} -p ${DATADIR}/sdk/bindings/webservice
 .for f in vboxweb.wsdl vboxwebService.wsdl
 	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/webservice/${f} ${DATADIR}/sdk/bindings/webservice/
 .endfor
 .endif
 
-.if defined(WITH_GUESTADDITIONS)
+.if ${PORT_OPTIONS:MGUESTADDITIONS}
 	${MKDIR} ${PREFIX}/lib/virtualbox/additions
 	${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/
 	${LN} -sf ${PREFIX}/lib/virtualbox/additions/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/VBoxGuestAdditions.iso
@@ -295,7 +293,7 @@
 	@${FIND} ${PREFIX}/include/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	@${FIND} ${PREFIX}/lib/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
-.if !defined(WITHOUT_QT4)
+.if ${PORT_OPTIONS:MQT4}
 	${MKDIR} ${PREFIX}/share/pixmaps/
 	${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/pixmaps/VBox.png
 	${MKDIR} ${PREFIX}/share/applications/
Index: virtualbox-ose-additions-devel/Makefile
===================================================================
--- virtualbox-ose-additions-devel/Makefile	(revision 4410)
+++ virtualbox-ose-additions-devel/Makefile	(working copy)
@@ -41,9 +41,8 @@
 CONFLICTS_BUILD=	kBuild-[0-9]*
 CONFLICTS_INSTALL=	virtualbox-ose-additions-[3,4]* virtualbox-ose-[3,4]* virtualbox-ose-devel-[3,4]* virtualbox-ose-legacy-[3,4]*
 
-OPTIONS=	DEBUG "Build with debugging symbols" off \
-		X11 "Build with X11 support" on \
-		OPENGL "Build with OpenGL support" off
+OPTIONS_DEFINE=	DEBUG X11 OPENGL
+OPTIONS_DEFAULT=	X11
 
 .include <bsd.port.options.mk>
 
@@ -60,12 +59,12 @@
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE}
 KMK_FLAGS=
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 KMK_FLAGS+=	BUILD_TYPE=debug
 KMK_BUILDTYPE=	debug
 .endif
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 VBOX_WITH_X11=	1
 USE_XORG=	xcursor xmu inputproto xrandr
 PLIST_SUB+=	X11=""
@@ -74,10 +73,10 @@
 PLIST_SUB+=	X11="@comment "
 .endif
 
-.if defined(WITHOUT_OPENGL)
+.if ${PORT_OPTIONS:MOPENGL}
+USE_GL=		gl
+.else
 CONFIGURE_ARGS+=--disable-opengl
-.else
-USE_GL=		gl
 .endif
 
 .if ${ARCH} == i386
@@ -141,7 +140,7 @@
 	${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxControl ${PREFIX}/sbin/
 	${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxService ${PREFIX}/sbin/
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 	${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxClient ${PREFIX}/bin/
 
 	${MKDIR} ${PREFIX}/bin
Index: virtualbox-ose-additions/Makefile
===================================================================
--- virtualbox-ose-additions/Makefile	(revision 4410)
+++ virtualbox-ose-additions/Makefile	(working copy)
@@ -41,9 +41,8 @@
 CONFLICTS_BUILD=	kBuild-[0-9]*
 CONFLICTS_INSTALL=	virtualbox-ose-additions-devel-[3,4]* virtualbox-ose-[3,4]* virtualbox-ose-devel-[3,4]* virtualbox-ose-legacy-[3,4]*
 
-OPTIONS=	DEBUG "Build with debugging symbols" off \
-		X11 "Build with X11 support" on \
-		OPENGL "Build with OpenGL support" off
+OPTIONS_DEFINE=	DEBUG X11 OPENGL
+OPTIONS_DEFAULT=	X11
 
 .include <bsd.port.options.mk>
 
@@ -60,12 +59,12 @@
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE}
 KMK_FLAGS=
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 KMK_FLAGS+=	BUILD_TYPE=debug
 KMK_BUILDTYPE=	debug
 .endif
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 VBOX_WITH_X11=	1
 USE_XORG=	xcursor xmu inputproto xorg-server xrandr
 PLIST_SUB+=	X11=""
@@ -74,10 +73,10 @@
 PLIST_SUB+=	X11="@comment "
 .endif
 
-.if defined(WITHOUT_OPENGL)
+.if ${PORT_OPTIONS:MOPENGL}
+USE_GL=		gl
+.else
 CONFIGURE_ARGS+=--disable-opengl
-.else
-USE_GL=		gl
 .endif
 
 .if ${ARCH} == i386
@@ -139,7 +138,7 @@
 	${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxControl ${PREFIX}/sbin/
 	${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxService ${PREFIX}/sbin/
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 	${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxClient ${PREFIX}/bin/
 
 	${MKDIR} ${PREFIX}/bin
Index: virtualbox-ose-kmod-devel/Makefile
===================================================================
--- virtualbox-ose-kmod-devel/Makefile	(revision 4410)
+++ virtualbox-ose-kmod-devel/Makefile	(working copy)
@@ -40,8 +40,8 @@
 CONFLICTS_BUILD=	kBuild-[0-9]*
 CONFLICTS_INSTALL=	virtualbox-ose-kmod-[3,4]* virtualbox-ose-kmod-legacy-[3,4]*
 
-OPTIONS=	DEBUG "Build with debugging symbols" off \
-		VIMAGE "VIMAGE virtual networking support" off
+OPTIONS_DEFINE=	DEBUG VIMAGE
+VIMAGE_DESC=	VIMAGE virtual networking support
 
 .include <bsd.port.options.mk>
 
@@ -56,7 +56,7 @@
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 KMK_FLAGS=	HostDrivers-scripts vboxdrv-mod VBoxNetFlt-src VBoxNetAdp-src
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 KMK_FLAGS+=	BUILD_TYPE=debug
 KMK_BUILDTYPE=	debug
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-Config.kmk ${FILESDIR}/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile
@@ -78,7 +78,7 @@
 BROKEN=		Does not compile on FreeBSD < 8.2
 .endif
 
-.if ${OSVERSION} < 800500 && defined(WITH_VIMAGE)
+.if ${OSVERSION} < 800500 && !empty(PORT_OPTIONS:MVIMAGE)
 IGNORE=		newer kernel is required to build with VIMAGE
 .endif
 
@@ -87,7 +87,7 @@
 	@${ECHO} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_NETADP = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
-.if defined(WITH_VIMAGE)
+.if ${PORT_OPTIONS:MVIMAGE}
 	@${ECHO} 'VBOX_WITH_NETFLT_VIMAGE = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
Index: virtualbox-ose-kmod/Makefile
===================================================================
--- virtualbox-ose-kmod/Makefile	(revision 4410)
+++ virtualbox-ose-kmod/Makefile	(working copy)
@@ -40,8 +40,8 @@
 CONFLICTS_BUILD=	kBuild-[0-9]*
 CONFLICTS_INSTALL=	virtualbox-ose-kmod-devel-[3,4]* virtualbox-ose-kmod-legacy-[3,4]*
 
-OPTIONS=	DEBUG "Build with debugging symbols" off \
-		VIMAGE "VIMAGE virtual networking support" off
+OPTIONS_DEFINE=	DEBUG VIMAGE
+VIMAGE_DESC=	VIMAGE virtual networking support
 
 .include <bsd.port.options.mk>
 
@@ -56,7 +56,7 @@
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 KMK_FLAGS=	HostDrivers-src vboxdrv-mod VBoxNetFlt-src VBoxNetAdp-src
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 KMK_FLAGS+=	BUILD_TYPE=debug
 KMK_BUILDTYPE=	debug
 .endif
@@ -77,7 +77,7 @@
 BROKEN=		Does not compile on FreeBSD < 8.2
 .endif
 
-.if ${OSVERSION} < 800500 && defined(WITH_VIMAGE)
+.if ${OSVERSION} < 800500 && !empty(PORT_OPTIONS:MVIMAGE)
 IGNORE=		newer kernel is required to build with VIMAGE
 .endif
 
@@ -86,7 +86,7 @@
 	@${ECHO} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_NETADP = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
-.if defined(WITH_VIMAGE)
+.if ${PORT_OPTIONS:MVIMAGE}
 	@${ECHO} 'VBOX_WITH_NETFLT_VIMAGE = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
Index: virtualbox-ose-kmod-legacy/Makefile
===================================================================
--- virtualbox-ose-kmod-legacy/Makefile	(revision 4410)
+++ virtualbox-ose-kmod-legacy/Makefile	(working copy)
@@ -40,8 +40,8 @@
 CONFLICTS_BUILD=	kBuild-devel-[0-9]*
 CONFLICTS_INSTALL=	virtualbox-ose-kmod-[3,4]* virtualbox-ose-kmod-devel-[3,4]*
 
-OPTIONS=	DEBUG "Build with debugging symbols" off \
-		VIMAGE "VIMAGE virtual networking support" off
+OPTIONS_DEFINE=	DEBUG VIMAGE
+VIMAGE_DESC=	VIMAGE virtual networking support
 
 .include <bsd.port.options.mk>
 
@@ -56,7 +56,7 @@
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 KMK_FLAGS=	HostDrivers-src vboxdrv-mod VBoxNetFlt-src VBoxNetAdp-src
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 KMK_FLAGS+=	BUILD_TYPE=debug
 KMK_BUILDTYPE=	debug
 .endif
@@ -73,7 +73,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 800500 && defined(WITH_VIMAGE)
+.if ${OSVERSION} < 800500 && !empty(PORT_OPTIONS:MVIMAGE)
 IGNORE=		newer kernel is required to build with VIMAGE
 .endif
 
@@ -82,7 +82,7 @@
 	@${ECHO} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_NETADP = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
-.if defined(WITH_VIMAGE)
+.if ${PORT_OPTIONS:MVIMAGE}
 	@${ECHO} 'VBOX_WITH_NETFLT_VIMAGE = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \