diff options
Diffstat (limited to 'comms')
46 files changed, 309 insertions, 334 deletions
diff --git a/comms/bladerf/Makefile b/comms/bladerf/Makefile index 8aed3e03c0f5..b7312186938f 100644 --- a/comms/bladerf/Makefile +++ b/comms/bladerf/Makefile @@ -1,25 +1,27 @@ PORTNAME= bladeRF -DISTVERSION= 2024.05 +DISTVERSION= 2025.10 CATEGORIES= comms hamradio MAINTAINER= yuri@FreeBSD.org COMMENT= BladeRF USB 3.0 Superspeed software defined radio -WWW= https://www.nuand.com/ +WWW= https://www.nuand.com/ \ + https://github.com/Nuand/bladeRF/ -LICENSE= MIT LGPL20 GPLv2 +LICENSE= GPLv2 LGPL21 MIT LICENSE_COMB= multi +LICENSE_FILE_GPLv2= ${WRKSRC}/legal/licenses/LICENSE.GPLv2 +LICENSE_FILE_LGPL21= ${WRKSRC}/legal/licenses/LICENSE.LGPLv2.1 +LICENSE_FILE_MIT= ${WRKSRC}/legal/licenses/LICENSE.MIT.nuand -USES= cmake compiler:c11 libedit -USE_LDCONFIG= yes +LIB_DEPENDS= libcurl.so:ftp/curl +USES= cmake compiler:c11 libedit ncurses pkgconfig USE_GITHUB= yes GH_ACCOUNT= Nuand -GH_TUPLE= analogdevicesinc:no-OS:0bba46e:x/thirdparty/analogdevicesinc/no-OS - -.include <bsd.port.pre.mk> +GH_TUPLE= Nuand:bladeRF-fsk:fb903684:bladerffsk/host/utilities/bladeRF-fsk \ + analogdevicesinc:no-OS:0bba46e6:noos/thirdparty/analogdevicesinc/no-OS +USE_LDCONFIG= yes -.if ${OPSYS} == FreeBSD -CFLAGS+= -Wno-error=unused-but-set-variable -.endif +CMAKE_ARGS+= -DCURSES_INCLUDE_PATH="${NCURSESINC}" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/comms/bladerf/distinfo b/comms/bladerf/distinfo index da94de33f3b9..950d4f52cb18 100644 --- a/comms/bladerf/distinfo +++ b/comms/bladerf/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1726633562 -SHA256 (Nuand-bladeRF-2024.05_GH0.tar.gz) = ac7d7991bc1e5faa2509da3c3046c60e9076ac293e479835aea5f19fa71f1fd2 -SIZE (Nuand-bladeRF-2024.05_GH0.tar.gz) = 2580546 -SHA256 (analogdevicesinc-no-OS-0bba46e_GH0.tar.gz) = f150fc06780eddad31968bb677a9445ff830aa47d7eed15c15c53559eca48b0c -SIZE (analogdevicesinc-no-OS-0bba46e_GH0.tar.gz) = 44177429 +TIMESTAMP = 1761328337 +SHA256 (Nuand-bladeRF-2025.10_GH0.tar.gz) = f7a63f7ad53cf3478dc60cc476b377020a7c256ef37640b1a4fa715cd9784b23 +SIZE (Nuand-bladeRF-2025.10_GH0.tar.gz) = 2769136 +SHA256 (Nuand-bladeRF-fsk-fb903684_GH0.tar.gz) = 020a711fd7dfc5ed89e4d21561759a7e7b2f3e6a7838851697490e73bb6b5b1c +SIZE (Nuand-bladeRF-fsk-fb903684_GH0.tar.gz) = 87480 +SHA256 (analogdevicesinc-no-OS-0bba46e6_GH0.tar.gz) = d329f2996c028fb0fc545e6594046a61080b7b5bb0022a0b098fec74d95dcf26 +SIZE (analogdevicesinc-no-OS-0bba46e6_GH0.tar.gz) = 44179855 diff --git a/comms/bladerf/pkg-plist b/comms/bladerf/pkg-plist index 6f33b1aa0508..e52c37929915 100644 --- a/comms/bladerf/pkg-plist +++ b/comms/bladerf/pkg-plist @@ -1,5 +1,7 @@ bin/bladeRF-cli bin/bladeRF-fsk +bin/bladeRF-power +bin/bladeRF-update include/bladeRF1.h include/bladeRF2.h include/libbladeRF.h diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile index caba1212bef4..4fca0057c0f1 100644 --- a/comms/chirp/Makefile +++ b/comms/chirp/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yattag>0:devel/py-yattag@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}suds>0:net/py-suds@${PY_FLAVOR} -USES= desktop-file-utils gnome python:3.10+ shebangfix +USES= desktop-file-utils gnome python shebangfix SHEBANG_GLOB= *.py USE_GITHUB= yes diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile index 9b7a20488617..e9d9cf309626 100644 --- a/comms/conserver-com/Makefile +++ b/comms/conserver-com/Makefile @@ -1,11 +1,11 @@ PORTNAME= conserver DISTVERSION= 8.2.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= comms MASTER_SITES= https://github.com/bstansell/conserver/releases/download/v${DISTVERSION}/ PKGNAMESUFFIX= -com -MAINTAINER= eduardo@FreeBSD.org +MAINTAINER= philip@FreeBSD.org COMMENT= Application that allows multiple users to watch serial consoles WWW= https://www.conserver.com/ diff --git a/comms/conserver-com/files/patch-conserver_readcfg.c b/comms/conserver-com/files/patch-conserver_readcfg.c new file mode 100644 index 000000000000..a683927d324c --- /dev/null +++ b/comms/conserver-com/files/patch-conserver_readcfg.c @@ -0,0 +1,14 @@ +--- conserver/readcfg.c.orig 2022-07-08 01:20:02 UTC ++++ conserver/readcfg.c +@@ -3128,9 +3128,9 @@ ConsoleAdd(CONSENT *c) + + SwapStr(&pCEmatch->motd, &c->motd); + SwapStr(&pCEmatch->idlestring, &c->idlestring); +- SwapStr(&pCEmatch->replstring, &c->breaklist); ++ SwapStr(&pCEmatch->replstring, &c->replstring); + SwapStr(&pCEmatch->tasklist, &c->tasklist); +- SwapStr(&pCEmatch->breaklist, &c->tasklist); ++ SwapStr(&pCEmatch->breaklist, &c->breaklist); + pCEmatch->portinc = c->portinc; + pCEmatch->portbase = c->portbase; + pCEmatch->spinmax = c->spinmax; diff --git a/comms/direwolf/Makefile b/comms/direwolf/Makefile index b8a40138dbc6..cbc82ad200ea 100644 --- a/comms/direwolf/Makefile +++ b/comms/direwolf/Makefile @@ -1,6 +1,5 @@ PORTNAME= direwolf -DISTVERSION= 1.7 -PORTREVISION= 1 +DISTVERSION= 1.8 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org @@ -10,24 +9,27 @@ WWW= https://github.com/wb2osz/direwolf LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libasound.so:audio/alsa-lib\ - libgps.so:astro/gpsd \ +LIB_DEPENDS= libgps.so:astro/gpsd \ libhamlib.so:comms/hamlib \ libportaudio.so:audio/portaudio RUN_DEPENDS= bash:shells/bash -USES= cmake python shebangfix pkgconfig - +USES= cmake pkgconfig python shebangfix USE_GITHUB= yes GH_ACCOUNT= wb2osz SHEBANG_FILES= scripts + TARGET_ORDER_OVERRIDE= 610:fix-shebang -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOCS +OPTIONS_SUB= yes post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g'\ - -e 's|/var/tmp|/var/log|' ${WRKSRC}/scripts/dw-start.sh + ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ + ${WRKSRC}/scripts/dw-start.sh + +post-install-DOCS-off: + ${RM} -r ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/comms/direwolf/distinfo b/comms/direwolf/distinfo index d1df2606d49b..2d561abe3d04 100644 --- a/comms/direwolf/distinfo +++ b/comms/direwolf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1708800333 -SHA256 (wb2osz-direwolf-1.7_GH0.tar.gz) = 6301f6a43e5db9ef754765875592a58933f6b78585e9272afc850acf7c5914be -SIZE (wb2osz-direwolf-1.7_GH0.tar.gz) = 20587417 +TIMESTAMP = 1761963033 +SHA256 (wb2osz-direwolf-1.8_GH0.tar.gz) = 20af50f397ce492a1e42889a1e2eba54581334c0754adae8e196433998a44e3a +SIZE (wb2osz-direwolf-1.8_GH0.tar.gz) = 20000274 diff --git a/comms/direwolf/files/patch-scripts_dw-start.sh b/comms/direwolf/files/patch-scripts_dw-start.sh index be35586236a9..09d1c84ed362 100644 --- a/comms/direwolf/files/patch-scripts_dw-start.sh +++ b/comms/direwolf/files/patch-scripts_dw-start.sh @@ -1,12 +1,11 @@ --- scripts/dw-start.sh.orig 2022-01-28 14:55:02 UTC +++ scripts/dw-start.sh -@@ -68,9 +68,9 @@ DWCMD="$DIREWOLF -a 100" +@@ -68,9 +68,8 @@ DWCMD="$DIREWOLF -a 100" #Where will logs go - needs to be writable by non-root users -LOGFILE=/var/tmp/dw-start.log -+#LOGFILE=/var/tmp/dw-start.log -+LOGFILE=/var/var/dw-start.log ++LOGFILE=/var/log/dw-start.log - #------------------------------------- diff --git a/comms/direwolf/pkg-plist b/comms/direwolf/pkg-plist index 483fcbcac6ac..d1b907bf90f1 100644 --- a/comms/direwolf/pkg-plist +++ b/comms/direwolf/pkg-plist @@ -22,6 +22,39 @@ bin/tnctest bin/tt2text bin/ttcalc bin/utm2ll +share/applications/direwolf.desktop +%%DATADIR%%/symbols-new.txt +%%DATADIR%%/symbolsX.txt +%%DATADIR%%/tocalls.yaml +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/2400-4800-PSK-for-APRS-Packet-Radio.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/AIS-Reception.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/APRS-Telemetry-Toolkit.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/APRStt-Implementation-Notes.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/APRStt-Listening-Example.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/APRStt-interface-for-SARTrack.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/AX25_plus_FEC_equals_FX25.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Bluetooth-KISS-TNC.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Going-beyond-9600-baud.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/LICENSE +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README.md +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Raspberry-Pi-APRS-Tracker.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Raspberry-Pi-APRS.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Raspberry-Pi-SDR-IGate.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Successful-APRS-IGate-Operation.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/User-Guide.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/WA8LMF-TNC-Test-CD-Results.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Why-is-9600-only-twice-as-fast-as-1200.pdf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/conf/direwolf.conf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/conf/sdr.conf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/conf/telem-balloon.conf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/conf/telem-m0xer-3.txt +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/conf/telem-volts.conf +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/external/LICENSE +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/scripts/dw-start.sh share/man/man1/aclients.1.gz share/man/man1/atest.1.gz share/man/man1/decode_aprs.1.gz @@ -33,37 +66,4 @@ share/man/man1/log2gpx.1.gz share/man/man1/text2tt.1.gz share/man/man1/tt2text.1.gz share/man/man1/utm2ll.1.gz -share/applications/direwolf.desktop -%%DATADIR%%/symbols-new.txt -%%DATADIR%%/symbolsX.txt -%%DATADIR%%/tocalls.txt -%%PORTDOCS%%%%DOCSDIR%%/2400-4800-PSK-for-APRS-Packet-Radio.pdf -%%PORTDOCS%%%%DOCSDIR%%/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf -%%PORTDOCS%%%%DOCSDIR%%/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf -%%PORTDOCS%%%%DOCSDIR%%/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf -%%PORTDOCS%%%%DOCSDIR%%/AIS-Reception.pdf -%%PORTDOCS%%%%DOCSDIR%%/APRS-Telemetry-Toolkit.pdf -%%PORTDOCS%%%%DOCSDIR%%/APRStt-Implementation-Notes.pdf -%%PORTDOCS%%%%DOCSDIR%%/APRStt-Listening-Example.pdf -%%PORTDOCS%%%%DOCSDIR%%/APRStt-interface-for-SARTrack.pdf -%%PORTDOCS%%%%DOCSDIR%%/AX25_plus_FEC_equals_FX25.pdf -%%PORTDOCS%%%%DOCSDIR%%/Bluetooth-KISS-TNC.pdf -%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md -%%PORTDOCS%%%%DOCSDIR%%/Going-beyond-9600-baud.pdf -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTDOCS%%%%DOCSDIR%%/Raspberry-Pi-APRS-Tracker.pdf -%%PORTDOCS%%%%DOCSDIR%%/Raspberry-Pi-APRS.pdf -%%PORTDOCS%%%%DOCSDIR%%/Raspberry-Pi-SDR-IGate.pdf -%%PORTDOCS%%%%DOCSDIR%%/Successful-APRS-IGate-Operation.pdf -%%PORTDOCS%%%%DOCSDIR%%/User-Guide.pdf -%%PORTDOCS%%%%DOCSDIR%%/WA8LMF-TNC-Test-CD-Results.pdf -%%PORTDOCS%%%%DOCSDIR%%/Why-is-9600-only-twice-as-fast-as-1200.pdf -%%PORTDOCS%%%%DOCSDIR%%/conf/direwolf.conf -%%PORTDOCS%%%%DOCSDIR%%/conf/sdr.conf -%%PORTDOCS%%%%DOCSDIR%%/conf/telem-balloon.conf -%%PORTDOCS%%%%DOCSDIR%%/conf/telem-m0xer-3.txt -%%PORTDOCS%%%%DOCSDIR%%/conf/telem-volts.conf -%%PORTDOCS%%%%DOCSDIR%%/external/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/scripts/dw-start.sh share/pixmaps/direwolf_icon.png diff --git a/comms/fllog/Makefile b/comms/fllog/Makefile index e76a2f970259..d3a36c569c71 100644 --- a/comms/fllog/Makefile +++ b/comms/fllog/Makefile @@ -1,30 +1,27 @@ PORTNAME= fllog -PORTVERSION= 1.2.8 +DISTVERSION= 1.2.9 CATEGORIES= comms hamradio -MASTER_SITES= SF/fldigi/${PORTNAME} \ - http://www.w1hkj.com/files/fllog/ +MASTER_SITES= SF/fldigi/${PORTNAME} MAINTAINER= hamradio@FreeBSD.org COMMENT= Ham Radio logging program -WWW= http://www.w1hkj.com/fllog-help/index.html +WWW= https://www.w1hkj.org/fllog-help/ LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libfltk.so:x11-toolkits/fltk +LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ + libfontconfig.so:x11-fonts/fontconfig \ + libpng16.so:graphics/png + +USES= desktop-file-utils gmake jpeg xorg +USE_XORG= x11 xcursor xext xfixes xft xinerama xrender -USES= gmake desktop-file-utils GNU_CONFIGURE= yes CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" -OPTIONS_DEFINE= NATIVE_OPT - -NATIVE_OPT_DESC= Enable Native Optimizations - PLIST_FILES= bin/fllog \ share/applications/fllog.desktop \ share/pixmaps/fllog.xpm -NATIVE_OPT_CONFIGURE_ON= --enable-optimizations=native -NATIVE_OPT_CONFIGURE_OFF= --enable-optimizations=none - .include <bsd.port.mk> diff --git a/comms/fllog/distinfo b/comms/fllog/distinfo index d02569fd764f..afe3a52da32d 100644 --- a/comms/fllog/distinfo +++ b/comms/fllog/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1705522238 -SHA256 (fllog-1.2.8.tar.gz) = 9092dbd627ddf2c50ec0680db081269611f6f5f40b7537c332328baf32bbaf52 -SIZE (fllog-1.2.8.tar.gz) = 439478 +TIMESTAMP = 1762266415 +SHA256 (fllog-1.2.9.tar.gz) = dde26f4fd3e31d3acc9f4fe902b50320813b4fbcb56276b21b93ee1a8930b519 +SIZE (fllog-1.2.9.tar.gz) = 440142 diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index f83233cf20c4..5a76b07eca03 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -1,7 +1,7 @@ PORTNAME= gnuradio DISTVERSIONPREFIX= v DISTVERSION= 3.10.12.0 -PORTREVISION= 5 +PORTREVISION= 7 CATEGORIES= comms astro hamradio MAINTAINER= hamradio@FreeBSD.org @@ -36,7 +36,7 @@ BUILD_DEPENDS= ${PYNUMPY} \ xdg-open:devel/xdg-utils LIB_DEPENDS= libad9361.so:misc/libad9361-iio \ libasound.so:audio/alsa-lib \ - libboost_system.so:devel/boost-libs \ + libboost_thread.so:devel/boost-libs \ libcodec2.so:audio/codec2 \ libfftw3f.so:math/fftw3-float \ libfmt.so:devel/libfmt \ diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile index 583c0a77e203..674554414290 100644 --- a/comms/gqrx/Makefile +++ b/comms/gqrx/Makefile @@ -1,7 +1,7 @@ PORTNAME= gqrx PORTVERSION= 2.17.7 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= comms hamradio PKGNAMESUFFIX= -${FLAVOR} @@ -21,7 +21,7 @@ LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \ libgnuradio-digital.so:comms/gnuradio \ libgnuradio-pmt.so:comms/gnuradio \ libgnuradio-osmosdr.so:comms/gr-osmosdr \ - libboost_system.so:devel/boost-libs \ + libboost_thread.so:devel/boost-libs \ liblog4cpp.so:devel/log4cpp \ libgmpxx.so:math/gmp \ libgmp.so:math/gmp \ diff --git a/comms/gr-osmosdr/Makefile b/comms/gr-osmosdr/Makefile index 370b98934cfd..82c09772cd04 100644 --- a/comms/gr-osmosdr/Makefile +++ b/comms/gr-osmosdr/Makefile @@ -1,7 +1,7 @@ PORTNAME= gr-osmosdr DISTVERSIONPREFIX= v DISTVERSION= 0.2.6 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= comms hamradio @@ -17,7 +17,6 @@ LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \ libgnuradio-pmt.so:comms/gnuradio \ libgnuradio-blocks.so:comms/gnuradio \ libvolk.so:devel/volk \ - libboost_system.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs \ liblog4cpp.so:devel/log4cpp \ libgmpxx.so:math/gmp \ diff --git a/comms/hydrasdr/Makefile b/comms/hydrasdr/Makefile index 009c1f115e10..592c953c84b1 100644 --- a/comms/hydrasdr/Makefile +++ b/comms/hydrasdr/Makefile @@ -1,10 +1,10 @@ PORTNAME= hydrasdr DISTVERSIONPREFIX= v -DISTVERSION= 1.0.2 +DISTVERSION= 1.0.3 CATEGORIES= comms hamradio -MAINTAINER= unitrunker@gmail.com -COMMENT= HydraSDR RFONE's host library and associated tools +MAINTAINER= unitrunker@unitrunker.net +COMMENT= HydraSDR RFONE\'s host library and associated tools WWW= https://hydrasdr.com/ LICENSE= GPLv2 @@ -15,9 +15,13 @@ USE_GITHUB= yes GH_PROJECT= rfone_host USE_LDCONFIG= yes +CMAKE_ARGS= -DLIBUSB_INCLUDE_DIR="/usr/include" \ + -DLIBUSB_LIBRARIES="/usr/lib/libusb.so" CMAKE_OFF= INSTALL_UDEV_RULES -CMAKE_ARGS= -DLIBUSB_LIBRARIES="/usr/lib/libusb.so" \ - -DLIBUSB_INCLUDE_DIR="/usr/include" + +CFLAGS_powerpc64= -DNO_WARN_X86_INTRINSICS -mvsx +CFLAGS_powerpc64le= -DNO_WARN_X86_INTRINSICS + OPTIONS_DEFINE_amd64= SIMD OPTIONS_DEFINE_i386= SIMD OPTIONS_DEFAULT_amd64= SIMD @@ -25,7 +29,4 @@ OPTIONS_DEFAULT_i386= SIMD SIMD_CFLAGS= -DFREEBSD_USE_SIMD -msse -msse2 -mfpmath=sse -mmmx -CFLAGS_powerpc64= -DNO_WARN_X86_INTRINSICS -mvsx -CFLAGS_powerpc64le= -DNO_WARN_X86_INTRINSICS - .include <bsd.port.mk> diff --git a/comms/hydrasdr/distinfo b/comms/hydrasdr/distinfo index 80c529e2c654..17bdd759d016 100644 --- a/comms/hydrasdr/distinfo +++ b/comms/hydrasdr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1753631782 -SHA256 (hydrasdr-rfone_host-v1.0.2_GH0.tar.gz) = 4d5d47bd5f34479073b50229e95be606d6236714c048af97ed356ab090f158ac -SIZE (hydrasdr-rfone_host-v1.0.2_GH0.tar.gz) = 270469 +TIMESTAMP = 1760863733 +SHA256 (hydrasdr-rfone_host-v1.0.3_GH0.tar.gz) = 9ede1a10d03f47444972b4c84d7d846bfdbe63e0912e96b9131f1d5f5851454b +SIZE (hydrasdr-rfone_host-v1.0.3_GH0.tar.gz) = 271460 diff --git a/comms/hydrasdr/files/patch-libhydrasdr_CMakeLists.txt b/comms/hydrasdr/files/patch-libhydrasdr_CMakeLists.txt deleted file mode 100644 index 609c02a6a7c4..000000000000 --- a/comms/hydrasdr/files/patch-libhydrasdr_CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ ---- libhydrasdr/CMakeLists.txt.orig 2025-07-17 22:22:04 UTC -+++ libhydrasdr/CMakeLists.txt -@@ -108,11 +108,18 @@ CONFIGURE_FILE( - ${CMAKE_CURRENT_BINARY_DIR}/libhydrasdr.pc - @ONLY) - -+STRING(COMPARE EQUAL ${BSD} "FreeBSD" FREEBSD) -+if (FREEBSD) - INSTALL( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libhydrasdr.pc -+ DESTINATION libdata${LIB_SUFFIX}/pkgconfig -+) -+else() -+INSTALL( -+ FILES ${CMAKE_CURRENT_BINARY_DIR}/libhydrasdr.pc - DESTINATION lib${LIB_SUFFIX}/pkgconfig - ) -- -+endif() - ######################################################################## - # Create uninstall target - ######################################################################## diff --git a/comms/hydrasdr/pkg-plist b/comms/hydrasdr/pkg-plist index 684527fd20c7..322c2c89f8de 100644 --- a/comms/hydrasdr/pkg-plist +++ b/comms/hydrasdr/pkg-plist @@ -14,8 +14,13 @@ include/libhydrasdr/hydrasdr.h include/libhydrasdr/hydrasdr_commands.h include/libhydrasdr/iqconverter_float.h include/libhydrasdr/iqconverter_int16.h +lib/cmake/HydraSDR/FindLIBUSB.cmake +lib/cmake/HydraSDR/HydraSDRConfig.cmake +lib/cmake/HydraSDR/HydraSDRConfigVersion.cmake +lib/cmake/HydraSDR/HydraSDRTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/HydraSDR/HydraSDRTargets.cmake lib/libhydrasdr.a lib/libhydrasdr.so lib/libhydrasdr.so.0 -lib/libhydrasdr.so.1.0.2 +lib/libhydrasdr.so.1.0.3 libdata/pkgconfig/libhydrasdr.pc diff --git a/comms/libimobiledevice/Makefile b/comms/libimobiledevice/Makefile index acfa4759a88c..c55c56ed183d 100644 --- a/comms/libimobiledevice/Makefile +++ b/comms/libimobiledevice/Makefile @@ -1,9 +1,8 @@ PORTNAME= libimobiledevice -DISTVERSION= 1.3.0-300 +DISTVERSION= 1.4.0 PORTREVISION?= 0 -DISTVERSIONSUFFIX= -gcb34a17 CATEGORIES?= comms -#MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ MAINTAINER?= jhale@FreeBSD.org COMMENT?= Library to communicate with Apple iOS devices @@ -12,23 +11,35 @@ WWW= https://www.libimobiledevice.org LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -USES+= autoreconf cpe libtool localbase:ldflags pkgconfig \ - readline ssl -USE_GITHUB= yes +LIB_DEPENDS= libplist-2.0.so:devel/libplist + +USES= cpe libtool localbase:ldflags pkgconfig \ + readline ssl tar:bz2 GNU_CONFIGURE= yes -CONFIGURE_ARGS+=openssl_CFLAGS="-I${OPENSSLINC}" \ +CONFIGURE_ARGS= openssl_CFLAGS="-I${OPENSSLINC}" \ openssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" INSTALL_TARGET= install-strip CFLAGS+= -Wno-error=int-conversion -SLAVE_PORT?= no +.if defined(_LIMD_BINDING) && ${_LIMD_BINDING} == "py" +LIB_DEPENDS+= libimobiledevice-1.0.so:${MASTER_PORT} +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}libplist>=2.2.0:devel/py-libplist@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}libplist>=2.2.0:devel/py-libplist@${PY_FLAVOR} + +USES+= python +USE_PYTHON= cython3 flavors + +CONFIGURE_ENV+= PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`" -.if ${SLAVE_PORT} == no +BINARY_ALIAS= cython=cython-${PYTHON_VER} \ + python=${PYTHON_VERSION} -LIB_DEPENDS= libplist-2.0.so:devel/libplist \ - libimobiledevice-glue-1.0.so:comms/libimobiledevice-glue \ +BUILD_WRKSRC= ${WRKSRC}/cython +INSTALL_WRKSRC= ${BUILD_WRKSRC} +.else # parent port +LIB_DEPENDS+= libimobiledevice-glue-1.0.so:comms/libimobiledevice-glue \ libusbmuxd-2.0.so:comms/libusbmuxd \ libtatsu.so:security/libtatsu @@ -39,16 +50,26 @@ CONFIGURE_ARGS+=--without-cython PORTDOCS= AUTHORS NEWS README.md OPTIONS_DEFINE= DOCS - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - -.endif # ${SLAVE_PORT} == no +.endif post-patch: @${REINPLACE_CMD} -e 's| *@ssl_requires@||' \ ${WRKSRC}/src/${PORTNAME}*.pc.in - @echo "${DISTVERSIONFULL}" > ${WRKSRC}/.tarball-version +.if defined(_LIMD_BINDING) + @${REINPLACE_CMD} \ + -e 's|$$(top_builddir)/src/libimobiledevice-1.0.la|-limobiledevice-1.0|' \ + -e 's|$$(imobiledevice_la_DEPENDENCIES)||' \ + ${BUILD_WRKSRC}/Makefile.in +.endif + +post-install: +.if defined(_LIMD_BINDING) && ${_LIMD_BINDING} == "py" + @${MKDIR} ${STAGEDIR}${PREFIX}/include/imobiledevice/cython + ${INSTALL_DATA} ${INSTALL_WRKSRC}/imobiledevice.pxd \ + ${STAGEDIR}${PREFIX}/include/imobiledevice/cython +.else # parent port + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} +.endif .include <bsd.port.mk> diff --git a/comms/libimobiledevice/distinfo b/comms/libimobiledevice/distinfo index 8ec9aee3f8a7..4ec7114043a0 100644 --- a/comms/libimobiledevice/distinfo +++ b/comms/libimobiledevice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1751600582 -SHA256 (libimobiledevice-libimobiledevice-1.3.0-300-gcb34a17_GH0.tar.gz) = a3bd75332a403855e46458606fb8bccc166e54c4755c7481bb5ddae275394069 -SIZE (libimobiledevice-libimobiledevice-1.3.0-300-gcb34a17_GH0.tar.gz) = 420171 +TIMESTAMP = 1760586833 +SHA256 (libimobiledevice-1.4.0.tar.bz2) = 23cc0077e221c7d991bd0eb02150a0d49199bcca1ddf059edccee9ffd914939d +SIZE (libimobiledevice-1.4.0.tar.bz2) = 714628 diff --git a/comms/libimobiledevice/files/patch-configure b/comms/libimobiledevice/files/patch-configure new file mode 100644 index 000000000000..50c2e684e9dd --- /dev/null +++ b/comms/libimobiledevice/files/patch-configure @@ -0,0 +1,13 @@ +Remove bash-ism from configure script + +--- configure.orig 2025-10-07 03:17:25 UTC ++++ configure +@@ -22303,7 +22303,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.b + + if test "X$flag_ok" = Xyes ; then + +- CYTHON_CFLAGS+=" -Wno-cast-function-type" ++ CYTHON_CFLAGS="$CYTHON_CFLAGS -Wno-cast-function-type" + + + diff --git a/comms/libimobiledevice/files/patch-configure.ac b/comms/libimobiledevice/files/patch-configure.ac deleted file mode 100644 index b9595b147b48..000000000000 --- a/comms/libimobiledevice/files/patch-configure.ac +++ /dev/null @@ -1,13 +0,0 @@ -Remove bash-ism from configure script - ---- configure.ac.orig 2024-07-01 16:27:27 UTC -+++ configure.ac -@@ -139,7 +139,7 @@ if test "$build_cython" = "true"; then - AM_PATH_PYTHON([3.0], [ - CYTHON_PYTHON - AS_COMPILER_FLAG([-Wno-cast-function-type -Werror], [ -- CYTHON_CFLAGS+=" -Wno-cast-function-type" -+ CYTHON_CFLAGS="$CYTHON_CFLAGS -Wno-cast-function-type" - AC_SUBST([CYTHON_CFLAGS]) - ], []) - ]) diff --git a/comms/libimobiledevice/pkg-plist b/comms/libimobiledevice/pkg-plist index 5d80ce566f8f..0e173a86acc7 100644 --- a/comms/libimobiledevice/pkg-plist +++ b/comms/libimobiledevice/pkg-plist @@ -20,6 +20,7 @@ bin/idevicescreenshot bin/idevicesetlocation bin/idevicesyslog include/libimobiledevice/afc.h +include/libimobiledevice/bt_packet_logger.h include/libimobiledevice/companion_proxy.h include/libimobiledevice/debugserver.h include/libimobiledevice/diagnostics_relay.h @@ -49,7 +50,7 @@ include/libimobiledevice/webinspector.h lib/libimobiledevice-1.0.a lib/libimobiledevice-1.0.so lib/libimobiledevice-1.0.so.6 -lib/libimobiledevice-1.0.so.6.0.0 +lib/libimobiledevice-1.0.so.6.1.0 libdata/pkgconfig/libimobiledevice-1.0.pc share/man/man1/afcclient.1.gz share/man/man1/idevice_id.1.gz diff --git a/comms/opencbm-kmod/Makefile b/comms/opencbm-kmod/Makefile index 77ea7d63eed5..b88cbc68c9a8 100644 --- a/comms/opencbm-kmod/Makefile +++ b/comms/opencbm-kmod/Makefile @@ -3,7 +3,7 @@ PORTVERSION= ${OCBM_VERSION} PORTREVISION= 2 CATEGORIES= comms archivers -MAINTAINER= zirias@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= OpenCBM driver module for parallel-port X[MA]-1541 cables WWW= http://opencbm.sourceforge.net/ diff --git a/comms/opencbm-plugin-xa1541/Makefile b/comms/opencbm-plugin-xa1541/Makefile index fddd313b1467..64fb480a88f3 100644 --- a/comms/opencbm-plugin-xa1541/Makefile +++ b/comms/opencbm-plugin-xa1541/Makefile @@ -2,7 +2,7 @@ PORTNAME= opencbm-plugin-xa1541 PORTVERSION= ${OCBM_VERSION} CATEGORIES= comms archivers -MAINTAINER= zirias@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= OpenCBM plugin for parallel-port cables WWW= http://opencbm.sourceforge.net/ diff --git a/comms/opencbm/Makefile b/comms/opencbm/Makefile index d01d86da4815..f04c4d159bfa 100644 --- a/comms/opencbm/Makefile +++ b/comms/opencbm/Makefile @@ -2,7 +2,7 @@ PORTNAME= opencbm PORTVERSION= ${OCBM_VERSION} CATEGORIES= comms archivers -MAINTAINER= zirias@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Commodore CBM serial IEC/IEEE-488 bus utilities WWW= http://opencbm.sourceforge.net/ diff --git a/comms/py-libimobiledevice/Makefile b/comms/py-libimobiledevice/Makefile index 4b2a98ec349a..baff82aad8af 100644 --- a/comms/py-libimobiledevice/Makefile +++ b/comms/py-libimobiledevice/Makefile @@ -1,45 +1,18 @@ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= comms python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= jhale@FreeBSD.org COMMENT= Python bindings for libimobiledevice -LIB_DEPENDS= libimobiledevice-1.0.so:${MASTER_PORT} \ - libplist-2.0.so:devel/libplist -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>=2.2.0:devel/py-libplist@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>=2.2.0:devel/py-libplist@${PY_FLAVOR} - -USES+= python -USE_PYTHON= cython3 flavors - -CONFIGURE_ENV= PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`" - -BINARY_ALIAS= cython=cython-${PYTHON_VER} MASTERDIR= ${.CURDIR:H:H}/comms/libimobiledevice PORTSCOUT= ignore:1 -BUILD_WRKSRC= ${WRKSRC}/cython -INSTALL_WRKSRC= ${BUILD_WRKSRC} - PLIST= ${.CURDIR}/pkg-plist PLIST_FILES= include/imobiledevice/cython/imobiledevice.pxd \ ${PYTHONPREFIX_SITELIBDIR:S|^${PREFIX}/||}/imobiledevice.a \ ${PYTHONPREFIX_SITELIBDIR:S|^${PREFIX}/||}/imobiledevice.so -_USES_configure+= 471:post-autoreconf - -SLAVE_PORT= yes - -post-autoreconf: - @${REINPLACE_CMD} \ - -e 's|$$(top_builddir)/src/libimobiledevice-1.0.la|-limobiledevice-1.0|' \ - -e 's|$$(imobiledevice_la_DEPENDENCIES)||' \ - ${BUILD_WRKSRC}/Makefile.in - -post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/include/imobiledevice/cython - ${INSTALL_DATA} ${INSTALL_WRKSRC}/imobiledevice.pxd \ - ${STAGEDIR}${PREFIX}/include/imobiledevice/cython +_LIMD_BINDING= py .include "${MASTERDIR}/Makefile" diff --git a/comms/sdr++/Makefile b/comms/sdr++/Makefile index 4c19b9063cfc..0436e916043a 100644 --- a/comms/sdr++/Makefile +++ b/comms/sdr++/Makefile @@ -1,5 +1,6 @@ PORTNAME= sdr++ DISTVERSION= 20250105 # rolling (nightly) release is the current release model (see README) +PORTREVISION= 1 CATEGORIES= comms hamradio MAINTAINER= yuri@FreeBSD.org diff --git a/comms/soapybladerf/Makefile b/comms/soapybladerf/Makefile index 3110558958c1..7f7438c940df 100644 --- a/comms/soapybladerf/Makefile +++ b/comms/soapybladerf/Makefile @@ -1,7 +1,7 @@ PORTNAME= SoapyBladeRF DISTVERSIONPREFIX= soapy-bladerf- DISTVERSION= 0.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= comms hamradio MAINTAINER= yuri@FreeBSD.org diff --git a/comms/soapyuhd/Makefile b/comms/soapyuhd/Makefile index 3ab4a8a68fab..e7b7d533cb7b 100644 --- a/comms/soapyuhd/Makefile +++ b/comms/soapyuhd/Makefile @@ -1,7 +1,7 @@ PORTNAME= SoapyUHD DISTVERSIONPREFIX= soapy-uhd- DISTVERSION= 0.4.1-18 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= -g6b52139 CATEGORIES= comms hamradio @@ -12,7 +12,7 @@ WWW= https://github.com/pothosware/SoapyUHD/wiki LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libboost_system.so:devel/boost-libs \ +LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libSoapySDR.so:misc/soapysdr \ libuhd.so:comms/uhd diff --git a/comms/syncterm/Makefile b/comms/syncterm/Makefile index 76eb74d69cc7..86a1b37571f8 100644 --- a/comms/syncterm/Makefile +++ b/comms/syncterm/Makefile @@ -1,5 +1,5 @@ PORTNAME= syncterm -DISTVERSION= 1.6 +DISTVERSION= 1.7 CATEGORIES= comms MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/comms/syncterm/distinfo b/comms/syncterm/distinfo index 19485fc78257..037e3be80273 100644 --- a/comms/syncterm/distinfo +++ b/comms/syncterm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739300793 -SHA256 (syncterm-1.6-src.tgz) = 79e3ae43d39f98a592268ff40094094da62aa587b5b925e6b7459d66a5d11d49 -SIZE (syncterm-1.6-src.tgz) = 10986287 +TIMESTAMP = 1760239214 +SHA256 (syncterm-1.7-src.tgz) = bed2a55b17bc2fc2ae65463fe87835c68defe519820657421b99dba18edb90c8 +SIZE (syncterm-1.7-src.tgz) = 11002120 diff --git a/comms/syncterm/files/patch-src_syncterm_GNUmakefile b/comms/syncterm/files/patch-src_syncterm_GNUmakefile deleted file mode 100644 index e0928249d3dd..000000000000 --- a/comms/syncterm/files/patch-src_syncterm_GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ ---- src/syncterm/GNUmakefile.orig 2025-02-11 19:11:48 UTC -+++ src/syncterm/GNUmakefile -@@ -83,6 +83,7 @@ $(MTOBJODIR)$(DIRSEP)conn$(OFILE): $(CRYPT_LIBS) - $(MTOBJODIR)$(DIRSEP)ssh$(OFILE): $(CRYPT_LIBS) - $(MTOBJODIR)$(DIRSEP)syncterm$(OFILE): $(CRYPT_LIBS) $(CIOLIB-MT) - $(MTOBJODIR)$(DIRSEP)telnets$(OFILE): $(CRYPT_LIBS) -+$(MTOBJODIR)$(DIRSEP)webget$(OFILE): $(CRYPT_LIBS) - $(CIOLIB_INTERPOLATE_OBJS): $(CIOLIB-MT_BUILD) - - ifeq ($(os),darwin) diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile index 497d4ba6de6f..3c143330db7e 100644 --- a/comms/uhd/Makefile +++ b/comms/uhd/Makefile @@ -1,7 +1,7 @@ PORTNAME= uhd DISTVERSIONPREFIX= v -DISTVERSION= 4.8.0.0 -PORTREVISION= 1 +DISTVERSION= 4.9.0.1 +#PORTREVISION= 1 CATEGORIES= comms hamradio DIST_SUBDIR= ${PORTNAME} @@ -17,8 +17,8 @@ WWW= https://www.ettus.com/sdr-software/uhd-usrp-hardware-driver/ LICENSE= GPLv3 LIB_DEPENDS= ${PY_BOOST} \ - libboost_system.so:devel/boost-libs -BUILD_DEPENDS= flatc:devel/flatbuffers \ + libboost_thread.so:devel/boost-libs +BUILD_DEPENDS= \ orcc:devel/orc \ cheetah-analyze:devel/py-cheetah3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ @@ -49,7 +49,7 @@ SHEBANG_GLOB= *.py *.py.in *_bist usrp_update* CMAKE_ARGS+= -DPKG_LIB_DIR:STRING="share/uhd" -DUHD_TXRX_DEBUG_PRINTS="yes" # for excruciating debug use this -db -#CMAKE_ARGS+= --debug-output --trace +CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH="${WRKSRC}/host/include ${LOCALBASE}/include" OPTIONS_DEFINE= DOCS DOXYGEN OPTIONS_DEFAULT= DOCS @@ -62,15 +62,6 @@ DOXYGEN_CMAKE_OFF= -DENABLE_DOXYGEN:STRING="OFF" \ -DENABLE_MANUAL:STRING="OFF" DOXYGEN_PORTDOCS= doxygen -# -# XXX N.B. uhd compile will fail if the generated flatbuffers -# files are out of date with current version of flatbuffers. -# There is likely a better way of doing this, but this works. -pre-configure: -.for f in cal_metadata.fbs iq_cal.fbs dsa_cal.fbs pwr_cal.fbs - (cd ${WRKSRC}/host/include/uhd/cal;flatc --cpp ${f}) -.endfor - do-install: # install host component # hack the install prefix now diff --git a/comms/uhd/distinfo b/comms/uhd/distinfo index 6d339e633362..a9bec3a7d40d 100644 --- a/comms/uhd/distinfo +++ b/comms/uhd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744309213 -SHA256 (uhd/EttusResearch-uhd-v4.8.0.0_GH0.tar.gz) = a2159491949477dca67f5a9b05f5a80d8c2b32e91b95dd7fac8ddd3893e36d09 -SIZE (uhd/EttusResearch-uhd-v4.8.0.0_GH0.tar.gz) = 41358938 +TIMESTAMP = 1761417993 +SHA256 (uhd/EttusResearch-uhd-v4.9.0.1_GH0.tar.gz) = 0be26a139f23041c1fb6e9666d84cba839460e3c756057dc48dc067cc356a7bc +SIZE (uhd/EttusResearch-uhd-v4.9.0.1_GH0.tar.gz) = 37508709 diff --git a/comms/uhd/pkg-plist b/comms/uhd/pkg-plist index 77ed4132c411..10425c59d068 100644 --- a/comms/uhd/pkg-plist +++ b/comms/uhd/pkg-plist @@ -53,6 +53,7 @@ include/uhd/rfnoc/chdr_types.hpp include/uhd/rfnoc/constants.hpp include/uhd/rfnoc/ddc_block_control.hpp include/uhd/rfnoc/defaults.hpp +include/uhd/rfnoc/detail/graph.hpp include/uhd/rfnoc/dirtifier.hpp include/uhd/rfnoc/dmafifo_block_control.hpp include/uhd/rfnoc/duc_block_control.hpp @@ -66,12 +67,14 @@ include/uhd/rfnoc/lc_block_control.hpp include/uhd/rfnoc/logpwr_block_control.hpp include/uhd/rfnoc/mb_controller.hpp include/uhd/rfnoc/mock_block.hpp +include/uhd/rfnoc/mock_nodes.hpp include/uhd/rfnoc/moving_average_block_control.hpp include/uhd/rfnoc/multichan_register_iface.hpp include/uhd/rfnoc/noc_block_base.hpp include/uhd/rfnoc/noc_block_make_args.hpp include/uhd/rfnoc/node.hpp include/uhd/rfnoc/node.ipp +include/uhd/rfnoc/node_accessor.hpp include/uhd/rfnoc/null_block_control.hpp include/uhd/rfnoc/property.hpp include/uhd/rfnoc/property.ipp @@ -143,7 +146,6 @@ include/uhd/usrp/dboard_iface.hpp include/uhd/usrp/dboard_manager.hpp include/uhd/usrp/fe_connection.hpp include/uhd/usrp/gpio_defs.hpp -include/uhd/usrp/gps_ctrl.hpp include/uhd/usrp/mboard_eeprom.h include/uhd/usrp/mboard_eeprom.hpp include/uhd/usrp/multi_usrp.hpp @@ -162,6 +164,7 @@ include/uhd/utils/byteswap.ipp include/uhd/utils/cast.hpp include/uhd/utils/chdr/chdr_packet.hpp include/uhd/utils/chdr/chdr_packet.ipp +include/uhd/utils/compat_check.hpp include/uhd/utils/csv.hpp include/uhd/utils/dirty_tracked.hpp include/uhd/utils/fp_compare_delta.ipp @@ -194,8 +197,9 @@ lib/cmake/uhd/UHDConfig.cmake lib/cmake/uhd/UHDConfigVersion.cmake lib/cmake/uhd/UHDMinDepVersions.cmake lib/cmake/uhd/UHDPython.cmake +lib/cmake/uhd/UHDUnitTest.cmake lib/libuhd.so -lib/libuhd.so.4.8.0 +lib/libuhd.so.4.9.0 %%PYTHON_SITELIBDIR%%/uhd/__init__.py %%PYTHON_SITELIBDIR%%/uhd/chdr.py %%PYTHON_SITELIBDIR%%/uhd/dsp/__init__.py @@ -211,8 +215,12 @@ lib/libuhd.so.4.8.0 %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/grc.py %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/image_builder.py %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/log.py +%%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/modtool_commands/add-gr-block.yml +%%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/modtool_commands/add-gr-oot.yml +%%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/modtool_commands/add-grc.yml %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/modtool_commands/add.yml %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/modtool_commands/create.yml +%%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/modtool_commands/make-yaml.yml %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/rfnoc_modtool.py %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/step_executor.py %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/template.py @@ -220,7 +228,9 @@ lib/libuhd.so.4.8.0 %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/templates/blocktool/CMakeLists.txt.mako %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/templates/blocktool/Makefile.mako %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/templates/blocktool/Makefile.srcs.mako +%%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/templates/blocktool/descriptor.yml.mako %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/templates/blocktool/functions.mako +%%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/templates/blocktool/grc_bindings_template.block.yml.mako %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/templates/blocktool/modules/axis_chdr_connect_template.mako %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/templates/blocktool/modules/axis_chdr_modules_template.mako %%PYTHON_SITELIBDIR%%/uhd/rfnoc_utils/templates/blocktool/modules/axis_chdr_wires_template.mako @@ -274,6 +284,8 @@ lib/libuhd.so.4.8.0 %%PYTHON_SITELIBDIR%%/uhd/usrp/cal/tone_gen.py %%PYTHON_SITELIBDIR%%/uhd/usrp/cal/usrp_calibrator.py %%PYTHON_SITELIBDIR%%/uhd/usrp/cal/visa.py +%%PYTHON_SITELIBDIR%%/uhd/usrp/chips/__init__.py +%%PYTHON_SITELIBDIR%%/uhd/usrp/chips/max287x.py %%PYTHON_SITELIBDIR%%/uhd/usrp/dram_utils.py %%PYTHON_SITELIBDIR%%/uhd/usrp/libtypes.py %%PYTHON_SITELIBDIR%%/uhd/usrp/multi_usrp.py @@ -437,13 +449,14 @@ share/man/man1/usrpctl.1.gz %%DATADIR%%/examples/benchmark_rate %%DATADIR%%/examples/gpio %%DATADIR%%/examples/latency_test -%%DATADIR%%/examples/network_relay %%DATADIR%%/examples/python/benchmark_rate.py -%%DATADIR%%/examples/python/curses_fft.py -%%DATADIR%%/examples/python/fft_loopback.py -%%DATADIR%%/examples/python/remote_rx.py -%%DATADIR%%/examples/python/replay_capture.py +%%DATADIR%%/examples/python/rfnoc_rx_replay_samples_to_file.py +%%DATADIR%%/examples/python/rfnoc_rx_to_file.py +%%DATADIR%%/examples/python/rfnoc_txrx_fft_block_loopback.py +%%DATADIR%%/examples/python/rx_spectrum_to_asciiplot.py +%%DATADIR%%/examples/python/rx_spectrum_to_pyplot.py %%DATADIR%%/examples/python/rx_to_file.py +%%DATADIR%%/examples/python/rx_to_remote_udp.py %%DATADIR%%/examples/python/tx_waveforms.py %%DATADIR%%/examples/python/usrp_power_meter.py %%DATADIR%%/examples/python/x440_L_band_capture.py @@ -476,13 +489,14 @@ share/man/man1/usrpctl.1.gz %%DATADIR%%/rfnoc-newmod/CMakeLists.txt %%DATADIR%%/rfnoc-newmod/README.md %%DATADIR%%/rfnoc-newmod/apps/CMakeLists.txt +%%DATADIR%%/rfnoc-newmod/cmake/Modules/rfnoc-newmodConfig.cmake %%DATADIR%%/rfnoc-newmod/cmake/Modules/run_testbench.sh.in %%DATADIR%%/rfnoc-newmod/cmake/cmake_uninstall.cmake.in %%DATADIR%%/rfnoc-newmod/examples/CMakeLists.txt -%%DATADIR%%/rfnoc-newmod/fpga/newmod/CMakeLists.txt %%DATADIR%%/rfnoc-newmod/icores/.gitignore %%DATADIR%%/rfnoc-newmod/icores/CMakeLists.txt %%DATADIR%%/rfnoc-newmod/include/rfnoc/newmod/CMakeLists.txt +%%DATADIR%%/rfnoc-newmod/include/rfnoc/newmod/config.hpp %%DATADIR%%/rfnoc-newmod/lib/CMakeLists.txt %%DATADIR%%/rfnoc-newmod/python/CMakeLists.txt %%DATADIR%%/rfnoc-newmod/python/pyrfnoc-newmod.cpp @@ -490,6 +504,10 @@ share/man/man1/usrpctl.1.gz %%DATADIR%%/rfnoc-newmod/python/setup.py.in %%DATADIR%%/rfnoc-newmod/rfnoc/CMakeLists.txt %%DATADIR%%/rfnoc-newmod/rfnoc/blocks/CMakeLists.txt +%%DATADIR%%/rfnoc-newmod/rfnoc/fpga/newmod/CMakeLists.txt +%%DATADIR%%/rfnoc-newmod/tests/CMakeLists.txt +%%DATADIR%%/rfnoc-newmod/tests/newmod_block_test.cpp +%%DATADIR%%/rfnoc-newmod/tests/newmod_math_test.cpp %%DATADIR%%/rfnoc/blocks/addsub.yml %%DATADIR%%/rfnoc/blocks/axi_ram_fifo.yml %%DATADIR%%/rfnoc/blocks/ddc.yml @@ -525,7 +543,6 @@ share/man/man1/usrpctl.1.gz %%DATADIR%%/rfnoc/transport_adapters/x4xx_eth.yml %%DATADIR%%/tests/actions_test %%DATADIR%%/tests/addr_test -%%DATADIR%%/tests/addsub_block_test %%DATADIR%%/tests/adf535x_test %%DATADIR%%/tests/block_id_test %%DATADIR%%/tests/buffer_test @@ -542,7 +559,6 @@ share/man/man1/usrpctl.1.gz %%DATADIR%%/tests/constrained_device_args_test %%DATADIR%%/tests/convert_test %%DATADIR%%/tests/custom_reg_test -%%DATADIR%%/tests/ddc_block_test %%DATADIR%%/tests/device_addr_test.py %%DATADIR%%/tests/devtest/benchmark_rate_test.py %%DATADIR%%/tests/devtest/bitbang_test.py @@ -563,6 +579,7 @@ share/man/man1/usrpctl.1.gz %%DATADIR%%/tests/devtest/run_testsuite.py %%DATADIR%%/tests/devtest/rx_multi_spc_timed_commands_test.py %%DATADIR%%/tests/devtest/rx_samples_to_file_test.py +%%DATADIR%%/tests/devtest/rx_stream_cmds_test.py %%DATADIR%%/tests/devtest/test_messages_test.py %%DATADIR%%/tests/devtest/test_pps_test.py %%DATADIR%%/tests/devtest/tx_bursts_test.py @@ -573,7 +590,6 @@ share/man/man1/usrpctl.1.gz %%DATADIR%%/tests/devtest/usrp_probe_test.py %%DATADIR%%/tests/dict_test %%DATADIR%%/tests/discoverable_feature_test -%%DATADIR%%/tests/duc_block_test %%DATADIR%%/tests/eeprom_c_test %%DATADIR%%/tests/eeprom_utils_test %%DATADIR%%/tests/error_c_test @@ -581,28 +597,19 @@ share/man/man1/usrpctl.1.gz %%DATADIR%%/tests/expert_test %%DATADIR%%/tests/fe_conn_test %%DATADIR%%/tests/ferrum_radio_block_test -%%DATADIR%%/tests/fft_block_test -%%DATADIR%%/tests/fft_block_test_v2 -%%DATADIR%%/tests/fir_filter_block_test -%%DATADIR%%/tests/fosphor_block_test %%DATADIR%%/tests/fp_compare_delta_test %%DATADIR%%/tests/fp_compare_epsilon_test %%DATADIR%%/tests/gain_group_test %%DATADIR%%/tests/interpolation_test %%DATADIR%%/tests/isatty_test -%%DATADIR%%/tests/keep_one_in_n_test -%%DATADIR%%/tests/lc_block_test %%DATADIR%%/tests/link_test %%DATADIR%%/tests/lmx2572_test %%DATADIR%%/tests/log_test -%%DATADIR%%/tests/logpwr_block_test %%DATADIR%%/tests/math_test %%DATADIR%%/tests/max287x_test %%DATADIR%%/tests/mb_controller_test -%%DATADIR%%/tests/moving_average_block_test %%DATADIR%%/tests/multichan_register_iface_test %%DATADIR%%/tests/narrow_cast_test -%%DATADIR%%/tests/null_block_test %%DATADIR%%/tests/offload_io_srv_test %%DATADIR%%/tests/paths_test %%DATADIR%%/tests/property_test @@ -611,8 +618,25 @@ share/man/man1/usrpctl.1.gz %%DATADIR%%/tests/pyranges_test.py %%DATADIR%%/tests/ranges_c_test %%DATADIR%%/tests/ranges_test -%%DATADIR%%/tests/replay_block_test %%DATADIR%%/tests/rf_control_gain_profile_test +%%DATADIR%%/tests/rfnoc_block_tests/addsub_block_test +%%DATADIR%%/tests/rfnoc_block_tests/ddc_block_test +%%DATADIR%%/tests/rfnoc_block_tests/duc_block_test +%%DATADIR%%/tests/rfnoc_block_tests/fft_block_test +%%DATADIR%%/tests/rfnoc_block_tests/fft_block_test_v2 +%%DATADIR%%/tests/rfnoc_block_tests/fir_filter_block_test +%%DATADIR%%/tests/rfnoc_block_tests/fosphor_block_test +%%DATADIR%%/tests/rfnoc_block_tests/keep_one_in_n_test +%%DATADIR%%/tests/rfnoc_block_tests/lc_block_test +%%DATADIR%%/tests/rfnoc_block_tests/logpwr_block_test +%%DATADIR%%/tests/rfnoc_block_tests/moving_average_block_test +%%DATADIR%%/tests/rfnoc_block_tests/null_block_test +%%DATADIR%%/tests/rfnoc_block_tests/replay_block_test +%%DATADIR%%/tests/rfnoc_block_tests/siggen_block_test +%%DATADIR%%/tests/rfnoc_block_tests/split_stream_block_test +%%DATADIR%%/tests/rfnoc_block_tests/switchboard_block_test +%%DATADIR%%/tests/rfnoc_block_tests/vector_iir_block_test +%%DATADIR%%/tests/rfnoc_block_tests/window_block_test %%DATADIR%%/tests/rfnoc_chdr_test %%DATADIR%%/tests/rfnoc_detailgraph_test %%DATADIR%%/tests/rfnoc_node_test @@ -624,11 +648,9 @@ share/man/man1/usrpctl.1.gz %%DATADIR%%/tests/sensors_c_test %%DATADIR%%/tests/sensors_test %%DATADIR%%/tests/serial_number_test -%%DATADIR%%/tests/siggen_block_test %%DATADIR%%/tests/soft_reg_test %%DATADIR%%/tests/sph_recv_test %%DATADIR%%/tests/sph_send_test -%%DATADIR%%/tests/split_stream_block_test %%DATADIR%%/tests/streamer_benchmark %%DATADIR%%/tests/streaming_performance/batch_run_benchmark_rate.py %%DATADIR%%/tests/streaming_performance/parse_benchmark_rate.py @@ -639,17 +661,15 @@ share/man/man1/usrpctl.1.gz %%DATADIR%%/tests/string_vector_c_test %%DATADIR%%/tests/subdev_spec_c_test %%DATADIR%%/tests/subdev_spec_test -%%DATADIR%%/tests/switchboard_block_test %%DATADIR%%/tests/system_time_test %%DATADIR%%/tests/tasks_test %%DATADIR%%/tests/time_spec_test +%%DATADIR%%/tests/tmp468_test %%DATADIR%%/tests/transport_test %%DATADIR%%/tests/tx_streamer_test %%DATADIR%%/tests/uhd_image_downloader_test.py -%%DATADIR%%/tests/vector_iir_block_test %%DATADIR%%/tests/verify_fbs_test.py %%DATADIR%%/tests/vrt_test -%%DATADIR%%/tests/window_block_test %%DATADIR%%/tests/x400_rfdc_control_test %%DATADIR%%/tests/x4xx_radio_block_test %%DATADIR%%/tests/xport_adapter_ctrl_test diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile index f97384701999..a096a0399ffd 100644 --- a/comms/wsjtx/Makefile +++ b/comms/wsjtx/Makefile @@ -1,6 +1,6 @@ PORTNAME= wsjtx DISTVERSION= 2.5.4 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= comms hamradio MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} diff --git a/comms/wsjtz/Makefile b/comms/wsjtz/Makefile index 59c62c57d250..48def3b9c0b2 100644 --- a/comms/wsjtz/Makefile +++ b/comms/wsjtz/Makefile @@ -1,6 +1,5 @@ PORTNAME= wsjtz -DISTVERSION= 2.5.4-1.22 -PORTREVISION= 13 +DISTVERSION= 2.7.0-rc7-1.48 CATEGORIES= comms hamradio MASTER_SITES= SF/wsjt-z/Source @@ -9,45 +8,45 @@ COMMENT= Clone of WSJT-X software with additional features WWW= https://sourceforge.net/projects/wsjt-z/ LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libboost_log_setup.so:devel/boost-libs \ - libfftw3.so:math/fftw3 \ - libfftw3f.so:math/fftw3-float \ - libhamlib.so:comms/hamlib \ - libreadline.so:devel/readline +PATCH_DEPENDS= dos2unix:converters/dos2unix BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl \ a2x:textproc/asciidoc \ asciidoctor:textproc/rubygem-asciidoctor \ boost-libs>0:devel/boost-libs \ libtool:devel/libtool +LIB_DEPENDS= libboost_log_setup.so:devel/boost-libs \ + libfftw3.so:math/fftw3 \ + libfftw3f.so:math/fftw3-float \ + libhamlib.so:comms/hamlib \ + libreadline.so:devel/readline USES= cmake compiler:c++14-lang fortran makeinfo pkgconfig qt:5 zip USE_QT= concurrent core gui multimedia network printsupport serialport \ sql sql-sqlite3 testlib widgets buildtools:build \ linguisttools:build qmake:build -CONFLICTS= wsjtx - -CMAKE_ARGS+= -DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \ +CMAKE_ARGS+= -DCMAKE_PREFIX_PATH+=${LOCALBASE}/${PORTNAME:S/z/x/}/lib \ -DLOCALBASE::STRING="${LOCALBASE}" # for detailed debugging uncomment the next line #CMAKE_ARGS+= --debug-output --trace -PLIST_SUB+= PORTVERSION="${PORTVERSION}" - -OPTIONS_DEFINE= DOCS -PORTDOCS= * +CONFLICTS= wsjtx -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/z/x/} DATADIR= ${PREFIX}/share/${PORTNAME:S/z/x/} -WRKSRC= ${WRKDIR}/wsjtx +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/z/x/} + +WRKSRC= ${WRKDIR}/${PORTNAME:S/z/x/} -.include <bsd.port.pre.mk> +PLIST_SUB= PORTVERSION="${PORTVERSION}" -.if ${GCC_DEFAULT} >= 10 -# workaround for More actual than formal arguments in procedure call at (1) -FFLAGS+= -fallow-argument-mismatch -.endif +OPTIONS_DEFINE= DOCS +OPTIONS_SUB= yes + +pre-patch: + ${FIND} ${WRKSRC} -type f -not -name '*.png' \ + -exec dos2unix {} > /dev/null 2>&1 \; post-install: .for f in fcal fmeasure fmtave fst4sim ft8code jt4code jt65code jt9 jt9code \ @@ -55,4 +54,7 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor -.include <bsd.port.post.mk> +post-install-DOCS-off: + ${RM} -r ${STAGEDIR}${DOCSDIR} + +.include <bsd.port.mk> diff --git a/comms/wsjtz/distinfo b/comms/wsjtz/distinfo index 2df0a6f4cc0f..39823eb69cc4 100644 --- a/comms/wsjtz/distinfo +++ b/comms/wsjtz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653239901 -SHA256 (wsjtz-2.5.4-1.22.zip) = a2944ebc961e6d2ecfd1f36a07f4ec5ad6d6f80a528d8ef6f894794b247c3fe9 -SIZE (wsjtz-2.5.4-1.22.zip) = 38009881 +TIMESTAMP = 1761124730 +SHA256 (wsjtz-2.7.0-rc7-1.48.zip) = 4af4a008eadbe49eb5d620a0802691550d83605c235573a3e859a3013937b933 +SIZE (wsjtz-2.7.0-rc7-1.48.zip) = 39190543 diff --git a/comms/wsjtz/files/patch-CMakeLists.txt b/comms/wsjtz/files/patch-CMakeLists.txt index 012db69b5b5a..d6783c509153 100644 --- a/comms/wsjtz/files/patch-CMakeLists.txt +++ b/comms/wsjtz/files/patch-CMakeLists.txt @@ -1,9 +1,10 @@ ---- CMakeLists.txt.orig 2022-04-18 18:07:26 UTC +--- CMakeLists.txt.orig 2025-01-07 04:30:42 UTC +++ CMakeLists.txt -@@ -141,6 +141,12 @@ attach a debugger which will then receive the console +@@ -145,7 +145,12 @@ attach a debugger which will then receive the console # install locations # +- +if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + set (FREEBSD TRUE) + link_directories("/usr/lib" "${LOCALBASE}/lib") @@ -13,7 +14,7 @@ if (APPLE) set (CMAKE_INSTALL_BINDIR ${CMAKE_PROJECT_NAME}.app/Contents/MacOS) set (CMAKE_INSTALL_DATAROOTDIR ${CMAKE_PROJECT_NAME}.app/Contents/Resources) -@@ -875,8 +881,20 @@ find_package (Boost 1.62 REQUIRED COMPONENTS log_setup +@@ -936,8 +941,20 @@ find_package (Boost 1.62 REQUIRED COMPONENTS log_setup # # OpenMP # @@ -35,7 +36,7 @@ # # fftw3 single precision library # -@@ -923,7 +941,7 @@ set (CMAKE_VISIBILITY_INLINES_HIDDEN ON) +@@ -986,7 +1003,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") # set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") @@ -44,8 +45,8 @@ if (NOT APPLE) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas") -@@ -1169,7 +1187,7 @@ add_executable (encode77 lib/77bit/encode77.f90) - target_link_libraries (encode77 wsjt_fort wsjt_cxx) +@@ -1247,7 +1264,7 @@ add_executable (wsprsim ${wsprsim_CSRCS}) + target_link_libraries (hash22calc wsjt_fort wsjt_cxx) add_executable (wsprsim ${wsprsim_CSRCS}) -target_link_libraries (wsprsim ${LIBM_LIBRARIES}) @@ -53,7 +54,7 @@ add_executable (jt4code lib/jt4code.f90) target_link_libraries (jt4code wsjt_fort wsjt_cxx) -@@ -1211,6 +1229,12 @@ target_link_libraries (ldpcsim240_74 wsjt_fort wsjt_cx +@@ -1301,6 +1318,12 @@ endif(WSJT_BUILD_UTILS) endif(WSJT_BUILD_UTILS) @@ -66,7 +67,7 @@ add_executable (fmtave lib/fmtave.f90) add_executable (fcal lib/fcal.f90) -@@ -1410,6 +1434,11 @@ if (${OPENMP_FOUND} OR APPLE) +@@ -1499,6 +1522,11 @@ endif (${OPENMP_FOUND} OR APPLE) else (${OPENMP_FOUND} OR APPLE) target_link_libraries (jt9 wsjt_fort wsjt_cxx fort_qt) endif (${OPENMP_FOUND} OR APPLE) @@ -77,8 +78,8 @@ +endif () if (WIN32) - # build map65 -@@ -1601,12 +1630,12 @@ install (PROGRAMS + find_package (Portaudio REQUIRED) +@@ -1690,12 +1718,12 @@ install (PROGRAMS RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX} ) diff --git a/comms/wsjtz/files/patch-CMake_Modules_FindUsb.cmake b/comms/wsjtz/files/patch-CMake_Modules_FindUsb.cmake index 75c7a19faca7..b010b31b571a 100644 --- a/comms/wsjtz/files/patch-CMake_Modules_FindUsb.cmake +++ b/comms/wsjtz/files/patch-CMake_Modules_FindUsb.cmake @@ -1,4 +1,4 @@ ---- CMake/Modules/FindUsb.cmake.orig 2021-12-28 16:31:58 UTC +--- CMake/Modules/FindUsb.cmake.orig 2024-09-27 09:47:22 UTC +++ CMake/Modules/FindUsb.cmake @@ -27,7 +27,7 @@ libfind_pkg_detect (Usb usb-1.0 endif () diff --git a/comms/wsjtz/files/patch-Radio.cpp b/comms/wsjtz/files/patch-Radio.cpp deleted file mode 100644 index 482155884385..000000000000 --- a/comms/wsjtz/files/patch-Radio.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- Radio.cpp.orig 2021-12-28 16:31:58 UTC -+++ Radio.cpp -@@ -54,7 +54,7 @@ namespace Radio - value *= std::pow (10., scale); - if (ok) - { -- if (value < 0. || value > std::numeric_limits<Frequency>::max ()) -+ if (value < 0. || value > (float)std::numeric_limits<Frequency>::max ()) - { - value = 0.; - *ok = false; -@@ -92,7 +92,7 @@ namespace Radio - if (ok) - { - if (value < -std::numeric_limits<Frequency>::max () -- || value > std::numeric_limits<Frequency>::max ()) -+ || value > (float)std::numeric_limits<Frequency>::max ()) - { - value = 0.; - *ok = false; diff --git a/comms/wsjtz/files/patch-widgets_FrequencyDeltaLineEdit.cpp b/comms/wsjtz/files/patch-widgets_FrequencyDeltaLineEdit.cpp deleted file mode 100644 index 1b677344d795..000000000000 --- a/comms/wsjtz/files/patch-widgets_FrequencyDeltaLineEdit.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- widgets/FrequencyDeltaLineEdit.cpp.orig 2021-02-01 18:08:30 UTC -+++ widgets/FrequencyDeltaLineEdit.cpp -@@ -39,8 +39,8 @@ namespace - FrequencyDeltaLineEdit::FrequencyDeltaLineEdit (QWidget * parent) - : QLineEdit (parent) - { -- setValidator (new MHzValidator {-std::numeric_limits<FrequencyDelta>::max () / 10.e6, -- std::numeric_limits<FrequencyDelta>::max () / 10.e6, this}); -+ setValidator (new MHzValidator {-(float)std::numeric_limits<FrequencyDelta>::max () / 10.e6, -+ (float)std::numeric_limits<FrequencyDelta>::max () / 10.e6, this}); - } - - auto FrequencyDeltaLineEdit::frequency_delta () const -> FrequencyDelta diff --git a/comms/wsjtz/files/patch-widgets_FrequencyLineEdit.cpp b/comms/wsjtz/files/patch-widgets_FrequencyLineEdit.cpp deleted file mode 100644 index 10b456242781..000000000000 --- a/comms/wsjtz/files/patch-widgets_FrequencyLineEdit.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- widgets/FrequencyLineEdit.cpp.orig 2021-02-01 18:08:30 UTC -+++ widgets/FrequencyLineEdit.cpp -@@ -39,7 +39,7 @@ namespace - FrequencyLineEdit::FrequencyLineEdit (QWidget * parent) - : QLineEdit (parent) - { -- setValidator (new MHzValidator {0., std::numeric_limits<Radio::Frequency>::max () / 10.e6, this}); -+ setValidator (new MHzValidator {0., (float)std::numeric_limits<Radio::Frequency>::max () / 10.e6, this}); - } - - auto FrequencyLineEdit::frequency () const -> Frequency diff --git a/comms/wsjtz/pkg-plist b/comms/wsjtz/pkg-plist index bd7c426ca0d1..7520e73a7be7 100644 --- a/comms/wsjtz/pkg-plist +++ b/comms/wsjtz/pkg-plist @@ -1,8 +1,25 @@ +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/BUGS +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/THANKS +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/changelog.gz +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/copyright +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/example_log_configurations/README +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/example_log_configurations/wsjtx_log_config.ini.console +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/example_log_configurations/wsjtx_log_config.ini.debugger +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/example_log_configurations/wsjtx_log_config.ini.rig_control +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/example_log_configurations/wsjtx_log_config.ini.simple_verbose +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/wsjtx-main-2.7.0-rc7.html +bin/cablog +bin/echosim bin/fcal bin/fmeasure bin/fmtave bin/fst4sim bin/ft8code +bin/hash22calc bin/jt4code bin/jt65code bin/jt9 @@ -17,6 +34,8 @@ bin/udp_daemon bin/wsjtx bin/wsjtx_app_version bin/wsprd +share/applications/message_aggregator.desktop +share/applications/wsjtx.desktop share/man/man1/fcal.1.gz share/man/man1/fmeasure.1.gz share/man/man1/fmtave.1.gz @@ -36,10 +55,9 @@ share/man/man1/rigctld-wsjtx.1.gz share/man/man1/udp_daemon.1.gz share/man/man1/wsjtx.1.gz share/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 +%%DATADIR%%/eclipse.txt |