- Remove now needless qmake_build from USE_QT4

- Get rid of QMAKEFLAGS
- Use globally provided LRELEASE

23 files changed, 24 insertions, 30 deletions

diff --git a/audio/quimup/Makefile b/audio/quimup/Makefile
index 1996084..06eed40 100644
--- a/audio/quimup/Makefile
+++ b/audio/quimup/Makefile
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
 USES=		qmake
 USE_QT4=	corelib gui network \
-		moc_build qmake_build rcc_build uic_build
+		moc_build rcc_build uic_build
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png
diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile
index ca2a8df..3d93b94 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -31,7 +31,7 @@ BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 USES=		qmake
 USE_BZIP2=	yes
 USE_QT4=	corelib gui xml \
-		linguist_build moc_build qmake_build uic_build
+		linguist_build moc_build uic_build
 INSTALLS_ICONS=	yes
 
 QMAKE_ARGS+=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
@@ -45,7 +45,6 @@ QMAKE_ARGS+=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
 		DEFINES+="MEDIAINFO_UNICODE" \
 		DEFINES+="USE_LIBEXIF"
 QMAKE_PRO=	${PORTNAME}.pro
-LRELEASE=	${QT_PREFIX}/bin/lrelease-qt4
 
 # spoof tinderbox: build deps for multimedia/mediainfo
 USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
diff --git a/deskutils/launchy/Makefile b/deskutils/launchy/Makefile
index ed834b0..392b9a6 100644
--- a/deskutils/launchy/Makefile
+++ b/deskutils/launchy/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils
 
 USES=		dos2unix qmake
 DOS2UNIX_FILES=	readme.lyx readme.txt
-USE_QT4=	qmake_build moc_build rcc_build uic_build gui network
+USE_QT4=	moc_build rcc_build uic_build gui network
 PORTDOCS=	*
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/deskutils/nagaina/Makefile b/deskutils/nagaina/Makefile
index 3e11f73..c954bdf 100644
--- a/deskutils/nagaina/Makefile
+++ b/deskutils/nagaina/Makefile
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		gettext iconv qmake
 USE_GNOME=	glib20
-USE_QT4=	corelib gui xml moc_build qmake_build rcc_build uic_build
+USE_QT4=	corelib gui xml moc_build rcc_build uic_build
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 
 PORTDOCS=	CHANGELOG TODO
diff --git a/deskutils/qlabels/Makefile b/deskutils/qlabels/Makefile
index aa5cc78..6af6abc 100644
--- a/deskutils/qlabels/Makefile
+++ b/deskutils/qlabels/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Labels and business cards creating
 
 USES=		qmake
 USE_BZIP2=	yes
-USE_QT4=	xml gui corelib qmake_build uic_build moc_build rcc_build
+USE_QT4=	xml gui corelib uic_build moc_build rcc_build
 WRKSRC=		${WRKDIR}/${DISTNAME:C/_/-/}
 
 DESKTOP_ENTRIES=	"qLabels" \
diff --git a/devel/alabastra/Makefile b/devel/alabastra/Makefile
index 0ef1646..545a568 100644
--- a/devel/alabastra/Makefile
+++ b/devel/alabastra/Makefile
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USES=		qmake gmake
 USE_QT4=	gui xml \
-		moc_build qmake_build rcc_build uic_build \
+		moc_build rcc_build uic_build \
 		iconengines_run
 ALL_TARGET=	Alabastra
 
diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile
index 831fba4..800ec82 100644
--- a/devel/kaptain/Makefile
+++ b/devel/kaptain/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2 # (or later)
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USES=		qmake
-USE_QT4=	qt3support moc_build qmake_build
+USE_QT4=	qt3support moc_build
 
 INFO=		kaptain
 PORTDOCS=	*
diff --git a/editors/lfhex/Makefile b/editors/lfhex/Makefile
index 475bee4..e2b4988 100644
--- a/editors/lfhex/Makefile
+++ b/editors/lfhex/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Large file hex editor
 
 LICENSE=	GPLv2
 
-USE_QT4=	corelib gui moc_build qmake_build rcc_build
+USE_QT4=	corelib gui moc_build rcc_build
 USES=		bison qmake
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
diff --git a/editors/textroom/Makefile b/editors/textroom/Makefile
index 612f1ec0..5b3b72f 100644
--- a/editors/textroom/Makefile
+++ b/editors/textroom/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
 
 USES=		qmake shared-mime-info
 USE_SDL=	mixer
