git: ecc47ac0d3a2 - main - comms/direwolf: Update version 1.6=>1.7

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Sat, 24 Feb 2024 19:25:46 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ecc47ac0d3a2c81c3e8b93468187f330aaef7622

commit ecc47ac0d3a2c81c3e8b93468187f330aaef7622
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-02-24 18:49:21 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-02-24 19:25:24 +0000

    comms/direwolf: Update version 1.6=>1.7
    
    - Moved man to share/man
    
    Changelog: https://github.com/wb2osz/direwolf/releases/tag/1.7
    
    Approved by:    portmgr (blanket)
---
 comms/direwolf/Makefile                   | 11 +----------
 comms/direwolf/distinfo                   | 18 +++---------------
 comms/direwolf/files/patch-CMakeLists.txt | 15 +++++++++++++++
 comms/direwolf/pkg-plist                  | 23 ++++++++++++-----------
 4 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/comms/direwolf/Makefile b/comms/direwolf/Makefile
index fb8af135afc6..1f44b3276bc0 100644
--- a/comms/direwolf/Makefile
+++ b/comms/direwolf/Makefile
@@ -1,16 +1,7 @@
 PORTNAME=	direwolf
-DISTVERSION=	1.6
-PORTREVISION=	2
+DISTVERSION=	1.7
 CATEGORIES=	comms hamradio
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	a30f90956b81feeb65007828c27617df1ce9f052.patch:-p1 \
-		e449e39d4d0fba994b1a48aad13c40cd5e44a959.patch:-p1 \
-		6bfd22811c329539111ed72bafc1d18514af8a74.patch:-p1 \
-		5dbe2ce136fbe75dcfed49583fb62e2b394293c1.patch:-p1 \
-		42314b7219ec266697396c7a4b61afe91be9b92c.patch:-p1 \
-		27019b479344c1eb7cdf0a5c2dbfc54471ed4379.patch:-p1
-
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Software "soundcard" modem/TNC and APRS encoder/decoder
 WWW=		https://github.com/wb2osz/direwolf
diff --git a/comms/direwolf/distinfo b/comms/direwolf/distinfo
index 0185a9b3071d..d1df2606d49b 100644
--- a/comms/direwolf/distinfo
+++ b/comms/direwolf/distinfo
@@ -1,15 +1,3 @@
-TIMESTAMP = 1646509148
-SHA256 (wb2osz-direwolf-1.6_GH0.tar.gz) = 208b0563c9b339cbeb0e1feb52dc18ae38295c40c0009d6381fc4acb68fdf660
-SIZE (wb2osz-direwolf-1.6_GH0.tar.gz) = 22298168
-SHA256 (a30f90956b81feeb65007828c27617df1ce9f052.patch) = 1d755aa6cfd4407e7ac3075f8010da52453b10b61e5ba39cb8c97b95c19b9c81
-SIZE (a30f90956b81feeb65007828c27617df1ce9f052.patch) = 830
-SHA256 (e449e39d4d0fba994b1a48aad13c40cd5e44a959.patch) = 3c92308229acbac31e65867b0c6234aa7cc8056a953bcd44d008a9b5eab1987c
-SIZE (e449e39d4d0fba994b1a48aad13c40cd5e44a959.patch) = 1246
-SHA256 (6bfd22811c329539111ed72bafc1d18514af8a74.patch) = db2a520f0ee7a3c066bf3db308dd27cb09bba198c959f564f9a3bc52d042d22c
-SIZE (6bfd22811c329539111ed72bafc1d18514af8a74.patch) = 67043
-SHA256 (5dbe2ce136fbe75dcfed49583fb62e2b394293c1.patch) = c1e31fbfc18399e3dacc1fc821e2720ab0793337eba3841e110a37b3f9251a20
-SIZE (5dbe2ce136fbe75dcfed49583fb62e2b394293c1.patch) = 2910
-SHA256 (42314b7219ec266697396c7a4b61afe91be9b92c.patch) = 58c0d62f778e2598ae68a8f5d734ee6ac71e786763cabb616189533b8aae2dc0
-SIZE (42314b7219ec266697396c7a4b61afe91be9b92c.patch) = 18991
-SHA256 (27019b479344c1eb7cdf0a5c2dbfc54471ed4379.patch) = bbfe2caf64ca9fccc796ca61a381ce4e7eedf4bd8d0b7522c6090766daf71e13
-SIZE (27019b479344c1eb7cdf0a5c2dbfc54471ed4379.patch) = 1963
+TIMESTAMP = 1708800333
+SHA256 (wb2osz-direwolf-1.7_GH0.tar.gz) = 6301f6a43e5db9ef754765875592a58933f6b78585e9272afc850acf7c5914be
+SIZE (wb2osz-direwolf-1.7_GH0.tar.gz) = 20587417
diff --git a/comms/direwolf/files/patch-CMakeLists.txt b/comms/direwolf/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..80669e9aa49c
--- /dev/null
+++ b/comms/direwolf/files/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+--- CMakeLists.txt.orig	2024-02-24 18:41:07 UTC
++++ CMakeLists.txt
+@@ -237,11 +237,7 @@ else()
+   set(INSTALL_DOC_DIR "share/doc/${CMAKE_PROJECT_NAME}")
+   set(INSTALL_CONF_DIR "${INSTALL_DOC_DIR}/conf")
+   set(INSTALL_SCRIPTS_DIR "${INSTALL_DOC_DIR}/scripts")
+-  if(FREEBSD)
+-    set(INSTALL_MAN_DIR "man/man1")
+-  else()
+-    set(INSTALL_MAN_DIR "share/man/man1")
+-  endif()
++  set(INSTALL_MAN_DIR "share/man/man1")
+   set(INSTALL_DATA_DIR "share/${PROJECT_NAME}")
+ endif(WIN32 OR CYGWIN)
+ 
diff --git a/comms/direwolf/pkg-plist b/comms/direwolf/pkg-plist
index 8d72badedb4f..483fcbcac6ac 100644
--- a/comms/direwolf/pkg-plist
+++ b/comms/direwolf/pkg-plist
@@ -18,20 +18,21 @@ bin/telem-seq.sh
 bin/telem-unit.pl
 bin/telem-volts.py
 bin/text2tt
+bin/tnctest
 bin/tt2text
 bin/ttcalc
 bin/utm2ll
-man/man1/aclients.1.gz
-man/man1/atest.1.gz
-man/man1/decode_aprs.1.gz
-man/man1/direwolf.1.gz
-man/man1/gen_packets.1.gz
-man/man1/kissutil.1.gz
-man/man1/ll2utm.1.gz
-man/man1/log2gpx.1.gz
-man/man1/text2tt.1.gz
-man/man1/tt2text.1.gz
-man/man1/utm2ll.1.gz
+share/man/man1/aclients.1.gz
+share/man/man1/atest.1.gz
+share/man/man1/decode_aprs.1.gz
+share/man/man1/direwolf.1.gz
+share/man/man1/gen_packets.1.gz
+share/man/man1/kissutil.1.gz
+share/man/man1/ll2utm.1.gz
+share/man/man1/log2gpx.1.gz
+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