Attachment #227502 for bug #258112




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

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

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

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

USES=		cmake python shebangfix pkgconfig

USE_GITHUB=	yes
GH_ACCOUNT=	wb2osz
GH_TAGNAME=	1.5

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-eqns.pl \
		scripts/telemetry-toolkit/telem-parm.pl \
		scripts/telemetry-toolkit/telem-unit.pl \
		scripts/telemetry-toolkit/telem-volts.py

OPTIONS_DEFINE=	DOCS EXAMPLES
MAKEFILE=	Makefile.linux

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

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)comms/direwolf/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1549716498	1	TIMESTAMP = 1629389828
2	SHA256 (wb2osz-direwolf-1.5_GH0.tar.gz) = 2e263ea4fa75c342b620dee048436ac95486ea3f93599ad818e74dfd4aec8b48	2	SHA256 (wb2osz-direwolf-1.6_GH0.tar.gz) = 208b0563c9b339cbeb0e1feb52dc18ae38295c40c0009d6381fc4acb68fdf660
3	SIZE (wb2osz-direwolf-1.5_GH0.tar.gz) = 17996557	3	SIZE (wb2osz-direwolf-1.6_GH0.tar.gz) = 22298168




--- CMakeLists.txt.orig	2020-10-28 00:45:30 UTC
+++ CMakeLists.txt
@@ -236,6 +236,7 @@ else()
   set(INSTALL_BIN_DIR "bin")
   set(INSTALL_DOC_DIR "share/doc/${CMAKE_PROJECT_NAME}")
   set(INSTALL_CONF_DIR "${INSTALL_DOC_DIR}/conf")
+  set(INSTALL_EXAMPLES_DIR "share/examples/${CMAKE_PROJECT_NAME}")
   set(INSTALL_SCRIPTS_DIR "${INSTALL_DOC_DIR}/scripts")
   if(FREEBSD)
     set(INSTALL_MAN_DIR "man/man1")
@@ -265,7 +266,7 @@ else()
   set(HAMLIB_LIBRARIES "")
 endif()
 
-if(LINUX)
+if(LINUX OR FREEBSD)
   find_package(ALSA REQUIRED)
   if(ALSA_FOUND)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_ALSA")




--- Makefile.linux.orig	2018-10-08 14:15:21 UTC
+++ Makefile.linux
@@ -1,5 +1,5 @@
 #
-# Makefile for Linux version of Dire Wolf.
+# Makefile for FreeBSD version of Dire Wolf.
 #
 
 
@@ -13,7 +13,7 @@ all :  $(APPS) direwolf.desktop direwolf
 	@echo "        sudo make install"
 	@echo " "
 
-CC := gcc
+#CC := clang
 
 # Just for fun, let's see how clang compares to gcc.  First install like this:
 #	sudo apt-get update
@@ -32,14 +32,14 @@ CC := gcc
 # we will inherit options already set in build environment.
 # Explanation - https://github.com/wb2osz/direwolf/pull/38
 
-CFLAGS += -O3 -pthread -Igeotranz -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE=1 -Wall
+CFLAGS += -O3 -I${LOCALBASE}/include -pthread -Igeotranz -D_DEFAULT_SOURCE=1 -Wall
 
 # That was fine for a recent Ubuntu and Raspbian Jessie.
 # However, Raspbian wheezy was then missing declaration for strsep and definition of fd_set.
 
 CFLAGS += -D_BSD_SOURCE
 
-LDFLAGS += -lm -lpthread -lrt
+LDFLAGS += -lm -lpthread -lrt -L${LOCALBASE}/lib
 
 
 
@@ -95,7 +95,7 @@ LDFLAGS += -lm -lpthread -lrt
 # If the compiler is generating code for the i386 target, we can
 # get much better results by telling it we have at least a Pentium 3.
 
-arch := $(shell echo | gcc -E -dM - | grep __i386__)
+arch := $(shell echo | ${CC} -E -dM - | grep __i386__)
 ifneq ($(arch),)
 CFLAGS += -march=pentium3
 endif
@@ -152,7 +152,7 @@ endif
 #
 
 
-useffast := $(shell gcc --help -v 2>/dev/null | grep ffast-math)
+useffast := $(shell ${CC} --help -v 2>/dev/null | grep ffast-math)
 ifneq ($(useffast),)
 CFLAGS += -ffast-math
 endif
@@ -215,7 +215,7 @@ endif
 # and the compiler target defaults.
 #
 
-neon := $(shell cat /proc/cpuinfo | grep neon)
+#neon := $(shell cat /proc/cpuinfo | grep neon)
 ifneq ($(neon),)
 CFLAGS += -mfpu=neon
 endif
@@ -257,7 +257,7 @@ endif
 # ALSA (for Linux), comment out (or remove) the line below.
 # TODO:  Can we automate this somehow?
 
-alsa = 1
+#alsa = 1
 
 ifeq ($(wildcard /usr/include/pthread.h),)
 $(error /usr/include/pthread.h does not exist.  Install it with "sudo apt-get install libc6-dev" or "sudo yum install glibc-headers" )
@@ -266,8 +266,8 @@ endif
 ifneq ($(alsa),)
 CFLAGS += -DUSE_ALSA
 LDFLAGS += -lasound
-ifeq ($(wildcard /usr/include/alsa/asoundlib.h),)
-$(error /usr/include/alsa/asoundlib.h does not exist.  Install it with "sudo apt-get install libasound2-dev" or "sudo yum install alsa-lib-devel" )
+ifeq ($(wildcard ${LOCALBASE}/include/alsa/asoundlib.h),)
+$(error ${LOCALBASE}/include/alsa/asoundlib.h does not exist.  Install it with "sudo apt-get install libasound2-dev" or "sudo yum install alsa-lib-devel" )
 endif
 endif
 
@@ -276,20 +276,20 @@ endif
 # Finding libgps.so* is more difficult because it
 # is in different places on different operating systems.
 
-enable_gpsd := $(wildcard /usr/include/gps.h)
-ifneq ($(enable_gpsd),)
+#enable_gpsd := $(wildcard ${LOCALBASE}/include/gps.h)
+#ifneq ($(enable_gpsd),)
 CFLAGS += -DENABLE_GPSD
 LDFLAGS += -lgps
-endif
+#endif
 
 
 # Enable hamlib support if header file is present.
 
-enable_hamlib := $(wildcard /usr/include/hamlib/rig.h /usr/local/include/hamlib/rig.h)
-ifneq ($(enable_hamlib),)
+#enable_hamlib := $(wildcard ${LOCALBASE}/include/hamlib/rig.h /usr/local/include/hamlib/rig.h)
+#ifneq ($(enable_hamlib),)
 CFLAGS += -DUSE_HAMLIB
 LDFLAGS += -lhamlib
-endif
+#endif
 
 
 # Should enabling of this feature be strongly encouraged or
