<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8ff152561cb6e67094d5635e93548fadac1cffe1">https://github.com/macports/macports-ports/commit/8ff152561cb6e67094d5635e93548fadac1cffe1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8ff152561cb6e67094d5635e93548fadac1cffe1
</span>Author: Davide Gerhard <rainbow@irh.it>
AuthorDate: Mon Jan 27 11:33:05 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> grig: add support for hamlib-devel
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> added patch to support the new struct; see
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/Hamlib/Hamlib/commit/73c1ecd165888ea2802ef6549c80e7c7d7da6c75
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> the upstream project seems not developed anymore.
</span>---
science/grig/Portfile | 11 ++-
science/grig/files/patch-hamlib4.diff | 147 ++++++++++++++++++++++++++++++++++
2 files changed, 154 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/grig/Portfile b/science/grig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e2b6169..5f134c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/grig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/grig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,6 +3,7 @@
</span> PortSystem 1.0
name grig
version 0.8.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,8 +16,10 @@ master_sites sourceforge:groundstation
</span>
depends_build port:pkgconfig
depends_lib port:gtk2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hamlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libhamlib.dylib:hamlib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 01deadaea1ae2e6ed3e27ada07ad4557039ddf8c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 be8687418fb23efa0468674c3fdd15340fed06eef09be9de21106cc17e033c25 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 621728
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 01deadaea1ae2e6ed3e27ada07ad4557039ddf8c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 be8687418fb23efa0468674c3fdd15340fed06eef09be9de21106cc17e033c25 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 621728
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-hamlib4.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/grig/files/patch-hamlib4.diff b/science/grig/files/patch-hamlib4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c74de21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/grig/files/patch-hamlib4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,147 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/rig-daemon-check.c b/src/rig-daemon-check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c5c0d14..0ced05a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/rig-daemon-check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/rig-daemon-check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,6 +42,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gtk/gtk.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib/gi18n.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <hamlib/rig.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_CONFIG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "rig-data.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "grig-debug.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "rig-daemon-check.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -396,15 +399,26 @@ rig_daemon_check_mode (RIG *myrig,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this list is good for current mode AND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the current frequency is within this range
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAMLIB_MAJOR_VERSION >= 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!found_mode &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((mode & myrig->state.rx_range_list[i].modes) == mode) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (get->freq1 >= myrig->state.rx_range_list[i].start) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (get->freq1 <= myrig->state.rx_range_list[i].end)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- found_mode = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get->fmin = myrig->state.rx_range_list[i].start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get->fmax = myrig->state.rx_range_list[i].end;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (get->freq1 >= myrig->state.rx_range_list[i].startf) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (get->freq1 <= myrig->state.rx_range_list[i].endf)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get->fmin = myrig->state.rx_range_list[i].startf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get->fmax = myrig->state.rx_range_list[i].endf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!found_mode &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((mode & myrig->state.rx_range_list[i].modes) == mode) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (get->freq1 >= myrig->state.rx_range_list[i].start) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (get->freq1 <= myrig->state.rx_range_list[i].end)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get->fmin = myrig->state.rx_range_list[i].start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get->fmax = myrig->state.rx_range_list[i].end;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ found_mode = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ grig_debug_local (RIG_DEBUG_VERBOSE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _("%s: Found frequency range for mode %d"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __FUNCTION__, mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/rig-daemon.c b/src/rig-daemon.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ddd922f..f86c3aa 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/rig-daemon.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/rig-daemon.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,6 +50,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <hamlib/rig.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_CONFIG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "grig-config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "grig-debug.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "rig-anomaly.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1673,13 +1676,23 @@ rig_daemon_exec_cmd (rig_cmd_t cmd,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* is this list good for current mode?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is the current frequency within this range?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAMLIB_MAJOR_VERSION >= 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (((mode & myrig->state.rx_range_list[i].modes) == mode) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (get->freq1 >= myrig->state.rx_range_list[i].start) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (get->freq1 <= myrig->state.rx_range_list[i].end)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (get->freq1 >= myrig->state.rx_range_list[i].startf) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (get->freq1 <= myrig->state.rx_range_list[i].endf)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get->fmin = myrig->state.rx_range_list[i].startf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get->fmax = myrig->state.rx_range_list[i].endf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (((mode & myrig->state.rx_range_list[i].modes) == mode) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (get->freq1 >= myrig->state.rx_range_list[i].start) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (get->freq1 <= myrig->state.rx_range_list[i].end)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get->fmin = myrig->state.rx_range_list[i].start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get->fmax = myrig->state.rx_range_list[i].end;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ found_mode = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get->fmin = myrig->state.rx_range_list[i].start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get->fmax = myrig->state.rx_range_list[i].end;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ grig_debug_local (RIG_DEBUG_VERBOSE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _("%s: Found frequency range for mode %d"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 86f1091..de6ee39 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,7 +89,9 @@ GDK_V=`pkg-config --modversion gdk-2.0`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GTK_V=`pkg-config --modversion gtk+-2.0`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE_UNQUOTED([HAMLIB_VERSION],[`pkg-config --modversion hamlib`],["Hamlib version"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_DEFINE_UNQUOTED([HAMLIB_MAJOR_VERSION],[`pkg-config --modversion hamlib | cut -d'.' -f1`],["Hamlib major version"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_DEFINE_UNQUOTED([HAMLIB_MINOR_VERSION],[`pkg-config --modversion hamlib | cut -d'.' -f2 | cut -d'~' -f1`],["Hamlib minor version"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_DEFINE_UNQUOTED([HAMLIB_PATCH_VERSION],[`pkg-config --modversion hamlib | cut -d'.' -f2 | cut -d'~' -f2`],["Hamlib patch version"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index acb75d2..9e00929 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14091,8 +14091,19 @@ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAMLIB_MAJOR_VERSION `pkg-config --modversion hamlib | cut -d'.' -f1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAMLIB_MINOR_VERSION `pkg-config --modversion hamlib | cut -d'.' -f2 | cut -d'~' -f1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAMLIB_PATCH_VERSION `pkg-config --modversion hamlib | cut -d'.' -f2 | cut -d'~' -f2`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_config_files="$ac_config_files Makefile doc/Makefile doc/man/grig.1 doc/man/Makefile grig.spec src/Makefile pixmaps/Makefile po/Makefile.in"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.h.in.orig 2015-12-20 22:15:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.h.in 2020-01-27 13:07:46.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,6 +10,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* The gettext domain */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef GETTEXT_PACKAGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* "Hamlib major version" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAMLIB_MAJOR_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* "Hamlib minor version" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAMLIB_MINOR_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* "Hamlib patch version" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAMLIB_PATCH_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* "Hamlib version" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAMLIB_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>