svn commit: r301600 - in head: audio/kid3-kde4 audio/mp3unicode cad/librecad devel/qdevelop editors/kile-kde4 emulators/qtemu games/darkplaces games/frozenbubble games/toppler games/trigger games/t...

Fri Jul 27 11:03:40 UTC 2012

Author: makc
Date: Fri Jul 27 11:03:38 2012
New Revision: 301600
URL: http://svn.freebsd.org/changeset/ports/301600

Log:
  - Convert my ports to new options framework
  - use CONFLICTS_INSTALL
  - other minor changes

Modified:
  head/audio/kid3-kde4/Makefile   (contents, props changed)
  head/audio/mp3unicode/Makefile   (contents, props changed)
  head/cad/librecad/Makefile   (contents, props changed)
  head/devel/qdevelop/Makefile   (contents, props changed)
  head/editors/kile-kde4/Makefile   (contents, props changed)
  head/emulators/qtemu/Makefile   (contents, props changed)
  head/games/darkplaces/Makefile   (contents, props changed)
  head/games/frozenbubble/Makefile   (contents, props changed)
  head/games/toppler/Makefile   (contents, props changed)
  head/games/trigger/Makefile   (contents, props changed)
  head/games/trophy/Makefile   (contents, props changed)
  head/games/warmux/Makefile   (contents, props changed)
  head/graphics/fraqtive/Makefile   (contents, props changed)
  head/graphics/povray-meta/Makefile   (contents, props changed)
  head/graphics/xaos/Makefile   (contents, props changed)
  head/irc/kvirc/Makefile   (contents, props changed)
  head/irc/quassel/Makefile   (contents, props changed)
  head/math/qtiplot/Makefile   (contents, props changed)
  head/math/scilab-toolbox-sivp/Makefile   (contents, props changed)
  head/math/scilab-toolbox-swt/Makefile   (contents, props changed)
  head/math/speedcrunch/Makefile   (contents, props changed)
  head/multimedia/minitube/Makefile
  head/multimedia/subtitlecomposer-kde4/Makefile   (contents, props changed)
  head/net-im/psi/Makefile   (contents, props changed)
  head/print/hplip/Makefile   (contents, props changed)
  head/print/texvc/Makefile   (contents, props changed)
  head/science/kst2/Makefile   (contents, props changed)
  head/security/pinentry-curses/Makefile   (contents, props changed)
  head/security/pinentry-gtk/Makefile   (contents, props changed)
  head/security/pinentry-gtk2/Makefile   (contents, props changed)
  head/security/pinentry-qt/Makefile   (contents, props changed)
  head/security/pinentry-qt4/Makefile   (contents, props changed)
  head/security/pinentry/Makefile   (contents, props changed)
  head/textproc/qstardict/Makefile   (contents, props changed)
  head/textproc/stardict3/Makefile   (contents, props changed)
  head/x11-fonts/fontmatrix/Makefile   (contents, props changed)
  head/x11-toolkits/qwt5/Makefile   (contents, props changed)
  head/x11-toolkits/qwt6/Makefile   (contents, props changed)

Modified: head/audio/kid3-kde4/Makefile
==============================================================================

--- head/audio/kid3-kde4/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/audio/kid3-kde4/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -27,36 +27,39 @@ CMAKE_ARGS=	-DWITH_CHROMAPRINT=off
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	FLAC "Support for FLAC files" on \
-		ID3LIB "Support for mp3 files" on \
-		MP4V2 "Support for mp4 files" on \
-		VORBIS "Support for Ogg/Vorbis files" on \
-		TAGLIB "Support for various audio formats" on
+OPTIONS_DEFINE=	FLAC ID3LIB MP4V2 VORBIS TAGLIB
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+
+FLAC_DESC=	Support for FLAC files
+ID3LIB_DESC=	Support for mp3 files
+MP4V2_DESC=	Support for mp4 files
+VORBIS_DESC=	Support for Ogg/Vorbis files
+TAGLIB_DESC=	Support for various audio formats
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
 CMAKE_ARGS+=	-DWITH_FLAC=OFF
 .else
 CMAKE_ARGS+=	-DWITH_FLAC=ON
 LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
 .endif
 
-.if defined(WITHOUT_ID3LIB)
+.if ${PORT_OPTIONS:MID3LIB}
 CMAKE_ARGS+=	-DWITH_ID3LIB=OFF
 .else
 CMAKE_ARGS+=	-DWITH_ID3LIB=ON
 LIB_DEPENDS+=	id3-3.8.3:${PORTSDIR}/audio/id3lib
 .endif
 
-.if defined(WITHOUT_MP4V2)
+.if ${PORT_OPTIONS:MMP4V2}
 CMAKE_ARGS+=	-DWITH_MP4V2=OFF
 .else
 CMAKE_ARGS+=	-DWITH_MP4V2=ON
 LIB_DEPENDS+=	mp4v2.10:${PORTSDIR}/multimedia/mp4v2
 .endif
 
