Date: Tue, 24 Feb 2015 21:46:29 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379845 - in head: audio/kid3-kde4 cad/librecad devel/qdevelop emulators/aqemu emulators/qtemu graphics/klatexformula graphics/qcomicbook irc/quassel math/qtiplot math/qtoctave multimed... Message-ID: <201502242146.t1OLkTnV053831@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Tue Feb 24 21:46:28 2015 New Revision: 379845 URL: https://svnweb.freebsd.org/changeset/ports/379845 QAT: https://qat.redports.org/buildarchive/r379845/ Log: - Switch my ports to USE_QT4=linguisttools_build and adjust Qt components - Use LUPDATE/LRELEASE provided by bsd.qt.mk - Drop needless stripping Modified: head/audio/kid3-kde4/Makefile head/cad/librecad/Makefile head/devel/qdevelop/Makefile head/devel/qdevelop/pkg-descr head/emulators/aqemu/Makefile head/emulators/qtemu/Makefile head/graphics/klatexformula/Makefile head/graphics/qcomicbook/Makefile head/irc/quassel/Makefile head/math/qtiplot/Makefile head/math/qtoctave/Makefile head/multimedia/minitube/Makefile head/science/kst2/Makefile head/x11-fonts/fontmatrix/Makefile Modified: head/audio/kid3-kde4/Makefile ============================================================================== --- head/audio/kid3-kde4/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/audio/kid3-kde4/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -33,7 +33,7 @@ CMAKE_ARGS+= -DWITH_QT5=true .else # Qt 4 and KDE 4 USE_QT4= qmake_build moc_build rcc_build uic_build \ - linguist_build + linguisttools_build .endif .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4" Modified: head/cad/librecad/Makefile ============================================================================== --- head/cad/librecad/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/cad/librecad/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -2,6 +2,7 @@ PORTNAME= librecad DISTVERSION= 2.0.5 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= GITHUB @@ -11,8 +12,8 @@ COMMENT= 2D CAD system BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs LIB_DEPENDS= libmuparser.so:${PORTSDIR}/math/muparser -USE_QT4= help qt3support help-tools_build linguist_build moc_build \ - rcc_build uic_build uic3_build +USE_QT4= gui help network sql svg help-tools_build \ + linguisttools_build moc_build rcc_build uic_build USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake USE_GITHUB= yes Modified: head/devel/qdevelop/Makefile ============================================================================== --- head/devel/qdevelop/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/devel/qdevelop/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -17,8 +17,6 @@ USE_QT4= gui sql network xml designer sq moc_build uic_build rcc_build USES= qmake -STRIP_FILES= bin/${PORTNAME} - DESKTOP_ENTRIES= "QDevelop" \ "Qt 4 development environment" \ "${PREFIX}/share/pixmaps/qdevelop.png" \ @@ -29,10 +27,10 @@ DESKTOP_ENTRIES= "QDevelop" \ OPTIONS_DEFINE= TOOLS DOCS NLS OPTIONS_DEFAULT= ${OPTIONS_DEFINE} OPTIONS_SUB= yes -NLS_USE= QT4=linguist_build +NLS_USE= QT4=linguisttools_build TOOLS_DESC= Install Qt 4 development tools (qmake, moc, etc.) TOOLS_USE= ${_TOOLS:C|.*|QT4=&_run|} -_TOOLS= assistant linguist moc qmake rcc uic +_TOOLS= assistant linguisttools moc qmake rcc uic .include <bsd.port.options.mk> @@ -59,7 +57,6 @@ post-configure: .endif post-install: - ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} ${INSTALL_DATA} ${WRKSRC}/resources/images/logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/qdevelop.png .if ${PORT_OPTIONS:MNLS} @${MKDIR} ${STAGEDIR}${DATADIR}/translations Modified: head/devel/qdevelop/pkg-descr ============================================================================== --- head/devel/qdevelop/pkg-descr Tue Feb 24 21:40:33 2015 (r379844) +++ head/devel/qdevelop/pkg-descr Tue Feb 24 21:46:28 2015 (r379845) @@ -4,4 +4,4 @@ to Qt and is totally independent of KDev light and especially multi-platforms. QDevelop and KDevelop have different code sources. -WWW: http://biord-software.org/qdevelop/ +WWW: http://code.google.com/p/qdevelop/ Modified: head/emulators/aqemu/Makefile ============================================================================== --- head/emulators/aqemu/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/emulators/aqemu/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -2,6 +2,7 @@ PORTNAME= aqemu PORTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S,.0$,,}/ @@ -10,8 +11,8 @@ COMMENT= Qt 4 based Qemu frontend LIB_DEPENDS= libvncclient.so:${PORTSDIR}/net/libvncserver -USE_QT4= gui qtestlib xml qmake_build uic_build moc_build rcc_build \ - linguist_build +USE_QT4= gui network qtestlib xml linguisttools_build \ + moc_build qmake_build rcc_build uic_build USES= cmake tar:bzip2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S,.0$,,} Modified: head/emulators/qtemu/Makefile ============================================================================== --- head/emulators/qtemu/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/emulators/qtemu/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -17,15 +17,11 @@ DESKTOP_ENTRIES="QtEmu" "QEMU frontend" "qtemu" "" true OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes -.include <bsd.port.options.mk> +NLS_USE= QT4=linguisttools_build -.if ${PORT_OPTIONS:MNLS} -USE_QT4+= linguist_build -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +.include <bsd.port.options.mk> post-configure: .if ${PORT_OPTIONS:MNLS} Modified: head/graphics/klatexformula/Makefile ============================================================================== --- head/graphics/klatexformula/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/graphics/klatexformula/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -11,7 +11,7 @@ COMMENT= Convert LaTeX formula to image BUILD_DEPENDS= help2man:${PORTSDIR}/misc/help2man USES= cmake:outsource desktop-file-utils shared-mime-info -USE_QT4= gui xml dbus designer_build linguist_build \ +USE_QT4= gui xml dbus designer_build linguisttools_build \ qmake_build moc_build rcc_build uic_build USE_TEX= latex dvipsk USE_GHOSTSCRIPT_RUN= yes Modified: head/graphics/qcomicbook/Makefile ============================================================================== --- head/graphics/qcomicbook/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/graphics/qcomicbook/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -15,7 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 USES= cmake:outsource pkgconfig -USE_QT4= corelib gui linguist_build moc_build qmake_build rcc_build \ +USE_QT4= corelib gui linguisttools_build moc_build qmake_build rcc_build \ uic_build xml OPTIONS_DEFINE= 7ZIP ACE RAR ZIP Modified: head/irc/quassel/Makefile ============================================================================== --- head/irc/quassel/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/irc/quassel/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -41,7 +41,7 @@ CLIENT_CMAKE_OFF= -DWANT_QTCLIENT=off KDE_DESC= KDE 4 integration (for clients only) -NLS_USE= QT4=linguist_build +NLS_USE= QT4=linguisttools_build .include <bsd.port.options.mk> Modified: head/math/qtiplot/Makefile ============================================================================== --- head/math/qtiplot/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/math/qtiplot/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -34,8 +34,6 @@ OPTIONS_DEFAULT= DOCS PYTHON NLS DOCS_DESC= Install the QtiPlot Handbook PYTHON_DESC= Python scripting support -STRIP_FILES= bin/qtiplot share/qtiplot/fitPlugins/*.so.1.0.0 - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MPYTHON} @@ -55,7 +53,7 @@ USE_QT4+= assistant-adp_run .endif .if ${PORT_OPTIONS:MNLS} -USE_QT4+= linguist_build +USE_QT4+= linguisttools_build PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " @@ -99,7 +97,6 @@ pre-configure: .endif post-install: - ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} ${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/qtiplot.png .if ${PORT_OPTIONS:MPYTHON} .for s in qtiplotrc.py qtiUtil.py Modified: head/math/qtoctave/Makefile ============================================================================== --- head/math/qtoctave/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/math/qtoctave/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -13,7 +13,7 @@ RUN_DEPENDS= octave:${PORTSDIR}/math/oct USE_QT4= designer gui network script svg xml \ qmake_build moc_build rcc_build uic_build \ - linguist_build + linguisttools_build USES= cmake CMAKE_ARGS+= -DWITH_UseRPMTools:Bool=Off Modified: head/multimedia/minitube/Makefile ============================================================================== --- head/multimedia/minitube/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/multimedia/minitube/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -18,11 +18,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME} QMAKE_ARGS= QMAKE_LRELEASE=${LRELEASE} -STRIP_FILES= bin/minitube - OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -NLS_USE= QT4=linguist_build +NLS_USE= QT4=linguisttools_build .include <bsd.port.options.mk> @@ -32,7 +30,4 @@ pre-configure: ${REINPLACE_CMD} -e '/include(locale\/locale.pri)/d' ${WRKSRC}/minitube.pro .endif -post-install: - ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} - .include <bsd.port.mk> Modified: head/science/kst2/Makefile ============================================================================== --- head/science/kst2/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/science/kst2/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -13,7 +13,7 @@ COMMENT= Data viewing and plotting tool LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/gsl USES= cmake:outsource pkgconfig -_USE_QT4= gui xml designer svg linguist_build \ +_USE_QT4= gui xml designer svg linguisttools_build \ qmake_build moc_build rcc_build uic_build _USE_QT5= concurrent network printsupport widgets xml \ buildtools_build linguisttools_build qmake_build Modified: head/x11-fonts/fontmatrix/Makefile ============================================================================== --- head/x11-fonts/fontmatrix/Makefile Tue Feb 24 21:40:33 2015 (r379844) +++ head/x11-fonts/fontmatrix/Makefile Tue Feb 24 21:46:28 2015 (r379845) @@ -13,7 +13,7 @@ COMMENT= Graphical font manager RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme USES= cmake -USE_QT4= gui svg network moc_build uic_build rcc_build qmake_build linguist_build +USE_QT4= gui svg network moc_build uic_build rcc_build qmake_build linguisttools_build INSTALLS_ICONS= yes OPTIONS_DEFINE= FONTFORGE @@ -28,7 +28,7 @@ post-patch: pre-configure: cd ${WRKSRC}/src/messages && \ - ${LOCALBASE}/bin/lupdate-qt4 -noobsolete ../ -ts *.ts && \ - ${LOCALBASE}/bin/lrelease-qt4 *.ts + ${LUPDATE} -noobsolete ../ -ts *.ts && \ + ${LRELEASE} *.ts .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502242146.t1OLkTnV053831>