Date: Wed, 14 Aug 2013 17:07:32 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324740 - in head/comms/dabstick-radio: . files Message-ID: <201308141707.r7EH7WeW046157@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Wed Aug 14 17:07:32 2013 New Revision: 324740 URL: http://svnweb.freebsd.org/changeset/ports/324740 Log: - Update to 0.96 . - Remove now obsolete MAKE_JOBS_SAFE. - Remove 7.x cruft. Modified: head/comms/dabstick-radio/Makefile head/comms/dabstick-radio/distinfo head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro head/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro Modified: head/comms/dabstick-radio/Makefile ============================================================================== --- head/comms/dabstick-radio/Makefile Wed Aug 14 16:23:29 2013 (r324739) +++ head/comms/dabstick-radio/Makefile Wed Aug 14 17:07:32 2013 (r324740) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dabstick-radio -PORTVERSION= 0.95 -PORTREVISION= 1 +PORTVERSION= 0.96 CATEGORIES= comms audio hamradio MASTER_SITES= http://www.sdr-j.tk/ EXTRACT_SUFX= .tgz @@ -27,7 +26,6 @@ FFMPEG_SUFFIX= 1 QMAKE_DABSTICK= ${QMAKE} -unix PREFIX=${PREFIX} -o MAKE_ENV+= FFMPEG_SUFFIX=${FFMPEG_SUFFIX} -MAKE_JOBS_SAFE= yes PORTDOCS= * PLIST_FILES+= bin/dabreceiver bin/fmreceiver bin/spectrum-viewer @@ -35,7 +33,7 @@ PLIST_FILES+= bin/dabreceiver bin/fmrece ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= uses MMX and SSE2 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if (${OSVERSION} >= 901000) && exists(${DESTDIR}/usr/bin/clang) CC= clang @@ -45,10 +43,6 @@ CPP= clang-cpp USE_GCC= 4.6+ .endif -.if ${OSVERSION} < 800069 -IGNORE= requires FreeBSD 8.0 or later -.endif - do-configure: cd ${WRKSRC}/fmreceiver-dab && ${SETENV} ${MAKE_ENV} \ ${QMAKE_DABSTICK} Makefile fmreceiver.pro @@ -71,8 +65,9 @@ do-install: ${WRKSRC}/spectrum-viewer/spectrum-viewer \ ${PREFIX}/bin .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/dab-manual.pdf ${WRKSRC}/README-${PORTVERSION} ${DOCSDIR} + ${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 .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/comms/dabstick-radio/distinfo ============================================================================== --- head/comms/dabstick-radio/distinfo Wed Aug 14 16:23:29 2013 (r324739) +++ head/comms/dabstick-radio/distinfo Wed Aug 14 17:07:32 2013 (r324740) @@ -1,2 +1,2 @@ -SHA256 (dabstick-radio-0.95.tgz) = 753e31ab9720c18fbf9484460520cdcc3ee48c98b2f4d9f413bd1267775c67a8 -SIZE (dabstick-radio-0.95.tgz) = 606458 +SHA256 (dabstick-radio-0.96.tgz) = a212473d80e93acad0f592f2057d1f3ad129fe3ccb2c3fa29e2c638ea11102e6 +SIZE (dabstick-radio-0.96.tgz) = 205513 Modified: head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro ============================================================================== --- head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro Wed Aug 14 16:23:29 2013 (r324739) +++ head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro Wed Aug 14 17:07:32 2013 (r324740) @@ -1,17 +1,24 @@ --- dabreceiver-V2/dabreceiver.pro.orig +++ dabreceiver-V2/dabreceiver.pro -@@ -147,40 +147,41 @@ LIBS += -lsndfile +@@ -156,36 +156,10 @@ LIBS += -lsndfile #} #for fedora use the second set -unix { -- HEADERS += ../input/dabstick.h -- SOURCES += ../input/dabstick.cpp -- INCLUDEPATH += /usr/include/qwt5-qt4 +-INCLUDEPATH += ../scopes-qwt6 +-HEADERS += ../input/dabstick.h +-SOURCES += ../input/dabstick.cpp +-HEADERS += ../scopes-qwt6/scope.h \ +- ../scopes-qwt6/spectrogramdata.h \ +- ../scopes-qwt6/iqdisplay.h \ +- ../scopes-qwt6/fft-scope.h +-SOURCES += ../scopes-qwt6/scope.cpp \ +- ../scopes-qwt6/fft-scope.cpp \ +- ../scopes-qwt6/iqdisplay.cpp +- INCLUDEPATH += /usr/include/qwt - INCLUDEPATH += /usr/include/ - INCLUDEPATH += /usr/include/ffmpeg --# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3f -lrtlsdr -ldl -lz -- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl -lz +- LIBS+= -lqwt -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl -lz -#uncomment the following line when using the libav package for ffmpeg -#rather than the "built-in" code for KJMP - LIBS+= -lavcodec -lavdevice -lavutil -lavformat -lswresample -lswscale -lavfilter @@ -23,9 +30,19 @@ - -##for FreeBSD use the third set (Thanks to Juergen Lock) #unix { + #INCLUDEPATH += ../scopes-qwt6 -# QMAKE_CXXFLAGS += -D__FREEBSD__ - # HEADERS += ../input/dabstick.h +-# HEADERS += ../input/dabstick.h -# SOURCES += ../input/dabstick.cpp ++#HEADERS += ../input/dabstick.h ++#SOURCES += ../input/dabstick.cpp + #HEADERS += ../scopes-qwt6/scope.h \ + # ../scopes-qwt6/spectrogramdata.h \ + # ../scopes-qwt6/iqdisplay.h \ +@@ -193,18 +167,44 @@ SOURCES += ../scopes-qwt6/scope.cpp \ + #SOURCES += ../scopes-qwt6/scope.cpp \ + # ../scopes-qwt6/fft-scope.cpp \ + # ../scopes-qwt6/iqdisplay.cpp -# INCLUDEPATH += ${LOCALBASE}/include/qwt -# INCLUDEPATH += ${LOCALBASE}/include/portaudio2 -# INCLUDEPATH += ${LOCALBASE}/include/ffmpeg1 @@ -35,12 +52,10 @@ -# QMAKE_LIBDIR += ${LOCALBASE}/lib/ffmpeg${FFMPEG_SUFFIX} -# QMAKE_LIBDIR += ${LOCALBASE}/lib -# LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -lz -+# SOURCES += ../input/dabstick.cpp -+# INCLUDEPATH += /usr/include/qwt5-qt4 ++# INCLUDEPATH += /usr/include/qwt +# INCLUDEPATH += /usr/include/ +# INCLUDEPATH += /usr/include/ffmpeg -+## LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3f -lrtlsdr -ldl -lz -+# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl -lz ++# LIBS+= -lqwt -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl -lz ##uncomment the following line when using the libav package for ffmpeg -# LIBS+= -lavcodec${FFMPEG_SUFFIX} -lavdevice${FFMPEG_SUFFIX} -lavutil${FFMPEG_SUFFIX} -lavformat${FFMPEG_SUFFIX} -lswresample${FFMPEG_SUFFIX} -lswscale${FFMPEG_SUFFIX} -lavfilter${FFMPEG_SUFFIX} +##rather than the "built-in" code for KJMP @@ -51,12 +66,19 @@ +##If otherwise: also adjust the define(s) in dab-constants.h #} -+##for FreeBSD use the third set (Thanks to Juergen Lock) ++#for FreeBSD use the third set (Thanks to Juergen Lock) +unix { -+ QMAKE_CXXFLAGS += -D__FREEBSD__ -mmmx -msse2 -+ QMAKE_CFLAGS += -D__FREEBSD__ -mmmx -msse2 ++INCLUDEPATH += ../scopes-qwt5 ++ QMAKE_CXXFLAGS += -D__FREEBSD__ + HEADERS += ../input/dabstick.h + SOURCES += ../input/dabstick.cpp ++HEADERS += ../scopes-qwt5/scope.h \ ++ ../scopes-qwt5/spectrogramdata.h \ ++ ../scopes-qwt5/iqdisplay.h \ ++ ../scopes-qwt5/fft-scope.h ++SOURCES += ../scopes-qwt5/scope.cpp \ ++ ../scopes-qwt5/fft-scope.cpp \ ++ ../scopes-qwt5/iqdisplay.cpp + INCLUDEPATH += ${LOCALBASE}/include/qwt + INCLUDEPATH += ${LOCALBASE}/include/portaudio2 + INCLUDEPATH += ${LOCALBASE}/include/ffmpeg1 Modified: head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro ============================================================================== --- head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro Wed Aug 14 16:23:29 2013 (r324739) +++ head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro Wed Aug 14 17:07:32 2013 (r324740) @@ -1,50 +1,71 @@ --- fmreceiver-dab/fmreceiver.pro.orig +++ fmreceiver-dab/fmreceiver.pro -@@ -121,26 +121,27 @@ LIBS += -lstdc++ +@@ -126,38 +126,38 @@ LIBS += -lstdc++ #} #for fedora use the second set -unix { -- HEADERS += ../input/dabstick.h -- SOURCES += ../input/dabstick.cpp -- INCLUDEPATH += /usr/include/qwt5-qt4 -- INCLUDEPATH += /usr/local/include -- INCLUDEPATH += /usr/include/ -- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl +-HEADERS += ../input/dabstick.h +-SOURCES += ../input/dabstick.cpp +-INCLUDEPATH += ../scopes-qwt6 +-HEADERS += ../scopes-qwt6/scope.h \ +- ../scopes-qwt6/spectrogramdata.h \ +- ../scopes-qwt6/fft-scope.h +-SOURCES += ../scopes-qwt6/scope.cpp \ +- ../scopes-qwt6/fft-scope.cpp +-INCLUDEPATH += /usr/include/qwt +-INCLUDEPATH += /usr/local/include +-INCLUDEPATH += /usr/include/ +-LIBS+= -lqwt -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl -} -+#unix { -+# HEADERS += ../input/dabstick.h -+# SOURCES += ../input/dabstick.cpp -+# INCLUDEPATH += /usr/include/qwt5-qt4 -+# INCLUDEPATH += /usr/local/include -+# INCLUDEPATH += /usr/include/ -+# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl -+#} - - #for FreeBSD use the third set (thanks Juergen Lock) +- +-#for FreeBSD use the third set (thanks Juergen Lock) -#unix { --# QMAKE_CXXFLAGS += -D__FREEBSD__ --# HEADERS += ../input/dabstick.h --# SOURCES += ../input/dabstick.cpp --# INCLUDEPATH += ${LOCALBASE}/include/qwt --# INCLUDEPATH += ${LOCALBASE}/include/portaudio2 --# INCLUDEPATH += ${LOCALBASE}/include --# INCLUDEPATH += /usr/include/ --# QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 --# QMAKE_LIBDIR += ${LOCALBASE}/lib --# LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr --#} +-#QMAKE_CXXFLAGS += -D__FREEBSD__ +-#HEADERS += ../input/dabstick.h +-#SOURCES += ../input/dabstick.cpp ++#unix { ++#HEADERS += ../input/dabstick.h ++#SOURCES += ../input/dabstick.cpp + #INCLUDEPATH += ../scopes-qwt6 +-#HEADERS += ../scopes-qwt6/scope.h \ ++#HEADERS += ../scopes-qwt6/scope.h \ + # ../scopes-qwt6/spectrogramdata.h \ + # ../scopes-qwt6/fft-scope.h +-#SOURCES += ../scopes-qwt6/scope.cpp \ ++#SOURCES += ../scopes-qwt6/scope.cpp \ + # ../scopes-qwt6/fft-scope.cpp +-#INCLUDEPATH += ${LOCALBASE}/include/qwt +-#INCLUDEPATH += ${LOCALBASE}/include/portaudio2 +-#INCLUDEPATH += ${LOCALBASE}/include +-#INCLUDEPATH += /usr/include/ +-#QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 +-#QMAKE_LIBDIR += ${LOCALBASE}/lib +-#LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr ++#INCLUDEPATH += /usr/include/qwt ++#INCLUDEPATH += /usr/local/include ++#INCLUDEPATH += /usr/include/ ++#LIBS+= -lqwt -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl + #} +-# ++ ++#for FreeBSD use the third set (thanks Juergen Lock) +unix { -+ QMAKE_CXXFLAGS += -D__FREEBSD__ -mmmx -msse2 -+ QMAKE_CFLAGS += -D__FREEBSD__ -mmmx -msse2 -+ HEADERS += ../input/dabstick.h -+ SOURCES += ../input/dabstick.cpp -+ INCLUDEPATH += ${LOCALBASE}/include/qwt -+ INCLUDEPATH += ${LOCALBASE}/include/portaudio2 -+ INCLUDEPATH += ${LOCALBASE}/include -+ INCLUDEPATH += /usr/include/ -+ QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 -+ QMAKE_LIBDIR += ${LOCALBASE}/lib -+ LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr ++QMAKE_CXXFLAGS += -D__FREEBSD__ ++HEADERS += ../input/dabstick.h ++SOURCES += ../input/dabstick.cpp ++INCLUDEPATH += ../scopes-qwt5 ++HEADERS += ../scopes-qwt5/scope.h \ ++ ../scopes-qwt5/spectrogramdata.h \ ++ ../scopes-qwt5/fft-scope.h ++SOURCES += ../scopes-qwt5/scope.cpp \ ++ ../scopes-qwt5/fft-scope.cpp ++INCLUDEPATH += ${LOCALBASE}/include/qwt ++INCLUDEPATH += ${LOCALBASE}/include/portaudio2 ++INCLUDEPATH += ${LOCALBASE}/include ++INCLUDEPATH += /usr/include/ ++QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 ++QMAKE_LIBDIR += ${LOCALBASE}/lib ++LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr +} - # ++ Modified: head/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro ============================================================================== --- head/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro Wed Aug 14 16:23:29 2013 (r324739) +++ head/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro Wed Aug 14 17:07:32 2013 (r324740) @@ -1,48 +1,62 @@ --- spectrum-viewer/spectrum-viewer.pro.orig +++ spectrum-viewer/spectrum-viewer.pro -@@ -63,24 +63,27 @@ LIBS += -lsamplerate +@@ -67,32 +67,33 @@ LIBS += -lsamplerate #} #for fedora use the second set -unix { -- HEADERS += ../input/dabstick.h -- SOURCES += ../input/dabstick.cpp -- INCLUDEPATH += /usr/include/qwt5-qt4 -- INCLUDEPATH += /usr/include/ -- INCLUDEPATH += /usr/local/include -- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lfftw3 -lrtlsdr -ldl +-HEADERS += ../input/dabstick.h +-SOURCES += ../input/dabstick.cpp +-DEPENDPATH += ../scopes-qwt6 +-INCLUDEPATH += ../scopes-qwt6 +-HEADERS += ../scopes-qwt6/scope.h +-SOURCES += ../scopes-qwt6/scope.cpp +-INCLUDEPATH += /usr/include/qwt +-INCLUDEPATH += /usr/include/ +-INCLUDEPATH += /usr/local/include +-LIBS+= -lqwt -lusb-1.0 -lrt -lfftw3 -lrtlsdr -ldl -} -+#unix { -+# HEADERS += ../input/dabstick.h -+# SOURCES += ../input/dabstick.cpp -+# INCLUDEPATH += /usr/include/qwt5-qt4 -+# INCLUDEPATH += /usr/include/ -+# INCLUDEPATH += /usr/local/include -+# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lfftw3 -lrtlsdr -ldl -+#} - - #for FreeBSD use the third set (thanks Juergen Lock) +- +-#for FreeBSD use the third set (thanks Juergen Lock) -#unix { --# QMAKE_CXXFLAGS += -D__FREEBSD__ --# HEADERS += ../input/dabstick.h --# SOURCES += ../input/dabstick.cpp --# INCLUDEPATH += ${LOCALBASE}/include/qwt --# INCLUDEPATH += ${LOCALBASE}/include --# INCLUDEPATH += /usr/include/ --# QMAKE_LIBDIR += ${LOCALBASE}/lib --# LIBS+= -lqwt -lusb -lrt -lfftw3 -lrtlsdr --#} +-#QMAKE_CXXFLAGS += -D__FREEBSD__ +-#HEADERS += ../input/dabstick.h +-#SOURCES += ../input/dabstick.cpp ++#unix { ++#HEADERS += ../input/dabstick.h ++#SOURCES += ../input/dabstick.cpp + #DEPENDPATH += ../scopes-qwt6 + #INCLUDEPATH += ../scopes-qwt6 +-#HEADERS += ../scopes-qwt6/scope.h +-#SOURCES += ../scopes-qwt6/scope.cpp +-#INCLUDEPATH += ${LOCALBASE}/include/qwt +-#INCLUDEPATH += ${LOCALBASE}/include +-#INCLUDEPATH += /usr/include/ +-#QMAKE_LIBDIR += ${LOCALBASE}/lib +-#LIBS+= -lqwt -lusb -lrt -lfftw3 -lrtlsdr ++#HEADERS += ../scopes-qwt6/scope.h ++#SOURCES += ../scopes-qwt6/scope.cpp ++#INCLUDEPATH += /usr/include/qwt ++#INCLUDEPATH += /usr/include/ ++#INCLUDEPATH += /usr/local/include ++#LIBS+= -lqwt -lusb-1.0 -lrt -lfftw3 -lrtlsdr -ldl + #} +-# ++ ++#for FreeBSD use the third set (thanks Juergen Lock) +unix { -+ QMAKE_CXXFLAGS += -D__FREEBSD__ -mmmx -msse2 -+ QMAKE_CFLAGS += -D__FREEBSD__ -mmmx -msse2 -+ HEADERS += ../input/dabstick.h -+ SOURCES += ../input/dabstick.cpp -+ INCLUDEPATH += ${LOCALBASE}/include/qwt -+ INCLUDEPATH += ${LOCALBASE}/include/portaudio2 -+ INCLUDEPATH += ${LOCALBASE}/include -+ INCLUDEPATH += /usr/include/ -+ QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 -+ QMAKE_LIBDIR += ${LOCALBASE}/lib -+ LIBS+= -lqwt -lusb -lrt -lfftw3 -lrtlsdr ++QMAKE_CXXFLAGS += -D__FREEBSD__ ++HEADERS += ../input/dabstick.h ++SOURCES += ../input/dabstick.cpp ++DEPENDPATH += ../scopes-qwt5 ++INCLUDEPATH += ../scopes-qwt5 ++HEADERS += ../scopes-qwt5/scope.h ++SOURCES += ../scopes-qwt5/scope.cpp ++INCLUDEPATH += ${LOCALBASE}/include/qwt ++INCLUDEPATH += ${LOCALBASE}/include/portaudio2 ++INCLUDEPATH += ${LOCALBASE}/include ++INCLUDEPATH += /usr/include/ ++QMAKE_LIBDIR += ${LOCALBASE}/lib ++LIBS+= -lqwt -lusb -lrt -lfftw3 -lrtlsdr +} - # ++
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308141707.r7EH7WeW046157>