hamlib: bump version

media-libs/hamlib/hamlib-4.2.recipe

@@ -7,31 +7,34 @@ software to control the radio. This project will endeavour to provide shared \
 libraries that greatly simplify the application programmer''s interaction \
 with radio equipment and other controllable devices such as rotators, \
 switches, etc."
-HOMEPAGE="http://www.hamlib.org/"
+HOMEPAGE="https://hamlib.github.io/"
 COPYRIGHT="2000 Frank Singleton
 	2000-2011 Stephane Fillod
 	2000-2012 The Hamlib Group"
 LICENSE="GNU LGPL v2
 	GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://sourceforge.net/projects/hamlib/files/hamlib/$portVersion/hamlib-$portVersion.tar.gz"
-CHECKSUM_SHA256="c90b53949c767f049733b442cd6e0a48648b55d99d4df5ef3f852d985f45e880"
+CHECKSUM_SHA256="e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5"
 PATCHES="hamlib-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	hamlib$secondaryArchSuffix = $portVersion compat >= 3
+	hamlib$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:ampctl$secondaryArchSuffix
+	cmd:ampctld$secondaryArchSuffix
 	cmd:rigctl$secondaryArchSuffix
+	cmd:rigctlcom$secondaryArchSuffix
 	cmd:rigctld$secondaryArchSuffix
 	cmd:rigmem$secondaryArchSuffix
 	cmd:rigsmtr$secondaryArchSuffix
 	cmd:rigswr$secondaryArchSuffix
 	cmd:rotctl$secondaryArchSuffix
 	cmd:rotctld$secondaryArchSuffix
-	lib:libhamlib$secondaryArchSuffix = 2.1.3 compat >= 2
-	lib:libhamlib++$secondaryArchSuffix = 2.1.3 compat >= 2
+	lib:libhamlib$secondaryArchSuffix = 4.0.2 compat >= 4
+	lib:libhamlib++$secondaryArchSuffix = 4.0.2 compat >= 4
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -40,9 +43,9 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	hamlib${secondaryArchSuffix}_devel = $portVersion compat >= 3
-	devel:libhamlib$secondaryArchSuffix = 2.1.3 compat >= 2
-	devel:libhamlib++$secondaryArchSuffix = 2.1.3 compat >= 2
+	hamlib${secondaryArchSuffix}_devel = $portVersion compat >= 4
+	devel:libhamlib$secondaryArchSuffix = 4.0.2 compat >= 4
+	devel:libhamlib++$secondaryArchSuffix = 4.0.2 compat >= 4
 	"
 REQUIRES_devel="
 	hamlib$secondaryArchSuffix == $portVersion base
@@ -50,7 +53,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libreadline$secondaryArchSuffix >= 8
+	devel:libreadline$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="

media-libs/hamlib/patches/hamlib-3.3.patchset

