5 files changed, 39 insertions, 56 deletions

diff --git a/cad/layouteditor/Makefile b/cad/layouteditor/Makefile
index 24d0d589cb74..b0c147a8151e 100644
--- a/cad/layouteditor/Makefile
+++ b/cad/layouteditor/Makefile
@@ -12,19 +12,16 @@ DISTNAME=	LayoutEditor-${PORTVERSION:S,^0.0.,,}-gpl-src
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	IC/MEMS layout editor
 
-LIB_DEPENDS=	ttf:${PORTSDIR}/print/freetype
+LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
 
+USES=		qmake
 USE_QT4=	corelib gui network moc_build sql uic_build \
-		rcc_build qmake qt3support xml
+		rcc_build qt3support xml
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/layout
 PLIST_FILES=	bin/layout
 
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && ${QMAKE} -makefile -spec ${QMAKESPEC}
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/layout ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/layout ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile
index 70986a0febed..35463ae5a10d 100644
--- a/cad/leocad/Makefile
+++ b/cad/leocad/Makefile
@@ -23,8 +23,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/ldraw/models/car.dat:${PORTSDIR}/cad/ldraw
 WRKSRC=		${WRKDIR}/${PORTNAME}
 LEOCAD_PIECES=	pieces-7439.zip
 
-USES=		desktop-file-utils gmake pkgconfig shared-mime-info
-USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
+USES=		desktop-file-utils gmake pkgconfig qmake shared-mime-info
+USE_QT4=	moc_build rcc_build uic_build iconengines_run imageformats_run \
 		corelib gui network opengl
 
 USE_GL=		glut
