8 files changed, 58 insertions, 75 deletions

diff --git a/x11-toolkits/gigi/Makefile b/x11-toolkits/gigi/Makefile
index 90ec616f1ad6..1180820ab532 100644
--- a/x11-toolkits/gigi/Makefile
+++ b/x11-toolkits/gigi/Makefile
@@ -25,16 +25,17 @@ USE_LDCONFIG=	yes
 # Ensure local headers are found first, otherwise updating would fail.
 CFLAGS+=	-I.
 
-OPTIONS=	OGRE "Enable Ogre (3D engine) support"	on
+OPTIONS_DEFINE=	OGRE
+OGRE_DESC=	Ogre (3D engine) support
 
 SHLIB_VER=	0
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 GIGI_LIBS=	GiGi GiGiSDL
 WRKSRC=		${WRKDIR}/gigi/GG
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_OGRE)
+.if ${PORT_OPTIONS:MOGRE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libOgreMain.so:${PORTSDIR}/graphics/ogre3d \
 		${LOCALBASE}/lib/libOIS.so:${PORTSDIR}/devel/ois
 RUN_DEPENDS+=	${LOCALBASE}/lib/libOgreMain.so:${PORTSDIR}/graphics/ogre3d \
@@ -69,4 +70,4 @@ maint-gen-distfile:
 	tar cjf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}
 	${RM} -rf ${PORTNAME}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index aa78017db6d8..9e21c3cc26c7 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	irrlicht
-# Date created:				19 September 2004
-# Whom:					Simon Barner <barner@gmx.de>
-#
+# Created by: Simon Barner <barner@gmx.de>
 # $FreeBSD$
-#
 
 PORTNAME=	irrlicht
 PORTVERSION=	1.7.3
@@ -35,11 +31,10 @@ EXAMPLEDIRS=	01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserIn
 		11.PerPixelLighting 12.TerrainRendering 13.RenderToTexture 15.LoadIrrFile \
 		Demo
 
-OPTIONS=	DEBUG	"Compile with debugging simbols" off \
-		EXAMPLES	"Install example files"	on \
-		JOYSTICK	"Support for Linux Joystick" off
+OPTIONS_DEFINE=	DEBUG EXAMPLES JOYSTICK
+JOYSTICK_DESC=	Support for Linux Joystick
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if (${ARCH} == "amd64") || (${ARCH} == "ia64")
 CFLAGS+=	-fPIC
@@ -49,18 +44,18 @@ CFLAGS+=	-fPIC
 BROKEN=		Does not compile on sparc64
 .endif
 
