Attachment #231417 for bug #258112




LICENSE_FILE=	${WRKSRC}/LICENSE

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

USES=		cmake python shebangfix pkgconfig

USE_GITHUB=	yes
GH_ACCOUNT=	wb2osz
GH_TAGNAME=	1.6

SHEBANG_FILES=	scripts/dwespeak.sh \
		scripts/telemetry-toolkit/telem-balloon.pl \
		scripts/telemetry-toolkit/telem-bits.pl \
		scripts/dwespeak.sh \
		scripts/telemetry-toolkit/telem-data.pl \
		scripts/telemetry-toolkit/telem-data91.pl \
		scripts/telemetry-toolkit/telem-eqns.pl \
		scripts/telemetry-toolkit/telem-parm.pl\
		scripts/dw-start.sh \
		scripts/telemetry-toolkit/telem-unit.pl	\
		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>




--- 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

(-)b/comms/direwolf/pkg-descr (+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
		8	WWW: https://github.com/wb2osz/direwolf

Return to bug 258112

Lines 10-41 LICENSE= GPLv2 Link Here

(-)b/comms/direwolf/Makefile (-11 / +11 lines)
10	LICENSE_FILE= ${WRKSRC}/LICENSE	10	LICENSE_FILE= ${WRKSRC}/LICENSE
11		11
12	LIB_DEPENDS= libasound.so:audio/alsa-lib\	12	LIB_DEPENDS= libasound.so:audio/alsa-lib\
13	libhamlib.so:comms/hamlib \
14	libgps.so:astro/gpsd \	13	libgps.so:astro/gpsd \
		14	libudev.so:devel/libudev-devd \
		15	libhamlib.so:comms/hamlib \
15	libportaudio.so:audio/portaudio	16	libportaudio.so:audio/portaudio
16	RUN_DEPENDS= bash:shells/bash	17	RUN_DEPENDS= bash:shells/bash
17		18
18	USES= cmake:noninja python shebangfix	19	USES= cmake python shebangfix pkgconfig
19		20
20	USE_GITHUB= yes	21	USE_GITHUB= yes
21	GH_ACCOUNT= wb2osz	22	GH_ACCOUNT= wb2osz
22	GH_TAGNAME= 1.6
23		23
24	SHEBANG_FILES= scripts/telemetry-toolkit/telem-bits.pl \	24	SHEBANG_FILES= scripts/dwespeak.sh \
25	scripts/telemetry-toolkit/telem-parm.pl\	25	scripts/telemetry-toolkit/telem-balloon.pl \
26	scripts/telemetry-toolkit/telem-eqns.pl \	26	scripts/telemetry-toolkit/telem-bits.pl \
27	scripts/dwespeak.sh \
28	scripts/telemetry-toolkit/telem-data.pl \	27	scripts/telemetry-toolkit/telem-data.pl \
29	scripts/telemetry-toolkit/telem-data91.pl \	28	scripts/telemetry-toolkit/telem-data91.pl \
30	scripts/telemetry-toolkit/telem-unit.pl \	29	scripts/telemetry-toolkit/telem-eqns.pl \
31	scripts/telemetry-toolkit/telem-balloon.pl\	30	scripts/telemetry-toolkit/telem-parm.pl\
32	scripts/dw-start.sh \	31	scripts/dw-start.sh \
		32	scripts/telemetry-toolkit/telem-unit.pl \
33	scripts/telemetry-toolkit/telem-volts.py	33	scripts/telemetry-toolkit/telem-volts.py
34		34
35	OPTIONS_DEFINE= DOCS EXAMPLES	35	OPTIONS_DEFINE= DOCS EXAMPLES
36		36
37	post-patch:	37	post-patch:
38	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|'\	38	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g'\
39	${WRKSRC}/scripts/dw-start.sh	39	-e 's\|/var/tmp\|/var/log\|' ${WRKSRC}/scripts/dw-start.sh
40		40
41	.include <bsd.port.mk>	41	.include <bsd.port.mk>

Lines 1-29 Link Here

(-)b/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"