CVS commit: pkgsrc/ham/hamlib

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Sep 15 22:52:46 UTC 2021

Modified Files:
        pkgsrc/ham/hamlib: Makefile PLIST distinfo
        pkgsrc/ham/hamlib/patches: patch-src_network.c

Log Message:
ham/hamlib: Update to 4.3.1

packaging:

  - Adjust upstream program testlibusb to have rigctl_ prefix to avoid
    collisions.

  - Note that sunos patch should be sent upstream.

Version 4.3.1
        * 2021-09-14
        * Bug fix release

Version 4.3
        * 2021-09-01
        * libusb-1.0.23 or greater is now required or use --without-libusb
        * Generating documentation now requires GNU source-highlighter.
        * Added IC-575
        * Less VFO swapping of newer Icom rigs -- zero swapping in WSJTX and JTDX
        * Dual rotator control in rotctl -R option
        * Started work on simulators -- very crude right now but usable to debug some things
        * Overhaul of rig split -- reverse split (VFOA=RX VFOB=TX) should work for rigs capable of it
          Starting VFO does not matter -- rig will end up on RX VFO
          S VFOA 1 VFOB
          S VFOB 1 VFOA
          S Main 1 Sub
          S Sub 1 Main

Version 4.2
        * 2021-05-17
        * New rig_get_mode_bandwidths -- returns token set for bandwidths for given mode
              Rig command: \get_mode_bandwidths CW
              Mode=CW
              Normal=500Hz
              Narrow=50Hz
              Wide=2400Hz
        * New rig_get_info  -- returns token set for all vfos where order does not matter
          This is a string return to allow for easy future expansion without changing the API
          New tokens may be introduced and can be skipped if not used by clients
              Rig command: \get_rig_info
              VFO=Main Freq=145000000 Mode=None Width=0 RX=1 TX=1
              VFO=VFOB Freq=145000000 Mode=FM Width=15000 RX=0 TX=0
              Split=0 SatMode=0
              Rig=Dummy
              App=Hamlib
              Version=20210429
              CRC=0xf49f4708
        * New rig_get_vfo_info
              Rig command: \get_vfo_info VFOA
              Freq: 145000000
              Mode: None
              Width: 0
              Split: 0
              SatMode: 0

        * FILPATHLEN has changed to HAMLIB_FILPATHLEN

        * USRP lib and gnuradio are deprecated and will be removed in 5.0
        * Added Radan rotator
        * Added Malachite SDR
        * Major rework for PRM80
        * Add twiddle_timeout and twiddle_rit --set-conf options
              rigctld --set-conf=twiddle_timeout=5,twiddle_rit=1
              This will set the twiddle timeout to 5 seconds and turn on twiddle_rit
              For twiddle timeout VFOB will not be polled for 5 seconds after VFO twiddling
              is detected
        * rigctld --twiddle is deprecated and will be removed in 5.0 along with
          get_twiddle and set_twiddle
        * Rework Doxygen manual including default layout for Doxygen 1.9.1.  So far
          the amplifier, rotator, and utilities API sections have been updated.  The
          rig (radio) section remains to be updated.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/ham/hamlib/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/ham/hamlib/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/ham/hamlib/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/ham/hamlib/patches/patch-src_network.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/ham/hamlib/Makefile
diff -u pkgsrc/ham/hamlib/Makefile:1.50 pkgsrc/ham/hamlib/Makefile:1.51
--- pkgsrc/ham/hamlib/Makefile:1.50     Mon May 24 19:52:29 2021
+++ pkgsrc/ham/hamlib/Makefile  Wed Sep 15 22:52:45 2021
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.50 2021/05/24 19:52:29 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2021/09/15 22:52:45 gdt Exp $
 #
 
 DISTNAME=      hamlib-${VERSION}
 # V.rcN, VrcN, V~rcN
-VERSION=       4.1
+VERSION=       4.3.1
 VERSIOND=      ${VERSION}
 VERSIONF=      ${VERSION}
-PKGREVISION=   4
 CATEGORIES=    ham
 MASTER_SITES=  https://github.com/Hamlib/Hamlib/releases/download/${VERSIOND}/
 #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hamlib/}
@@ -27,10 +26,14 @@ CONFIGURE_ARGS+=    --without-tcl-binding \
                        --without-perl-binding \
                        --without-python-binding
 
