svn commit: r426360 - in head/comms/jsdr: . files
Tobias C. Berner
tcberner at FreeBSD.org
Sat Nov 19 11:53:25 UTC 2016
Author: tcberner
Date: Sat Nov 19 11:53:23 2016
New Revision: 426360
URL: https://svnweb.freebsd.org/changeset/ports/426360
Log:
Simplify Makefile of comms/jsdr
Instead of doing a manual do-configure / do-build / do-install targets, copy
a small 'jsdr.pro' file to WRKSRC and then rely on USES=qmake to do the rest.
The version-suffix of the two binaries spectrum-viewer and fmreceiver was
dropped in the process (why was it there?) -- and therefore the PORTREVISION
is bumped.
PR: 214642
Approved by: rakuco (mentor)
Added:
head/comms/jsdr/files/patch-jsdr.pro (contents, props changed)
Modified:
head/comms/jsdr/Makefile
head/comms/jsdr/files/patch-make-x64_fmreceiver_fmreceiver.pro
head/comms/jsdr/files/patch-make-x64_mini-receiver_mini-receiver.pro
head/comms/jsdr/files/patch-make-x64_spectrum-viewer_spectrum-viewer.pro
head/comms/jsdr/files/patch-make-x64_swreceiver_swreceiver.pro
Modified: head/comms/jsdr/Makefile
==============================================================================
--- head/comms/jsdr/Makefile Sat Nov 19 11:45:14 2016 (r426359)
+++ head/comms/jsdr/Makefile Sat Nov 19 11:53:23 2016 (r426360)
@@ -3,7 +3,7 @@
PORTNAME= jsdr
PORTVERSION= 4.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= comms audio hamradio
MASTER_SITES= http://www.sdr-j.tk/ \
LOCAL/nox/
@@ -19,44 +19,15 @@ LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt
libsndfile.so:audio/libsndfile \
libfftw3.so:math/fftw3
-USES= tar:tgz
+USES= qmake tar:tgz
USE_QT4= gui qt3support qmake_build moc_build rcc_build uic_build
PORTDOCS= *
-PLIST_FILES+= bin/swreceiver bin/spectrum-viewer-${PORTVERSION} \
- bin/mini-receiver bin/fmreceiver-${PORTVERSION}
+PLIST_FILES+= bin/swreceiver bin/spectrum-viewer \
+ bin/mini-receiver bin/fmreceiver
OPTIONS_DEFINE= DOCS
-do-configure:
- cd ${WRKSRC}/make-x64/swreceiver && ${SETENV} ${MAKE_ENV} \
- ${QMAKE} ${QMAKE_ARGS}
- cd ${WRKSRC}/make-x64/fmreceiver && ${SETENV} ${MAKE_ENV} \
- ${QMAKE} ${QMAKE_ARGS}
- cd ${WRKSRC}/make-x64/spectrum-viewer && ${SETENV} ${MAKE_ENV} \
- ${QMAKE} ${QMAKE_ARGS}
- cd ${WRKSRC}/make-x64/mini-receiver && ${SETENV} ${MAKE_ENV} \
- ${QMAKE} ${QMAKE_ARGS}
-
-do-build:
- cd ${WRKSRC}/make-x64/swreceiver && ${SETENV} ${MAKE_ENV} \
- ${MAKE} ${_MAKE_JOBS}
- cd ${WRKSRC}/make-x64/fmreceiver && ${SETENV} ${MAKE_ENV} \
- ${MAKE} ${_MAKE_JOBS}
- cd ${WRKSRC}/make-x64/spectrum-viewer && ${SETENV} ${MAKE_ENV} \
- ${MAKE} ${_MAKE_JOBS}
- cd ${WRKSRC}/make-x64/mini-receiver && ${SETENV} ${MAKE_ENV} \
- ${MAKE} ${_MAKE_JOBS}
-
-do-install:
- ${INSTALL} ${WRKSRC}/make-x64/swreceiver/swreceiver \
- ${WRKSRC}/make-x64/mini-receiver/mini-receiver \
- ${STAGEDIR}${PREFIX}/bin
- ${INSTALL} ${WRKSRC}/make-x64/spectrum-viewer/spectrum-viewer \
- ${STAGEDIR}${PREFIX}/bin/spectrum-viewer-${PORTVERSION}
- ${INSTALL} ${WRKSRC}/make-x64/fmreceiver/fmreceiver \
- ${STAGEDIR}${PREFIX}/bin/fmreceiver-${PORTVERSION}
-
do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
Added: head/comms/jsdr/files/patch-jsdr.pro
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/jsdr/files/patch-jsdr.pro Sat Nov 19 11:53:23 2016 (r426360)
@@ -0,0 +1,11 @@
+--- jsdr.pro.orig 2016-11-18 22:17:37 UTC
++++ jsdr.pro
+@@ -0,0 +1,8 @@
++TEMPLATE = subdirs
++
++SUBDIRS = make-x64/swreceiver \
++ make-x64/fmreceiver \
++ make-x64/spectrum-viewer \
++ make-x64/mini-receiver
++
++CONFIG += ordered
Modified: head/comms/jsdr/files/patch-make-x64_fmreceiver_fmreceiver.pro
==============================================================================
--- head/comms/jsdr/files/patch-make-x64_fmreceiver_fmreceiver.pro Sat Nov 19 11:45:14 2016 (r426359)
+++ head/comms/jsdr/files/patch-make-x64_fmreceiver_fmreceiver.pro Sat Nov 19 11:53:23 2016 (r426360)
@@ -1,6 +1,6 @@
---- make-x64/fmreceiver/fmreceiver.pro.orig
+--- make-x64/fmreceiver/fmreceiver.pro.orig 2012-09-16 16:23:45 UTC
+++ make-x64/fmreceiver/fmreceiver.pro
-@@ -137,9 +137,16 @@ LIBS += -lstdc++
+@@ -137,9 +137,18 @@ LIBS += -lstdc++
#}
#for fedora use the second set
@@ -17,6 +17,8 @@
+ INCLUDEPATH += ${LOCALBASE}/include
+ QMAKE_LIBDIR += ${LOCALBASE}/lib
+ LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lsamplerate -lfftw3
++ target.path = $$INSTALL_ROOT/$$PREFIX/bin
++ INSTALLS += target
}
Modified: head/comms/jsdr/files/patch-make-x64_mini-receiver_mini-receiver.pro
==============================================================================
--- head/comms/jsdr/files/patch-make-x64_mini-receiver_mini-receiver.pro Sat Nov 19 11:45:14 2016 (r426359)
+++ head/comms/jsdr/files/patch-make-x64_mini-receiver_mini-receiver.pro Sat Nov 19 11:53:23 2016 (r426360)
@@ -1,6 +1,6 @@
---- make-x64/mini-receiver/mini-receiver.pro.orig
+--- make-x64/mini-receiver/mini-receiver.pro.orig 2012-10-02 08:15:01 UTC
+++ make-x64/mini-receiver/mini-receiver.pro
-@@ -108,9 +108,16 @@ LIBS += -lstdc++
+@@ -108,9 +108,18 @@ LIBS += -lstdc++
#}
#for fedora use the second set
@@ -17,6 +17,8 @@
+ INCLUDEPATH += ${LOCALBASE}/include
+ QMAKE_LIBDIR += ${LOCALBASE}/lib
+ LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lsamplerate -lfftw3
++ target.path = $$INSTALL_ROOT/$$PREFIX/bin
++ INSTALLS += target
}
Modified: head/comms/jsdr/files/patch-make-x64_spectrum-viewer_spectrum-viewer.pro
==============================================================================
--- head/comms/jsdr/files/patch-make-x64_spectrum-viewer_spectrum-viewer.pro Sat Nov 19 11:45:14 2016 (r426359)
+++ head/comms/jsdr/files/patch-make-x64_spectrum-viewer_spectrum-viewer.pro Sat Nov 19 11:53:23 2016 (r426360)
@@ -1,6 +1,6 @@
---- make-x64/spectrum-viewer/spectrum-viewer.pro.orig
+--- make-x64/spectrum-viewer/spectrum-viewer.pro.orig 2012-10-02 08:19:58 UTC
+++ make-x64/spectrum-viewer/spectrum-viewer.pro
-@@ -83,10 +83,16 @@ LIBS += -lsamplerate
+@@ -83,10 +83,18 @@ LIBS += -lsamplerate
#}
#for fedora use the second set
@@ -18,6 +18,8 @@
+unix { INCLUDEPATH += ${LOCALBASE}/include/qwt
+ INCLUDEPATH += ${LOCALBASE}/include
+ LIBS+= -lqwt -lusb -lrt -lfftw3 -lsamplerate
++ target.path = $$INSTALL_ROOT/$$PREFIX/bin
++ INSTALLS += target
}
Modified: head/comms/jsdr/files/patch-make-x64_swreceiver_swreceiver.pro
==============================================================================
--- head/comms/jsdr/files/patch-make-x64_swreceiver_swreceiver.pro Sat Nov 19 11:45:14 2016 (r426359)
+++ head/comms/jsdr/files/patch-make-x64_swreceiver_swreceiver.pro Sat Nov 19 11:53:23 2016 (r426360)
@@ -1,6 +1,6 @@
---- make-x64/swreceiver/swreceiver.pro.orig
+--- make-x64/swreceiver/swreceiver.pro.orig 2012-09-16 16:12:33 UTC
+++ make-x64/swreceiver/swreceiver.pro
-@@ -180,13 +180,19 @@ LIBS += -lwinmm
+@@ -180,13 +180,21 @@ LIBS += -lwinmm
#}
#for Fedora use the second set
@@ -26,5 +26,7 @@
+ INCLUDEPATH += ${LOCALBASE}/include
+ QMAKE_LIBDIR += ${LOCALBASE}/lib
+ LIBS += -lqwt -lrt -lsndfile -lsamplerate -lportaudio -lusb -lfftw3
++ target.path = $$INSTALL_ROOT/$$PREFIX/bin
++ INSTALLS += target
+}
More information about the svn-ports-all
mailing list