- Pass QMAKE_ARGS to qmake

Approved by:	portmgr (blanket approval)

11 files changed, 45 insertions, 54 deletions

diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile
index 02c8549cba12..c1a4bdb1e8ab 100644
--- a/comms/dabstick-radio/Makefile
+++ b/comms/dabstick-radio/Makefile
@@ -23,15 +23,12 @@ LIB_DEPENDS+=	rtlsdr:${PORTSDIR}/comms/rtl-sdr \
 
 USE_QT4=	gui qt3support qmake_build moc_build rcc_build uic_build
 
-QMAKE_DABSTICK=	${QMAKE} -unix PREFIX=${PREFIX} -o
-
 PORTDOCS=	*
 PLIST_FILES+=	bin/dabreceiver bin/fmreceiver bin/spectrum-viewer
 
 ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	uses MMX and SSE2
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if (${OSVERSION} >= 901000) && exists(${DESTDIR}/usr/bin/clang)
@@ -43,30 +40,30 @@ USE_GCC=	yes
 .endif
 
 do-configure:
-	cd ${WRKSRC}/fmreceiver-dab && ${SETENV} ${MAKE_ENV} \
-		${QMAKE_DABSTICK} Makefile fmreceiver.pro
-	cd ${WRKSRC}/dabreceiver-V2 && ${SETENV} ${MAKE_ENV} \
-		${QMAKE_DABSTICK} Makefile dabreceiver.pro
-	cd ${WRKSRC}/spectrum-viewer && ${SETENV} ${MAKE_ENV} \
-		${QMAKE_DABSTICK} Makefile spectrum-viewer.pro
+	cd ${WRKSRC}/fmreceiver-dab && ${SETENV} ${QMAKE_ENV} \
+		${QMAKE} ${QMAKE_ARGS}
+	cd ${WRKSRC}/dabreceiver-V2 && ${SETENV} ${QMAKE_ENV} \
+		${QMAKE} ${QMAKE_ARGS}
+	cd ${WRKSRC}/spectrum-viewer && ${SETENV} ${QMAKE_ENV} \
+		${QMAKE} ${QMAKE_ARGS}
 
 do-build:
 	cd ${WRKSRC}/fmreceiver-dab && ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${_MAKE_JOBS} CC=${CC} CXX=${CXX} LINK=${CXX}
+		${MAKE} ${_MAKE_JOBS}
 	cd ${WRKSRC}/dabreceiver-V2 && ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${_MAKE_JOBS} CC=${CC} CXX=${CXX} LINK=${CXX}
+		${MAKE} ${_MAKE_JOBS}
 	cd ${WRKSRC}/spectrum-viewer && ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${_MAKE_JOBS} CC=${CC} CXX=${CXX} LINK=${CXX}
+		${MAKE} ${_MAKE_JOBS}
 
 do-install:
 	${INSTALL} ${WRKSRC}/fmreceiver-dab/fmreceiver \
 		${WRKSRC}/dabreceiver-V2/dabreceiver \
 		${WRKSRC}/spectrum-viewer/spectrum-viewer \
