- Pass QMAKE_ARGS to qmake

Approved by:	portmgr (blanket approval)

deskutils/recoll/Makefile

@@ -46,8 +46,8 @@ PYDISTUTILS_EGGINFO=	Recoll-1.0-py${PYTHON_VER}.egg-info
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
-USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
-		corelib gui xml webkit
+USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines_run \
+		imageformats_run corelib gui xml webkit
 QT_NONSTANDARD=	yes
 CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}"
 INSTALLS_ICONS=	yes
@@ -71,8 +71,8 @@ post-patch:
 
 post-configure:
 .if ${PORT_OPTIONS:MQT4}
-	@cd ${WRKSRC}/qtgui && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
+	@cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} \
+		${QMAKE} ${QMAKE_ARGS}
 .endif
 
 .include <bsd.port.mk>

sysutils/qpxtool/Makefile

@@ -7,7 +7,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION:C/\.[^.]*$/.x/}/${DISTVERSION}
 
 MAINTAINER=	horia@racoviceanu.com
-COMMENT=	A GUI for testing CD/DVD quality and transfer rate
+COMMENT=	GUI for testing CD/DVD quality and transfer rate
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
@@ -20,7 +20,7 @@ CONFIGURE_ENV=	PREFIX=${PREFIX}
 USE_LDCONFIG=	yes
 
 post-configure:
-	@${REINPLACE_CMD} -e 's|$$(QMAKE4)|& ${QMAKEFLAGS}|' \
+	@${REINPLACE_CMD} -e 's|$$(QMAKE4)|& ${QMAKE_AGRS}|' \
 		${WRKSRC}/gui/Makefile
 	@${REINPLACE_CMD} -e 's|S_ISBLK|S_ISCHR|' \
 		${WRKSRC}/lib/qpxtransport/qpx_mmc.cpp