Attachment #232260 for bug #258112




PORTNAME=	direwolf
DISTVERSION=	1.6
PORTREVISION=	2
CATEGORIES=	comms hamradio

PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES=	e449e39d4d0fba994b1a48aad13c40cd5e44a959.patch:-p1 \
		8619b74c7bca080bb8825cd83f3bd9b43289ad11.patch:-p1 \
		5dbe2ce136fbe75dcfed49583fb62e2b394293c1.patch:-p1 \
		42314b7219ec266697396c7a4b61afe91be9b92c.patch:-p1 \
		27019b479344c1eb7cdf0a5c2dbfc54471ed4379.patch:-p1

MAINTAINER=	hamradio@FreeBSD.org
COMMENT=	Software "soundcard" modem/TNC and APRS encoder/decoder


LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	libasound.so:audio/alsa-lib\
		libhamlib.so:comms/hamlib \
		libgps.so:astro/gpsd \
		libhamlib.so:comms/hamlib \
		libportaudio.so:audio/portaudio
RUN_DEPENDS=	bash:shells/bash

USES=		cmake python shebangfix pkgconfig

USE_GITHUB=	yes
GH_ACCOUNT=	wb2osz

SHEBANG_FILES=	scripts
SHEBANG_FILES=	scripts/telemetry-toolkit/telem-bits.pl \
		scripts/telemetry-toolkit/telem-parm.pl\
		scripts/telemetry-toolkit/telem-eqns.pl \
		scripts/dwespeak.sh \
		scripts/telemetry-toolkit/telem-data.pl \
		scripts/telemetry-toolkit/telem-data91.pl \
		scripts/telemetry-toolkit/telem-unit.pl	\
		scripts/telemetry-toolkit/telem-balloon.pl\
		scripts/dw-start.sh \
		scripts/telemetry-toolkit/telem-volts.py

OPTIONS_DEFINE=	DOCS EXAMPLES

post-patch:
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g'\
		-e 's|/var/tmp|/var/log|' ${WRKSRC}/scripts/dw-start.sh

.include <bsd.port.mk>




TIMESTAMP = 1646453576
SHA256 (wb2osz-direwolf-1.6_GH0.tar.gz) = 208b0563c9b339cbeb0e1feb52dc18ae38295c40c0009d6381fc4acb68fdf660
SIZE (wb2osz-direwolf-1.6_GH0.tar.gz) = 22298168
SHA256 (e449e39d4d0fba994b1a48aad13c40cd5e44a959.patch) = 3c92308229acbac31e65867b0c6234aa7cc8056a953bcd44d008a9b5eab1987c
SIZE (e449e39d4d0fba994b1a48aad13c40cd5e44a959.patch) = 1246
SHA256 (8619b74c7bca080bb8825cd83f3bd9b43289ad11.patch) = a0191603fd4ea0ba7f46c83f920a0c66033ba51d44b418761adc9322de5a5c66
SIZE (8619b74c7bca080bb8825cd83f3bd9b43289ad11.patch) = 76433
SHA256 (5dbe2ce136fbe75dcfed49583fb62e2b394293c1.patch) = c1e31fbfc18399e3dacc1fc821e2720ab0793337eba3841e110a37b3f9251a20
SIZE (5dbe2ce136fbe75dcfed49583fb62e2b394293c1.patch) = 2910
SHA256 (42314b7219ec266697396c7a4b61afe91be9b92c.patch) = 58c0d62f778e2598ae68a8f5d734ee6ac71e786763cabb616189533b8aae2dc0
SIZE (42314b7219ec266697396c7a4b61afe91be9b92c.patch) = 18991
SHA256 (27019b479344c1eb7cdf0a5c2dbfc54471ed4379.patch) = bbfe2caf64ca9fccc796ca61a381ce4e7eedf4bd8d0b7522c6090766daf71e13
SIZE (27019b479344c1eb7cdf0a5c2dbfc54471ed4379.patch) = 1963




--- scripts/dw-start.sh.orig	2022-01-28 14:55:02 UTC
+++ scripts/dw-start.sh
@@ -68,9 +68,9 @@ DWCMD="$DIREWOLF -a 100"
-#!/usr/bin/bash
+#!%%PREFIX%%/bin/bash
 
 # Why not simply "#!/bin/bash" ?
 
 #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
 
-
 #-------------------------------------
 # Main functions of the script
 #-------------------------------------