@@ -1,73 +0,0 @@
-From 7bee55fad22ec6e00cd8a655fc1d4c7272f45ad3 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Thu, 25 Feb 2016 19:48:03 +0000
-Subject: Haiku patch
-
-
-diff --git a/aor/ar7030p_utils.c b/aor/ar7030p_utils.c
-index 37dc3c5..26f8d41 100644
---- a/aor/ar7030p_utils.c
-+++ b/aor/ar7030p_utils.c
-@@ -34,6 +34,8 @@
- #include "serial.h"
- #include "idx_builtin.h"
- 
-+#undef PAGE_SIZE
-+
- static enum PAGE_e curPage = NONE; /* Current memory page */
- static unsigned int curAddr = 65535; /* Current page address */
- static enum LOCK_LVL_e curLock = LOCK_0; /* Current lock level */
-@@ -972,7 +974,7 @@ int getCalLevel( RIG * rig, unsigned char rawAgc, int *dbm )
-   assert( NULL != dbm );
- 
-   rig_debug( RIG_DEBUG_VERBOSE, "%s: raw AGC %03d\n", __func__, rawAgc );
-- 
-+
-   for ( i = 0; i < rig->state.str_cal.size; i++ )
-   {
-     *dbm = rig->state.str_cal.table[ i ].val;
-diff --git a/configure.ac b/configure.ac
-index 1bcf02c..054cf70 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -189,6 +189,15 @@ hl_oldLibs=$LIBS
- AC_CHECK_FUNC([connect], [hl_checkSocket=0], [hl_checkSocket=1])
- 
- AS_IF([test "$hl_checkSocket" = 1], [
-+        AC_CHECK_LIB([network],
-+                     [main],
-+                     [NET_LIBS="$NET_LIBS -lnetwork"
-+                      hl_checkSocket=0],
-+                     [],
-+                     [])
-+        ])
-+
-+AS_IF([test "$hl_checkSocket" = 1], [
-         AC_CHECK_LIB([socket],
-                      [main],
-                      [NET_LIBS="$NET_LIBS -lsocket"],
-diff --git a/src/event.c b/src/event.c
-index 5a94005..9060029 100644
---- a/src/event.c
-+++ b/src/event.c
-@@ -88,7 +88,7 @@ extern int foreach_opened_rig(int (*cfunc)(RIG *, rig_ptr_t),rig_ptr_t data);
-  */
- int add_trn_rig(RIG *rig)
- {
--#ifdef HAVE_SIGACTION
-+#if defined(HAVE_SIGACTION) && !defined(__HAIKU__)
- 	struct sigaction act;
- 	int status;
- 
-@@ -151,7 +151,7 @@ int add_trn_rig(RIG *rig)
-  */
- int remove_trn_rig(RIG *rig)
- {
--#ifdef HAVE_SIGACTION
-+#if defined(HAVE_SIGACTION) && !defined(__HAIKU__)
- 	int status;
- 
-     /* assert(rig->caps->transceive == RIG_TRN_RIG); */
--- 
-2.2.2
-

media-libs/hamlib/patches/hamlib-4.2.patchset

@@ -0,0 +1,91 @@
+From e48d43a51136606e6a26d236603b0c2f262aa619 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 1 Jul 2021 22:03:21 +0300
+Subject: Haiku patch
+
+
+diff --git a/configure.ac b/configure.ac
+index 4fdd14a..d8b7fd3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -189,6 +189,15 @@ hl_oldLibs=$LIBS
+ 
+ AC_CHECK_FUNC([connect], [hl_checkSocket=0], [hl_checkSocket=1])
+ 
++AS_IF([test "$hl_checkSocket" = 1], [
++        AC_CHECK_LIB([network],
++                     [main],
++                     [NET_LIBS="$NET_LIBS -lnetwork"
++                      hl_checkSocket=0],
++                     [],
++                     [])
++        ])
++
+ AS_IF([test "$hl_checkSocket" = 1], [
+ 	AC_CHECK_LIB([socket],
+ 		     [main],
+diff --git a/rigs/aor/ar7030p_utils.c b/rigs/aor/ar7030p_utils.c
+index 4724915..dce0292 100644
+--- a/rigs/aor/ar7030p_utils.c
++++ b/rigs/aor/ar7030p_utils.c
+@@ -33,6 +33,8 @@
+ #include "serial.h"
+ #include "idx_builtin.h"
+ 
++#undef PAGE_SIZE
++
+ static enum PAGE_e curPage = NONE; /* Current memory page */
+ static unsigned int curAddr = 65535; /* Current page address */
+ static enum LOCK_LVL_e curLock = LOCK_0; /* Current lock level */
+diff --git a/src/event.c b/src/event.c
+index 03f4e76..0438bad 100644
+--- a/src/event.c
++++ b/src/event.c
+@@ -70,7 +70,7 @@
+ #define CHECK_RIG_ARG(r) (!(r) || !(r)->caps || !(r)->state.comm_state)
+ 
+ 
+-#ifdef HAVE_SIGACTION
++#if defined(HAVE_SIGACTION) && !defined(__HAIKU__)
+ static struct sigaction hamlib_trn_oldact, hamlib_trn_poll_oldact;
+ 
+ #ifdef HAVE_SIGINFO_T
+@@ -94,7 +94,7 @@ extern int foreach_opened_rig(int (*cfunc)(RIG *, rig_ptr_t), rig_ptr_t data);
+  */
+ int add_trn_rig(RIG *rig)
+ {
+-#ifdef HAVE_SIGACTION
++#if defined(HAVE_SIGACTION) && !defined(__HAIKU__)
+     struct sigaction act;
+     int status;
+ 
+@@ -180,7 +180,7 @@ int add_trn_rig(RIG *rig)
+  */
+ int remove_trn_rig(RIG *rig)
+ {
+-#ifdef HAVE_SIGACTION
++#if defined(HAVE_SIGACTION) && !defined(__HAIKU__)
+     int status;
+ 
+     /* assert(rig->caps->transceive == RIG_TRN_RIG); */
+@@ -215,7 +215,7 @@ int remove_trn_rig(RIG *rig)
+ }
+ 
+ 
+-#ifdef HAVE_SIGACTION
++#if defined(HAVE_SIGACTION) && !defined(__HAIKU__)
+ 
+ 
+ /*
+@@ -224,7 +224,7 @@ int remove_trn_rig(RIG *rig)
+  */
+ static int add_trn_poll_rig(RIG *rig)
+ {
+-#ifdef HAVE_SIGACTION
++#if defined(HAVE_SIGACTION) && !defined(__HAIKU__)
+     struct sigaction act;
+     int status;
+ 
+-- 
+2.30.2
+