- Support staging

- Use new LIB_DEPENDS syntax
- Use options helpers
- Convert to USES
- Minor changes/fixes

6 files changed, 19 insertions, 42 deletions

diff --git a/math/liborigin/Makefile b/math/liborigin/Makefile
index 75ce968b4bed..4d324aaabf77 100644
--- a/math/liborigin/Makefile
+++ b/math/liborigin/Makefile
@@ -22,7 +22,6 @@ PORTDOCS=	*
 OPTIONS_DEFINE=	DOXYGEN
 DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDOXYGEN}
diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile
index 677730d55854..9d8bb2c7ba48 100644
--- a/math/qtiplot-doc/Makefile
+++ b/math/qtiplot-doc/Makefile
@@ -19,14 +19,13 @@ USE_BZIP2=	yes
 DATADIR=	${PREFIX}/share/qtiplot/manual
 WRKSRC=		${WRKDIR}/${DISTNAME}/manual
 
-NO_STAGE=	yes
 post-patch:
 	cd ${WRKSRC} && ${REINPLACE_CMD} -e "s:/usr/local:${LOCALBASE}:g" \
 		docbook-en/index.docbook qtiplot.dsl qtiplot_html.xsl Makefile
 
 do-install:
-	${MKDIR} ${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}
 	${RM} -rf ${WRKSRC}/html/pics-it
-	cd ${WRKSRC}/html && ${COPYTREE_SHARE} \* ${DATADIR}
+	cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/math/qtoctave/Makefile b/math/qtoctave/Makefile
index 1434e2c773cd..8500554c1d31 100644
--- a/math/qtoctave/Makefile
+++ b/math/qtoctave/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	math
 MASTER_SITES=	http://forja.rediris.es/frs/download.php/2054/
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	Qt4 frontend for Octave
+COMMENT=	Qt 4 frontend for Octave
 
 RUN_DEPENDS=	octave:${PORTSDIR}/math/octave
 
@@ -16,7 +16,6 @@ USE_QT4=	designer gui network script svg xml \
 USES=		cmake
 CMAKE_ARGS+=	-DWITH_UseRPMTools:Bool=Off
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e '/COMMAND "lrelease"/s,lrelease,$${QT_LRELEASE_EXECUTABLE},' \
 		${WRKSRC}/qtoctave/src/CMakeLists.txt
diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile
index 24e932ec2ca9..ba9735a092a0 100644
--- a/math/scilab-toolbox-sivp/Makefile
+++ b/math/scilab-toolbox-sivp/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Scilab Image and Video Processing Toolbox
 
 BUILD_DEPENDS=	${SCILAB_CMD}:${PORTSDIR}/math/scilab
-LIB_DEPENDS=	opencv_legacy.2:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS=	libopencv_legacy.so:${PORTSDIR}/graphics/opencv
 RUN_DEPENDS=	${SCILAB_CMD}:${PORTSDIR}/math/scilab
 
 USES=		pkgconfig
-USE_XZ=	yes
+USE_XZ=		yes
 
 SCILAB_CMD=	${LOCALBASE}/bin/scilab
 CONTRIBDIR?=	share/scilab/contrib
@@ -28,7 +28,6 @@ OPTIONS_DEFINE=	HELP
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 HELP_DESC=	Build help files (requires scilab with gui support)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MHELP}
@@ -36,7 +35,7 @@ SCILAB_ARGS=	-nogui
 PLIST_SUB+=	HELP="@comment "
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-etc__SIVP.start
 .else
-USE_DISPLAY=	yes
+USES+=		display:build
 MAKE_ENV=	LC_ALL="C"
 PLIST_SUB+=	HELP=""
 TOOLBOX_SUBDIRS+=	jar
@@ -55,37 +54,21 @@ post-patch:
 
 pre-build:
 	${FIND} -d ${WRKSRC} \( -name '*.orig' -or -name '*.bak' \) -delete