@@ -297,18 +297,18 @@ endif
 # If, for some reason, can obtain the libudev-dev package, or
 # don't want to install it, comment out the next 3 lines.
 
-#ifeq ($(wildcard /usr/include/libudev.h),)
-#$(error /usr/include/libudev.h does not exist.  Install it with "sudo apt-get install libudev-dev" or "sudo yum install libudev-devel" )
+#ifeq ($(wildcard ${LOCALBASE}/include/libudev.h),)
+#$(error ${LOCALBASE}/include/libudev.h does not exist.  Install it with "sudo apt-get install libudev-dev" or "sudo yum install libudev-devel" )
 #endif
 
 
 # Enable cm108 PTT support if libudev header file is present.
 
-enable_cm108 := $(wildcard /usr/include/libudev.h)
-ifneq ($(enable_cm108),)
-CFLAGS += -DUSE_CM108
-LDFLAGS += -ludev
-endif
+#enable_cm108 := $(wildcard ${LOCALBASE}/include/libudev.h)
+#ifneq ($(enable_cm108),)
+#CFLAGS += -DUSE_CM108
+#LDFLAGS += -ludev
+#endif
 
 
 # Name of current directory.
@@ -333,20 +333,20 @@ direwolf : direwolf.o config.o recv.o de
 		misc.a geotranz.a
 	$(CC) -o $@ $^ $(LDFLAGS)
 	@echo " "
-ifneq ($(enable_gpsd),)
-	@echo "\t>\tThis includes support for gpsd."
-else
-	@echo "\t>\tThis does NOT include support for gpsd."
-endif
-ifneq ($(enable_hamlib),)
-	@echo "\t>\tThis includes support for hamlib."
-else
-	@echo "\t>\tThis does NOT include support for hamlib."
-endif
+#ifneq ($(enable_gpsd),)
+	@echo "	>	This includes support for gpsd."
+#else
+#	@echo "\t>\tThis does NOT include support for gpsd."
+#endif
+#ifneq ($(enable_hamlib),)
+	@echo "	>	This includes support for hamlib."
+#else
+#	@echo "\t>\tThis does NOT include support for hamlib."
+#endif
 ifneq ($(enable_cm108),)
-	@echo "\t>\tThis includes support for CM108/CM119 PTT."
+	@echo "	>	This includes support for CM108/CM119 PTT."
 else
-	@echo "\t>\tThis does NOT include support for CM108/CM119 PTT."
+	@echo "	>	This does NOT include support for CM108/CM119 PTT."
 endif
 	@echo " "
 
@@ -535,12 +535,17 @@ direwolf.conf : generic.conf
 # Something built from source and installed locally would normally go in /usr/local/...
 # If not specified on the make command line, this is our default.
 
-DESTDIR ?= /usr/local
+INSTALLDIR  ?= ${PREFIX}
+SHAREDIR    ?= ${INSTALLDIR}/share
+DATADIR     ?= ${SHAREDIR}/direwolf
+DOCSDIR     ?= ${SHAREDIR}/doc/direwolf
+EXAMPLESDIR ?= ${SHAREDIR}/examples/direwolf
+MANDIR      ?= ${INSTALLDIR}/man
 
 # However, if you are preparing a "binary" DEB or RPM package, the installation location
 # would normally be  /usr/...  instead.   In this case, use a command line like this:
 #
-#	make  DESTDIR=/usr  install
+#	make  INSTALLDIR=/usr  install
 
 
 
@@ -560,22 +565,22 @@ direwolf.desktop :
 	@echo '[Desktop Entry]' > $@
 	@echo 'Type=Application' >> $@
 ifneq ($(wildcard /usr/bin/lxterminal),)
-	@echo "Exec=lxterminal -t \"Dire Wolf\" -e \"$(DESTDIR)/bin/direwolf\"" >> $@
+	@echo "Exec=lxterminal -t \"Dire Wolf\" -e \"$(INSTALLDIR)/bin/direwolf\"" >> $@
 else ifneq ($(wildcard /usr/bin/lxterm),)
-	@echo "Exec=lxterm -hold -title \"Dire Wolf\" -bg white -e \"$(DESTDIR)/bin/direwolf\"" >> $@
+	@echo "Exec=lxterm -hold -title \"Dire Wolf\" -bg white -e \"$(INSTALLDIR)/bin/direwolf\"" >> $@
 else
-	@echo "Exec=xterm -hold -title \"Dire Wolf\" -bg white -e \"$(DESTDIR)/bin/direwolf\"" >> $@
+	@echo "Exec=xterm -hold -title \"Dire Wolf\" -bg white -e \"$(INSTALLDIR)/bin/direwolf\"" >> $@
 endif
 	@echo 'Name=Dire Wolf' >> $@
 	@echo 'Comment=APRS Soundcard TNC' >> $@
-	@echo 'Icon=$(DESTDIR)/share/direwolf/pixmaps/dw-icon.png' >> $@
-	@echo "Path=$(HOME)" >> $@
+	@echo 'Icon=$(DATADIR)/pixmaps/dw-icon.png' >> $@
+#	@echo "Path=$(HOME)" >> $@
 	@echo '#Terminal=true' >> $@
 	@echo 'Categories=HamRadio' >> $@
 	@echo 'Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25' >> $@
 
 
-# Installation into $(DESTDIR), usually /usr/local/... or /usr/...
+# Installation into $(DESTDIR)$(INSTALLDIR), usually /usr/local/... or /usr/...
 # Needs to be run as root or with sudo.
 
 
@@ -585,102 +590,107 @@ install : $(APPS) direwolf.conf tocalls.
 # Applications, not installed with package manager, normally go in /usr/local/bin.
 # /usr/bin is used instead when installing from .DEB or .RPM package.
 #
