Received: by mail.netbsd.org (Postfix, from userid 605) id BE04484DA1; Tue, 9 Mar 2021 08:14:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 04E5D84D90 for ; Tue, 9 Mar 2021 08:14:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id BxAaucoSm-He for ; Tue, 9 Mar 2021 08:14:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4527B84D60 for ; Tue, 9 Mar 2021 08:14:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3DD21FA95; Tue, 9 Mar 2021 08:14:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_161527764192340" MIME-Version: 1.0 Date: Tue, 9 Mar 2021 08:14:01 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/ham/grig To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210309081401.3DD21FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_161527764192340 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Mar 9 08:14:01 UTC 2021 Modified Files: pkgsrc/ham/grig: distinfo Added Files: pkgsrc/ham/grig/patches: patch-src_rig-daemon-check.c patch-src_rig-daemon.c patch-src_rig-data.h Log Message: grig: Fix build. Patches from Debian. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/ham/grig/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/ham/grig/patches/patch-src_rig-daemon-check.c \ pkgsrc/ham/grig/patches/patch-src_rig-daemon.c \ pkgsrc/ham/grig/patches/patch-src_rig-data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_161527764192340 Content-Disposition: inline Content-Length: 6429 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/ham/grig/distinfo diff -u pkgsrc/ham/grig/distinfo:1.10 pkgsrc/ham/grig/distinfo:1.11 --- pkgsrc/ham/grig/distinfo:1.10 Thu Jul 14 12:11:56 2016 +++ pkgsrc/ham/grig/distinfo Tue Mar 9 08:14:00 2021 @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.10 2016/07/14 12:11:56 mef Exp $ +$NetBSD: distinfo,v 1.11 2021/03/09 08:14:00 nia Exp $ SHA1 (grig-0.8.1.tar.gz) = 6c93486c3d9fd692a4ce70a8274f57ef51238c4f RMD160 (grig-0.8.1.tar.gz) = 01deadaea1ae2e6ed3e27ada07ad4557039ddf8c SHA512 (grig-0.8.1.tar.gz) = 84eda8db5d18324f26f0775483c8272296aad05dd75f0572c01a3c7af6dbd14bff7b98cc6a61fe3c43d25193866be4b3dafdc4e68dfc37217e88b53ca53266f9 Size (grig-0.8.1.tar.gz) = 621728 bytes +SHA1 (patch-src_rig-daemon-check.c) = 04c958c5a9fe5dfcd6db931e0de96f017201a053 +SHA1 (patch-src_rig-daemon.c) = e70633aad4468c3302f2abedf8d92ab27f17f823 +SHA1 (patch-src_rig-data.h) = cb2acfb5fdaa2bda4cc8674ee5977bcb003912ac Added files: Index: pkgsrc/ham/grig/patches/patch-src_rig-daemon-check.c diff -u /dev/null pkgsrc/ham/grig/patches/patch-src_rig-daemon-check.c:1.1 --- /dev/null Tue Mar 9 08:14:01 2021 +++ pkgsrc/ham/grig/patches/patch-src_rig-daemon-check.c Tue Mar 9 08:14:01 2021 @@ -0,0 +1,26 @@ +$NetBSD: patch-src_rig-daemon-check.c,v 1.1 2021/03/09 08:14:01 nia Exp $ + +Description: align affected parts for Hamlib4.0 +Author: Ervin Hegedus +From Debian: +https://sources.debian.org/data/main/g/grig/0.8.1-3/debian/patches/04-hamlib-align.patch + +--- src/rig-daemon-check.c.orig 2010-05-11 19:42:34.000000000 +0000 ++++ src/rig-daemon-check.c +@@ -398,12 +398,12 @@ rig_daemon_check_mode (RIG + */ + if (!found_mode && + ((mode & myrig->state.rx_range_list[i].modes) == mode) && +- (get->freq1 >= myrig->state.rx_range_list[i].start) && +- (get->freq1 <= myrig->state.rx_range_list[i].end)) { ++ (get->freq1 >= myrig->state.rx_range_list[i].startf) && ++ (get->freq1 <= myrig->state.rx_range_list[i].endf)) { + + found_mode = 1; +- get->fmin = myrig->state.rx_range_list[i].start; +- get->fmax = myrig->state.rx_range_list[i].end; ++ get->fmin = myrig->state.rx_range_list[i].startf; ++ get->fmax = myrig->state.rx_range_list[i].endf; + + grig_debug_local (RIG_DEBUG_VERBOSE, + _("%s: Found frequency range for mode %d"), Index: pkgsrc/ham/grig/patches/patch-src_rig-daemon.c diff -u /dev/null pkgsrc/ham/grig/patches/patch-src_rig-daemon.c:1.1 --- /dev/null Tue Mar 9 08:14:01 2021 +++ pkgsrc/ham/grig/patches/patch-src_rig-daemon.c Tue Mar 9 08:14:01 2021 @@ -0,0 +1,44 @@ +$NetBSD: patch-src_rig-daemon.c,v 1.1 2021/03/09 08:14:01 nia Exp $ + +Description: align affected parts for Hamlib4.0 +Author: Ervin Hegedus +From Debian: +https://sources.debian.org/data/main/g/grig/0.8.1-3/debian/patches/04-hamlib-align.patch + +--- src/rig-daemon.c.orig 2015-12-19 15:14:27.000000000 +0000 ++++ src/rig-daemon.c +@@ -1674,12 +1674,12 @@ rig_daemon_exec_cmd (rig_cmd_t c + is the current frequency within this range? + */ + if (((mode & myrig->state.rx_range_list[i].modes) == mode) && +- (get->freq1 >= myrig->state.rx_range_list[i].start) && +- (get->freq1 <= myrig->state.rx_range_list[i].end)) { ++ (get->freq1 >= myrig->state.rx_range_list[i].startf) && ++ (get->freq1 <= myrig->state.rx_range_list[i].endf)) { + + found_mode = 1; +- get->fmin = myrig->state.rx_range_list[i].start; +- get->fmax = myrig->state.rx_range_list[i].end; ++ get->fmin = myrig->state.rx_range_list[i].startf; ++ get->fmax = myrig->state.rx_range_list[i].endf; + + grig_debug_local (RIG_DEBUG_VERBOSE, + _("%s: Found frequency range for mode %d"), +@@ -2971,7 +2971,7 @@ rig_daemon_exec_cmd (rig_cmd_t c + val.i = set->voxdel; + + /* try to execute command */ +- retcode = rig_set_level (myrig, RIG_VFO_CURR, RIG_LEVEL_VOX, val); ++ retcode = rig_set_level (myrig, RIG_VFO_CURR, RIG_LEVEL_VOXDELAY, val); + + /* raise anomaly if execution did not succeed */ + if (retcode != RIG_OK) { +@@ -2996,7 +2996,7 @@ rig_daemon_exec_cmd (rig_cmd_t c + value_t val; + + /* try to execute command */ +- retcode = rig_get_level (myrig, RIG_VFO_CURR, RIG_LEVEL_VOX, &val); ++ retcode = rig_get_level (myrig, RIG_VFO_CURR, RIG_LEVEL_VOXDELAY, &val); + + /* raise anomaly if execution did not succeed */ + if (retcode != RIG_OK) { Index: pkgsrc/ham/grig/patches/patch-src_rig-data.h diff -u /dev/null pkgsrc/ham/grig/patches/patch-src_rig-data.h:1.1 --- /dev/null Tue Mar 9 08:14:01 2021 +++ pkgsrc/ham/grig/patches/patch-src_rig-data.h Tue Mar 9 08:14:01 2021 @@ -0,0 +1,27 @@ +$NetBSD: patch-src_rig-data.h,v 1.1 2021/03/09 08:14:01 nia Exp $ + +Description: align affected parts for Hamlib4.0 +Author: Ervin Hegedus +From Debian: +https://sources.debian.org/data/main/g/grig/0.8.1-3/debian/patches/04-hamlib-align.patch + +--- src/rig-data.h.orig 2008-12-15 01:14:50.000000000 +0000 ++++ src/rig-data.h +@@ -190,7 +190,7 @@ typedef struct { + + #define GRIG_LEVEL_RD (RIG_LEVEL_RFPOWER | RIG_LEVEL_AGC | RIG_LEVEL_SWR | RIG_LEVEL_ALC | \ + RIG_LEVEL_STRENGTH | RIG_LEVEL_ATT | RIG_LEVEL_PREAMP | \ +- RIG_LEVEL_VOX | RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL | \ ++ RIG_LEVEL_VOXDELAY | RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL | \ + RIG_LEVEL_IF | RIG_LEVEL_APF | RIG_LEVEL_NR | RIG_LEVEL_PBT_IN | \ + RIG_LEVEL_PBT_OUT | RIG_LEVEL_CWPITCH | \ + RIG_LEVEL_MICGAIN | RIG_LEVEL_KEYSPD | RIG_LEVEL_NOTCHF | \ +@@ -198,7 +198,7 @@ typedef struct { + RIG_LEVEL_VOXGAIN | RIG_LEVEL_ANTIVOX) + + #define GRIG_LEVEL_WR (RIG_LEVEL_RFPOWER | RIG_LEVEL_AGC | RIG_LEVEL_ATT | RIG_LEVEL_PREAMP | \ +- RIG_LEVEL_VOX | RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL | \ ++ RIG_LEVEL_VOXDELAY | RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL | \ + RIG_LEVEL_IF | RIG_LEVEL_APF | RIG_LEVEL_NR | RIG_LEVEL_PBT_IN | \ + RIG_LEVEL_PBT_OUT | RIG_LEVEL_CWPITCH | \ + RIG_LEVEL_MICGAIN | RIG_LEVEL_KEYSPD | RIG_LEVEL_NOTCHF | \ --_----------=_161527764192340--