diff options
| author | makc <makc@FreeBSD.org> | 2013-11-21 16:55:54 +0000 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2013-11-21 16:55:54 +0000 |
| commit | 38d697fecc3a04b9ca1505b478d5e014f9b408b7 (patch) | |
| tree | d3bc482daafbf3ff99c41a31569f5df0b14b7d79 | |
| parent | ca79beed89bf11c2b08ac0d284dfb34c7b90afc8 (diff) | |
| download | FreeBSD-ports-38d697fecc3a04b9ca1505b478d5e014f9b408b7.zip FreeBSD-ports-38d697fecc3a04b9ca1505b478d5e014f9b408b7.tar.gz | |
- Get rid of deprecated QMAKEFLAGS
- Use globally provided QMAKE, etc.
| -rw-r--r-- | audio/last.fm/Makefile | 2 | ||||
| -rw-r--r-- | games/djgame2/Makefile | 3 | ||||
| -rw-r--r-- | graphics/djview4/Makefile | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/audio/last.fm/Makefile b/audio/last.fm/Makefile index 0a9d004..0b42ca1 100644 --- a/audio/last.fm/Makefile +++ b/audio/last.fm/Makefile @@ -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' \ diff --git a/games/djgame2/Makefile b/games/djgame2/Makefile index 372cfc6..11c2aac 100644 --- a/games/djgame2/Makefile +++ b/games/djgame2/Makefile @@ -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 diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile index 57b4a50..d9455fc 100644 --- a/graphics/djview4/Makefile +++ b/graphics/djview4/Makefile @@ -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 |