-.if defined(WITHOUT_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 CMAKE_ARGS+=	-DWITH_VORBIS=OFF
 .else
 CMAKE_ARGS+=	-DWITH_VORBIS=ON
@@ -64,7 +67,7 @@ LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio
 		ogg:${PORTSDIR}/audio/libogg
 .endif
 
-.if defined(WITHOUT_TAGLIB)
+.if ${PORT_OPTIONS:MTAGLIB}
 CMAKE_ARGS+=	-DWITH_TAGLIB=OFF
 .else
 CMAKE_ARGS+=	-DWITH_TAGLIB=ON

Modified: head/audio/mp3unicode/Makefile
==============================================================================
--- head/audio/mp3unicode/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/audio/mp3unicode/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -27,11 +27,11 @@ MAN1=		mp3unicode.1
 PLIST_FILES=	bin/mp3unicode
 PORTDOCS=	COPYING README
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 pre-configure:
-.if defined(NOPORTDOCS)
+.if !${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e '/^install-data-am/s|install-dist_docDATA||' ${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/cad/librecad/Makefile
==============================================================================
--- head/cad/librecad/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/cad/librecad/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -19,7 +19,9 @@ USE_QT4=	help qt3support help-tools_buil
 		rcc_build uic_build uic3_build
 MAKE_JOBS_SAFE=	yes
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_QT4+=	linguist_build
 PLIST_SUB+=	NLS=""
 .else
@@ -37,7 +39,7 @@ do-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS})
 
 post-build:
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	@(cd ${WRKSRC} && ${LOCALBASE}/bin/lrelease-qt4 -compress librecad.pro)
 	${MKDIR} ${WRKSRC}/unix/resources/qm
 	${INSTALL_DATA} ${WRKSRC}/ts/*.qm ${WRKSRC}/unix/resources/qm

Modified: head/devel/qdevelop/Makefile
==============================================================================
--- head/devel/qdevelop/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/devel/qdevelop/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -15,14 +15,13 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	A development environment entirely dedicated to Qt4
 
-RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags \
-		qt4-sqlite-plugin>=0:${PORTSDIR}/databases/qt4-sqlite3-plugin
+RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
 
-USE_QT4=	gui sql network xml designer \
+USE_QT4=	gui sql network xml designer sql-sqlite3_run \
 		qmake_build moc_build uic_build rcc_build
 MAKE_JOBS_SAFE=	yes
 
-QMAKE_ARGS=	-unix -recursive ${QMAKE_PRO}
+QMAKE_ARGS=	-recursive ${QMAKE_PRO}
 QMAKE_PRO=	QDevelop.pro
 STRIP_FILES=	bin/${PORTNAME}
 
@@ -35,17 +34,20 @@ DESKTOP_ENTRIES=	"QDevelop" \
 			"Qt;KDE;Development;" \
 			"false"
 
-OPTIONS=	TOOLS "Install Qt4 dev. tools (qmake, moc, etc.)" on
+OPTIONS_DEFINE=	TOOLS
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+TOOLS_DESC=	Install Qt4 dev. tools (qmake, moc, etc.)
 
-.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_QT4+=	linguist_build
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if !defined(WITHOUT_TOOLS)
+.if ${PORT_OPTIONS:MTOOLS}
 USE_QT4+=	assistant_run linguist_run \
 		qmake_run moc_run uic_run rcc_run
 .endif
@@ -68,7 +70,7 @@ post-patch:
 		${WRKSRC}/plugins/formatting-astyle/astyleplugin.cpp
 
 do-configure:
-.if !defined(WITHOUT_NLS)
+.if !${PORT_OPTIONS:MNLS}
 	cd ${WRKSRC} && ${QT_LRELEASE} ${QMAKE_PRO}
 .endif
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
@@ -76,15 +78,15 @@ do-configure:
 post-install:
 	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
 	${INSTALL_DATA} ${WRKSRC}/resources/images/logo.png ${PREFIX}/share/pixmaps/qdevelop.png
-.if !defined(WITHOUT_NLS)
+.if !${PORT_OPTIONS:MNLS}
 	${MKDIR} ${DATADIR}
 	cd ${WRKSRC}/resources/translations/ && ${COPYTREE_SHARE} '*.qm' ${DATADIR}/translations
 .endif
-.if !defined(NOPORTDOCS)
+.if !${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for doc in ChangeLog.txt README.txt
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/editors/kile-kde4/Makefile
==============================================================================
--- head/editors/kile-kde4/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/editors/kile-kde4/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -15,23 +15,23 @@ MAINTAINER=	makc at FreeBSD.org
 COMMENT=	A LaTeX source editor for KDE
 
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
-		identify:${PORTSDIR}/graphics/ImageMagick \
-		${KDE4_PREFIX}/lib/kde4/katepart.so:${PORTSDIR}/editors/kate
+		identify:${PORTSDIR}/graphics/ImageMagick
 
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_QT4=	qmake_build moc_build rcc_build uic_build
-USE_KDE4=	kdeprefix kdelibs automoc4 sharedmime
+USE_KDE4=	kdeprefix kdelibs automoc4 sharedmime kate_run
 MAKE_JOBS_SAFE=	yes
 
 LATEST_LINK=	${PORTNAME}-kde4
 
-OPTIONS=	OKULAR "Use Okular for viewing" off
+OPTIONS_DEFINE=	OKULAR
+OKULAR_DESC=	Use Okular for viewing
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_OKULAR)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/okular:${PORTSDIR}/graphics/okular
+.if ${PORT_OPTIONS:MOKULAR)
+USE_KDE4+=	okular_run
 .endif
 
 .include <bsd.port.mk>

Modified: head/emulators/qtemu/Makefile
==============================================================================
--- head/emulators/qtemu/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/emulators/qtemu/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -22,9 +22,9 @@ CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
 DESKTOP_ENTRIES="QtEmu" "QEMU frontend" "" \
 		"qtemu" "" false
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 #USE_QT4+=	linguist
 BUILD_DEPENDS+=	${LOCALBASE}/bin/lupdate-qt4:${PORTSDIR}/devel/qt4-linguist
 PLIST_SUB+=	NLS=""
@@ -45,12 +45,12 @@ post-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qtemu ${PREFIX}/bin/qtemu
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	${MKDIR} ${DATADIR}
 	(cd ${WRKSRC}/translations/ && ${COPYTREE_SHARE} 'qtemu*.qm' ${DATADIR}/translations)
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	(cd ${WRKSRC}/help/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/games/darkplaces/Makefile
==============================================================================
--- head/games/darkplaces/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/games/darkplaces/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -25,9 +25,13 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKEFILE=	makefile
 ALL_TARGET=	#
 
-OPTIONS=	CLIENT "Build GLX client" on \
-		DEDICATED "Build dedicated server" on \
-		SDL "Build SDL client" on
+OPTIONS_MULTI=	MODULE
+OPTIONS_MULTI_MODULE=	CLIENT DEDICATED SDL
+OPTIONS_DEFAULT=	${OPTIONS_MULTI_MODULE}
+
+CLIENT_DESC=	Build GLX client
+DEDICATED_DESC=	Build dedicated server
+SDL_DESC=	Build SDL client
 
 PLIST_FILES=	%%DATADIR%%/dummy
 PLIST_DIRS=	%%DATADIR%%
@@ -37,18 +41,14 @@ PORTDOCS=	darkplaces.txt
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITH_CLIENT) && !defined(WITH_DEDICATED) && !defined(WITH_SDL)
-IGNORE=		needs at least one of CLIENT, DEDICATED and SDL options
-.endif
-
-.if defined(WITH_CLIENT) || defined(WITH_SDL)
-USE_GL=		yes
+.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSDL}
+USE_GL=		glu
 # Loads libraries at run-time, thus RUN_DEPENDS.
 RUN_DEPENDS+=	${LOCALBASE}/lib/libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		${LOCALBASE}/lib/libvorbis.so:${PORTSDIR}/audio/libvorbis
 .endif
 
-.if defined(WITH_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 ALL_TARGET+=	cl-release
 EXE_TARGETS+=	${PORTNAME}-glx
 PLIST_SUB+=	CLIENT=""
@@ -57,13 +57,13 @@ DESKTOP_ENTRIES+="Darkplaces GLX Client"
 		"Game;ActionGame;" "false"
 .endif
 
-.if defined(WITH_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 ALL_TARGET+=	sv-release
 EXE_TARGETS+=	${PORTNAME}-dedicated
 PLIST_FILES+=	bin/${PORTNAME}-dedicated
 .endif
 
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
 ALL_TARGET+=	sdl-release
 EXE_TARGETS+=	${PORTNAME}-sdl
@@ -83,7 +83,7 @@ do-install:
 .endfor
 	@${MKDIR} ${DATADIR}
 	@${TOUCH} ${DATADIR}/dummy
-.if !defined(NOPORTDOCS)
+.if !{PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/darkplaces.txt ${DOCSDIR}
 .endif

Modified: head/games/frozenbubble/Makefile
==============================================================================
--- head/games/frozenbubble/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/games/frozenbubble/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -30,7 +30,9 @@ MAN6=		frozen-bubble-editor.6 frozen-bub
 
 LEXECDIR=	${PREFIX}/libexec/${PORTNAME}
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 RUN_DEPENDS+=	p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
 PLIST_SUB+=	NLS=""
 .else
@@ -54,24 +56,18 @@ pre-install:
 
 do-install:
 	cd ${WRKSRC}/c_stuff && ${GMAKE} install
-
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	cd ${WRKSRC}/po && ${GMAKE} install
 .endif
-
 	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/frozen-bubble ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/frozen-bubble-editor ${PREFIX}/bin/
-
 	${INSTALL_MAN} ${MAN6:S,^,${WRKSRC}/doc/,} ${PREFIX}/man/man6/
-
 	${MKDIR} ${DATADIR}
 	@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "gfx snd data" ${DATADIR}/)
-
 	${MKDIR} ${LEXECDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/server/fb-server ${LEXECDIR}/
 
 post-install:
-
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/games/toppler/Makefile
==============================================================================
--- head/games/toppler/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/games/toppler/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -25,6 +25,8 @@ MAN6=		${PORTNAME}.6
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|DATA install-dist_pkgdocDATA|DATA|g' ${WRKSRC}/Makefile.in
@@ -34,7 +36,7 @@ post-install:
 	@${CHOWN} root:games ${PREFIX}/bin/${PORTNAME}
 	@${CHMOD} 0664 ${DATADIR}/${PORTNAME}.hsc
 	@${CHOWN} root:games ${DATADIR}/${PORTNAME}.hsc
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in AUTHORS ChangeLog NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}

Modified: head/games/trigger/Makefile
==============================================================================
--- head/games/trigger/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/games/trigger/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -35,6 +35,8 @@ DATAVERSION=	0.5.2
 DESKTOP_ENTRIES="Trigger" "Car racing game" "" \
 		"trigger" "" false
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|SDL/||' \
 		${WRKSRC}/src/trigger/main.cpp \
@@ -61,7 +63,7 @@ do-install:
 	${FIND} ${DATADIR}/* -type f -exec ${CHMOD} 444 {} \;
 	${FIND} ${DATADIR}/* -type d -exec ${CHMOD} 555 {} \;
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in README-stereo.txt README.txt
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}

Modified: head/games/trophy/Makefile
==============================================================================
--- head/games/trophy/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/games/trophy/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -26,12 +26,14 @@ MAN6=	trophy.6
 
 PORTDOCS=	AUTHORS COPYING ChangeLog README TODO
 
+.include <bsd.port.options.mk>
+
 pre-configure:
 	${REINPLACE_CMD} -e "/^icondir =/s,icons,pixmaps," \
 		${WRKSRC}/resources/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR} && \
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif

Modified: head/games/warmux/Makefile
==============================================================================
--- head/games/warmux/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/games/warmux/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -18,7 +18,7 @@ COMMENT=	Wormux game
 LIB_DEPENDS=	xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \
 		curl:${PORTSDIR}/ftp/curl
 
-CONFLICTS=	wormux-*
+CONFLICTS_INSTALL=	wormux-*
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -30,9 +30,9 @@ USE_DOS2UNIX=	fixed_class.h
 MANCOMPRESSED=	no
 MAN6=		warmux.6
 
-OPTIONS+=	NLS "Native Language Support via gettext utilities" on \
-		FRIBIDI "Enable bi-directional unicode support" off \
-		SERVER "Enable dedicated server" off
+OPTIONS_DEFINE=	FRIBIDI SERVER
+FRIBIDI_DESC=	Enable bi-directional unicode support
+SERVER_DESC=	Enable dedicated server
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:R}
 
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=	--enable-debug \
 			--enable-logging
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -59,14 +59,14 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITH_SERVER)
+.if ${PORT_OPTIONS:MSERVER}
 PLIST_SUB+=	SERVER=""
 CONFIGURE_ARGS+=	--enable-servers
 .else
 PLIST_SUB+=	SERVER="@comment "
 .endif
 
-.if defined(WITH_FRIBIDI)
+.if ${PORT_OPTIONS:MFRIBIDI}
 LIB_DEPENDS+=	fribidi:${PORTSDIR}/converters/fribidi
 CONFIGURE_ARGS+=	--enable-fribidi
 .else

Modified: head/graphics/fraqtive/Makefile
==============================================================================
--- head/graphics/fraqtive/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/graphics/fraqtive/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -24,13 +24,14 @@ CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}" 
 CONFIGURE_ARGS=	-prefix ${PREFIX} -qmake ${QMAKE}
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	SSE2 "Enable SSE2 optimization" off
+OPTIONS_DEFINE=	SSE2
+SSE2_DESC=	Enable SSE2 optimization
 
 STRIP_FILES=	bin/fraqtive
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITH_SSE2)
+.if !${PORT_OPTIONS:MSSE2}
 CONFIGURE_ARGS+=-no-sse2
 .endif
 
@@ -44,4 +45,4 @@ post-configure:
 post-install:
 		${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/povray-meta/Makefile
==============================================================================
--- head/graphics/povray-meta/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/graphics/povray-meta/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -25,38 +25,34 @@ DEFAULT_VER?=	36
 #To change version linked by default define WITH_DEFAULT${ver}.
 #Please, note that only one of WITH_DEFAULT* can be set at once.
 
-OPT_POVRAY${DEFAULT_VER}=	on
-OPT_DEFAULT${DEFAULT_VER}=	on
+OPTIONS_MULTI=	POVRAY
+OPTIONS_SINGLE=	DEFAULT
+
+OPTIONS_DEFAULT=	POVRAY${DEFAULT_VER} DEFAULT${DEFAULT_VER}
 
 .for ver in ${POV_VERSIONS_ALL}
 POVRAY${ver}_BIN=	${LOCALBASE}/bin/povray${ver}
 POVRAY${ver}_PORT=	graphics/povray${ver}
-OPT_POVRAY${ver}?=	off
-OPT_DEFAULT${ver}?=	off
-OPTIONS+=	POVRAY${ver} "Install graphics/povray${ver}" ${OPT_POVRAY${ver}}
-OPTIONS+=	DEFAULT${ver} "Create link bin/povray -> bin/povray${ver}" ${OPT_DEFAULT${ver}}
+
+OPTIONS_MULTI_POVRAY+=	POVRAY${ver}
+OPTIONS_SINGLE_DEFAULT+=	DEFAULT${ver}
+
+POVRAY${ver}_DESC=	Install graphics/povray${ver}
+DEFAULT${ver}_DESC=	Create link bin/povray -> bin/povray${ver}
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for ver in ${POV_VERSIONS_ALL}
-. if defined(WITH_DEFAULT${ver})
-WITH_POVRAY${ver}=	yes
-.  if defined(POV_VERSION)
-IGNORE=	can't be build: only one default povray can be chosen
-.  else
+. if ${PORT_OPTIONS:MDEFAULT${ver}}
+PORT_OPTIONS+=	POVRAY${ver}
 POV_VERSION=	${ver}
-.  endif
 . endif
-. if defined(WITH_POVRAY${ver})
+. if ${PORT_OPTIONS:MPOVRAY${ver}}
 RUN_DEPENDS+=	${POVRAY${ver}_BIN}:${PORTSDIR}/${POVRAY${ver}_PORT}
 . endif
 .endfor
 
-.if !defined(POV_VERSION)
-IGNORE=	can't be build: one default povray must be chosen
-.endif
-
 do-install:
 	${LN} -s ${POVRAY${POV_VERSION}_BIN} ${PREFIX}/bin/povray
 

Modified: head/graphics/xaos/Makefile
==============================================================================
--- head/graphics/xaos/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/graphics/xaos/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -20,9 +20,9 @@ USE_XORG=	x11 xext
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-OPTIONS=	PTHREAD "Enable SMP support (experimental)" off \
-		GTK2 "GTK+ User Interface (experimental)" off \
-		NLS "Native Language Support" on
+OPTIONS_DEFINE=	GTK2 PTHREAD
+GTK2_DESC=	GTK+ User Interface (experimental)
+PTHREAD_DESC=	Enable SMP support (experimental)
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -39,7 +39,7 @@ DESKTOP_ENTRIES=	"XaoS" "Fractal zoomer"
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PTHREAD)
+.if ${PORT_OPTIONS:MPTHREAD}
 CONFIGURE_ARGS+=	--with-pthread=yes
 CONFIGURE_ENV+=		LIBS="${PTHREAD_LIBS}"
 CFLAGS+=		${PTHREAD_CFLAGS}
@@ -47,12 +47,12 @@ CFLAGS+=		${PTHREAD_CFLAGS}
 CONFIGURE_ARGS+=	--with-pthread=no
 .endif
 
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME=	gtk20
 CONFIGURE_ARGS+=	--with-gtk-driver=yes --with-x11-driver=no
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else

Modified: head/irc/kvirc/Makefile
==============================================================================
--- head/irc/kvirc/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/irc/kvirc/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -23,7 +23,7 @@ MAINTAINER=	makc at FreeBSD.org
 COMMENT?=	IRC client for KDE4
 
 .if !defined(PKGNAMESUFFIX)
-CONFLICTS=	kvirc-qt4-4.*
+CONFLICTS_INSTALL=	kvirc-qt4-4.*
 .endif
 
 USE_BZIP2=	yes
@@ -42,14 +42,17 @@ MAKE_JOBS_SAFE=	yes
 MAN1=		kvirc.1
 MANLANG=	"" de fr it
 
-OPTIONS=	AUDIOFILE "Support for various audio formats" off \
-		DEBUG "Build with debug support" off \
-		GSM "u-law to gsm audio converter support" off \
-		PERL "Perl scripting support" off \
-		PYTHON "Python scripting support" off
+OPTIONS_DEFINE=	AUDIOFILE GSM PERL PYTHON
+
+AUDIOFILE_DESC=	Support for various audio formats
+GSM_DESC=	u-law to gsm audio converter support
+PERL_DESC=	Perl scripting support
+PYTHON_DESC=	Python scripting support
+
 .if defined(PKGNAMESUFFIX)
-OPTIONS+=	PHONON "Build with Phonon support" off \
-		WEBKIT "Build with QtWebkit support" off
+OPTIONS_DEFINE+=	PHONON WEBKIT
+PHONON_DESC=	Build with Phonon support
+WEBKIT_DESC=	Build with QtWebkit support
 .endif
 
 PLIST_SUB+=	VER="${PORTVERSION:R}"
@@ -59,12 +62,12 @@ PLIST_SUB+=	VER="${PORTVERSION:R}"
 .if defined(PKGNAMESUFFIX)
 CMAKE_ARGS+=	-DWITHOUT_KDE4=yes
 PLIST_SUB+=	QT="" KDE="@comment "
-. if defined(WITH_PHONON)
+. if ${PORT_OPTIONS:MPHONON}
 USE_QT4+=	phonon
 . else
 CMAKE_ARGS+=	-DWITHOUT_PHONON=yes
 . endif
-. if defined(WITH_WEBKIT)
+. if ${PORT_OPTIONS:MWEBKIT}
 USE_QT4+=	webkit
 . else
 CMAKE_ARGS+=	-DWITHOUT_QTWEBKIT=yes
@@ -79,20 +82,20 @@ CMAKE_ARGS+=	-DWITH_DEBUG=yes -DVERBOSE=
 .endif
 
 #audio support
-.if defined(WITH_AUDIOFILE)
+.if ${PORT_OPTIONS:MAUDIOFILE}
 LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 .else
 CMAKE_ARGS+=	-DWITHOUT_AUDIOFILE=yes
 .endif
 
-.if defined(WITH_GSM)
+.if ${PORT_OPTIONS:MGSM}
 LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
 .else
 CMAKE_ARGS+=	-DWITHOUT_GSM=yes
 .endif
 
 #scripting support
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 PLIST_SUB+=	PYTHON=""
 .else
@@ -100,7 +103,7 @@ CMAKE_ARGS+=	-DWITHOUT_PYTHON=yes
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5_RUN=	yes
 PLIST_SUB+=	PERL=""
 .else
@@ -108,7 +111,7 @@ CMAKE_ARGS+=	-DWITHOUT_PERL=yes
 PLIST_SUB+=	PERL="@comment "
 .endif
 
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 pre-everything::
 	@${ECHO_CMD} "====================================================="
 	@${ECHO_CMD} "     To enable perl scripting you need to rebuild"

Modified: head/irc/quassel/Makefile
==============================================================================
--- head/irc/quassel/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/irc/quassel/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -21,9 +21,13 @@ USE_CMAKE=	yes
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	MONO "Quassel standalone client" on \
-		CORE "Quassel core" on \
-		CLIENT "Quassel client" on
+OPTIONS_MULTI=	MODULE
+OPTIONS_MULTI_MODULE=	MONO CORE CLIENT
+OPTIONS_DEFAULT=	${OPTIONS_MULTI_MODULE}
+
+MONO_DESC=	Quassel standalone client
+CORE_DESC=	Quassel core
+CLIENT_DESC=	Quassel client
 
 CMAKE_ARGS+=	-DWANT_MONO=${QUASSEL_MONO} \
 		-DWANT_CORE=${QUASSEL_CORE} \
@@ -32,21 +36,17 @@ CMAKE_ARGS+=	-DWANT_MONO=${QUASSEL_MONO}
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_MONO) && defined(WITHOUT_CORE) && defined(WITHOUT_CLIENT)
-IGNORE=		needs at least one Quassel component. Please, rerun 'make config'
-.endif
-
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_QT4+=	linguist_build
 .endif
 
-.if defined(WITHOUT_MONO) && defined(WITHOUT_CLIENT)
+.if !${PORT_OPTIONS:MMONO} && !${PORT_OPTIONS:MCLIENT}
 PLIST_SUB+=	MONO_OR_CLIENT="@comment "
 .else
 PLIST_SUB+=	MONO_OR_CLIENT=""
 .endif
 
-.if !defined(WITHOUT_MONO)
+.if ${PORT_OPTIONS:MMONO}
 USE_QT4+=	dbus gui network script sql xml webkit
 QUASSEL_MONO=	ON
 PLIST_SUB+=	MONO=""
@@ -55,7 +55,7 @@ QUASSEL_MONO=	OFF
 PLIST_SUB+=	MONO="@comment "
 .endif
 
-.if !defined(WITHOUT_CORE)
+.if ${PORT_OPTIONS:MCORE}
 USE_QT4+=	network script sql sql-sqlite3_run
 QUASSEL_CORE=	ON
 PLIST_SUB+=	CORE=""
@@ -69,7 +69,7 @@ QUASSEL_CORE=	OFF
 PLIST_SUB+=	CORE="@comment "
 .endif
 
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 USE_QT4+=	dbus gui network xml webkit
 QUASSEL_CLIENT=	ON
 PLIST_SUB+=	CLIENT=""
@@ -79,13 +79,13 @@ PLIST_SUB+=	CLIENT="@comment "
 .endif
 
 pre-configure:
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	${REINPLACE_CMD} -e '/add_subdirectory(i18n)/d' \
 		${WRKSRC}/CMakeLists.txt
 .endif
 
 post-install:
-.if !defined(WITHOUT_CORE)
+.if ${PORT_OPTIONS:MCORE}
 	@${CAT} ${PKGMESSAGE}
 .endif
 

Modified: head/math/qtiplot/Makefile
==============================================================================
--- head/math/qtiplot/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/math/qtiplot/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	qtiplot
-# Date created:			9 May 2005
-# Whom:				Jie Gao <gaoj at cpsc.ucalgary.ca>
+# Date created:				2005-05-09
+# Whom:					Jie Gao <gaoj at cpsc.ucalgary.ca>
 #
 # $FreeBSD$
 #
@@ -37,14 +37,17 @@ DESKTOP_ENTRIES="QtiPlot" "Data analysis
 		"${DATADIR}/qtiplot.png" \
 		"qtiplot" "" false
 
-OPTIONS=	DOCS "Install the QtiPlot Handbook" on \
-		PYTHON "Python scripting support" on
+OPTIONS_DEFINE=	DOCS PYTHON
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+
+DOCS_DESC=	Install the QtiPlot Handbook
+PYTHON_DESC=	Python scripting support
 
 STRIP_FILES=	bin/qtiplot share/qtiplot/fitPlugins/*.so.1.0.0
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
@@ -55,12 +58,12 @@ CONFIGURE_ENV+=	PYTHON_INCLUDEDIR=${PYTH
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-.if !defined(WITHOUT_DOCS)
+.if ${PORT_OPTIONS:MDOCS}
 RUN_DEPENDS+=	qtiplot-doc>=0:${PORTSDIR}/math/qtiplot-doc
 USE_QT4+=	assistant-adp_run
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_QT4+=	linguist_build
 PLIST_SUB+=	NLS=""
 .else
@@ -73,7 +76,7 @@ post-extract:
 	@${CP} ${FILESDIR}/build.conf ${WRKSRC}
 
 post-patch:
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 	@${REINPLACE_CMD} -e \
 		'/^sys.path.append/s|"\."|"${DATADIR}"|' \
 		${WRKSRC}/${PORTNAME}/qtiplotrc.py
@@ -95,14 +98,14 @@ post-patch:
 		"/^CONFIG.*release/s|release|debug|" \
 		${WRKSRC}/build.conf
 .endif
-.if defined(WITHOUT_NLS)
+.if !${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e \
 		"/INSTALLS.*translations/d" \
 		${WRKSRC}/${PORTNAME}/qtiplot.pro
 .endif
 
 do-configure:
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	@(cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 -compress qtiplot.pro)
 .endif
 	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} )
@@ -110,7 +113,7 @@ do-configure:
 post-install:
 	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
 	${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${DATADIR}/qtiplot.png
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 .for s in qtiplotrc.py qtiUtil.py
 	@(cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('${s}')")
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s}c ${DATADIR}/${s}c

Modified: head/math/scilab-toolbox-sivp/Makefile
==============================================================================
--- head/math/scilab-toolbox-sivp/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/math/scilab-toolbox-sivp/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -28,11 +28,13 @@ TOOLBOXDIR=	${PREFIX}/${TOOLBOXDIR_REL}
 PLIST_SUB=	TOOLBOXDIR=${TOOLBOXDIR_REL}
 TOOLBOX_SUBDIRS=	demos etc images macros
 
-OPTIONS=	HELP "Build help files (requires scilab with gui support)" on
+OPTIONS_DEFINE=	HELP
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+HELP_DESC=	Build help files (requires scilab with gui support)
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_HELP)
+.if !${PORT_OPTIONS:MHELP}
 SCILAB_ARGS=	-nogui
 PLIST_SUB+=	HELP="@comment "
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-etc__SIVP.start
@@ -49,14 +51,14 @@ pre-everything::
 	@${ECHO_CMD}
 
 post-patch:
-.if defined(WITHOUT_HELP)
+.if !${PORT_OPTIONS:MHELP}
 	${REINPLACE_CMD} -e '/tbx_builder_help/d' ${WRKSRC}/builder.sce
 .endif
 	${ECHO_CMD} quit >> ${WRKSRC}/builder.sce
 
 pre-build:
 	${FIND} -d ${WRKSRC} \( -name '*.orig' -or -name '*.bak' \) -delete
-.if !defined(WITHOUT_HELP) && !defined(DISPLAY)
+.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY)
 	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
 		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
 		${RM} -f ${WRKDIR}/.Xvfb.pid ; \
@@ -70,7 +72,7 @@ do-build:
 		${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce
 
 post-build:
-.if !defined(WITHOUT_HELP) && !defined(DISPLAY)
+.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY)
 	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
 		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
 		${RM} -f ${WRKDIR}/.Xvfb.pid ; \

Modified: head/math/scilab-toolbox-swt/Makefile
==============================================================================
--- head/math/scilab-toolbox-swt/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/math/scilab-toolbox-swt/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -1,6 +1,6 @@
-## New ports collection makefile for:   swt
-# Date created:			28 March 2006
-# Whom:				Max Brazhnikov makc at issp.ac.ru
+## New ports collection makefile for:	swt
+# Date created:				2006-03-28
+# Whom:					Max Brazhnikov makc at issp.ac.ru
 #
 # $FreeBSD$
 #
@@ -26,16 +26,19 @@ TOOLBOXDIR=	${PREFIX}/${TOOLBOXDIR_REL}
 PLIST_SUB=	TOOLBOXDIR=${TOOLBOXDIR_REL}
 TOOLBOX_SUBDIRS=	demos etc macros
 
-OPTIONS=	SIVP "Enable Image and Video support" off \
-		HELP "Build help files (requires scilab with gui support)" on
+OPTIONS_DEFINE=	HELP SIVP
+OPTIONS_DEFAULT=	HELP
+
+HELP_DESC=	Build help files (requires scilab with gui support)
+SIVP_DESC=	Enable Image and Video support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_SIVP)
+.if ${PORT_OPTIONS:MSIVP}
 RUN_DEPENDS+=	${LOCALBASE}/${CONTRIBDIR}/sivp/loader.sce:${PORTSDIR}/math/scilab-toolbox-sivp
 .endif
 
-.if defined(WITHOUT_HELP)
+.if !${PORT_OPTIONS:MHELP}
 SCILAB_ARGS=	-nogui
 PLIST_SUB+=	HELP="@comment "
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-etc__swt.start
@@ -47,7 +50,7 @@ TOOLBOX_SUBDIRS+=	jar
 .endif
 
 post-patch:
-.if defined(WITHOUT_HELP)
+.if !${PORT_OPTIONS:MHELP}
 	${REINPLACE_CMD} -e '/tbx_builder_help/d' ${WRKSRC}/builder.sce
 .endif
 	${REINPLACE_CMD} -e "s,SWTDIR+','${TOOLBOXDIR}/demos," \
@@ -56,7 +59,7 @@ post-patch:
 
 pre-build:
 	${FIND} -d ${WRKSRC} \( -name '*.orig' -or -name '*.bak' \) -delete
-.if !defined(WITHOUT_HELP) && !defined(DISPLAY)
+.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY)
 	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
 		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
 		${RM} -f ${WRKDIR}/.Xvfb.pid ; \
@@ -70,7 +73,7 @@ do-build:
 		${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce
 
 post-build:
-.if !defined(WITHOUT_HELP) && !defined(DISPLAY)
+.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY)
 	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
 		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
 		${RM} -f ${WRKDIR}/.Xvfb.pid ; \

Modified: head/math/speedcrunch/Makefile
==============================================================================
--- head/math/speedcrunch/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/math/speedcrunch/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -23,7 +23,9 @@ MAKE_JOBS_SAFE=	yes
 LRELEASE_CMD=	${LOCALBASE}/bin/lrelease-qt4
 LRELEASE_ARGS=	-compress -silent
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_QT4+=	linguist
 PLIST_SUB+=	NLS=""
 .else
@@ -31,7 +33,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 pre-configure:
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	cd ${WRKSRC}/src/i18n && ${LRELEASE_CMD} ${LRELEASE_ARGS} *.ts
 .else
 	${REINPLACE_CMD} -e '/speedcrunch_TRANSLATIONS/d' ${WRKSRC}/src/CMakeLists.txt

Modified: head/multimedia/minitube/Makefile
==============================================================================
--- head/multimedia/minitube/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/multimedia/minitube/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -27,7 +27,9 @@ LRELEASE=	${LOCALBASE}/bin/lrelease-qt4
 
 STRIP_FILES=	bin/minitube
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_QT4+=	linguist_build
 PLIST_SUB+=	NLS=""
 .else
@@ -36,7 +38,7 @@ PLIST_SUB+=	NLS="@comment "
 
 pre-configure:
 	${REINPLACE_CMD} -e 's,$$$$PKGDATADIR,${DATADIR},g' ${QMAKE_PRO}
-.if defined(WITHOUT_NLS)
+.if !${PORT_OPTIONS:MNLS}
 	${REINPLACE_CMD} -e '/include(locale\/locale.pri)/d' ${QMAKE_PRO}
 .endif
 

Modified: head/multimedia/subtitlecomposer-kde4/Makefile
==============================================================================
--- head/multimedia/subtitlecomposer-kde4/Makefile	Fri Jul 27 10:37:08 2012	(r301599)
+++ head/multimedia/subtitlecomposer-kde4/Makefile	Fri Jul 27 11:03:38 2012	(r301600)
@@ -18,30 +18,32 @@ USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	gui qmake_build moc_build rcc_build uic_build
-WANT_GSTREAMER=	yes
 
 LATEST_LINK=	${PORTNAME}-kde4
 
-OPTIONS=	MPLAYER "Enable MPlayer backend (recommended)" on \
-		XINE "Enable Xine backend" off \
-		GSTREAMER "Enable GStreamer backend (broken)" off
+OPTIONS_DEFINE=	GSTREAMER MPLAYER XINE
+OPTIONS_DEFAULT=	MPLAYER
 
-.include <bsd.port.pre.mk>
+MPLAYER_DESC=	Enable MPlayer backend (recommended)
+XINE_DESC=	Enable Xine backend
+GSTREAMER_DESC=	Enable GStreamer backend (broken)
 
-.if defined(WITH_MPLAYER)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMPLAYER}
 RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 .endif
 
-.if defined(WITH_XINE)
+.if ${PORT_OPTIONS:MXINE}

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