-.if !defined(WITHOUT_EXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 PLIST_SUB+=	EXAMPLES=""
 .else
 PLIST_SUB+=	EXAMPLES="@comment "
 .endif
 
-.if defined(WITH_JOYSTICK)
+.if ${PORT_OPTIONS:MJOYSTICK}
 BUILD_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
 HAVE_JOYSTICK=	true
 .endif
 
-.if !defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 MAKE_ENV+=	NDEBUG=1
 .endif
 
@@ -87,7 +82,7 @@ do-install:
 		${PREFIX}/lib && ${LN} -s libIrrlicht.so.${SHARED_LIB_VER} \
 			${PREFIX}/lib/libIrrlicht.so
 
-.if !defined(WITHOUT_EXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 .for DIRE in ${EXAMPLEDIRS}
 	${MKDIR} ${EXAMPLESDIR}/${DIRE}
 	${INSTALL_DATA} ${WRKSRC}/examples/${DIRE}/Makefile \
@@ -103,4 +98,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 2cf54c99b6b5..3efe1741c48d 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	paragui
-# Date Created:			Mar 28, 2001
-# Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	paragui
 PORTVERSION=	1.1.8
@@ -33,11 +29,11 @@ USE_LDCONFIG=	yes
 SHLIB_VER=	4
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 
-OPTIONS=	DEBUG	"Debug information"	off
+OPTIONS_DEFINE=	DEBUG
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
@@ -54,4 +50,4 @@ post-patch:
 		 s|-L[./]*../src|&/.libs |g ; \
 		 s|-release $$(LT_RELEASE)||g'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
index 8e8a0e06e283..9d1c94133d29 100644
--- a/x11-toolkits/swt/Makefile
+++ b/x11-toolkits/swt/Makefile
@@ -42,25 +42,26 @@ PLIST_FILES=	%%JAVAJARDIR%%/${OUTPUT_JAR} \
 
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	CAIRO "Cairo Support" on \
-		GNOMEVFS "Gnome VFS Support" on \
-		BROWSER "Gecko Browser Support" on
+OPTIONS_DEFINE=	CAIRO GNOMEVFS BROWSER
+OPTIONS_DEFAULT=	CAIRO GNOMEVFS BROWSER
+GNOMEVFS_DESC=	Gnome VFS Support
+BROWSER_DESC=	Gecko Browser Support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CAIRO)
+.if ${PORT_OPTIONS:MCAIRO}
 LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
 PLIST_FILES+=	lib/libswt-cairo-gtk-%%BUILD%%.so
 MAKE_CAIRO=	make_cairo
 .endif
 
-.if defined(WITH_GNOMEVFS)
+.if ${PORT_OPTIONS:MGNOMEVFS}
 USE_GNOME+=	gnomevfs2 libgnome libgnomeui
 PLIST_FILES+=	lib/libswt-gnome-gtk-%%BUILD%%.so
 MAKE_GNOME=	make_gnome
 .endif
 
-.if defined(WITH_BROWSER)
+.if ${PORT_OPTIONS:MBROWSER}
 USE_GECKO=	libxul19
 PLIST_FILES+=	lib/libswt-xulrunner-gtk-%%BUILD%%.so
 MAKE_MOZILLA=	make_xulrunner
@@ -86,4 +87,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/libswt-*.so ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/${OUTPUT_JAR} ${JAVAJARDIR}/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/tkshape/Makefile b/x11-toolkits/tkshape/Makefile
index 3af48632b314..3a0a3b39ccb9 100644
--- a/x11-toolkits/tkshape/Makefile
+++ b/x11-toolkits/tkshape/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	TkShape
-# Date created:				13 March 2004
-# Whom:					nivit@users.sourceforge.net
-#
+# Created by: nivit@users.sourceforge.net
 # $FreeBSD$
 
 PORTNAME=		tkshape
@@ -23,11 +20,13 @@ PLIST_SUB=		PORTNAME="${PORTNAME}"
 
 USE_LDCONFIG=		yes
 
-OPTIONS=		MANPAGES "Install manual pages" on
+OPTIONS_DEFINE=		MANPAGES
+OPTIONS_DEFAULT=	MANPAGES
+MANPAGES_DESC=	Install manual pages
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MANPAGES)
+.if ${PORT_OPTIONS:MMANPAGES}
 MAN3=			CombShape.3 QuryShape.3
 MANN=			shape.n
 .endif
@@ -83,7 +82,7 @@ do-install:
 	${INSTALL_DATA} unix/pkgIndex.tcl ${TARGET_DIR}/pkgIndex.tcl;
 
 # manpages
