svn commit: r334503 - in head: audio/last.fm games/djgame2 graphics/djview4

[Max Brazhnikov]

Author: makc
Date: Thu Nov 21 16:55:54 2013
New Revision: 334503
URL: http://svnweb.freebsd.org/changeset/ports/334503

Log:
  - Get rid of deprecated QMAKEFLAGS
  - Use globally provided QMAKE, etc.

Modified:
  head/audio/last.fm/Makefile
  head/games/djgame2/Makefile   (contents, props changed)
  head/graphics/djview4/Makefile   (contents, props changed)

Modified: head/audio/last.fm/Makefile
==============================================================================
--- head/audio/last.fm/Makefile	Thu Nov 21 16:14:42 2013	(r334502)
+++ head/audio/last.fm/Makefile	Thu Nov 21 16:55:54 2013	(r334503)
@@ -42,7 +42,7 @@ USE_GCC=4.2+
 
 post-patch:
 	${CP} ${WRKSRC}/dist/tarball_files/configure ${WRKSRC}/configure
-	${REINPLACE_CMD} -E -e 's|(.*"CONFIG-=debug")|\1 ${QMAKEFLAGS}|g' \
+	${REINPLACE_CMD} -E -e 's|(.*"CONFIG-=debug")|\1 ${QMAKE_ARGS}|g' \
 			-e 's|function header|header()|g' \
 			-e 's|function middle|middle()|g' \
 			-e 's|-pthread|-pthread -R/usr/local/share/last.fm|g' \

Modified: head/games/djgame2/Makefile
==============================================================================
--- head/games/djgame2/Makefile	Thu Nov 21 16:14:42 2013	(r334502)
+++ head/games/djgame2/Makefile	Thu Nov 21 16:55:54 2013	(r334503)
@@ -16,9 +16,6 @@ NO_BUILD=	yes
 USE_ZIP=	yes
 USE_QT4=	gui qt3support qmake_build uic_build rcc_build moc_build svg
 
-QMAKE?=		qmake-qt4
-QMAKESPEC?=	${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
-
 WRKSRC=		${WRKDIR}/${DISTNAME}
 DATADIR=	${PREFIX}/share/djgame2
 

Modified: head/graphics/djview4/Makefile
==============================================================================
--- head/graphics/djview4/Makefile	Thu Nov 21 16:14:42 2013	(r334502)
+++ head/graphics/djview4/Makefile	Thu Nov 21 16:55:54 2013	(r334503)
@@ -21,7 +21,7 @@ USE_XORG=	sm ice xt
 QT_NONSTANDARD=	yes
 CONFIGURE_ARGS=	--x-includes="${LOCALBASE}/include" \
 		--x-libraries="${LOCALBASE}/lib"
-CONFIGURE_ENV=	QMAKE="${LOCALBASE}/bin/qmake-qt4" \
+CONFIGURE_ENV=	QMAKE="${QMAKE}" \
 		QMAKESPEC="${QMAKESPEC}"
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include