<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/eabf6675e943b82b6ec1a49c388de4bd5a968a9a">https://github.com/macports/macports-ports/commit/eabf6675e943b82b6ec1a49c388de4bd5a968a9a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new eabf667  uhd*: fix patches to be great again!
</span>eabf667 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit eabf6675e943b82b6ec1a49c388de4bd5a968a9a
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Nov 5 17:07:10 2019 -0500

<span style='display:block; white-space:pre;color:#404040;'>    uhd*: fix patches to be great again!
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/59597
</span>---
 science/uhd/Portfile                               | 33 +++++++++++------
 .../files/patch-fix-UHD_VERSION_quotes.39lts.diff  | 13 +++++++
 .../patch-fix-gpsdata_altitude_api.39lts.diff      | 42 ++++++++++++++++++++++
 ...=> patch-fix-gpsdata_separation_api.39lts.diff} |  6 ++--
 .../files/patch-fix-gpsdata_separation_api.diff    |  2 +-
 5 files changed, 81 insertions(+), 15 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/Portfile b/science/uhd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6eda7ea..b3e9d60 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +53,17 @@ Provides the release version, which is typically updated every month or so.
</span> 
     patchfiles-append patch-fix-boost-python.release.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # temporary patch to fix gpsdata API: .separation -> .fix.geoid_sep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-fix-gpsdata_separation_api.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # temporary patch to add double quoting around UHD_VERSION, such
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # that if specified externally it can be any string. devel already
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # contains this patch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-fix-UHD_VERSION_quotes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # temporary patch to fix gpsdata API: .fix.altitude -> .fix.altHAE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-fix-gpsdata_altitude_api.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     # temporary patch to fix searching for Boost::Python, which
     # depends on the version of Boost & which Python. 2 parts: a patch
     # and then reinplace. This is part 2.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,6 +105,17 @@ Provides UHD 3.9 Long-Term Service \(LTS\) branch. This branch is not updated ex