@@ -157,7 +157,7 @@ function GUI {
 # When running from cron, we have a very minimal environment
 # including PATH=/usr/bin:/bin.
 #
-export PATH=/usr/local/bin:$PATH
+export PATH=%%PREFIX%%/bin:$PATH
 
 #Log the start of the script run and re-run
 date >> $LOGFILE
+      %%PREFIX%%/bin/x-terminal-emulator -e "$DWCMD" &
       SUCCESS=1
      else
       echo "Did not find an X terminal emulator.  Reverting to CLI mode"

Lines 4-6 APRStt gateway, or Internet Gateway (IGate). It can also be used as a Link Here

(-)comms/direwolf/pkg-descr (-1 / +2 lines)
4	virtual TNC for other applications such as APRSIS32, UI-View32, Xastir,	4	virtual TNC for other applications such as APRSIS32, UI-View32, Xastir,
5	APRS-TW, YAAC, UISS, Linux AX25, SARTrack, RMS Express, BPQ32, Outpost	5	APRS-TW, YAAC, UISS, Linux AX25, SARTrack, RMS Express, BPQ32, Outpost
6	PM, and many others.	6	PM, and many others.
7	-	7
		8	WWW: https://github.com/wb2osz/direwolf

Return to bug 258112

Lines 1-8 Link Here

(-)comms/direwolf/Makefile (-17 / +14 lines)
1	PORTNAME= direwolf	1	PORTNAME= direwolf
2	DISTVERSION= 1.6	2	DISTVERSION= 1.6
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= comms hamradio	4	CATEGORIES= comms hamradio
5		5
		6	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
		7	PATCHFILES= e449e39d4d0fba994b1a48aad13c40cd5e44a959.patch:-p1 \
		8	8619b74c7bca080bb8825cd83f3bd9b43289ad11.patch:-p1 \
		9	5dbe2ce136fbe75dcfed49583fb62e2b394293c1.patch:-p1 \
		10	42314b7219ec266697396c7a4b61afe91be9b92c.patch:-p1 \
		11	27019b479344c1eb7cdf0a5c2dbfc54471ed4379.patch:-p1
		12
6	MAINTAINER= hamradio@FreeBSD.org	13	MAINTAINER= hamradio@FreeBSD.org
7	COMMENT= Software "soundcard" modem/TNC and APRS encoder/decoder	14	COMMENT= Software "soundcard" modem/TNC and APRS encoder/decoder
8		15
Lines 10-41 LICENSE= GPLv2 Link Here
10	LICENSE_FILE= ${WRKSRC}/LICENSE	17	LICENSE_FILE= ${WRKSRC}/LICENSE
11		18
12	LIB_DEPENDS= libasound.so:audio/alsa-lib\	19	LIB_DEPENDS= libasound.so:audio/alsa-lib\
13	libhamlib.so:comms/hamlib \
14	libgps.so:astro/gpsd \	20	libgps.so:astro/gpsd \
		21	libhamlib.so:comms/hamlib \
15	libportaudio.so:audio/portaudio	22	libportaudio.so:audio/portaudio
16	RUN_DEPENDS= bash:shells/bash	23	RUN_DEPENDS= bash:shells/bash
17		24
18	USES= cmake:noninja python shebangfix	25	USES= cmake python shebangfix pkgconfig
19		26
20	USE_GITHUB= yes	27	USE_GITHUB= yes
21	GH_ACCOUNT= wb2osz	28	GH_ACCOUNT= wb2osz
22	GH_TAGNAME= 1.6	29
23		30	SHEBANG_FILES= scripts
24	SHEBANG_FILES= scripts/telemetry-toolkit/telem-bits.pl \
25	scripts/telemetry-toolkit/telem-parm.pl\
26	scripts/telemetry-toolkit/telem-eqns.pl \
27	scripts/dwespeak.sh \
28	scripts/telemetry-toolkit/telem-data.pl \
29	scripts/telemetry-toolkit/telem-data91.pl \
30	scripts/telemetry-toolkit/telem-unit.pl \
31	scripts/telemetry-toolkit/telem-balloon.pl\
32	scripts/dw-start.sh \
33	scripts/telemetry-toolkit/telem-volts.py
34		31
35	OPTIONS_DEFINE= DOCS EXAMPLES	32	OPTIONS_DEFINE= DOCS EXAMPLES
36		33
37	post-patch:	34	post-patch:
38	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|'\	35	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g'\
39	${WRKSRC}/scripts/dw-start.sh	36	-e 's\|/var/tmp\|/var/log\|' ${WRKSRC}/scripts/dw-start.sh
40		37
41	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)comms/direwolf/distinfo (-1 / +11 lines)
1	TIMESTAMP = 1639707044	1	TIMESTAMP = 1646453576
2	SHA256 (wb2osz-direwolf-1.6_GH0.tar.gz) = 208b0563c9b339cbeb0e1feb52dc18ae38295c40c0009d6381fc4acb68fdf660	2	SHA256 (wb2osz-direwolf-1.6_GH0.tar.gz) = 208b0563c9b339cbeb0e1feb52dc18ae38295c40c0009d6381fc4acb68fdf660
3	SIZE (wb2osz-direwolf-1.6_GH0.tar.gz) = 22298168	3	SIZE (wb2osz-direwolf-1.6_GH0.tar.gz) = 22298168
		4	SHA256 (e449e39d4d0fba994b1a48aad13c40cd5e44a959.patch) = 3c92308229acbac31e65867b0c6234aa7cc8056a953bcd44d008a9b5eab1987c
		5	SIZE (e449e39d4d0fba994b1a48aad13c40cd5e44a959.patch) = 1246
		6	SHA256 (8619b74c7bca080bb8825cd83f3bd9b43289ad11.patch) = a0191603fd4ea0ba7f46c83f920a0c66033ba51d44b418761adc9322de5a5c66
		7	SIZE (8619b74c7bca080bb8825cd83f3bd9b43289ad11.patch) = 76433
		8	SHA256 (5dbe2ce136fbe75dcfed49583fb62e2b394293c1.patch) = c1e31fbfc18399e3dacc1fc821e2720ab0793337eba3841e110a37b3f9251a20
		9	SIZE (5dbe2ce136fbe75dcfed49583fb62e2b394293c1.patch) = 2910
		10	SHA256 (42314b7219ec266697396c7a4b61afe91be9b92c.patch) = 58c0d62f778e2598ae68a8f5d734ee6ac71e786763cabb616189533b8aae2dc0
		11	SIZE (42314b7219ec266697396c7a4b61afe91be9b92c.patch) = 18991
		12	SHA256 (27019b479344c1eb7cdf0a5c2dbfc54471ed4379.patch) = bbfe2caf64ca9fccc796ca61a381ce4e7eedf4bd8d0b7522c6090766daf71e13
		13	SIZE (27019b479344c1eb7cdf0a5c2dbfc54471ed4379.patch) = 1963

