- Convert my ports to new options framework

- use CONFLICTS_INSTALL
- other minor changes

4 files changed, 38 insertions, 28 deletions

diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index 38c2567415c1..63628143b351 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	qtiplot
-# Date created:			9 May 2005
-# Whom:				Jie Gao <gaoj@cpsc.ucalgary.ca>
+# Date created:				2005-05-09
+# Whom:					Jie Gao <gaoj@cpsc.ucalgary.ca>
 #
 # $FreeBSD$
 #
@@ -37,14 +37,17 @@ DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \
 		"${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=${PYTHON_INCLUDEDIR} \
 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
diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile
index a27203b9ed9a..17cb1a7b57ed 100644
--- a/math/scilab-toolbox-sivp/Makefile
+++ b/math/scilab-toolbox-sivp/Makefile
@@ -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 ; \
diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile
index b1d38a317854..130406ca4d11 100644
--- a/math/scilab-toolbox-swt/Makefile
+++ b/math/scilab-toolbox-swt/Makefile
@@ -1,6 +1,6 @@
-## New ports collection makefile for:   swt
-# Date created:			28 March 2006
-# Whom:				Max Brazhnikov makc@issp.ac.ru
+## New ports collection makefile for:	swt
+# Date created:				2006-03-28
+# Whom:					Max Brazhnikov makc@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 ; \
diff --git a/math/speedcrunch/Makefile b/math/speedcrunch/Makefile
index 1f6e21966282..b6eee279f036 100644
--- a/math/speedcrunch/Makefile
+++ b/math/speedcrunch/Makefile
@@ -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