-USE_QT4=	moc_build qmake_build rcc_build uic_build corelib gui xml \
+USE_QT4=	moc_build rcc_build uic_build corelib gui xml \
 		svg opengl qt3support
 QMAKE_ARGS=	LOCALBASE=${LOCALBASE}
 
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index 7d9ec91..b01e78a 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6
 OPTIONS_DEFINE=	DOCS
 
 USES=		qmake:norecursive
-USE_QT4=	corelib gui sql moc_build qmake_build rcc_build uic_build
-QMAKE_ARGS=	${QMAKEFLAGS}
+USE_QT4=	corelib gui sql moc_build rcc_build uic_build
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
diff --git a/games/kardsgt/Makefile b/games/kardsgt/Makefile
index b1f6df9..90031bf 100644
--- a/games/kardsgt/Makefile
+++ b/games/kardsgt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Card game suite
 
 USES=		qmake
 USE_QT4=	assistantclient corelib gui network \
-		moc_build qmake_build rcc_build uic_build
+		moc_build rcc_build uic_build
 ALL_TARGET=	qmake release
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/games/qgo/Makefile b/games/qgo/Makefile
index 1424ee6..14c3132 100644
--- a/games/qgo/Makefile
+++ b/games/qgo/Makefile
@@ -14,7 +14,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_BZIP2=	yes
 USES=		desktop-file-utils qmake
-USE_QT4=	gui network qtestlib moc_build qmake_build rcc_build uic_build
+USE_QT4=	gui network qtestlib moc_build rcc_build uic_build
 
 PLIST_FILES=	bin/qgo share/applications/qgo.desktop share/pixmaps/qgo.png
 
diff --git a/games/spellathon/Makefile b/games/spellathon/Makefile
index 4bad8c8..7049893 100644
--- a/games/spellathon/Makefile
+++ b/games/spellathon/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
 CXXFLAGS+=	-fPIC
 USES=		gettext iconv qmake
 USE_GNOME=	glib20
-USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
+USE_QT4=	corelib gui moc_build rcc_build uic_build
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 USE_LDCONFIG=	yes
 
diff --git a/german/tipp10/Makefile b/german/tipp10/Makefile
index acf2cbb..8bc55dd 100644
--- a/german/tipp10/Makefile
+++ b/german/tipp10/Makefile
@@ -18,7 +18,7 @@ USES=		qmake dos2unix
 DOS2UNIX_GLOB=	*.pro *.cpp
 USE_ZIP=	yes
 USE_QT4=	gui sql corelib network script qtestlib \
-		qmake_build rcc_build uic_build moc_build \
+		rcc_build uic_build moc_build \
 		sql-sqlite2_run sql-sqlite3_run
 QMAKE_ARGS+=	DATADIR="${DATADIR}"
 WRKSRC=		${WRKDIR}/tipp10_source_v2-1-0
diff --git a/graphics/darknock/Makefile b/graphics/darknock/Makefile
index 7f817ab..3efc010 100644
--- a/graphics/darknock/Makefile
+++ b/graphics/darknock/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2 # (or later)
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		qmake
-USE_QT4=	gui linguist_build moc_build qmake_build rcc_build uic_build
+USE_QT4=	gui linguist_build moc_build rcc_build uic_build
 
 PORTDOCS=	changelog
 PLIST_FILES=	bin/darknock share/pixmaps/darknock.png
@@ -27,8 +27,6 @@ DESKTOP_ENTRIES=	"${PORTNAME}" \
 			"Graphics;Qt;" \
 			"true"
 
-LRELEASE=	${QT_PREFIX}/bin/lrelease-qt4
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/multimedia/2mandvd/Makefile b/multimedia/2mandvd/Makefile
index 8a0184e..c223ade 100644
--- a/multimedia/2mandvd/Makefile
+++ b/multimedia/2mandvd/Makefile
@@ -32,15 +32,13 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		desktop-file-utils gmake perl5 qmake:norecursive shebangfix
 SHEBANG_FILES=	fake.pl
 USE_QT4=	corelib gui opengl \
-		linguist_build moc_build qmake_build rcc_build uic_build
+		linguist_build moc_build rcc_build uic_build
 USE_GL=		glu
 USE_SDL=	sdl
 USE_PERL5=	run
 
 DATADIR=	${PREFIX}/share/2ManDVD
 
