Author: makc
Date: Thu Nov 21 15:41:06 2013
New Revision: 334497
URL: http://svnweb.freebsd.org/changeset/ports/334497
Log:
- Remove now needless qmake_build from USE_QT4
- Get rid of QMAKEFLAGS
- Convert to USES=dos2unix
Modified:
head/cad/librecad/Makefile
head/devel/qdevelop/Makefile
head/editors/texmaker/Makefile
head/emulators/dboxfe/Makefile
head/emulators/qtemu/Makefile
head/games/colorcode/Makefile
head/games/hexglass/Makefile
head/math/qtiplot/Makefile
head/math/qwtplot3d-qt4/Makefile
head/multimedia/minitube/Makefile
head/print/kpdftool/Makefile
head/textproc/beediff/Makefile
head/textproc/qstardict/Makefile
head/x11-toolkits/qwt5-designerplugin/Makefile
head/x11-toolkits/qwt5/Makefile
head/x11-toolkits/qwt6-designerplugin/Makefile
head/x11-toolkits/qwt6/Makefile
Modified: head/cad/librecad/Makefile
==============================================================================
--- head/cad/librecad/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/cad/librecad/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -10,7 +10,7 @@ COMMENT= 2D CAD system
BUILD_DEPENDS= ${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser
-USE_QT4= help qt3support help-tools_build moc_build qmake_build \
+USE_QT4= help qt3support help-tools_build moc_build \
rcc_build uic_build uic3_build
USES= qmake
MAKE_ENV= XDG_CONFIG_HOME=/dev/null
@@ -42,7 +42,7 @@ post-patch:
post-build:
.if ${PORT_OPTIONS:MNLS}
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
- ${LOCALBASE}/bin/lrelease-qt4 -compress librecad.pro
+ ${LRELEASE} -compress librecad.pro
${MKDIR} ${WRKSRC}/unix/resources/qm
${INSTALL_DATA} ${WRKSRC}/ts/*.qm ${WRKSRC}/unix/resources/qm
.endif
Modified: head/devel/qdevelop/Makefile
==============================================================================
--- head/devel/qdevelop/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/devel/qdevelop/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -14,14 +14,12 @@ COMMENT= Development environment entirel
RUN_DEPENDS= exctags:${PORTSDIR}/devel/ctags
USE_QT4= gui sql network xml designer sql-sqlite3_run \
- qmake_build moc_build uic_build rcc_build
+ moc_build uic_build rcc_build
USES= qmake
QMAKE_PRO= QDevelop.pro
STRIP_FILES= bin/${PORTNAME}
-QT_LRELEASE= ${LOCALBASE}/bin/lrelease-qt4
-
DESKTOP_ENTRIES= "QDevelop" \
"Qt4 development environment" \
"${PREFIX}/share/pixmaps/qdevelop.png" \
@@ -66,7 +64,7 @@ post-patch:
post-configure:
.if ${PORT_OPTIONS:MNLS}
- cd ${WRKSRC} && ${QT_LRELEASE} ${QMAKE_PRO}
+ cd ${WRKSRC} && ${LRELEASE} ${QMAKE_PRO}
.endif
post-install:
Modified: head/editors/texmaker/Makefile
==============================================================================
--- head/editors/texmaker/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/editors/texmaker/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -17,7 +17,7 @@ USES= desktop-file-utils pkgconfig qmak
USE_BZIP2= yes
USE_GHOSTSCRIPT_RUN= yes
USE_QT4= gui network xml webkit \
- moc_build qmake_build rcc_build uic_build
+ moc_build rcc_build uic_build
USE_TEX= latex dvipsk
QMAKE_ARGS= ICONDIR=${PREFIX}/share/pixmaps \
DESKTOPDIR=${DESKTOPDIR}
Modified: head/emulators/dboxfe/Makefile
==============================================================================
--- head/emulators/dboxfe/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/emulators/dboxfe/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -29,7 +29,7 @@ DESKTOP_ENTRIES= "DBoxFE" "DOSBox config
post-build:
@(cd ${WRKSRC}/dboxfetray && \
- ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} && \
+ ${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} && \
${SETENV} ${MAKE_ENV} ${MAKE})
do-install:
Modified: head/emulators/qtemu/Makefile
==============================================================================
--- head/emulators/qtemu/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/emulators/qtemu/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -10,7 +10,7 @@ MAINTAINER= makc at FreeBSD.org
COMMENT= Qt 4 based frontend for QEMU
USE_BZIP2= yes
-USE_QT4= gui xml uic_build moc_build qmake_build rcc_build
+USE_QT4= gui xml uic_build moc_build rcc_build
USES= qmake
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
@@ -30,7 +30,7 @@ PLIST_SUB+= NLS="@comment "
post-configure:
.if ${PORT_OPTIONS:MNLS}
- (cd ${WRKSRC} && ${LOCALBASE}/bin/lrelease-qt4 qtemu.pro)
+ (cd ${WRKSRC} && ${LRELEASE} qtemu.pro)
.endif
do-install:
Modified: head/games/colorcode/Makefile
==============================================================================
--- head/games/colorcode/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/games/colorcode/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -10,13 +10,13 @@ DISTNAME= ColorCode-${PORTVERSION}
MAINTAINER= makc at FreeBSD.org
COMMENT= Advanced MasterMind game and solver
-USE_QT4= gui moc_build qmake_build rcc_build uic_build
+USE_QT4= gui moc_build rcc_build uic_build
USES= qmake
WRKSRC= ${WRKDIR}/ColorCode-${PORTVERSION}
DESKTOP_ENTRIES= "ColorCode" "${COMMENT}" \
"${PREFIX}/share/pixmaps/colorcode.png" "colorcode" \
- "LogicGame;Game;Qt;" false
+ "LogicGame;Game;Qt;" true
PLIST_FILES= bin/colorcode \
share/pixmaps/colorcode.png
Modified: head/games/hexglass/Makefile
==============================================================================
--- head/games/hexglass/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/games/hexglass/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -9,7 +9,7 @@ MASTER_SITES= GOOGLE_CODE
MAINTAINER= makc at FreeBSD.org
COMMENT= Tetris-like puzzle game based on a hexagonal grid
-USE_QT4= gui qmake_build moc_build rcc_build
+USE_QT4= gui moc_build rcc_build
USES= qmake
PLIST_FILES= bin/${PORTNAME} \
Modified: head/math/qtiplot/Makefile
==============================================================================
--- head/math/qtiplot/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/math/qtiplot/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -17,13 +17,13 @@ LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/
# qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
# qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4
-USES= gmake qmake
+USES= dos2unix gmake qmake
USE_BZIP2= yes
USE_QT4= gui opengl svg qt3support network assistantclient \
- moc_build qmake_build rcc_build
+ moc_build rcc_build
USE_GL= glu
QMAKE_ARGS+= LOCALBASE=${LOCALBASE} PYTHON_CMD=${PYTHON_CMD}
-USE_DOS2UNIX= *.pro
+DOS2UNIX_GLOB= *.pro
DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \
"${DATADIR}/qtiplot.png" \
@@ -96,7 +96,7 @@ post-patch:
pre-configure:
.if ${PORT_OPTIONS:MNLS}
- cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 -compress qtiplot.pro
+ cd ${WRKSRC}/qtiplot && ${LRELEASE} -compress qtiplot.pro
.endif
post-install:
Modified: head/math/qwtplot3d-qt4/Makefile
==============================================================================
--- head/math/qwtplot3d-qt4/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/math/qwtplot3d-qt4/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -11,11 +11,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= makc at FreeBSD.org
COMMENT= 3D plotting widgets for scientific data and math expressions
-USES= qmake
-USE_QT4= gui moc_build qmake_build opengl
+USES= dos2unix qmake
+USE_QT4= gui moc_build opengl
USE_GL= glu
USE_LDCONFIG= yes
-USE_DOS2UNIX= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
Modified: head/multimedia/minitube/Makefile
==============================================================================
--- head/multimedia/minitube/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/multimedia/minitube/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -9,15 +9,14 @@ MAINTAINER= makc at FreeBSD.org
COMMENT= TV-like client for YouTube
USE_QT4= gui network xml dbus phonon phonon-gst \
- qmake_build moc_build rcc_build imageformats_run
+ moc_build rcc_build imageformats_run
USE_GSTREAMER= ffmpeg
USES= qmake
INSTALLS_ICONS= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-QMAKE_ARGS= QMAKE_LRELEASE=${QT_LRELEASE}
+QMAKE_ARGS= QMAKE_LRELEASE=${LRELEASE}
QMAKE_PRO= ${WRKSRC}/${PORTNAME}.pro
-QT_LRELEASE= ${LOCALBASE}/bin/lrelease-qt4
STRIP_FILES= bin/minitube
Modified: head/print/kpdftool/Makefile
==============================================================================
--- head/print/kpdftool/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/print/kpdftool/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -14,7 +14,7 @@ COMMENT= Simple utility to manipulate PS
RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
USE_ZIP= yes
-USE_QT4= qt3support moc_build porting_build qmake_build uic3_build
+USE_QT4= qt3support moc_build porting_build uic3_build
USE_GHOSTSCRIPT_RUN= yes
USES= qmake
Modified: head/textproc/beediff/Makefile
==============================================================================
--- head/textproc/beediff/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/textproc/beediff/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -11,7 +11,7 @@ MAINTAINER= makc at FreeBSD.org
COMMENT= Qt 4 based diff frontend
USES= qmake
-USE_QT4= gui moc_build rcc_build qmake_build
+USE_QT4= gui moc_build rcc_build
WRKSRC= ${WRKDIR}/${PORTNAME}
Modified: head/textproc/qstardict/Makefile
==============================================================================
--- head/textproc/qstardict/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/textproc/qstardict/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -9,10 +9,10 @@ MASTER_SITES= http://qstardict.ylsoftwar
MAINTAINER= makc at FreeBSD.org
COMMENT= Qt 4 based dictionary program (stardict clone)
-USES= pkgconfig qmake
+USES= dos2unix pkgconfig qmake
USE_BZIP2= yes
-USE_QT4= gui network xml qmake_build uic_build moc_build rcc_build
-USE_DOS2UNIX= qstardict.pri
+USE_QT4= gui network xml uic_build moc_build rcc_build
+DOS2UNIX_FILES= qstardict.pri
DICPATH= ${LOCALBASE}/share/stardict/dic
Modified: head/x11-toolkits/qwt5-designerplugin/Makefile
==============================================================================
--- head/x11-toolkits/qwt5-designerplugin/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/x11-toolkits/qwt5-designerplugin/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -12,7 +12,7 @@ COMMENT= Qt Designer plugin for Qwt
LIB_DEPENDS= libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
USES= gmake qmake
-USE_QT4= designer moc_build qmake_build rcc_build
+USE_QT4= designer moc_build rcc_build
USE_BZIP2= yes
QMAKE_ARGS+= CONFIG+=QwtDesigner \
PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}
Modified: head/x11-toolkits/qwt5/Makefile
==============================================================================
--- head/x11-toolkits/qwt5/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/x11-toolkits/qwt5/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -10,7 +10,7 @@ MAINTAINER= makc at FreeBSD.org
COMMENT= Qt Widgets for Technical Applications
USES= gmake qmake
-USE_QT4= gui svg moc_build qmake_build
+USE_QT4= gui svg moc_build
USE_BZIP2= yes
USE_LDCONFIG= yes
PORTSCOUT= limit:^5\.
Modified: head/x11-toolkits/qwt6-designerplugin/Makefile
==============================================================================
--- head/x11-toolkits/qwt6-designerplugin/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/x11-toolkits/qwt6-designerplugin/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -12,7 +12,7 @@ COMMENT= Qt Designer plugin for Qwt
LIB_DEPENDS= libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6
USES= gmake qmake
-USE_QT4= designer moc_build qmake_build rcc_build
+USE_QT4= designer moc_build rcc_build
USE_BZIP2= yes
QMAKE_ARGS+= CONFIG+=QwtDesigner \
PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}
Modified: head/x11-toolkits/qwt6/Makefile
==============================================================================
--- head/x11-toolkits/qwt6/Makefile Thu Nov 21 15:37:51 2013 (r334496)
+++ head/x11-toolkits/qwt6/Makefile Thu Nov 21 15:41:06 2013 (r334497)
@@ -10,7 +10,7 @@ MAINTAINER= makc at FreeBSD.org
COMMENT= Qt Widgets for Technical Applications
USES= gmake qmake
-USE_QT4= gui opengl svg xml moc_build qmake_build
+USE_QT4= gui opengl svg xml moc_build
USE_BZIP2= yes
USE_LDCONFIG= yes
DOCSDIR= ${PREFIX}/share/doc/qwt6