-.include "../../mk/bsd.prefs.mk"
+post-install:
+       mv ${DESTDIR}/${PREFIX}/bin/testlibusb ${DESTDIR}/${PREFIX}/bin/rigctl_testlibusb
+
 
 TEST_TARGET=   check
 
+.include "../../mk/bsd.prefs.mk"
+
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/ham/hamlib/PLIST
diff -u pkgsrc/ham/hamlib/PLIST:1.19 pkgsrc/ham/hamlib/PLIST:1.20
--- pkgsrc/ham/hamlib/PLIST:1.19        Sat Feb 13 01:02:18 2021
+++ pkgsrc/ham/hamlib/PLIST     Wed Sep 15 22:52:45 2021
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.19 2021/02/13 01:02:18 gdt Exp $
+@comment $NetBSD: PLIST,v 1.20 2021/09/15 22:52:45 gdt Exp $
 bin/ampctl
 bin/ampctld
 bin/rigctl
+bin/rigctl_testlibusb
 bin/rigctlcom
 bin/rigctld
 bin/rigmem

Index: pkgsrc/ham/hamlib/distinfo
diff -u pkgsrc/ham/hamlib/distinfo:1.24 pkgsrc/ham/hamlib/distinfo:1.25
--- pkgsrc/ham/hamlib/distinfo:1.24     Sat Feb 13 01:02:18 2021
+++ pkgsrc/ham/hamlib/distinfo  Wed Sep 15 22:52:45 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.24 2021/02/13 01:02:18 gdt Exp $
+$NetBSD: distinfo,v 1.25 2021/09/15 22:52:45 gdt Exp $
 
-SHA1 (hamlib-4.1.tar.gz) = c4688984a9f2b4068bfb184ca91a292bf38d8f42
-RMD160 (hamlib-4.1.tar.gz) = fd5e2c165c02de0b60a6af1ff812cb12dbc64de7
-SHA512 (hamlib-4.1.tar.gz) = a5fca5dc89a7408628bc77fe22c6d8c77474b3dabee7b2b6d0b280becb6cb63f5619e4a620ad11aeb81b8412145b0f8cb0291a2d4cd3751c643cb1709b2dfa78
-Size (hamlib-4.1.tar.gz) = 2260629 bytes
-SHA1 (patch-src_network.c) = 9e27f09c5499099563f03a08b47a0b4d08c4b55d
+SHA1 (hamlib-4.3.1.tar.gz) = 7f7269d1b6fc3fed76216d0a28097730aac99c8c
+RMD160 (hamlib-4.3.1.tar.gz) = f6dcf24d868a00c5a52ec102fbf82044f8019f37
+SHA512 (hamlib-4.3.1.tar.gz) = 8dee4676a19de7ac1ef733a4285b76e918f11aad6594d0557d36df295faf04c615e0993edb2f9ed5e7aea718c184603fec831caf28b75026c705f0b2e4b9eca7
+Size (hamlib-4.3.1.tar.gz) = 2356944 bytes
+SHA1 (patch-src_network.c) = ca55437ace4576abfbeb5693b400d5a85179e17d

Index: pkgsrc/ham/hamlib/patches/patch-src_network.c
diff -u pkgsrc/ham/hamlib/patches/patch-src_network.c:1.1 pkgsrc/ham/hamlib/patches/patch-src_network.c:1.2
--- pkgsrc/ham/hamlib/patches/patch-src_network.c:1.1   Tue Jun 12 12:40:02 2018
+++ pkgsrc/ham/hamlib/patches/patch-src_network.c       Wed Sep 15 22:52:46 2021
@@ -1,11 +1,14 @@
-$NetBSD: patch-src_network.c,v 1.1 2018/06/12 12:40:02 wiedi Exp $
+$NetBSD: patch-src_network.c,v 1.2 2021/09/15 22:52:46 gdt Exp $
 
 Add include for FIONREAD on SunOS
---- src/network.c.orig 2018-03-31 13:12:24.000000000 +0000
+
+\todo File this patch upstream and include bugtracker URL.
+
+--- src/network.c.orig 2021-09-13 23:33:26.000000000 +0000
 +++ src/network.c
-@@ -45,6 +45,10 @@
- #include <sys/types.h>
+@@ -46,6 +46,10 @@
  #include <signal.h>
+ #include <pthread.h>
  
 +#if defined(__sun)
 +#include <sys/filio.h>