diff --git a/comms/wsjtz/Makefile b/comms/wsjtz/Makefile old mode 100644 new mode 100755 index 53f83569d50e..3f9d48999162 --- a/comms/wsjtz/Makefile +++ b/comms/wsjtz/Makefile @@ -1,60 +1,61 @@ PORTNAME= wsjtz -DISTVERSION= 2.3.0-mod-0.81 +DISTVERSION= 2.5.0-1.10 CATEGORIES= comms hamradio MASTER_SITES= SF/wsjt-z/Source MAINTAINER= acm@FreeBSD.org COMMENT= Clone of WSJT-X software with additional features CONFLICTS= wsjtx LICENSE= GPLv3 BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor \ autoconf>=2.69:devel/autoconf \ automake>=1.16.1:devel/automake \ a2x:textproc/asciidoc \ boost-libs>0:devel/boost-libs \ libtool:devel/libtool \ ${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libxslt.so:textproc/libxslt \ libhamlib.so:comms/hamlib \ - libreadline.so:devel/readline + libreadline.so:devel/readline \ + libportaudio.so:audio/portaudio USES= cmake compiler:c++11-lib fortran gl \ makeinfo pkgconfig qt:5 zip USE_GL= glu USE_QT= core gui network widgets \ multimedia concurrent printsupport serialport sql sql-sqlite3 \ testlib buildtools_build linguisttools_build qmake_build CMAKE_ARGS+= -DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \ -DLOCALBASE::STRING="${LOCALBASE}" # for detailed debugging uncomment the next line #CMAKE_ARGS+= --debug-output --trace PLIST_SUB+= PORTVERSION="${PORTVERSION}" OPTIONS_DEFINE= DOCS PORTDOCS= * DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/z/x/} DATADIR= ${PREFIX}/share/${PORTNAME:S/z/x/} WRKSRC= ${WRKDIR}/wsjtx .include .if ${GCC_DEFAULT} >= 10 # workaround for More actual than formal arguments in procedure call at (1) FFLAGS+= -fallow-argument-mismatch .endif post-install: -.for f in fcal fmeasure fmtave ft8code jt4code jt65code jt9 jt9code \ - message_aggregator msk144code qra64code qra64sim udp_daemon wsjtx wsprd +.for f in fcal fmeasure fmtave fst4sim ft8code jt4code jt65code jt9 jt9code \ + message_aggregator msk144code q65code q65sim udp_daemon wsjtx wsprd ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor .include diff --git a/comms/wsjtz/distinfo b/comms/wsjtz/distinfo old mode 100644 new mode 100755 index e0613d6ef2da..aa5ae1a31ade --- a/comms/wsjtz/distinfo +++ b/comms/wsjtz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629936087 -SHA256 (wsjtz-2.3.0-mod-0.81.zip) = 7e36e44471c7d6fd4aae37d078d29afd9736cddeecf9e2f930e88298f484c2b3 -SIZE (wsjtz-2.3.0-mod-0.81.zip) = 15490080 +TIMESTAMP = 1636325545 +SHA256 (wsjtz-2.5.0-1.10.zip) = 5e5cca9a0fe4f172b42ea5c276ddd514108b7427cfcee432caa79ac2c7e572bf +SIZE (wsjtz-2.5.0-1.10.zip) = 38100716 diff --git a/comms/wsjtz/files/patch-CMake-Modules_FindUsb.cmake b/comms/wsjtz/files/patch-CMake-Modules_FindUsb.cmake new file mode 100755 index 000000000000..6b181e59cf49 --- /dev/null +++ b/comms/wsjtz/files/patch-CMake-Modules_FindUsb.cmake @@ -0,0 +1,11 @@ +--- CMake/Modules/FindUsb.cmake 2021-11-30 23:55:50.616592000 -0500 ++++ CMake/Modules/FindUsb.cmake 2021-11-30 23:56:00.350981000 -0500 +@@ -27,7 +27,7 @@ + endif () + libfind_pkg_detect (Usb usb-1.0 + FIND_PATH libusb.h PATH_SUFFIXES libusb-1.0 +- FIND_LIBRARY usb-1.0 ${_library_options} ++ FIND_LIBRARY usb-1.0 usb ${_library_options} + ) + + libfind_process (Usb) diff --git a/comms/wsjtz/files/patch-CMakeLists.txt b/comms/wsjtz/files/patch-CMakeLists.txt old mode 100644 new mode 100755 diff --git a/comms/wsjtz/files/patch-CMake_Modules_Findhamlib.cmake b/comms/wsjtz/files/patch-CMake_Modules_Findhamlib.cmake deleted file mode 100644 index 1963cf606c56..000000000000 --- a/comms/wsjtz/files/patch-CMake_Modules_Findhamlib.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- CMake/Modules/Findhamlib.cmake.orig 2021-02-01 18:08:30 UTC -+++ CMake/Modules/Findhamlib.cmake -@@ -16,7 +16,7 @@ set (hamlib_LIBRARY_DIRS) - - # pkg-config? - find_path (__hamlib_pc_path NAMES hamlib.pc -- PATH_SUFFIXES lib/pkgconfig lib64/pkgconfig -+ PATH_SUFFIXES libdata/pkgconfig lib64/pkgconfig - ) - if (__hamlib_pc_path) - set (__pc_path $ENV{PKG_CONFIG_PATH}) diff --git a/comms/wsjtz/files/patch-Radio.cpp b/comms/wsjtz/files/patch-Radio.cpp old mode 100644 new mode 100755 diff --git a/comms/wsjtz/files/patch-widgets_FrequencyDeltaLineEdit.cpp b/comms/wsjtz/files/patch-widgets_FrequencyDeltaLineEdit.cpp old mode 100644 new mode 100755 diff --git a/comms/wsjtz/files/patch-widgets_FrequencyLineEdit.cpp b/comms/wsjtz/files/patch-widgets_FrequencyLineEdit.cpp old mode 100644 new mode 100755 diff --git a/comms/wsjtz/pkg-descr b/comms/wsjtz/pkg-descr old mode 100644 new mode 100755 diff --git a/comms/wsjtz/pkg-plist b/comms/wsjtz/pkg-plist old mode 100644 new mode 100755 index 34dc0fcc7d74..b21010c30b29 --- a/comms/wsjtz/pkg-plist +++ b/comms/wsjtz/pkg-plist @@ -1,44 +1,45 @@ bin/fcal bin/fmeasure bin/fmtave bin/fst4sim bin/ft8code bin/jt4code bin/jt65code bin/jt9 bin/jt9code bin/message_aggregator bin/msk144code -bin/qra64code -bin/qra64sim +bin/q65code +bin/q65sim bin/rigctl-wsjtx bin/rigctld-wsjtx bin/udp_daemon bin/wsjtx bin/wsjtx_app_version bin/wsprd man/man1/fcal.1.gz man/man1/fmeasure.1.gz man/man1/fmtave.1.gz man/man1/fst4sim.1.gz man/man1/ft8code.1.gz man/man1/jt4code.1.gz man/man1/jt65code.1.gz man/man1/jt9.1.gz man/man1/jt9code.1.gz man/man1/message_aggregator.1.gz man/man1/msk144code.1.gz man/man1/qra64code.1.gz man/man1/qra64sim.1.gz man/man1/rigctl-wsjtx.1.gz man/man1/rigctlcom-wsjtx.1.gz man/man1/rigctld-wsjtx.1.gz man/man1/udp_daemon.1.gz man/man1/wsjtx.1.gz man/man1/wsprd.1.gz share/applications/message_aggregator.desktop share/applications/wsjtx.desktop share/pixmaps/wsjtx_icon.png %%DATADIR%%/JPLEPH +%%DATADIR%%/USState.db %%DATADIR%%/cty.dat %%DATADIR%%/cty.dat_copyright.txt