-.if defined(WITH_MANPAGES)
+.if ${PORT_OPTIONS:MMANPAGES}
 	cd ${WRKSRC}; \
 	for m in ${MANPAGES} ; do \
 	    s=$${m##*.}; \
@@ -91,4 +90,4 @@ do-install:
 	done;
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/wxd/Makefile b/x11-toolkits/wxd/Makefile
index 30836b7efacf..beff314ecfca 100644
--- a/x11-toolkits/wxd/Makefile
+++ b/x11-toolkits/wxd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   wxd
-# Date created:        29 August 2006
-# Whom:                Jona Joachim <walkingshadow@grummel.net>
-#
+# Created by: Jona Joachim <walkingshadow@grummel.net>
 # $FreeBSD$
-#
 
 PORTNAME=	wxd
 PORTVERSION=	0.14
@@ -22,15 +18,16 @@ USE_LDCONFIG=	yes
 USE_WX=		2.8
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS=	UNICODE "Build the Unicode version" On
+OPTIONS_DEFINE=	UNICODE
+OPTIONS_DEFAULT=	UNICODE
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
 BROKEN=		does not compile
 .endif
 
-.if !defined(WITHOUT_UNICODE)
+.if ${PORT_OPTIONS:MUNICODE}
 WX_UNICODE=	yes
 .endif
 
@@ -42,4 +39,4 @@ pre-patch:
 	@${RM} ${WRKSRC}/wx/Makefile
 	@${MV} ${WRKSRC}/wx/GNUmakefile ${WRKSRC}/wx/Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 7f57d36abfef..9519d4b33039 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	wxgtk26
-# Date created:         		June 27, 2004
-# Whom:					fjoe@FreeBSD.ORG
-#
+# Created by: fjoe@FreeBSD.ORG
 # $FreeBSD$
-#
 
 PORTNAME=	wx
 PORTVERSION=	2.8.12
@@ -49,12 +45,13 @@ PLIST=		${.CURDIR}/pkg-plist
 
 WXGTK_FLAVOR?=	gtk2
 
-OPTIONS=	GSTREAMER "media support" on\
-		MSPACK "MS archives support" on
+OPTIONS_DEFINE=	GSTREAMER MSPACK
+OPTIONS_DEFAULT=	GSTREAMER MSPACK
+MSPACK_DESC=	MS archives support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GSTREAMER)
+.if ${PORT_OPTIONS:MGSTREAMER}
 CONFIGURE_ARGS+=--enable-mediactrl
 USE_GNOME+=	gconf2
 USE_GSTREAMER=	yes
@@ -64,7 +61,7 @@ CONFIGURE_ARGS+=--disable-mediactrl
 PLIST_SUB+=     GSTREAMER="@comment "
 .endif
 
-.if defined(WITH_MSPACK)
+.if ${PORT_OPTIONS:MMSPACK}
 CONFIGURE_ARGS+=--with-libmspack
 LIB_DEPENDS+=	mspack.1:${PORTSDIR}/archivers/libmspack
 .else
@@ -113,4 +110,4 @@ post-patch:
 		-e 's|png_check_sig|png_sig_cmp|g' \
 			${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index f1dce9e1f18f..b6dda7a7d70d 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	wxgtk26
-# Date created:         		June 27, 2004
-# Whom:					fjoe@FreeBSD.ORG
-#
+# Created by: fjoe@FreeBSD.ORG
 # $FreeBSD$
-#
 
 PORTNAME=	wx
 PORTVERSION=	2.9.4
@@ -50,12 +46,13 @@ CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -linotify"\
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 NO_LATEST_LINK=	yes
 
-OPTIONS=	GSTREAMER "media support" on\
-		MSPACK "MS archives support" on
+OPTIONS_DEFINE=	GSTREAMER MSPACK
+OPTIONS_DEFAULT=	GSTREAMER MSPACK
+MSPACK_DESC=	MS archives support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GSTREAMER)
+.if ${PORT_OPTIONS:MGSTREAMER}
 CONFIGURE_ARGS+=--enable-mediactrl
 USE_GNOME+=	gconf2
 USE_GSTREAMER=	yes
@@ -65,11 +62,11 @@ CONFIGURE_ARGS+=--disable-mediactrl
 PLIST_SUB+=	GSTREAMER="@comment "
 .endif
 
-.if defined(WITH_MSPACK)
+.if ${PORT_OPTIONS:MMSPACK}
 CONFIGURE_ARGS+=--with-libmspack
 LIB_DEPENDS+=	mspack.1:${PORTSDIR}/archivers/libmspack
 .else
 CONFIGURE_ARGS+=--without-libmspack
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>