Date: Fri, 22 Nov 2013 12:55:12 +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: r334587 - in head: comms/dabstick-radio comms/jsdr graphics/fracplanet multimedia/smplayer multimedia/smtube multimedia/umplayer net-p2p/bitcoin net-p2p/litecoin net-p2p/transmission-qt4 Message-ID: <201311221255.rAMCtCYG084922@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Fri Nov 22 12:55:11 2013 New Revision: 334587 URL: http://svnweb.freebsd.org/changeset/ports/334587 Log: - Pass QMAKE_ARGS to qmake Approved by: portmgr (blanket approval) Modified: head/comms/dabstick-radio/Makefile head/comms/jsdr/Makefile head/graphics/fracplanet/Makefile head/multimedia/smplayer/Makefile head/multimedia/smplayer/pkg-plist (contents, props changed) head/multimedia/smtube/Makefile head/multimedia/umplayer/Makefile (contents, props changed) head/multimedia/umplayer/pkg-plist (contents, props changed) head/net-p2p/bitcoin/Makefile head/net-p2p/litecoin/Makefile head/net-p2p/transmission-qt4/Makefile Modified: head/comms/dabstick-radio/Makefile ============================================================================== --- head/comms/dabstick-radio/Makefile Fri Nov 22 12:55:00 2013 (r334586) +++ head/comms/dabstick-radio/Makefile Fri Nov 22 12:55:11 2013 (r334587) @@ -23,15 +23,12 @@ LIB_DEPENDS+= rtlsdr:${PORTSDIR}/comms/r USE_QT4= gui qt3support qmake_build moc_build rcc_build uic_build -QMAKE_DABSTICK= ${QMAKE} -unix PREFIX=${PREFIX} -o - PORTDOCS= * PLIST_FILES+= bin/dabreceiver bin/fmreceiver bin/spectrum-viewer ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= uses MMX and SSE2 -NO_STAGE= yes .include <bsd.port.options.mk> .if (${OSVERSION} >= 901000) && exists(${DESTDIR}/usr/bin/clang) @@ -43,30 +40,30 @@ USE_GCC= yes .endif do-configure: - cd ${WRKSRC}/fmreceiver-dab && ${SETENV} ${MAKE_ENV} \ - ${QMAKE_DABSTICK} Makefile fmreceiver.pro - cd ${WRKSRC}/dabreceiver-V2 && ${SETENV} ${MAKE_ENV} \ - ${QMAKE_DABSTICK} Makefile dabreceiver.pro - cd ${WRKSRC}/spectrum-viewer && ${SETENV} ${MAKE_ENV} \ - ${QMAKE_DABSTICK} Makefile spectrum-viewer.pro + cd ${WRKSRC}/fmreceiver-dab && ${SETENV} ${QMAKE_ENV} \ + ${QMAKE} ${QMAKE_ARGS} + cd ${WRKSRC}/dabreceiver-V2 && ${SETENV} ${QMAKE_ENV} \ + ${QMAKE} ${QMAKE_ARGS} + cd ${WRKSRC}/spectrum-viewer && ${SETENV} ${QMAKE_ENV} \ + ${QMAKE} ${QMAKE_ARGS} do-build: cd ${WRKSRC}/fmreceiver-dab && ${SETENV} ${MAKE_ENV} \ - ${MAKE} ${_MAKE_JOBS} CC=${CC} CXX=${CXX} LINK=${CXX} + ${MAKE} ${_MAKE_JOBS} cd ${WRKSRC}/dabreceiver-V2 && ${SETENV} ${MAKE_ENV} \ - ${MAKE} ${_MAKE_JOBS} CC=${CC} CXX=${CXX} LINK=${CXX} + ${MAKE} ${_MAKE_JOBS} cd ${WRKSRC}/spectrum-viewer && ${SETENV} ${MAKE_ENV} \ - ${MAKE} ${_MAKE_JOBS} CC=${CC} CXX=${CXX} LINK=${CXX} + ${MAKE} ${_MAKE_JOBS} do-install: ${INSTALL} ${WRKSRC}/fmreceiver-dab/fmreceiver \ ${WRKSRC}/dabreceiver-V2/dabreceiver \ ${WRKSRC}/spectrum-viewer/spectrum-viewer \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR}/dabreceiver-V2 ${DOCSDIR}/fmreceiver-dab - ${INSTALL_DATA} ${WRKSRC}/dabreceiver-V2/README ${DOCSDIR}/dabreceiver-V2 - ${INSTALL_DATA} ${WRKSRC}/fmreceiver-dab/README ${DOCSDIR}/fmreceiver-dab + ${MKDIR} ${STAGEDIR}${DOCSDIR}/dabreceiver-V2 ${STAGEDIR}${DOCSDIR}/fmreceiver-dab + ${INSTALL_DATA} ${WRKSRC}/dabreceiver-V2/README ${STAGEDIR}${DOCSDIR}/dabreceiver-V2 + ${INSTALL_DATA} ${WRKSRC}/fmreceiver-dab/README ${STAGEDIR}${DOCSDIR}/fmreceiver-dab .endif .include <bsd.port.mk> Modified: head/comms/jsdr/Makefile ============================================================================== --- head/comms/jsdr/Makefile Fri Nov 22 12:55:00 2013 (r334586) +++ head/comms/jsdr/Makefile Fri Nov 22 12:55:11 2013 (r334587) @@ -20,24 +20,21 @@ LIB_DEPENDS+= qwt:${PORTSDIR}/x11-toolki USE_QT4= gui qt3support qmake_build moc_build rcc_build uic_build -QMAKE_DABSTICK= ${QMAKE} -unix PREFIX=${PREFIX} -o - PORTDOCS= * PLIST_FILES+= bin/swreceiver bin/spectrum-viewer-${PORTVERSION} \ bin/mini-receiver bin/fmreceiver-${PORTVERSION} -NO_STAGE= yes .include <bsd.port.pre.mk> do-configure: cd ${WRKSRC}/make-x64/swreceiver && ${SETENV} ${MAKE_ENV} \ - ${QMAKE_DABSTICK} Makefile swreceiver.pro + ${QMAKE} ${QMAKE_ARGS} cd ${WRKSRC}/make-x64/fmreceiver && ${SETENV} ${MAKE_ENV} \ - ${QMAKE_DABSTICK} Makefile fmreceiver.pro + ${QMAKE} ${QMAKE_ARGS} cd ${WRKSRC}/make-x64/spectrum-viewer && ${SETENV} ${MAKE_ENV} \ - ${QMAKE_DABSTICK} Makefile spectrum-viewer.pro + ${QMAKE} ${QMAKE_ARGS} cd ${WRKSRC}/make-x64/mini-receiver && ${SETENV} ${MAKE_ENV} \ - ${QMAKE_DABSTICK} Makefile mini-receiver.pro + ${QMAKE} ${QMAKE_ARGS} do-build: cd ${WRKSRC}/make-x64/swreceiver && ${SETENV} ${MAKE_ENV} \ @@ -52,14 +49,14 @@ do-build: do-install: ${INSTALL} ${WRKSRC}/make-x64/swreceiver/swreceiver \ ${WRKSRC}/make-x64/mini-receiver/mini-receiver \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin ${INSTALL} ${WRKSRC}/make-x64/spectrum-viewer/spectrum-viewer \ - ${PREFIX}/bin/spectrum-viewer-${PORTVERSION} + ${STAGEDIR}${PREFIX}/bin/spectrum-viewer-${PORTVERSION} ${INSTALL} ${WRKSRC}/make-x64/fmreceiver/fmreceiver \ - ${PREFIX}/bin/fmreceiver-${PORTVERSION} + ${STAGEDIR}${PREFIX}/bin/fmreceiver-${PORTVERSION} .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.post.mk> Modified: head/graphics/fracplanet/Makefile ============================================================================== --- head/graphics/fracplanet/Makefile Fri Nov 22 12:55:00 2013 (r334586) +++ head/graphics/fracplanet/Makefile Fri Nov 22 12:55:11 2013 (r334587) @@ -59,6 +59,8 @@ post-patch: @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \ ${WRKSRC}/${f} .endfor + @${REINPLACE_CMD} -e 's|qmake-qt4|${QMAKE} ${QMAKE_ARGS}|' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lboost_program_options|-lboost_program_options -lGLU|' \ ${WRKSRC}/fracplanet.pro Modified: head/multimedia/smplayer/Makefile ============================================================================== --- head/multimedia/smplayer/Makefile Fri Nov 22 12:55:00 2013 (r334586) +++ head/multimedia/smplayer/Makefile Fri Nov 22 12:55:11 2013 (r334587) @@ -17,31 +17,27 @@ USE_QT4= gui network script xml qmake_bu ALL_TARGET= src/smplayer +USES= gmake USE_BZIP2= yes -USE_GMAKE= yes INSTALLS_ICONS= yes -MAN1= smplayer.1 -MANCOMPRESSED= yes - PORTDOCS= Changelog Copying.txt Install.txt Not_so_obvious_things.txt \ Readme.txt Release_notes.txt -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: - @${REINPLACE_CMD} -e 's|qmake|${QMAKE}|g' \ - -e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|g' \ + @${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|g' \ + -e 's|lrelease|${LRELEASE}|g' \ -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \ -e 's,/share/man,/man,g' \ - -e 's, make, ${GMAKE},g' \ + -e 's, make, ${MAKE_CMD},g' \ ${WRKSRC}/Makefile post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/multimedia/smplayer/pkg-plist ============================================================================== --- head/multimedia/smplayer/pkg-plist Fri Nov 22 12:55:00 2013 (r334586) +++ head/multimedia/smplayer/pkg-plist Fri Nov 22 12:55:11 2013 (r334587) @@ -1,4 +1,5 @@ bin/smplayer +man/man1/smplayer.1.gz share/applications/smplayer.desktop share/applications/smplayer_enqueue.desktop share/icons/hicolor/128x128/apps/smplayer.png Modified: head/multimedia/smtube/Makefile ============================================================================== --- head/multimedia/smtube/Makefile Fri Nov 22 12:55:00 2013 (r334586) +++ head/multimedia/smtube/Makefile Fri Nov 22 12:55:11 2013 (r334587) @@ -15,7 +15,7 @@ USE_BZIP2= yes USES= gmake ALL_TARGET= #empty USE_QT4= linguist_build moc_build qmake_build rcc_build uic_build -QMAKEFLAGS+= QMAKE_CXXFLAGS_RELEASE="" +QMAKE_ARGS+= QMAKE_CXXFLAGS_RELEASE="" INSTALLS_ICONS= yes PORTDOCS= * @@ -23,8 +23,8 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKEFLAGS}|' \ - -e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|g' \ + @${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|' \ + -e 's|lrelease|${LRELEASE}|g' \ -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \ -e 's|$$(PREFIX)/share/smtube|${DATADIR}|g' \ -e 's|$$(PREFIX)/share/doc/smtube|${DOCSDIR}|' \ Modified: head/multimedia/umplayer/Makefile ============================================================================== --- head/multimedia/umplayer/Makefile Fri Nov 22 12:55:00 2013 (r334586) +++ head/multimedia/umplayer/Makefile Fri Nov 22 12:55:11 2013 (r334587) @@ -17,22 +17,19 @@ USE_XZ= yes USE_QT4= gui network xml qmake_build moc_build rcc_build uic_build \ linguist_build INSTALLS_ICONS= yes -MAKE_ARGS= QMAKE_OPTS="DEFINES+=NO_DEBUG_ON_CONSOLE" PREFIX="${PREFIX}" +MAKE_ARGS+= ${PREFIX} +QMAKE_ARGS+= "DEFINES+=NO_DEBUG_ON_CONSOLE" ALL_TARGET= src/umplayer -MAN1= umplayer.1 -MANCOMPRESSED= yes - OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e 's| make| $$(MAKE)|' \ -e 's|cd src|(&| ; /cd src/s|$$|)|' \ - -e 's|qmake|${QMAKE}|' \ - -e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|' \ + -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|' \ + -e 's|lrelease|${LRELEASE}|' \ -e 's|/share/man|/man|' \ -e 's|/doc/packages|/doc|' \ -e 's|^.*/get_svn_revision.sh$$||' \ Modified: head/multimedia/umplayer/pkg-plist ============================================================================== --- head/multimedia/umplayer/pkg-plist Fri Nov 22 12:55:00 2013 (r334586) +++ head/multimedia/umplayer/pkg-plist Fri Nov 22 12:55:11 2013 (r334587) @@ -1,4 +1,5 @@ bin/umplayer +man/man1/umplayer.1.gz share/applications/umplayer.desktop share/applications/umplayer_enqueue.desktop %%PORTDOCS%%%%DOCSDIR%%/Audio_equalizer.txt Modified: head/net-p2p/bitcoin/Makefile ============================================================================== --- head/net-p2p/bitcoin/Makefile Fri Nov 22 12:55:00 2013 (r334586) +++ head/net-p2p/bitcoin/Makefile Fri Nov 22 12:55:11 2013 (r334587) @@ -78,8 +78,8 @@ post-patch: do-configure: .if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} USE_UPNP=${QMAKE_USE_UPNP} USE_QRCODE=${QMAKE_USE_QRCODE} \ - QMAKE_LRELEASE=lrelease-qt4 PREFIX=${PREFIX} INCLUDEPATH=${BDB_INCLUDE_DIR} \ + ${QMAKE} ${QMAKE_ARGS} USE_UPNP=${QMAKE_USE_UPNP} USE_QRCODE=${QMAKE_USE_QRCODE} \ + QMAKE_LRELEASE=${LRELEASE} INCLUDEPATH=${BDB_INCLUDE_DIR} \ QMAKE_LIBDIR+=${BDB_LIB_DIR} bitcoin-qt.pro .endif Modified: head/net-p2p/litecoin/Makefile ============================================================================== --- head/net-p2p/litecoin/Makefile Fri Nov 22 12:55:00 2013 (r334586) +++ head/net-p2p/litecoin/Makefile Fri Nov 22 12:55:11 2013 (r334587) @@ -75,9 +75,9 @@ QMAKE_USE_DBUS= 0 do-configure: .if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) cd ${BUILD_WRKSRC} && \ - ${QMAKE} PREFIX=${PREFIX} -spec ${QMAKESPEC} ${QMAKEFLAGS} \ + ${QMAKE} ${QMAKE_ARGS} \ QMAKE_LIBDIR+=${BDB_LIB_DIR} \ - QMAKE_LRELEASE=${LOCALBASE}/bin/lrelease-qt4 \ + QMAKE_LRELEASE=${LRELEASE} \ USE_UPNP=${QMAKE_USE_UPNP} \ USE_QRCODE=${QMAKE_USE_QRCODE} \ USE_DBUS=${QMAKE_USE_DBUS} \ Modified: head/net-p2p/transmission-qt4/Makefile ============================================================================== --- head/net-p2p/transmission-qt4/Makefile Fri Nov 22 12:55:00 2013 (r334586) +++ head/net-p2p/transmission-qt4/Makefile Fri Nov 22 12:55:11 2013 (r334587) @@ -17,7 +17,7 @@ SLAVEPORT= qt4 QT_NONSTANDARD= yes USE_QT4= moc_build qmake_build rcc_build uic_build gui dbus network USE_GNOME= desktopfileutils -QMAKEFLAGS= QMAKE_LFLAGS="-lcrypto -L${LOCALBASE}/lib ${ICONV_LIB}" +LDFLAGS+= -lcrypto EXTRA_CONF_ARGS=--disable-cli \ --disable-daemon \ @@ -33,7 +33,7 @@ post-patch: general-patch NO_STAGE= yes post-build: - @(cd ${WRKSRC}/qt ; ${QMAKE} ${QMAKEFLAGS} qtr.pro ; ${GMAKE}) + @(cd ${WRKSRC}/qt ; ${QMAKE} ${QMAKE_ARGS} qtr.pro ; ${GMAKE}) do-install: @(cd ${WRKSRC}/qt ; ${SETENV} INSTALL_ROOT=${PREFIX} ${MAKE} install)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311221255.rAMCtCYG084922>