-	$(INSTALL) -D --mode=755 direwolf $(DESTDIR)/bin/direwolf
-	$(INSTALL) -D --mode=755 decode_aprs $(DESTDIR)/bin/decode_aprs
-	$(INSTALL) -D --mode=755 text2tt $(DESTDIR)/bin/text2tt
-	$(INSTALL) -D --mode=755 tt2text $(DESTDIR)/bin/tt2text
-	$(INSTALL) -D --mode=755 ll2utm $(DESTDIR)/bin/ll2utm
-	$(INSTALL) -D --mode=755 utm2ll $(DESTDIR)/bin/utm2ll
-	$(INSTALL) -D --mode=755 aclients $(DESTDIR)/bin/aclients
-	$(INSTALL) -D --mode=755 log2gpx $(DESTDIR)/bin/log2gpx
-	$(INSTALL) -D --mode=755 gen_packets $(DESTDIR)/bin/gen_packets
-	$(INSTALL) -D --mode=755 atest $(DESTDIR)/bin/atest
-	$(INSTALL) -D --mode=755 ttcalc $(DESTDIR)/bin/ttcalc
-	$(INSTALL) -D --mode=755 kissutil $(DESTDIR)/bin/kissutil
-	$(INSTALL) -D --mode=755 cm108 $(DESTDIR)/bin/cm108
-	$(INSTALL) -D --mode=755 dwespeak.sh $(DESTDIR)/bin/dwspeak.sh
+	$(BSD_INSTALL_PROGRAM) direwolf $(DESTDIR)$(INSTALLDIR)/bin/direwolf
+	$(BSD_INSTALL_PROGRAM) decode_aprs $(DESTDIR)$(INSTALLDIR)/bin/decode_aprs
+	$(BSD_INSTALL_PROGRAM) text2tt $(DESTDIR)$(INSTALLDIR)/bin/text2tt
+	$(BSD_INSTALL_PROGRAM) tt2text $(DESTDIR)$(INSTALLDIR)/bin/tt2text
+	$(BSD_INSTALL_PROGRAM) ll2utm $(DESTDIR)$(INSTALLDIR)/bin/ll2utm
+	$(BSD_INSTALL_PROGRAM) utm2ll $(DESTDIR)$(INSTALLDIR)/bin/utm2ll
+	$(BSD_INSTALL_PROGRAM) aclients $(DESTDIR)$(INSTALLDIR)/bin/aclients
+	$(BSD_INSTALL_PROGRAM) log2gpx $(DESTDIR)$(INSTALLDIR)/bin/log2gpx
+	$(BSD_INSTALL_PROGRAM) gen_packets $(DESTDIR)$(INSTALLDIR)/bin/gen_packets
+	$(BSD_INSTALL_PROGRAM) atest $(DESTDIR)$(INSTALLDIR)/bin/atest
+	$(BSD_INSTALL_PROGRAM) ttcalc $(DESTDIR)$(INSTALLDIR)/bin/ttcalc
+	$(BSD_INSTALL_PROGRAM) kissutil $(DESTDIR)$(INSTALLDIR)/bin/kissutil
+	$(BSD_INSTALL_PROGRAM) cm108 $(DESTDIR)$(INSTALLDIR)/bin/cm108
+	$(BSD_INSTALL_SCRIPT) dwespeak.sh $(DESTDIR)$(INSTALLDIR)/bin/dwspeak.sh
 #
 # Telemetry Toolkit executables.   Other .conf and .txt files will go into doc directory.
 #
-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-balloon.pl $(DESTDIR)/bin/telem-balloon.pl
-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-bits.pl $(DESTDIR)/bin/telem-bits.pl
-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-data.pl $(DESTDIR)/bin/telem-data.pl
-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-data91.pl $(DESTDIR)/bin/telem-data91.pl
-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-eqns.pl $(DESTDIR)/bin/telem-eqns.pl
-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-parm.pl $(DESTDIR)/bin/telem-parm.pl
-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-seq.sh $(DESTDIR)/bin/telem-seq.sh
-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-unit.pl $(DESTDIR)/bin/telem-unit.pl
-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-volts.py $(DESTDIR)/bin/telem-volts.py
+	$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-balloon.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-balloon.pl
+	$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-bits.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-bits.pl
+	$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-data.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-data.pl
+	$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-data91.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-data91.pl
+	$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-eqns.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-eqns.pl
+	$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-parm.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-parm.pl
+	$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-seq.sh $(DESTDIR)$(INSTALLDIR)/bin/telem-seq.sh
+	$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-unit.pl $(DESTDIR)$(INSTALLDIR)/bin/telem-unit.pl
+	$(BSD_INSTALL_SCRIPT) telemetry-toolkit/telem-volts.py $(DESTDIR)$(INSTALLDIR)/bin/telem-volts.py
 #
 # Misc. data such as "tocall" to system mapping.
 #
-	$(INSTALL) -D --mode=644 tocalls.txt $(DESTDIR)/share/direwolf/tocalls.txt
-	$(INSTALL) -D --mode=644 symbols-new.txt $(DESTDIR)/share/direwolf/symbols-new.txt
-	$(INSTALL) -D --mode=644 symbolsX.txt $(DESTDIR)/share/direwolf/symbolsX.txt
+	mkdir -p $(DESTDIR)${DATADIR}
+	$(BSD_INSTALL_DATA) tocalls.txt $(DESTDIR)$(DATADIR)/tocalls.txt
+	$(BSD_INSTALL_DATA) symbols-new.txt $(DESTDIR)$(DATADIR)/symbols-new.txt
+	$(BSD_INSTALL_DATA) symbolsX.txt $(DESTDIR)$(DATADIR)/symbolsX.txt
 #
 # For desktop icon.
 #
-	$(INSTALL) -D --mode=644 dw-icon.png $(DESTDIR)/share/direwolf/pixmaps/dw-icon.png
-	$(INSTALL) -D --mode=644 direwolf.desktop $(DESTDIR)/share/applications/direwolf.desktop
+	mkdir -p $(DESTDIR)${DATADIR}/pixmaps
+	mkdir -p $(DESTDIR)${SHAREDIR}/applications
+	$(BSD_INSTALL_DATA) dw-icon.png $(DESTDIR)$(DATADIR)/pixmaps/dw-icon.png
+	$(BSD_INSTALL_DATA) direwolf.desktop $(DESTDIR)$(SHAREDIR)/applications/direwolf.desktop
 #
 # Documentation.  Various plain text files and PDF.
 #
-	$(INSTALL) -D --mode=644 CHANGES.md $(DESTDIR)/share/doc/direwolf/CHANGES.md
-	$(INSTALL) -D --mode=644 LICENSE-dire-wolf.txt $(DESTDIR)/share/doc/direwolf/LICENSE-dire-wolf.txt
-	$(INSTALL) -D --mode=644 LICENSE-other.txt $(DESTDIR)/share/doc/direwolf/LICENSE-other.txt
+	$(BSD_INSTALL_DATA) CHANGES.md $(DESTDIR)$(DATADIR)/CHANGES.md
+	$(BSD_INSTALL_DATA) LICENSE-dire-wolf.txt $(DESTDIR)$(DATADIR)/LICENSE-dire-wolf.txt
+	$(BSD_INSTALL_DATA) LICENSE-other.txt $(DESTDIR)$(DATADIR)/LICENSE-other.txt
 #
 # ./README.md is an overview for the project main page.
 # Maybe we could stick it in some other place.
 # doc/README.md contains an overview of the PDF file contents and is more useful here.
 #