-LRELEASE=	${LOCALBASE}/bin/lrelease-qt4
-
 post-extract:
 	@${FIND} ${WRKSRC} -name "*~" -delete
 
diff --git a/multimedia/abby/Makefile b/multimedia/abby/Makefile
index 117c2da..7230afc 100644
--- a/multimedia/abby/Makefile
+++ b/multimedia/abby/Makefile
@@ -16,7 +16,7 @@ CCLIVE_DESC=	Use cclive backend (instead of clive)
 
 USES=		qmake
 USE_BZIP2=	yes
-USE_QT4=	gui network xml moc_build qmake_build rcc_build uic_build
+USE_QT4=	gui network xml moc_build rcc_build uic_build
 
 PLIST_FILES=	bin/abby
 
diff --git a/multimedia/smile/Makefile b/multimedia/smile/Makefile
index ea93f0d..1324358 100644
--- a/multimedia/smile/Makefile
+++ b/multimedia/smile/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	sox>=14.0:${PORTSDIR}/audio/sox \
 		ImageMagick>=6.4:${PORTSDIR}/graphics/ImageMagick
 
 USES=		qmake
-USE_QT4=	qmake_build gui corelib rcc_build moc_build uic_build \
+USE_QT4=	gui corelib rcc_build moc_build uic_build \
 		opengl webkit
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/net-im/ramblercontacts/Makefile b/net-im/ramblercontacts/Makefile
index 050367a..00c9ef2 100644
--- a/net-im/ramblercontacts/Makefile
+++ b/net-im/ramblercontacts/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv3
 USES=		qmake dos2unix
 DOS2UNIX_FILES=	config.inc
 USE_XORG=	xscrnsaver
-USE_QT4=	qmake_build moc_build rcc_build uic_build designer_build \
+USE_QT4=	moc_build rcc_build uic_build designer_build \
 		webkit
 USE_LDCONFIG=	yes
 
diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile
index 281b080..9589644 100644
--- a/net/x2goclient/Makefile
+++ b/net/x2goclient/Makefile
@@ -24,8 +24,8 @@ OPTIONS_DEFAULT=LDAP
 USES=		qmake
 USE_XORG=	xpm
 USE_QT4=	gui network svg \
-		linguist_build moc_build qmake_build rcc_build uic_build
-QMAKE_ARGS=	QMAKE_LRELEASE="${QT_PREFIX}/bin/lrelease-qt4"
+		linguist_build moc_build rcc_build uic_build
+QMAKE_ARGS=	QMAKE_LRELEASE="${LRELEASE}"
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.options.mk>
diff --git a/sysutils/searchmonkey/Makefile b/sysutils/searchmonkey/Makefile
index 52341c4..ef3793b 100644
--- a/sysutils/searchmonkey/Makefile
+++ b/sysutils/searchmonkey/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv3 # (or later)
 USES=		qmake dos2unix
 USE_ZIP=	yes
 DOS2UNIX_GLOB=	*.cpp *.h
-USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
+USE_QT4=	corelib gui moc_build rcc_build uic_build
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/textproc/dixit/Makefile b/textproc/dixit/Makefile
index 585e6f0..d4840dd 100644
--- a/textproc/dixit/Makefile
+++ b/textproc/dixit/Makefile
@@ -21,7 +21,7 @@ LICENSE=	GPLv3 # (or later)
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.${QT_VER}
 
 USES=		qmake
-USE_QT4=	corelib gui network moc_build qmake_build rcc_build
+USE_QT4=	corelib gui network moc_build rcc_build
 QMAKE_ARGS=	QMAKE_LFLAGS="-lz"
 
 PLIST_SUB=	_DB=${_DB} DB_DIR=${DB_DIR} _DB_F=${_DB_F}
diff --git a/www/aria2fe/Makefile b/www/aria2fe/Makefile
index fa12377..92973b6 100644
--- a/www/aria2fe/Makefile
+++ b/www/aria2fe/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	aria2c:${PORTSDIR}/www/aria2 \
 
 USES=		qmake
 USE_BZIP2=	yes
-USE_QT4=	gui moc_build qmake_build rcc_build uic_build
+USE_QT4=	gui moc_build rcc_build uic_build
 
 PLIST_FILES=	bin/${PORTNAME}