diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2013-11-22 12:55:11 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2013-11-22 12:55:11 +0000 |
| commit | 2e206d8fad4d6aa3091a7410aba9abe1a3a41278 (patch) | |
| tree | 919f256f5d4152f9ba2438b4a3cc82a91d4707c6 /comms | |
| parent | - Convert to USES=qmake (and other USES while I'm here) (diff) | |
- Pass QMAKE_ARGS to qmake
Approved by: portmgr (blanket approval)
Notes
Notes:
svn path=/head/; revision=334587
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/dabstick-radio/Makefile | 29 | ||||
| -rw-r--r-- | comms/jsdr/Makefile | 21 |
2 files changed, 22 insertions, 28 deletions
diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile index 02c8549cba12..c1a4bdb1e8ab 100644 --- a/comms/dabstick-radio/Makefile +++ b/comms/dabstick-radio/Makefile @@ -23,15 +23,12 @@ LIB_DEPENDS+= rtlsdr:${PORTSDIR}/comms/rtl-sdr \ 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> diff --git a/comms/jsdr/Makefile b/comms/jsdr/Makefile index 53457cd92124..0edefe76d9b9 100644 --- a/comms/jsdr/Makefile +++ b/comms/jsdr/Makefile @@ -20,24 +20,21 @@ LIB_DEPENDS+= qwt:${PORTSDIR}/x11-toolkits/qwt5 \ 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> |