-		${PREFIX}/bin
+		${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/dabreceiver-V2 ${DOCSDIR}/fmreceiver-dab
-	${INSTALL_DATA} ${WRKSRC}/dabreceiver-V2/README ${DOCSDIR}/dabreceiver-V2
-	${INSTALL_DATA} ${WRKSRC}/fmreceiver-dab/README ${DOCSDIR}/fmreceiver-dab
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/dabreceiver-V2 ${STAGEDIR}${DOCSDIR}/fmreceiver-dab
+	${INSTALL_DATA} ${WRKSRC}/dabreceiver-V2/README ${STAGEDIR}${DOCSDIR}/dabreceiver-V2
+	${INSTALL_DATA} ${WRKSRC}/fmreceiver-dab/README ${STAGEDIR}${DOCSDIR}/fmreceiver-dab
 .endif
 
 .include <bsd.port.mk>
diff --git a/comms/jsdr/Makefile b/comms/jsdr/Makefile
index 53457cd92124..0edefe76d9b9 100644
--- a/comms/jsdr/Makefile
+++ b/comms/jsdr/Makefile
@@ -20,24 +20,21 @@ LIB_DEPENDS+=	qwt:${PORTSDIR}/x11-toolkits/qwt5 \
 
 USE_QT4=	gui qt3support qmake_build moc_build rcc_build uic_build
 
-QMAKE_DABSTICK=	${QMAKE} -unix PREFIX=${PREFIX} -o
-
 PORTDOCS=	*
 PLIST_FILES+=	bin/swreceiver bin/spectrum-viewer-${PORTVERSION} \
 		bin/mini-receiver bin/fmreceiver-${PORTVERSION}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 do-configure:
 	cd ${WRKSRC}/make-x64/swreceiver && ${SETENV} ${MAKE_ENV} \
-		${QMAKE_DABSTICK} Makefile swreceiver.pro
+		${QMAKE} ${QMAKE_ARGS}
 	cd ${WRKSRC}/make-x64/fmreceiver && ${SETENV} ${MAKE_ENV} \
-		${QMAKE_DABSTICK} Makefile fmreceiver.pro
+		${QMAKE} ${QMAKE_ARGS}
 	cd ${WRKSRC}/make-x64/spectrum-viewer && ${SETENV} ${MAKE_ENV} \
-		${QMAKE_DABSTICK} Makefile spectrum-viewer.pro
+		${QMAKE} ${QMAKE_ARGS}
 	cd ${WRKSRC}/make-x64/mini-receiver && ${SETENV} ${MAKE_ENV} \
-		${QMAKE_DABSTICK} Makefile mini-receiver.pro
+		${QMAKE} ${QMAKE_ARGS}
 
 do-build:
 	cd ${WRKSRC}/make-x64/swreceiver && ${SETENV} ${MAKE_ENV} \
@@ -52,14 +49,14 @@ do-build:
 do-install:
 	${INSTALL} ${WRKSRC}/make-x64/swreceiver/swreceiver \
 		${WRKSRC}/make-x64/mini-receiver/mini-receiver \
-		${PREFIX}/bin
+		${STAGEDIR}${PREFIX}/bin
 	${INSTALL} ${WRKSRC}/make-x64/spectrum-viewer/spectrum-viewer \
-		${PREFIX}/bin/spectrum-viewer-${PORTVERSION}
+		${STAGEDIR}${PREFIX}/bin/spectrum-viewer-${PORTVERSION}
 	${INSTALL} ${WRKSRC}/make-x64/fmreceiver/fmreceiver \
-		${PREFIX}/bin/fmreceiver-${PORTVERSION}
+		${STAGEDIR}${PREFIX}/bin/fmreceiver-${PORTVERSION}
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile
index 5ea85ec85a3d..055f17ac4654 100644
--- a/graphics/fracplanet/Makefile
+++ b/graphics/fracplanet/Makefile
@@ -59,6 +59,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \
 		${WRKSRC}/${f}
 .endfor
+	@${REINPLACE_CMD} -e 's|qmake-qt4|${QMAKE} ${QMAKE_ARGS}|' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-lboost_program_options|-lboost_program_options -lGLU|' \
 		${WRKSRC}/fracplanet.pro
 
diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index 8214c99d23e2..86da32dd93f1 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -17,31 +17,27 @@ USE_QT4=	gui network script xml qmake_build moc_build rcc_build uic_build \
 
 ALL_TARGET=	src/smplayer
 
+USES=		gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 
-MAN1=		smplayer.1
-MANCOMPRESSED=	yes
-
 PORTDOCS=	Changelog Copying.txt Install.txt Not_so_obvious_things.txt \
 		Readme.txt Release_notes.txt
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|qmake|${QMAKE}|g' \
-		-e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|g' \
+	@${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|g' \
+		-e 's|lrelease|${LRELEASE}|g' \
 		-e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \
 		-e 's,/share/man,/man,g' \
-		-e 's, make, ${GMAKE},g' \
+		-e 's, make, ${MAKE_CMD},g' \
 		${WRKSRC}/Makefile
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/smplayer/pkg-plist b/multimedia/smplayer/pkg-plist
index 24b470410fb3..0a41175344b2 100644
--- a/multimedia/smplayer/pkg-plist
+++ b/multimedia/smplayer/pkg-plist
@@ -1,4 +1,5 @@
 bin/smplayer
+man/man1/smplayer.1.gz
 share/applications/smplayer.desktop
 share/applications/smplayer_enqueue.desktop
 share/icons/hicolor/128x128/apps/smplayer.png
diff --git a/multimedia/smtube/Makefile b/multimedia/smtube/Makefile
index 8643355d56f3..91a912612c74 100644
--- a/multimedia/smtube/Makefile
+++ b/multimedia/smtube/Makefile
@@ -15,7 +15,7 @@ USE_BZIP2=	yes
 USES=		gmake
 ALL_TARGET=	#empty
 USE_QT4=	linguist_build moc_build qmake_build rcc_build uic_build
-QMAKEFLAGS+=	QMAKE_CXXFLAGS_RELEASE=""
+QMAKE_ARGS+=	QMAKE_CXXFLAGS_RELEASE=""
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	*
@@ -23,8 +23,8 @@ PORTDOCS=	*
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKEFLAGS}|' \
-		-e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|g' \
+	@${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|' \
+		-e 's|lrelease|${LRELEASE}|g' \
 		-e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \
 		-e 's|$$(PREFIX)/share/smtube|${DATADIR}|g' \
 		-e 's|$$(PREFIX)/share/doc/smtube|${DOCSDIR}|' \
diff --git a/multimedia/umplayer/Makefile b/multimedia/umplayer/Makefile
index 41c65a940678..c61efcf38dc9 100644
--- a/multimedia/umplayer/Makefile
+++ b/multimedia/umplayer/Makefile
@@ -17,22 +17,19 @@ USE_XZ=		yes
 USE_QT4=	gui network xml qmake_build moc_build rcc_build uic_build \
 		linguist_build
 INSTALLS_ICONS=	yes
-MAKE_ARGS=	QMAKE_OPTS="DEFINES+=NO_DEBUG_ON_CONSOLE" PREFIX="${PREFIX}"
+MAKE_ARGS+=	${PREFIX}
+QMAKE_ARGS+=	"DEFINES+=NO_DEBUG_ON_CONSOLE"
 ALL_TARGET=	src/umplayer
 
-MAN1=		umplayer.1
-MANCOMPRESSED=	yes
-
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| make| $$(MAKE)|' \
 		-e 's|cd src|(&| ; /cd src/s|$$|)|' \
-		-e 's|qmake|${QMAKE}|' \
-		-e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|' \
+		-e 's|qmake|${QMAKE} ${QMAKE_ARGS}|' \
+		-e 's|lrelease|${LRELEASE}|' \
 		-e 's|/share/man|/man|' \
 		-e 's|/doc/packages|/doc|' \
 		-e 's|^.*/get_svn_revision.sh$$||' \
diff --git a/multimedia/umplayer/pkg-plist b/multimedia/umplayer/pkg-plist
index c398748467b6..57329c2c17c5 100644
--- a/multimedia/umplayer/pkg-plist
+++ b/multimedia/umplayer/pkg-plist
@@ -1,4 +1,5 @@
 bin/umplayer
+man/man1/umplayer.1.gz
 share/applications/umplayer.desktop
 share/applications/umplayer_enqueue.desktop
 %%PORTDOCS%%%%DOCSDIR%%/Audio_equalizer.txt
diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index f0cbd8291b12..5277d6579272 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -78,8 +78,8 @@ post-patch:
 do-configure:
 .if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} USE_UPNP=${QMAKE_USE_UPNP} USE_QRCODE=${QMAKE_USE_QRCODE} \
-		QMAKE_LRELEASE=lrelease-qt4 PREFIX=${PREFIX} INCLUDEPATH=${BDB_INCLUDE_DIR} \
+		${QMAKE} ${QMAKE_ARGS} USE_UPNP=${QMAKE_USE_UPNP} USE_QRCODE=${QMAKE_USE_QRCODE} \
+		QMAKE_LRELEASE=${LRELEASE} INCLUDEPATH=${BDB_INCLUDE_DIR} \
 		QMAKE_LIBDIR+=${BDB_LIB_DIR} bitcoin-qt.pro
 .endif
 
diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile
index bf10052f5bcc..37765935e894 100644
--- a/net-p2p/litecoin/Makefile
+++ b/net-p2p/litecoin/Makefile
@@ -75,9 +75,9 @@ QMAKE_USE_DBUS=	0
 do-configure:
 .if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11)
 	cd ${BUILD_WRKSRC} && \
