diff --git a/comms/direwolf/Makefile b/comms/direwolf/Makefile --- 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 @@ 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 diff --git a/comms/direwolf/distinfo b/comms/direwolf/distinfo --- 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 --- 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 --- a/comms/direwolf/pkg-plist +++ b/comms/direwolf/pkg-plist @@ -22,6 +22,39 @@ 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/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