</span>     # release. works on all non-devel UHD ports; devel contains this patch.
     patchfiles-append patch-fix-gpsd_read-api.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # temporary patch to fix gpsdata API: .separation -> .fix.geoid_sep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-fix-gpsdata_separation_api.39lts.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # temporary patch to add double quoting around UHD_VERSION, such
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # that if specified externally it can be any string. devel already
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # contains this patch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-fix-UHD_VERSION_quotes.39lts.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # temporary patch to fix gpsdata API: .fix.altitude -> .fix.altHAE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-fix-gpsdata_altitude_api.39lts.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
 
 subport uhd-devel {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,17 +168,6 @@ if {${subport} ne "uhd-39lts"} {
</span> 
 if {${subport} ne "uhd-devel"} {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # temporary patch to fix gpsdata API: .separation -> .fix.geoid_sep
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append patch-fix-gpsdata_separation_api.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # temporary patch to add double quoting around UHD_VERSION, such
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # that if specified externally it can be any string. devel already
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # contains this patch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append patch-fix-UHD_VERSION_quotes.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # temporary patch to fix gpsdata API: .fix.altitude -> .fix.altHAE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append patch-fix-gpsdata_altitude_api.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     # gpsd has been removed from devel
     default_variants +gpsd
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-fix-UHD_VERSION_quotes.39lts.diff b/science/uhd/files/patch-fix-UHD_VERSION_quotes.39lts.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c176e41
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-fix-UHD_VERSION_quotes.39lts.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/host/cmake/Modules/UHDConfigVersion.cmake.in b/host/cmake/Modules/UHDConfigVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 67e0e40..5e30ba6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/host/cmake/Modules/UHDConfigVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/host/cmake/Modules/UHDConfigVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(PATCH_VERSION @TRIMMED_VERSION_PATCH@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(DEVEL_VERSION @UHD_VERSION_DEVEL@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(PACKAGE_VERSION @TRIMMED_UHD_VERSION@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(PACKAGE_VERSION "@TRIMMED_UHD_VERSION@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(ENV{UHD_PACKAGE_VERSION} ${PACKAGE_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # There is a bug in CMake whereby calling "find_package(FOO)" within
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-fix-gpsdata_altitude_api.39lts.diff b/science/uhd/files/patch-fix-gpsdata_altitude_api.39lts.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9e25d85
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-fix-gpsdata_altitude_api.39lts.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/host/lib/usrp/gpsd_iface.cpp b/host/lib/usrp/gpsd_iface.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2524222..f2dc26a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/host/lib/usrp/gpsd_iface.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/host/lib/usrp/gpsd_iface.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,8 +166,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     % _gps_data.fix.longitude);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             tmp["lat"] = str(boost::format("%f deg")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     % _gps_data.fix.latitude);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// https://gitlab.com/gpsd/gpsd/commit/2607bf6d6e22a6303b8320d9ddb3ada3ff27cd35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Large, but simple variable change: altitude -> altHAE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if GPSD_API_MAJOR_VERSION < 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             tmp["alt"] = str(boost::format("%fm")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     % _gps_data.fix.altitude);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            tmp["alt"] = str(boost::format("%fm")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                    % _gps_data.fix.altHAE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             tmp["lon"] = "n/a";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             tmp["lat"] = "n/a";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -267,11 +274,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             string.append(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 str(boost::format("%.2f,") % _gps_data.dop.hdop));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// https://gitlab.com/gpsd/gpsd/commit/2607bf6d6e22a6303b8320d9ddb3ada3ff27cd35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Large, but simple variable change: altitude -> altHAE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if GPSD_API_MAJOR_VERSION < 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if (boost::math::isnan(_gps_data.fix.altitude))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             string.append(",");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             string.append(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 str(boost::format("%.2f,M,") % _gps_data.fix.altitude));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if (boost::math::isnan(_gps_data.fix.altHAE))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            string.append(",");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            string.append(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                str(boost::format("%.2f,M,") % _gps_data.fix.altHAE));
</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;'>+ // https://gitlab.com/gpsd/gpsd/commit/c711d531a6faab93df68ec625a076631569a729d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // "gpsdata.separation moved into gpsdata.fix.geoid_sep"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-fix-gpsdata_separation_api.diff b/science/uhd/files/patch-fix-gpsdata_separation_api.39lts.diff
</span>similarity index 90%
copy from science/uhd/files/patch-fix-gpsdata_separation_api.diff
copy to science/uhd/files/patch-fix-gpsdata_separation_api.39lts.diff
<span style='display:block; white-space:pre;color:#808080;'>index f3b06c0..f9f2712 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/files/patch-fix-gpsdata_separation_api.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-fix-gpsdata_separation_api.39lts.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/host/lib/usrp/gpsd_iface.cpp b/host/lib/usrp/gpsd_iface.cpp
</span> index c700117..0f65af3 100644
 --- a/host/lib/usrp/gpsd_iface.cpp
 +++ b/host/lib/usrp/gpsd_iface.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -261,11 +267,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -273,11 +279,21 @@
</span>              string.append(
                  str(boost::format("%.2f,M,") % _gps_data.fix.altitude));
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,13 +10,13 @@ index c700117..0f65af3 100644
</span> +// "gpsdata.separation moved into gpsdata.fix.geoid_sep"
 +#if GPSD_API_MAJOR_VERSION < 9
          if (boost::math::isnan(_gps_data.separation))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-             string.append(",,");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             string.append(",");
</span>          else
              string.append(
                  str(boost::format("%.3f,M,") % _gps_data.separation));
 +#else
 +        if (boost::math::isnan(_gps_data.fix.geoid_sep))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+            string.append(",,");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            string.append(",");
</span> +        else
 +            string.append(
 +                str(boost::format("%.3f,M,") % _gps_data.fix.geoid_sep));
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-fix-gpsdata_separation_api.diff b/science/uhd/files/patch-fix-gpsdata_separation_api.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f3b06c0..420278f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/files/patch-fix-gpsdata_separation_api.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-fix-gpsdata_separation_api.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/host/lib/usrp/gpsd_iface.cpp b/host/lib/usrp/gpsd_iface.cpp
</span> index c700117..0f65af3 100644
 --- a/host/lib/usrp/gpsd_iface.cpp
 +++ b/host/lib/usrp/gpsd_iface.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -261,11 +267,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -265,11 +271,21 @@
</span>              string.append(
                  str(boost::format("%.2f,M,") % _gps_data.fix.altitude));
  
</pre><pre style='margin:0'>

</pre>