-	$(INSTALL) -D --mode=644 doc/README.md $(DESTDIR)/share/doc/direwolf/README.md
-	$(INSTALL) -D --mode=644 doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf $(DESTDIR)/share/doc/direwolf/2400-4800-PSK-for-APRS-Packet-Radio.pdf
-	$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(DESTDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
-	$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(DESTDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
-	$(INSTALL) -D --mode=644 doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf $(DESTDIR)/share/doc/direwolf/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf
-	$(INSTALL) -D --mode=644 doc/APRS-Telemetry-Toolkit.pdf $(DESTDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf
-	$(INSTALL) -D --mode=644 doc/APRStt-Implementation-Notes.pdf $(DESTDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
-	$(INSTALL) -D --mode=644 doc/APRStt-interface-for-SARTrack.pdf $(DESTDIR)/share/doc/direwolf/APRStt-interface-for-SARTrack.pdf
-	$(INSTALL) -D --mode=644 doc/APRStt-Listening-Example.pdf $(DESTDIR)/share/doc/direwolf/APRStt-Listening-Example.pdf
-	$(INSTALL) -D --mode=644 doc/Bluetooth-KISS-TNC.pdf $(DESTDIR)/share/doc/direwolf/Bluetooth-KISS-TNC.pdf
-	$(INSTALL) -D --mode=644 doc/Going-beyond-9600-baud.pdf $(DESTDIR)/share/doc/direwolf/Going-beyond-9600-baud.pdf
-	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
-	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS-Tracker.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
-	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-SDR-IGate.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-SDR-IGate.pdf
-	$(INSTALL) -D --mode=644 doc/Successful-APRS-IGate-Operation.pdf $(DESTDIR)/share/doc/direwolf/Successful-APRS-IGate-Operation.pdf
-	$(INSTALL) -D --mode=644 doc/User-Guide.pdf $(DESTDIR)/share/doc/direwolf/User-Guide.pdf
-	$(INSTALL) -D --mode=644 doc/WA8LMF-TNC-Test-CD-Results.pdf $(DESTDIR)/share/doc/direwolf/WA8LMF-TNC-Test-CD-Results.pdf
+	mkdir -p $(DESTDIR)${DOCSDIR}
+	$(BSD_INSTALL_DATA) doc/README.md $(DESTDIR)$(DOCSDIR)/README.md
+	$(BSD_INSTALL_DATA) doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf $(DESTDIR)$(DOCSDIR)/2400-4800-PSK-for-APRS-Packet-Radio.pdf
+	$(BSD_INSTALL_DATA) doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(DESTDIR)$(DOCSDIR)/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
+	$(BSD_INSTALL_DATA) doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(DESTDIR)$(DOCSDIR)/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
+	$(BSD_INSTALL_DATA) doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf $(DESTDIR)$(DOCSDIR)/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf
+	$(BSD_INSTALL_DATA) doc/APRS-Telemetry-Toolkit.pdf $(DESTDIR)$(DOCSDIR)/APRS-Telemetry-Toolkit.pdf
+	$(BSD_INSTALL_DATA) doc/APRStt-Implementation-Notes.pdf $(DESTDIR)$(DOCSDIR)/APRStt-Implementation-Notes.pdf
+	$(BSD_INSTALL_DATA) doc/APRStt-interface-for-SARTrack.pdf $(DESTDIR)$(DOCSDIR)/APRStt-interface-for-SARTrack.pdf
+	$(BSD_INSTALL_DATA) doc/APRStt-Listening-Example.pdf $(DESTDIR)$(DOCSDIR)/APRStt-Listening-Example.pdf
+	$(BSD_INSTALL_DATA) doc/Bluetooth-KISS-TNC.pdf $(DESTDIR)$(DOCSDIR)/Bluetooth-KISS-TNC.pdf
+	$(BSD_INSTALL_DATA) doc/Going-beyond-9600-baud.pdf $(DESTDIR)$(DOCSDIR)/Going-beyond-9600-baud.pdf
+	$(BSD_INSTALL_DATA) doc/Raspberry-Pi-APRS.pdf $(DESTDIR)$(DOCSDIR)/Raspberry-Pi-APRS.pdf
+	$(BSD_INSTALL_DATA) doc/Raspberry-Pi-APRS-Tracker.pdf $(DESTDIR)$(DOCSDIR)/Raspberry-Pi-APRS-Tracker.pdf
+	$(BSD_INSTALL_DATA) doc/Raspberry-Pi-SDR-IGate.pdf $(DESTDIR)$(DOCSDIR)/Raspberry-Pi-SDR-IGate.pdf
+	$(BSD_INSTALL_DATA) doc/Successful-APRS-IGate-Operation.pdf $(DESTDIR)$(DOCSDIR)/Successful-APRS-IGate-Operation.pdf
+	$(BSD_INSTALL_DATA) doc/User-Guide.pdf $(DESTDIR)$(DOCSDIR)/User-Guide.pdf
+	$(BSD_INSTALL_DATA) doc/WA8LMF-TNC-Test-CD-Results.pdf $(DESTDIR)$(DOCSDIR)/WA8LMF-TNC-Test-CD-Results.pdf
 #
 # Various sample config and other files go into examples under the doc directory.
 # When building from source, these can be put in home directory with "make install-conf".
 # When installed from .DEB or .RPM package, the user will need to copy these to
 # the home directory or other desired location.
 #
-	$(INSTALL) -D --mode=644 direwolf.conf $(DESTDIR)/share/doc/direwolf/examples/direwolf.conf
-	$(INSTALL) -D --mode=755 dw-start.sh $(DESTDIR)/share/doc/direwolf/examples/dw-start.sh
-	$(INSTALL) -D --mode=644 sdr.conf $(DESTDIR)/share/doc/direwolf/examples/sdr.conf
-	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-m0xer-3.txt $(DESTDIR)/share/doc/direwolf/examples/telem-m0xer-3.txt
-	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-balloon.conf $(DESTDIR)/share/doc/direwolf/examples/telem-balloon.conf
-	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-volts.conf $(DESTDIR)/share/doc/direwolf/examples/telem-volts.conf
+	mkdir -p $(DESTDIR)${EXAMPLESDIR}
+	$(BSD_INSTALL_DATA) direwolf.conf $(DESTDIR)$(EXAMPLESDIR)/direwolf.conf
+	$(BSD_INSTALL_SCRIPT) dw-start.sh $(DESTDIR)$(EXAMPLESDIR)/dw-start.sh
+	$(BSD_INSTALL_DATA) sdr.conf $(DESTDIR)$(EXAMPLESDIR)/sdr.conf
+	$(BSD_INSTALL_DATA) telemetry-toolkit/telem-m0xer-3.txt $(DESTDIR)$(EXAMPLESDIR)/telem-m0xer-3.txt
+	$(BSD_INSTALL_DATA) telemetry-toolkit/telem-balloon.conf $(DESTDIR)$(EXAMPLESDIR)/telem-balloon.conf
+	$(BSD_INSTALL_DATA) telemetry-toolkit/telem-volts.conf $(DESTDIR)$(EXAMPLESDIR)/telem-volts.conf
 #
 # "man" pages
 #
-	$(INSTALL) -D --mode=644 man1/aclients.1 $(DESTDIR)/share/man/man1/aclients.1
-	$(INSTALL) -D --mode=644 man1/atest.1 $(DESTDIR)/share/man/man1/atest.1
-	$(INSTALL) -D --mode=644 man1/decode_aprs.1 $(DESTDIR)/share/man/man1/decode_aprs.1
-	$(INSTALL) -D --mode=644 man1/direwolf.1 $(DESTDIR)/share/man/man1/direwolf.1
-	$(INSTALL) -D --mode=644 man1/gen_packets.1 $(DESTDIR)/share/man/man1/gen_packets.1
-	$(INSTALL) -D --mode=644 man1/kissutil.1 $(DESTDIR)/share/man/man1/kissutil.1
-	$(INSTALL) -D --mode=644 man1/ll2utm.1 $(DESTDIR)/share/man/man1/ll2utm.1
-	$(INSTALL) -D --mode=644 man1/log2gpx.1 $(DESTDIR)/share/man/man1/log2gpx.1
-	$(INSTALL) -D --mode=644 man1/text2tt.1 $(DESTDIR)/share/man/man1/text2tt.1
-	$(INSTALL) -D --mode=644 man1/tt2text.1 $(DESTDIR)/share/man/man1/tt2text.1
-	$(INSTALL) -D --mode=644 man1/utm2ll.1 $(DESTDIR)/share/man/man1/utm2ll.1
+	$(BSD_INSTALL_MAN) man1/aclients.1 $(DESTDIR)$(MANDIR)/man1/aclients.1
+	$(BSD_INSTALL_MAN) man1/atest.1 $(DESTDIR)$(MANDIR)/man1/atest.1
+	$(BSD_INSTALL_MAN) man1/decode_aprs.1 $(DESTDIR)$(MANDIR)/man1/decode_aprs.1
+	$(BSD_INSTALL_MAN) man1/direwolf.1 $(DESTDIR)$(MANDIR)/man1/direwolf.1
+	$(BSD_INSTALL_MAN) man1/gen_packets.1 $(DESTDIR)$(MANDIR)/man1/gen_packets.1
+	$(BSD_INSTALL_MAN) man1/kissutil.1 $(DESTDIR)$(MANDIR)/man1/kissutil.1
+	$(BSD_INSTALL_MAN) man1/ll2utm.1 $(DESTDIR)$(MANDIR)/man1/ll2utm.1
+	$(BSD_INSTALL_MAN) man1/log2gpx.1 $(DESTDIR)$(MANDIR)//man1/log2gpx.1
+	$(BSD_INSTALL_MAN) man1/text2tt.1 $(DESTDIR)$(MANDIR)/man1/text2tt.1
+	$(BSD_INSTALL_MAN) man1/tt2text.1 $(DESTDIR)$(MANDIR)/man1/tt2text.1
+	$(BSD_INSTALL_MAN) man1/utm2ll.1 $(DESTDIR)$(MANDIR)/man1/utm2ll.1
 #
 # Set group and mode of HID devices corresponding to C-Media USB Audio adapters.
 # This will allow us to use the CM108/CM119 GPIO pins for PTT.
 #
-	$(INSTALL) -D --mode=644 99-direwolf-cmedia.rules /etc/udev/rules.d/99-direwolf-cmedia.rules
+#	$(BSD_INSTALL_DATA) 99-direwolf-cmedia.rules /etc/udev/rules.d/99-direwolf-cmedia.rules
 #
 	@echo " "
 	@echo "If this is your first install, not an upgrade, type this to put a copy"
@@ -693,7 +703,7 @@ install : $(APPS) direwolf.conf tocalls.
 # Put sample configuration & startup files in home directory.
 # This step would be done as ordinary user.
 # Some people like to put the direwolf config file in /etc/ax25.
-# Note that all of these are also in $(DESTDIR)/share/doc/direwolf/examples/.
+# Note that all of these are also in $(DESTDIR)$(INSTALLDIR)/share/doc/direwolf/examples/.
 
 # The Raspberry Pi has ~/Desktop but Ubuntu does not.
 
@@ -724,7 +734,7 @@ endif
 
 .PHONY: install-rpi
 install-rpi : 
-	ln -f -s $(DESTDIR)/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop
+	ln -f -s $(DESTDIR)$(SHAREDIR)/applications/direwolf.desktop ~/Desktop/direwolf.desktop
 
 
 




--- conf/CMakeLists.txt.orig	2021-08-19 20:11:23 UTC
+++ conf/CMakeLists.txt
@@ -29,8 +29,8 @@ if(LINUX)
   install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION /etc/udev/rules.d/)
 endif()
 
-install(FILES "${CMAKE_BINARY_DIR}/direwolf.conf" DESTINATION ${INSTALL_CONF_DIR})
-install(FILES "${CUSTOM_CONF_DIR}/sdr.conf" DESTINATION ${INSTALL_CONF_DIR})
+install(FILES "${CMAKE_BINARY_DIR}/direwolf.conf" DESTINATION ${INSTALL_EXAMPLES_DIR})
+install(FILES "${CUSTOM_CONF_DIR}/sdr.conf" DESTINATION ${INSTALL_EXAMPLES_DIR})
 
 # Put sample configuration & startup files in home directory.
 # This step would be done as ordinary user.




--- dwgpsd.c.orig	2020-03-05 16:59:08 UTC
+++ dwgpsd.c
@@ -57,7 +57,10 @@
 // Debian bug report:  direwolf (1.2-1) FTBFS with libgps22 as part of the gpsd transition (#803605):
 // dwgps.c claims to only support GPSD_API_MAJOR_VERSION 5, but also builds successfully with
 // GPSD_API_MAJOR_VERSION 6 provided by libgps22 when the attached patch is applied.
-#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 6
+
+// Also compatible with API 9 with conditional compilation later.
+
+#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 9
 #error libgps API version might be incompatible.
 #endif
 
@@ -257,7 +260,19 @@ static void * read_gpsd_thread (void *arg)
 	    /* Fall thru to read which should get error and bail out. */
 	  }
 
+// https://github.com/wb2osz/direwolf/issues/196
+// https://bugzilla.redhat.com/show_bug.cgi?id=1674812
+
+// gps_read has two new parameters in API version 7.
+// It looks like this could be used to obtain the JSON message from the daemon.
+// Specify NULL, instead of message buffer space, if this is not desired.
+// Why couldn't they add a new function instead of introducing incompatibility?
+
+#if GPSD_API_MAJOR_VERSION >= 7
+	  if (gps_read (&gpsdata, NULL, 0) == -1) {
+#else
 	  if (gps_read (&gpsdata) == -1) {
+#endif
 	    text_color_set(DW_COLOR_ERROR);
 
 	    dw_printf ("------------------------------------------\n");




--- scripts/dw-start.sh.orig	2020-10-28 00:45:30 UTC
+++ scripts/dw-start.sh
@@ -68,7 +68,7 @@ DWCMD="$DIREWOLF -a 100"
 
 
 #Where will logs go - needs to be writable by non-root users
-LOGFILE=/var/tmp/dw-start.log
+LOGFILE=/var/log/dw-start.log
 
 
 #-------------------------------------
@@ -133,14 +133,14 @@ function GUI {
    # Auto adjust the startup for your particular environment:  gnome-terminal, xterm, etc.
    #
 

       SUCCESS=1
      else
       echo "Did not find an X terminal emulator.  Reverting to CLI mode"
@@ -155,7 +155,7 @@ function GUI {
 # -----------------------------------------------------------
 
 # When running from cron, we have a very minimal environment
-# including PATH=/usr/bin:/bin.
+# including PATH=%%PREFIX%%/bin:/bin.
 #
 export PATH=%%PREFIX%%/bin:$PATH
+export PATH=%%PREFIX%%/bin:$PATH
 
 #Log the start of the script run and re-run
 date >> $LOGFILE




--- scripts/telemetry-toolkit/CMakeLists.txt.orig	2021-08-19 20:57:17 UTC
+++ scripts/telemetry-toolkit/CMakeLists.txt
@@ -8,6 +8,6 @@ install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-seq.sh
 install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-unit.pl" DESTINATION ${INSTALL_BIN_DIR})
 install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-volts.py" DESTINATION ${INSTALL_BIN_DIR})
 
-install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-m0xer-3.txt" DESTINATION ${INSTALL_CONF_DIR})
-install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-balloon.conf" DESTINATION ${INSTALL_CONF_DIR})
-install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-volts.conf" DESTINATION ${INSTALL_CONF_DIR})
+install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-m0xer-3.txt" DESTINATION ${INSTALL_EXAMPLES_DIR})
+install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-balloon.conf" DESTINATION ${INSTALL_EXAMPLES_DIR})
+install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-volts.conf" DESTINATION ${INSTALL_EXAMPLES_DIR})




--- src/CMakeLists.txt.orig	2021-08-19 19:47:10 UTC
+++ src/CMakeLists.txt
@@ -87,7 +87,7 @@ list(APPEND direwolf_SOURCES
   mheard.c
   )
 
-if(LINUX)
+if(LINUX OR FREEBSD)
   list(APPEND direwolf_SOURCES
     audio.c
     )
@@ -107,7 +107,7 @@ if(LINUX)
     list(REMOVE_ITEM direwolf_SOURCES
       dwgpsd.c
       )
-  else() # macOS freebsd openbsd
+  else() # macOS openbsd
     list(APPEND direwolf_SOURCES
       audio_portaudio.c
       )




--- src/cm108.c.orig	2020-10-28 00:45:30 UTC
+++ src/cm108.c
@@ -99,8 +99,8 @@
 int main (void)
 {
 	text_color_init (0);    // Turn off text color.
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
-	dw_printf ("CM108 PTT support is not available for BSD.\n");
+#if defined(__OpenBSD__)
+	dw_printf ("CM108 PTT support is not available for OpenBSD.\n");
 #else
 	dw_printf ("CM108 PTT support was disabled in Makefile.linux.\n");
 	dw_printf ("It was excluded because /usr/include/libudev.h was missing.\n");
@@ -129,7 +129,12 @@ int main (void)
 #include <sys/ioctl.h>			// ioctl, _IOR
 #include <fcntl.h>
 #include <errno.h>
+#ifdef __linux__
 #include <linux/hidraw.h>		// for HIDIOCGRAWINFO
+#endif
+#ifdef __FreeBSD__
+#include <dev/hid/hidraw.h>
+#endif
 
 #include "textcolor.h"
 #include "cm108.h"
@@ -521,7 +526,7 @@ int cm108_inventory (struct thing_s *things, int max_t
 	        SAFE_STRCPY (things[num_things].product, udev_device_get_sysattr_value(parentdev,"product"));
 	        SAFE_STRCPY (things[num_things].devnode_hidraw, devnode);
 	        SAFE_STRCPY (things[num_things].devnode_usb, usb);
-	        SAFE_STRCPY (things[num_things].devpath, udev_device_get_devpath(dev));
+	        SAFE_STRCPY (things[num_things].devpath, udev_device_get_devnode(dev));
 	        num_things++;
 	      }
 	      udev_device_unref(parentdev);

Added Link Here

(-)comms/direwolf/files/patch-src_dwgpsd.c (+11 lines)
1	--- src/dwgpsd.c.orig 2021-08-19 16:50:15 UTC
2	+++ src/dwgpsd.c
3	@@ -60,7 +60,7 @@
4	// An incompatibility was introduced with version 7
5	// and again with 9 and again with 10.
6
7	-#if GPSD_API_MAJOR_VERSION < 5 \|\| GPSD_API_MAJOR_VERSION > 11
8	+#if GPSD_API_MAJOR_VERSION < 5 \|\| GPSD_API_MAJOR_VERSION > 12
9	#error libgps API version might be incompatible.
10	#endif
11

Lines 1-6 Link Here

(-)comms/direwolf/files/patch-src_ptt.c (-3 / +3 lines)
1	--- ptt.c.orig 2018-10-08 14:15:21 UTC	1	--- src/ptt.c.orig 2020-10-28 00:45:30 UTC
2	+++ ptt.c	2	+++ src/ptt.c
3	@@ -139,7 +139,7 @@	3	@@ -148,7 +148,7 @@
4		4
5	#if __WIN32__	5	#if __WIN32__
6	#else	6	#else

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

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




bin/aclients
bin/appserver
bin/atest
bin/cm108
bin/decode_aprs
bin/direwolf
bin/dwespeak.sh
bin/gen_packets
bin/kissutil
bin/ll2utm

man/man1/tt2text.1.gz
man/man1/utm2ll.1.gz
share/applications/direwolf.desktop
share/pixmaps/direwolf_icon.png
%%DATADIR%%/LICENSE-dire-wolf.txt
%%DATADIR%%/LICENSE-other.txt
%%DATADIR%%/symbols-new.txt
%%DATADIR%%/symbolsX.txt
%%DATADIR%%/tocalls.txt
%%DATADIR%%/pixmaps/dw-icon.png
%%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%%/Successful-APRS-IGate-Operation.pdf
%%PORTDOCS%%%%DOCSDIR%%/User-Guide.pdf
%%PORTDOCS%%%%DOCSDIR%%/WA8LMF-TNC-Test-CD-Results.pdf
%%PORTDOCS%%%%DOCSDIR%%/AIS-Reception.pdf
%%PORTDOCS%%%%DOCSDIR%%/AX25_plus_FEC_equals_FX25.pdf
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/Why-is-9600-only-twice-as-fast-as-1200.pdf
%%PORTDOCS%%%%DOCSDIR%%/external/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/scripts/dw-start.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/direwolf.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dw-start.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sdr.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/telem-balloon.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/telem-m0xer-3.txt

Return to bug 258112

Lines 1-35 Link Here

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

Added Link Here

(-)comms/direwolf/files/patch-CMakeLists.txt (+19 lines)
1	--- CMakeLists.txt.orig 2020-10-28 00:45:30 UTC
2	+++ CMakeLists.txt
3	@@ -236,6 +236,7 @@ else()
4	set(INSTALL_BIN_DIR "bin")
5	set(INSTALL_DOC_DIR "share/doc/${CMAKE_PROJECT_NAME}")
6	set(INSTALL_CONF_DIR "${INSTALL_DOC_DIR}/conf")
7	+ set(INSTALL_EXAMPLES_DIR "share/examples/${CMAKE_PROJECT_NAME}")
8	set(INSTALL_SCRIPTS_DIR "${INSTALL_DOC_DIR}/scripts")
9	if(FREEBSD)
10	set(INSTALL_MAN_DIR "man/man1")
11	@@ -265,7 +266,7 @@ else()
12	set(HAMLIB_LIBRARIES "")
13	endif()
14
15	-if(LINUX)
16	+if(LINUX OR FREEBSD)
17	find_package(ALSA REQUIRED)
18	if(ALSA_FOUND)
19	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_ALSA")

Added Link Here

(-)comms/direwolf/files/patch-conf_CMakeLists.txt (+13 lines)
1	--- conf/CMakeLists.txt.orig 2021-08-19 20:11:23 UTC
2	+++ conf/CMakeLists.txt
3	@@ -29,8 +29,8 @@ if(LINUX)
4	install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION /etc/udev/rules.d/)
5	endif()
6
7	-install(FILES "${CMAKE_BINARY_DIR}/direwolf.conf" DESTINATION ${INSTALL_CONF_DIR})
8	-install(FILES "${CUSTOM_CONF_DIR}/sdr.conf" DESTINATION ${INSTALL_CONF_DIR})
9	+install(FILES "${CMAKE_BINARY_DIR}/direwolf.conf" DESTINATION ${INSTALL_EXAMPLES_DIR})
10	+install(FILES "${CUSTOM_CONF_DIR}/sdr.conf" DESTINATION ${INSTALL_EXAMPLES_DIR})
11
12	# Put sample configuration & startup files in home directory.
13	# This step would be done as ordinary user.

Removed Link Here

(-)comms/direwolf/files/patch-dwgpsd.c (-34 lines)
1	--- dwgpsd.c.orig 2020-03-05 16:59:08 UTC
2	+++ dwgpsd.c
3	@@ -57,7 +57,10 @@
4	// Debian bug report: direwolf (1.2-1) FTBFS with libgps22 as part of the gpsd transition (#803605):
5	// dwgps.c claims to only support GPSD_API_MAJOR_VERSION 5, but also builds successfully with
6	// GPSD_API_MAJOR_VERSION 6 provided by libgps22 when the attached patch is applied.
7	-#if GPSD_API_MAJOR_VERSION < 5 \|\| GPSD_API_MAJOR_VERSION > 6
8	+
9	+// Also compatible with API 9 with conditional compilation later.
10	+
11	+#if GPSD_API_MAJOR_VERSION < 5 \|\| GPSD_API_MAJOR_VERSION > 9
12	#error libgps API version might be incompatible.
13	#endif
14
15	@@ -257,7 +260,19 @@ static void * read_gpsd_thread (void *arg)
16	/* Fall thru to read which should get error and bail out. */
17	}
18
19	+// https://github.com/wb2osz/direwolf/issues/196
20	+// https://bugzilla.redhat.com/show_bug.cgi?id=1674812
21	+
22	+// gps_read has two new parameters in API version 7.
23	+// It looks like this could be used to obtain the JSON message from the daemon.
24	+// Specify NULL, instead of message buffer space, if this is not desired.
25	+// Why couldn't they add a new function instead of introducing incompatibility?
26	+
27	+#if GPSD_API_MAJOR_VERSION >= 7
28	+ if (gps_read (&gpsdata, NULL, 0) == -1) {
29	+#else
30	if (gps_read (&gpsdata) == -1) {
31	+#endif
32	text_color_set(DW_COLOR_ERROR);
33
34	dw_printf ("------------------------------------------\n");

Lines 1-6 Link Here

(-)comms/direwolf/files/patch-scripts_dw-start.sh (-8 / +14 lines)
1	--- dw-start.sh.orig 2018-10-08 14:15:21 UTC	1	--- scripts/dw-start.sh.orig 2020-10-28 00:45:30 UTC
2	+++ dw-start.sh	2	+++ scripts/dw-start.sh
3	@@ -120,14 +120,14 @@ function GUI {	3	@@ -68,7 +68,7 @@ DWCMD="$DIREWOLF -a 100"
		4
		5
		6	#Where will logs go - needs to be writable by non-root users
		7	-LOGFILE=/var/tmp/dw-start.log
		8	+LOGFILE=/var/log/dw-start.log
		9
		10
		11	#-------------------------------------
		12	@@ -133,14 +133,14 @@ function GUI {
4	# Auto adjust the startup for your particular environment: gnome-terminal, xterm, etc.	13	# Auto adjust the startup for your particular environment: gnome-terminal, xterm, etc.
5	#	14	#
6		15
Lines 21-35 Link Here
21	SUCCESS=1	30	SUCCESS=1
22	else	31	else
23	echo "Did not find an X terminal emulator. Reverting to CLI mode"	32	echo "Did not find an X terminal emulator. Reverting to CLI mode"
24	@@ -142,9 +142,9 @@ function GUI {	33	@@ -155,7 +155,7 @@ function GUI {
25	# -----------------------------------------------------------	34	# -----------------------------------------------------------
26		35
27	# When running from cron, we have a very minimal environment	36	# When running from cron, we have a very minimal environment
28	-# including PATH=/usr/bin:/bin.	37	-# including PATH=/usr/bin:/bin.
29	+# including PATH=%%PREFIX%%/bin:/bin.	38	+# including PATH=%%PREFIX%%/bin:/bin.
30	#	39	#
31	-export PATH=/usr/local/bin:$PATH	40	export PATH=%%PREFIX%%/bin:$PATH
32	+export PATH=%%PREFIX%%/bin:$PATH
33		41
34	#Log the start of the script run and re-run
35	date >> $LOGFILE

Added Link Here

(-)comms/direwolf/files/patch-scripts_telemetry-toolkit_CMakeLists.txt (+12 lines)
1	--- scripts/telemetry-toolkit/CMakeLists.txt.orig 2021-08-19 20:57:17 UTC
2	+++ scripts/telemetry-toolkit/CMakeLists.txt
3	@@ -8,6 +8,6 @@ install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-seq.sh
4	install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-unit.pl" DESTINATION ${INSTALL_BIN_DIR})
5	install(PROGRAMS "${CUSTOM_TELEMETRY_DIR}/telem-volts.py" DESTINATION ${INSTALL_BIN_DIR})
6
7	-install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-m0xer-3.txt" DESTINATION ${INSTALL_CONF_DIR})
8	-install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-balloon.conf" DESTINATION ${INSTALL_CONF_DIR})
9	-install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-volts.conf" DESTINATION ${INSTALL_CONF_DIR})
10	+install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-m0xer-3.txt" DESTINATION ${INSTALL_EXAMPLES_DIR})
11	+install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-balloon.conf" DESTINATION ${INSTALL_EXAMPLES_DIR})
12	+install(FILES "${CUSTOM_TELEMETRY_DIR}/telem-volts.conf" DESTINATION ${INSTALL_EXAMPLES_DIR})

Added Link Here

(-)comms/direwolf/files/patch-src_CMakeLists.txt (+20 lines)
1	--- src/CMakeLists.txt.orig 2021-08-19 19:47:10 UTC
2	+++ src/CMakeLists.txt
3	@@ -87,7 +87,7 @@ list(APPEND direwolf_SOURCES
4	mheard.c
5	)
6
7	-if(LINUX)
8	+if(LINUX OR FREEBSD)
9	list(APPEND direwolf_SOURCES
10	audio.c
11	)
12	@@ -107,7 +107,7 @@ if(LINUX)
13	list(REMOVE_ITEM direwolf_SOURCES
14	dwgpsd.c
15	)
16	- else() # macOS freebsd openbsd
17	+ else() # macOS openbsd
18	list(APPEND direwolf_SOURCES
19	audio_portaudio.c
20	)

Added Link Here

(-)comms/direwolf/files/patch-src_cm108.c (+35 lines)
1	--- src/cm108.c.orig 2020-10-28 00:45:30 UTC
2	+++ src/cm108.c
3	@@ -99,8 +99,8 @@
4	int main (void)
5	{
6	text_color_init (0); // Turn off text color.
7	-#if defined(__OpenBSD__) \|\| defined(__FreeBSD__)
8	- dw_printf ("CM108 PTT support is not available for BSD.\n");
9	+#if defined(__OpenBSD__)
10	+ dw_printf ("CM108 PTT support is not available for OpenBSD.\n");
11	#else
12	dw_printf ("CM108 PTT support was disabled in Makefile.linux.\n");
13	dw_printf ("It was excluded because /usr/include/libudev.h was missing.\n");
14	@@ -129,7 +129,12 @@ int main (void)
15	#include <sys/ioctl.h> // ioctl, _IOR
16	#include <fcntl.h>
17	#include <errno.h>
18	+#ifdef __linux__
19	#include <linux/hidraw.h> // for HIDIOCGRAWINFO
20	+#endif
21	+#ifdef __FreeBSD__
22	+#include <dev/hid/hidraw.h>
23	+#endif
24
25	#include "textcolor.h"
26	#include "cm108.h"
27	@@ -521,7 +526,7 @@ int cm108_inventory (struct thing_s *things, int max_t
28	SAFE_STRCPY (things[num_things].product, udev_device_get_sysattr_value(parentdev,"product"));
29	SAFE_STRCPY (things[num_things].devnode_hidraw, devnode);
30	SAFE_STRCPY (things[num_things].devnode_usb, usb);
31	- SAFE_STRCPY (things[num_things].devpath, udev_device_get_devpath(dev));
32	+ SAFE_STRCPY (things[num_things].devpath, udev_device_get_devnode(dev));
33	num_things++;
34	}
35	udev_device_unref(parentdev);

Lines 1-9 Link Here

(-)comms/direwolf/pkg-plist (-6 / +10 lines)
1	bin/aclients	1	bin/aclients
		2	bin/appserver
2	bin/atest	3	bin/atest
3	bin/cm108	4	bin/cm108
4	bin/decode_aprs	5	bin/decode_aprs
5	bin/direwolf	6	bin/direwolf
6	bin/dwspeak.sh	7	bin/dwespeak.sh
7	bin/gen_packets	8	bin/gen_packets
8	bin/kissutil	9	bin/kissutil
9	bin/ll2utm	10	bin/ll2utm
Lines 33-45 man/man1/text2tt.1.gz Link Here
33	man/man1/tt2text.1.gz	34	man/man1/tt2text.1.gz
34	man/man1/utm2ll.1.gz	35	man/man1/utm2ll.1.gz
35	share/applications/direwolf.desktop	36	share/applications/direwolf.desktop
36	%%DATADIR%%/CHANGES.md	37	share/pixmaps/direwolf_icon.png
37	%%DATADIR%%/LICENSE-dire-wolf.txt
38	%%DATADIR%%/LICENSE-other.txt
39	%%DATADIR%%/symbols-new.txt	38	%%DATADIR%%/symbols-new.txt
40	%%DATADIR%%/symbolsX.txt	39	%%DATADIR%%/symbolsX.txt
41	%%DATADIR%%/tocalls.txt	40	%%DATADIR%%/tocalls.txt
42	%%DATADIR%%/pixmaps/dw-icon.png
43	%%PORTDOCS%%%%DOCSDIR%%/2400-4800-PSK-for-APRS-Packet-Radio.pdf	41	%%PORTDOCS%%%%DOCSDIR%%/2400-4800-PSK-for-APRS-Packet-Radio.pdf
44	%%PORTDOCS%%%%DOCSDIR%%/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf	42	%%PORTDOCS%%%%DOCSDIR%%/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
45	%%PORTDOCS%%%%DOCSDIR%%/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf	43	%%PORTDOCS%%%%DOCSDIR%%/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
Lines 57-64 share/applications/direwolf.desktop Link Here
57	%%PORTDOCS%%%%DOCSDIR%%/Successful-APRS-IGate-Operation.pdf	55	%%PORTDOCS%%%%DOCSDIR%%/Successful-APRS-IGate-Operation.pdf
58	%%PORTDOCS%%%%DOCSDIR%%/User-Guide.pdf	56	%%PORTDOCS%%%%DOCSDIR%%/User-Guide.pdf
59	%%PORTDOCS%%%%DOCSDIR%%/WA8LMF-TNC-Test-CD-Results.pdf	57	%%PORTDOCS%%%%DOCSDIR%%/WA8LMF-TNC-Test-CD-Results.pdf
		58	%%PORTDOCS%%%%DOCSDIR%%/AIS-Reception.pdf
		59	%%PORTDOCS%%%%DOCSDIR%%/AX25_plus_FEC_equals_FX25.pdf
		60	%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md
		61	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
		62	%%PORTDOCS%%%%DOCSDIR%%/Why-is-9600-only-twice-as-fast-as-1200.pdf
		63	%%PORTDOCS%%%%DOCSDIR%%/external/LICENSE
		64	%%PORTDOCS%%%%DOCSDIR%%/scripts/dw-start.sh
60	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/direwolf.conf	65	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/direwolf.conf
61	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dw-start.sh
62	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sdr.conf	66	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sdr.conf
63	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/telem-balloon.conf	67	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/telem-balloon.conf
64	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/telem-m0xer-3.txt	68	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/telem-m0xer-3.txt