-.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY)
-	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
-		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
-		${RM} -f ${WRKDIR}/.Xvfb.pid ; \
-	fi
-	${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 -fp ${LOCALBASE}/lib/X11/fonts/misc > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-.endif
 
 do-build:
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce
 
-post-build:
-.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY)
-	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
-		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
-		${RM} -f ${WRKDIR}/.Xvfb.pid ; \
-	fi
-.endif
-
 do-install:
-	${MKDIR} ${TOOLBOXDIR}/sci_gateway/cpp
-	${INSTALL_DATA} ${WRKSRC}/loader.sce ${TOOLBOXDIR}
+	${MKDIR} ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/cpp
+	${INSTALL_DATA} ${WRKSRC}/loader.sce ${STAGEDIR}${TOOLBOXDIR}
 	${INSTALL_DATA} ${WRKSRC}/sci_gateway/loader_gateway.sce \
-		${TOOLBOXDIR}/sci_gateway
+		${STAGEDIR}${TOOLBOXDIR}/sci_gateway
 	cd ${WRKSRC}/sci_gateway/cpp && \
-	${INSTALL_DATA} loader.sce ${TOOLBOXDIR}/sci_gateway/cpp && \
-	${INSTALL_PROGRAM} libgw_sivp.so ${TOOLBOXDIR}/sci_gateway/cpp
+	${INSTALL_DATA} loader.sce ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/cpp && \
+	${INSTALL_PROGRAM} libgw_sivp.so ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/cpp
 .for d in ${TOOLBOX_SUBDIRS}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${TOOLBOXDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${TOOLBOXDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile
index e8f98e231e76..3acfc0eb3862 100644
--- a/math/scilab-toolbox-swt/Makefile
+++ b/math/scilab-toolbox-swt/Makefile
@@ -27,7 +27,6 @@ OPTIONS_DEFAULT=	HELP
 HELP_DESC=	Build help files (requires scilab with gui support)
 SIVP_DESC=	Enable Image and Video support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSIVP}
@@ -61,15 +60,15 @@ do-build:
 		${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce
 
 do-install:
-	${MKDIR} ${TOOLBOXDIR}/sci_gateway/c
-	${INSTALL_DATA} ${WRKSRC}/loader.sce ${TOOLBOXDIR}
+	${MKDIR} ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/c
+	${INSTALL_DATA} ${WRKSRC}/loader.sce ${STAGEDIR}${TOOLBOXDIR}
 	${INSTALL_DATA} ${WRKSRC}/sci_gateway/loader_gateway.sce \
-		${TOOLBOXDIR}/sci_gateway
+		${STAGEDIR}${TOOLBOXDIR}/sci_gateway
 	cd ${WRKSRC}/sci_gateway/c && \
-	${INSTALL_DATA} loader.sce ${TOOLBOXDIR}/sci_gateway/c && \
-	${INSTALL_PROGRAM} libswt_c.so ${TOOLBOXDIR}/sci_gateway/c
+	${INSTALL_DATA} loader.sce ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/c && \
+	${INSTALL_PROGRAM} libswt_c.so ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/c
 .for d in ${TOOLBOX_SUBDIRS}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${TOOLBOXDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${TOOLBOXDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/math/speedcrunch/Makefile b/math/speedcrunch/Makefile
index cc1c03e2c845..1c5037cfa7da 100644
--- a/math/speedcrunch/Makefile
+++ b/math/speedcrunch/Makefile
@@ -8,19 +8,17 @@ CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	A desktop calculator for power users
+COMMENT=	Desktop calculator for power users
 
 USE_QT4=	qmake_build moc_build rcc_build uic_build gui xml
 USES=		cmake
 CMAKE_SOURCE_PATH=	src
 
-
 LRELEASE_CMD=	${LOCALBASE}/bin/lrelease-qt4
 LRELEASE_ARGS=	-compress -silent
 
 OPTIONS_DEFINE=	NLS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}