@@ -39,7 +39,6 @@ ICON_SIZES=	16x16 24x24 32x32 48x48 128x128 256x256
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-extract:
@@ -59,28 +58,24 @@ post-patch:
 	@cd ${WRKSRC}/tools/icon && ${CP} -a ${PORTNAME}_128x128.png icon128.png
 	@cd ${WRKSRC}/tools/icon && ${MV} icon.svg ${PORTNAME}.svg
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
 post-install:
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/pieces/* ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/pieces/* ${STAGEDIR}${DATADIR}
 
 .for s in ${ICON_SIZES}
 	@${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}_${s}.png \
-		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
-	@${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}.svg  \
-		${PREFIX}/share/icons/hicolor/scalable/apps/
-	@${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
-	${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${MAN1PREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/
+	@${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/cad/meshlab/Makefile b/cad/meshlab/Makefile
index 04028994caa1..87b3d05d97d8 100644
--- a/cad/meshlab/Makefile
+++ b/cad/meshlab/Makefile
@@ -14,10 +14,11 @@ COMMENT=	3D triangular meshes processing and editing tool
 EXTRACT_DEPENDS=7z:${PORTSDIR}/archivers/p7zip
 LIB_DEPENDS=	libQtSolutions_SOAP-head.so:${PORTSDIR}/devel/qt4-qtsolutions-soap
 
+USES=		dos2unix qmake
 USE_GL=		glew glu
-USE_QT4=	qmake_build moc_build rcc_build uic_build corelib gui xml \
+USE_QT4=	moc_build rcc_build uic_build corelib gui xml \
 		xmlpatterns opengl network script
-USE_DOS2UNIX=	external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h \
+DOS2UNIX_FILES=	external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h \
 		meshlabplugins/edit_arc3D/fillImage.cpp
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}/src
@@ -35,13 +36,11 @@ post-patch:
 	    ${REINPLACE_CMD} -e '/^CONFIG +=/s|$$| debug|'
 .endif
 
-do-configure:
-	cd ${WRKSRC}/external && ${QMAKE} -spec ${QMAKESPEC} -recursive external.pro
-	cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC} -recursive meshlab_full.pro
+pre-configure:
+	cd ${WRKSRC}/external && ${QMAKE} ${QMAKE_ARGS} -recursive external.pro
 
-do-build:
+pre-build:
 	cd ${WRKSRC}/external && ${MAKE}
-	cd ${WRKSRC} && ${MAKE}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/meshlab/plugins
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 57a8460c78b9..3ae00826f82d 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -12,26 +12,22 @@ COMMENT=	The programmer's solid 3D CAD modeller
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
-		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2 \
 		${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	GLU:${PORTSDIR}/graphics/libGLU \
-		gmp:${PORTSDIR}/math/gmp \
-		mpfr:${PORTSDIR}/math/mpfr \
-		CGAL:${PORTSDIR}/math/cgal \
-		opencsg:${PORTSDIR}/graphics/opencsg
-
-USE_GL=		glew
-USE_QT4=  qmake corelib gui opengl moc uic rcc
-PLIST_SUB=      PORTVERSION=${PORTVERSION}
-#MAKE_JOBS_UNSAFE=yes
-QMAKE_ENV =		EIGEN2DIR=${LOCALBASE}/include/eigen2
-QMAKE_FLAGS =		VERSION=${PORTVERSION}
-MAKE_ENV =		INSTALL_ROOT=${DESTDIR}
+LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
+		libmpfr.so:${PORTSDIR}/math/mpfr \
+		libCGAL.so:${PORTSDIR}/math/cgal \
+		libopencsg.so:${PORTSDIR}/graphics/opencsg
+
+USES=		bison qmake
+USE_GL=		glu glew
+USE_QT4=	corelib gui opengl moc_build uic_build rcc_build
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+QMAKE_ENV=	EIGEN2DIR=${LOCALBASE}/include/eigen2
+QMAKE_ARGS+=	VERSION=${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's,XXXFLEXXX,"${LOCALBASE}/bin/flex",' \
 		${WRKSRC}/openscad.pro
@@ -42,8 +38,4 @@ post-patch:
 	${REINPLACE_CMD} -e 's#/usr/local/bin/flex#${LOCALBASE}/bin/flex#g' \
 		${WRKSRC}/flex.pri
 
-do-configure:
-	cd ${WRKSRC} && \
-	${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_FLAGS} openscad.pro
-
 .include <bsd.port.mk>
diff --git a/cad/qelectrotech/Makefile b/cad/qelectrotech/Makefile
index ccc527f73d6b..643dba82932d 100644
--- a/cad/qelectrotech/Makefile
+++ b/cad/qelectrotech/Makefile
@@ -14,26 +14,26 @@ COMMENT=	QElectroTech is application to design electric diagrams
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_QT4=	gui moc_build network qmake_build rcc_build \
-		sql-sqlite3 svg uic_build xml designer
+USES=		qmake
+USE_QT4=	gui moc_build network rcc_build \
+		sql-sqlite3_run svg uic_build xml designer
 USE_GCC=	4.7+
 INSTALLS_ICONS=	yes
 
 CXXFLAGS+=	"-fno-ipa-sra"
-QMAKEFLAGS+=	QMAKE_RPATHDIR="${_GCC_RUNTIME}"
+QMAKE_ARGS+=	QMAKE_RPATHDIR="${_GCC_RUNTIME}"
 
 MAN1=		qelectrotech.1
 MANLANG=	"" cs el es fr.ISO8859-1 fr.UTF-8 fr it pl pt_PT
 MANCOMPRESSED=	yes
 
-do-configure:
+pre-configure:
 	${MV} ${WRKSRC}/man/files/pt ${WRKSRC}/man/files/pt_PT
-	${REINPLACE_CMD} -e 's,/usr/local/,${STAGEDIR}${PREFIX}/,g' \
+	${REINPLACE_CMD} -e 's,/usr/local/,${PREFIX}/,g' \
 		${WRKSRC}/${PORTNAME}.pro
 	${REINPLACE_CMD} -e 's,doc/,share/doc/,g' \
 		${WRKSRC}/${PORTNAME}.pro
 	${REINPLACE_CMD} -e 's,../share,share,g' \
 		${WRKSRC}/${PORTNAME}.pro
-	cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} ${PORTNAME}.pro
 
 .include <bsd.port.mk>