-		${QMAKE} PREFIX=${PREFIX} -spec ${QMAKESPEC} ${QMAKEFLAGS} \
+		${QMAKE} ${QMAKE_ARGS} \
 		QMAKE_LIBDIR+=${BDB_LIB_DIR} \
-		QMAKE_LRELEASE=${LOCALBASE}/bin/lrelease-qt4 \
+		QMAKE_LRELEASE=${LRELEASE} \
 		USE_UPNP=${QMAKE_USE_UPNP} \
 		USE_QRCODE=${QMAKE_USE_QRCODE} \
 		USE_DBUS=${QMAKE_USE_DBUS} \
diff --git a/net-p2p/transmission-qt4/Makefile b/net-p2p/transmission-qt4/Makefile
index 4c1c8b587b35..b5d2fef54267 100644
--- a/net-p2p/transmission-qt4/Makefile
+++ b/net-p2p/transmission-qt4/Makefile
@@ -17,7 +17,7 @@ SLAVEPORT=	qt4
 QT_NONSTANDARD=	yes
 USE_QT4=	moc_build qmake_build rcc_build uic_build gui dbus network
 USE_GNOME=	desktopfileutils
-QMAKEFLAGS=	QMAKE_LFLAGS="-lcrypto -L${LOCALBASE}/lib ${ICONV_LIB}"
+LDFLAGS+=	-lcrypto
 
 EXTRA_CONF_ARGS=--disable-cli \
 		--disable-daemon \
@@ -33,7 +33,7 @@ post-patch: general-patch
 
 NO_STAGE=	yes
 post-build:
-	@(cd ${WRKSRC}/qt ; ${QMAKE} ${QMAKEFLAGS} qtr.pro ; ${GMAKE})
+	@(cd ${WRKSRC}/qt ; ${QMAKE} ${QMAKE_ARGS} qtr.pro ; ${GMAKE})
 
 do-install:
 	@(cd ${WRKSRC}/qt ; ${SETENV} INSTALL_ROOT=${PREFIX} ${MAKE} install)