Date: Thu, 21 Nov 2013 16:09:47 +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: r334499 - in head: audio/quimup deskutils/cdcat deskutils/launchy deskutils/nagaina deskutils/qlabels devel/alabastra devel/kaptain editors/lfhex editors/textroom finance/qhacc games/ka... Message-ID: <201311211609.rALG9lP4055794@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Thu Nov 21 16:09:47 2013 New Revision: 334499 URL: http://svnweb.freebsd.org/changeset/ports/334499 Log: - Remove now needless qmake_build from USE_QT4 - Get rid of QMAKEFLAGS - Use globally provided LRELEASE Modified: head/audio/quimup/Makefile head/deskutils/cdcat/Makefile head/deskutils/launchy/Makefile head/deskutils/nagaina/Makefile head/deskutils/qlabels/Makefile head/devel/alabastra/Makefile head/devel/kaptain/Makefile head/editors/lfhex/Makefile head/editors/textroom/Makefile head/finance/qhacc/Makefile head/games/kardsgt/Makefile head/games/qgo/Makefile head/games/spellathon/Makefile head/german/tipp10/Makefile head/graphics/darknock/Makefile head/multimedia/2mandvd/Makefile head/multimedia/abby/Makefile head/multimedia/smile/Makefile head/net-im/ramblercontacts/Makefile head/net/x2goclient/Makefile head/sysutils/searchmonkey/Makefile head/textproc/dixit/Makefile head/www/aria2fe/Makefile Modified: head/audio/quimup/Makefile ============================================================================== --- head/audio/quimup/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/audio/quimup/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVER 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 Modified: head/deskutils/cdcat/Makefile ============================================================================== --- head/deskutils/cdcat/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/deskutils/cdcat/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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} 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 Modified: head/deskutils/launchy/Makefile ============================================================================== --- head/deskutils/launchy/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/deskutils/launchy/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -15,7 +15,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/xdg-open:$ 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 Modified: head/deskutils/nagaina/Makefile ============================================================================== --- head/deskutils/nagaina/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/deskutils/nagaina/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER 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 Modified: head/deskutils/qlabels/Makefile ============================================================================== --- head/deskutils/qlabels/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/deskutils/qlabels/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -14,7 +14,7 @@ COMMENT= Labels and business cards creat 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" \ Modified: head/devel/alabastra/Makefile ============================================================================== --- head/devel/alabastra/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/devel/alabastra/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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 Modified: head/devel/kaptain/Makefile ============================================================================== --- head/devel/kaptain/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/devel/kaptain/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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= * Modified: head/editors/lfhex/Makefile ============================================================================== --- head/editors/lfhex/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/editors/lfhex/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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 Modified: head/editors/textroom/Makefile ============================================================================== --- head/editors/textroom/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/editors/textroom/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -16,7 +16,7 @@ LIB_DEPENDS= libhunspell-1.3.so:${PORTSD 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} Modified: head/finance/qhacc/Makefile ============================================================================== --- head/finance/qhacc/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/finance/qhacc/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -17,8 +17,7 @@ LIB_DEPENDS= libqwt6.so:${PORTSDIR}/x11- 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 Modified: head/games/kardsgt/Makefile ============================================================================== --- head/games/kardsgt/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/games/kardsgt/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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 Modified: head/games/qgo/Makefile ============================================================================== --- head/games/qgo/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/games/qgo/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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 Modified: head/games/spellathon/Makefile ============================================================================== --- head/games/spellathon/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/games/spellathon/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -22,7 +22,7 @@ LIB_DEPENDS= libpthread-stubs.so:${PORTS 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 Modified: head/german/tipp10/Makefile ============================================================================== --- head/german/tipp10/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/german/tipp10/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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 Modified: head/graphics/darknock/Makefile ============================================================================== --- head/graphics/darknock/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/graphics/darknock/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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} Modified: head/multimedia/2mandvd/Makefile ============================================================================== --- head/multimedia/2mandvd/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/multimedia/2mandvd/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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 Modified: head/multimedia/abby/Makefile ============================================================================== --- head/multimedia/abby/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/multimedia/abby/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -16,7 +16,7 @@ CCLIVE_DESC= Use cclive backend (instead 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 Modified: head/multimedia/smile/Makefile ============================================================================== --- head/multimedia/smile/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/multimedia/smile/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -16,7 +16,7 @@ RUN_DEPENDS= sox>=14.0:${PORTSDIR}/audio 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} Modified: head/net-im/ramblercontacts/Makefile ============================================================================== --- head/net-im/ramblercontacts/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/net-im/ramblercontacts/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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 Modified: head/net/x2goclient/Makefile ============================================================================== --- head/net/x2goclient/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/net/x2goclient/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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> Modified: head/sysutils/searchmonkey/Makefile ============================================================================== --- head/sysutils/searchmonkey/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/sysutils/searchmonkey/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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} Modified: head/textproc/dixit/Makefile ============================================================================== --- head/textproc/dixit/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/textproc/dixit/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -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} Modified: head/www/aria2fe/Makefile ============================================================================== --- head/www/aria2fe/Makefile Thu Nov 21 15:55:58 2013 (r334498) +++ head/www/aria2fe/Makefile Thu Nov 21 16:09:47 2013 (r334499) @@ -17,7 +17,7 @@ RUN_DEPENDS= aria2c:${PORTSDIR}/www/aria 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311211609.rALG9lP4055794>