Lines 1-29 Link Here

(-)comms/direwolf/files/patch-scripts_dw-start.sh (-25 / +19 lines)
1	--- scripts/dw-start.sh.orig 2021-12-17 15:56:10 UTC	1	--- scripts/dw-start.sh.orig 2022-01-28 14:55:02 UTC
2	+++ scripts/dw-start.sh	2	+++ scripts/dw-start.sh
3	@@ -1,4 +1,4 @@	3	@@ -68,9 +68,9 @@ DWCMD="$DIREWOLF -a 100"
4	-#!/usr/bin/bash
5	+#!%%PREFIX%%/bin/bash
6		4
7	# Why not simply "#!/bin/bash" ?
8		5
9	@@ -133,14 +133,14 @@ function GUI {	6	#Where will logs go - needs to be writable by non-root users
10	# Auto adjust the startup for your particular environment: gnome-terminal, xterm, etc.	7	-LOGFILE=/var/tmp/dw-start.log
11	#	8	+#LOGFILE=/var/tmp/dw-start.log
		9	+LOGFILE=/var/var/dw-start.log
12		10
13	- if [ -x /usr/bin/lxterminal ]; then	11	-
14	- /usr/bin/lxterminal -t "Dire Wolf" -e "$DWCMD" &	12	#-------------------------------------
15	+ if [ -x %%PREFIX%%/bin/lxterminal ]; then	13	# Main functions of the script
16	+ %%PREFIX%%/bin/lxterminal -t "Dire Wolf" -e "$DWCMD" &	14	#-------------------------------------
17	SUCCESS=1	15	@@ -157,7 +157,7 @@ function GUI {
18	- elif [ -x /usr/bin/xterm ]; then	16	# When running from cron, we have a very minimal environment
19	- /usr/bin/xterm -bg white -fg black -e "$DWCMD" &	17	# including PATH=/usr/bin:/bin.
20	+ elif [ -x %%PREFIX%%/bin/xterm ]; then	18	#
21	+ %%PREFIX%%/bin/xterm -bg white -fg black -e "$DWCMD" &	19	-export PATH=/usr/local/bin:$PATH
22	SUCCESS=1	20	+export PATH=%%PREFIX%%/bin:$PATH
23	- elif [ -x /usr/bin/x-terminal-emulator ]; then	21
24	- /usr/bin/x-terminal-emulator -e "$DWCMD" &	22	#Log the start of the script run and re-run
25	+ elif [ -x %%PREFIX%%/bin/x-terminal-emulator ]; then	23	date >> $LOGFILE
26	+ %%PREFIX%%/bin/x-terminal-emulator -e "$DWCMD" &
27	SUCCESS=1
28	else
29	echo "Did not find an X terminal emulator. Reverting to CLI mode"