Attachment 231417 Details for Bug 258112 – patch to fix build with new gpsd against Direwolf 1.6

[patch] patch to fix build with new gpsd against Direwolf 1.6

direwolf_update.diff (text/plain), 3.98 KB, created by Diane Bruce on 2022-01-29 01:12:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Diane Bruce

Created: 2022-01-29 01:12:30 UTC

Size: 3.98 KB

patch

obsolete

>diff --git a/comms/direwolf/Makefile b/comms/direwolf/Makefile
>index eab6354a0b86..18623b37267b 100644
>--- a/comms/direwolf/Makefile
>+++ b/comms/direwolf/Makefile
>@@ -10,32 +10,32 @@ LICENSE=	GPLv2
> 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:noninja python shebangfix
>+USES=		cmake python shebangfix pkgconfig
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	wb2osz
>-GH_TAGNAME=	1.6
> 
>-SHEBANG_FILES=	scripts/telemetry-toolkit/telem-bits.pl \
>-		scripts/telemetry-toolkit/telem-parm.pl\
>-		scripts/telemetry-toolkit/telem-eqns.pl \
>-		scripts/dwespeak.sh \
>+SHEBANG_FILES=	scripts/dwespeak.sh \
>+		scripts/telemetry-toolkit/telem-balloon.pl \
>+		scripts/telemetry-toolkit/telem-bits.pl \
> 		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/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}|'\
>-		${WRKSRC}/scripts/dw-start.sh
>+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g'\
>+		-e 's|/var/tmp|/var/log|' ${WRKSRC}/scripts/dw-start.sh
> 
> .include <bsd.port.mk>
>diff --git a/comms/direwolf/files/patch-scripts_dw-start.sh b/comms/direwolf/files/patch-scripts_dw-start.sh
>index 974c7f92c6d8..be35586236a9 100644
>--- a/comms/direwolf/files/patch-scripts_dw-start.sh
>+++ b/comms/direwolf/files/patch-scripts_dw-start.sh
>@@ -1,29 +1,23 @@
>---- scripts/dw-start.sh.orig	2021-12-17 15:56:10 UTC
>+--- scripts/dw-start.sh.orig	2022-01-28 14:55:02 UTC
> +++ scripts/dw-start.sh
>-@@ -1,4 +1,4 @@
>--#!/usr/bin/bash
>-+#!%%PREFIX%%/bin/bash
>+@@ -68,9 +68,9 @@ DWCMD="$DIREWOLF -a 100"
>  
>- # Why not simply "#!/bin/bash" ?
>  
>-@@ -133,14 +133,14 @@ function GUI {
>-    # Auto adjust the startup for your particular environment:  gnome-terminal, xterm, etc.
>-    #
>+ #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
>  
>--   if [ -x /usr/bin/lxterminal ]; then
>--      /usr/bin/lxterminal -t "Dire Wolf" -e "$DWCMD" &
>-+   if [ -x %%PREFIX%%/bin/lxterminal ]; then
>-+      %%PREFIX%%/bin/lxterminal -t "Dire Wolf" -e "$DWCMD" &
>-       SUCCESS=1
>--     elif [ -x /usr/bin/xterm ]; then
>--      /usr/bin/xterm -bg white -fg black -e "$DWCMD" &
>-+     elif [ -x %%PREFIX%%/bin/xterm ]; then
>-+      %%PREFIX%%/bin/xterm -bg white -fg black -e "$DWCMD" &
>-       SUCCESS=1
>--     elif [ -x /usr/bin/x-terminal-emulator ]; then
>--      /usr/bin/x-terminal-emulator -e "$DWCMD" &
>-+     elif [ -x %%PREFIX%%/bin/x-terminal-emulator ]; then
>-+      %%PREFIX%%/bin/x-terminal-emulator -e "$DWCMD" &
>-       SUCCESS=1
>-      else
>-       echo "Did not find an X terminal emulator.  Reverting to CLI mode"
>+-
>+ #-------------------------------------
>+ # 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
>diff --git a/comms/direwolf/pkg-descr b/comms/direwolf/pkg-descr
>index 26e72fd5bf6c..b2510bd9a7c6 100644
>--- a/comms/direwolf/pkg-descr
>+++ b/comms/direwolf/pkg-descr
>@@ -4,3 +4,5 @@ APRStt gateway, or Internet Gateway (IGate).  It can also be used as a
> virtual TNC for other applications such as APRSIS32, UI-View32, Xastir,
> APRS-TW, YAAC, UISS, Linux AX25, SARTrack, RMS Express, BPQ32, Outpost
> PM, and many others.
>+
>+WWW: https://github.com/wb2osz/direwolf
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 258112: 227502 | 231417 | 232260 | 232261 | 232272