<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/13394d8f02c67c2bd1cfc028b6b10c630d80481c">https://github.com/macports/macports-ports/commit/13394d8f02c67c2bd1cfc028b6b10c630d80481c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 13394d8f02c67c2bd1cfc028b6b10c630d80481c
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sun Nov 25 01:20:58 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> gpsd: update to 3.18.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This is essentially the same as the 3.18 port, but for the new
</span><span style='display:block; white-space:pre;color:#404040;'> version.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The upstream code as patched by the port can also be seen at:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/fhgwright/gpsd/tree/macports-3.18.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The -devel version is pointing at the upstream sources as of
</span><span style='display:block; white-space:pre;color:#404040;'> 21-Nov-2018. Since all needed patches are included upstream
</span><span style='display:block; white-space:pre;color:#404040;'> at that point, there are no patches for it in the port.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Used "port test" and "port install" as the primary test, with the
</span><span style='display:block; white-space:pre;color:#404040;'> default variants, all binary variants with the default python27, each
</span><span style='display:block; white-space:pre;color:#404040;'> single binary variant with the default python27, and all binary
</span><span style='display:block; white-space:pre;color:#404040;'> variants with each non-default python. Ran this on a MacPro/10.9, a
</span><span style='display:block; white-space:pre;color:#404040;'> MacPro/10.14, a MacBook Pro/10.9, a PowerBook G4/10.5, and VMs for all
</span><span style='display:block; white-space:pre;color:#404040;'> 10.5-10.13 versions, except that, due to test flakiness on the
</span><span style='display:block; white-space:pre;color:#404040;'> PowerBook, "port test" was skipped in most PowerBook cases. This was
</span><span style='display:block; white-space:pre;color:#404040;'> all done for both the normal and -devel ports, except that the -devel
</span><span style='display:block; white-space:pre;color:#404040;'> version had test issues on 10.5 x86, so those tests were also skipped.
</span>---
net/gpsd/Portfile | 29 +++++++++--------
net/gpsd/files/patch-SConstruct.diff | 61 +++++++++++++++++-------------------
net/gpsd/files/patch-noC99.diff | 19 +++++++++++
net/gpsd/files/patch-pyserial.diff | 14 ++++-----
4 files changed, 69 insertions(+), 54 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/gpsd/Portfile b/net/gpsd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a04a39f..e6160af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/gpsd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/gpsd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,22 +28,22 @@ if {${subport} eq ${name}} {
</span> # release
conflicts gpsd-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8499ad1637bf6dbf6b7349d74b0dd6317771e87b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 48521f5158f5fda4c88a6f75e8bfc1ee67e999e3fc095e4a06cb8c2af56712f4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9020649
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.18.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 08f95b51218f11f7b07c1a5046cead366216fdc8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9031595
</span>
master_sites savannah
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # NOTE: The 3.18 tarball doesn't quite match the release-3.18 sources.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is a combination of a recurring problem clobbering the 'gps'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # symlinks in the contrib/ and devtools/, and an irrelevant post-release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # change in SConstruct. Since none of these affects the installed port,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOTE: The 3.18.1 tarball doesn't quite match the release-3.18.1 sources.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This due to a recurring problem clobbering the 'gps' symlinks in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # contrib/ and devtools/. Since this doesn't affect the installed port,
</span> # these errors are left as is. Note, however, that attempts to directly
# use Python programs in thsese subdirectories from the work directory
# may not work.
patchfiles-append patch-SConstruct.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-noC99.diff
</span> patchfiles-append patch-pyserial.diff
livecheck.type regex
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,17 +55,16 @@ if {${subport} eq ${name}} {
</span> # devel
conflicts gpsd
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20181002
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit 81fb3d613b78f0cadcb57194dedf4ad2146ef0eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 27b14026f348829a8879072d85a5dabc571461c1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 426643084abb9b390b0a238616ff24bfe1072db00f6bbb8a4c1ff629c1174166 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9779700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20181121
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit eb4dfe0e87b4010f3032a9947c9fd0b5b157f9bc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c740f3713162c34883171729fa4a113e055eb286 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ee810aa1d6791a8cb239509e9cff7733e315c4c627b36917ad9835123109342d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10064973
</span>
master_sites http://git.savannah.gnu.org/cgit/gpsd.git/snapshot
distname ${name}-${commit}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-SConstruct.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-pyserial.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This upstream version is completely patch-free
</span>
livecheck.type regex
livecheck.version ${commit}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/gpsd/files/patch-SConstruct.diff b/net/gpsd/files/patch-SConstruct.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b466fc4..05ecfa8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/gpsd/files/patch-SConstruct.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/gpsd/files/patch-SConstruct.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- SConstruct.orig 2018-10-02 17:05:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ SConstruct 2018-11-17 18:45:31.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -383,7 +383,8 @@ for key, value in os.environ.items():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Placeholder so we can kluge together something like VPATH builds.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $SRCDIR replaces occurrences for $(srcdir) in the autotools build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--env['SRCDIR'] = '.'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# scons can get confused if this is not a full path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+env['SRCDIR'] = os.getcwd()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We may need to force slow regression tests to get around race
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # conditions in the pty layer, especially on a loaded machine.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1366,6 +1367,7 @@ if not env['python']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python_progs = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SConstruct.orig 2018-10-19 12:45:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SConstruct 2018-11-18 16:35:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1385,6 +1385,7 @@ if not env['python']:
</span> else:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- python_progs = ["gegps", "gpscat", "gpsfake", "gpsprof", "ubxtool", "zerk"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # installed python programs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_progs = ["gegps", "gpscat", "gpsfake", "gpsprof"]
</span> + python_deps = {'gpscat': 'packet'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if env['xgps']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check for pycairo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1388,6 +1390,8 @@ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # python misc helpers and stuff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_misc = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1398,6 +1399,7 @@ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "test_xgps_deps.py",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "valgrind-audit.py"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ python_deps['test_maidenhead.py'] = 'clienthelpers'
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if env['xgps']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python_progs.extend(["xgps", "xgpsspeed"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_manpages = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "gegps.1": "gps.xml",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1414,6 +1416,7 @@ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ubxtool.1": "ubxtool.xml",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "zerk.1": "zerk.xml",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ })
</span> + python_deps['xgps'] = 'clienthelpers'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python_modules = Glob('gps/*.py')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build Python binding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1471,6 +1475,11 @@ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except ImportError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no pyserial, reduced functionality in ubxtool and zerk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ announce("WARNING: Python module serial (pyserial) not found.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1527,6 +1530,11 @@ else:
</span> )
python_compiled_libs[ext] = python_env.SharedLibrary(
ext, python_objects[ext])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,12 +36,12 @@
</span> # Make PEP 241 Metadata 1.0.
# Why not PEP 314 (V1.1) or PEP 345 (V1.2)?
# V1.2 and V1.2 require a Download-URL to an installable binary
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1906,7 +1915,7 @@ if python_progs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- verenv = env['ENV'].copy()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1891,7 +1899,7 @@ if env['python']:
</span> verenv['DISPLAY'] = '' # Avoid launching X11 in X11 progs
<span style='display:block; white-space:pre;background:#ffe0e0;'>- for prog in python_progs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vchk += '$SRCDIR/%s -V\n' % prog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vchk += '$PYTHON $SRCDIR/%s -V\n' % prog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python_versions = Utility('python-versions', [python_progs], vchk,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENV=verenv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pp = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for p in python_progs:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pp.append("$SRCDIR/%s -V" % p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pp.append("$PYTHON $SRCDIR/%s -V" % p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_versions = Utility('python-versions', python_progs, pp, ENV=verenv)
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/gpsd/files/patch-noC99.diff b/net/gpsd/files/patch-noC99.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1161651
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/gpsd/files/patch-noC99.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- driver_ubx.c.orig 2018-10-18 13:59:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ driver_ubx.c 2018-11-18 16:35:32.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -813,6 +813,7 @@ static gps_mask_t ubx_rxm_rawx(struct gp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int8_t leapS;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t numMeas;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t recStat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (16 > data_len) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gpsd_log(&session->context->errout, LOG_WARN,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -830,7 +831,7 @@ static gps_mask_t ubx_rxm_rawx(struct gp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "UBX_RXM_RAWX: rcvTow %f week %u leapS %d numMeas %u recStat %d\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rcvTow, week, leapS, numMeas, recStat);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (int i = 0; i < numMeas; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (i = 0; i < numMeas; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int off = 32 * i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double prMes = getled64((const char *)buf, off + 16);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double cpMes = getled64((const char *)buf, off + 24);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/gpsd/files/patch-pyserial.diff b/net/gpsd/files/patch-pyserial.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5fff2892..9117345 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/gpsd/files/patch-pyserial.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/gpsd/files/patch-pyserial.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ubxtool.orig 2018-10-02 15:51:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ubxtool 2018-11-17 15:10:43.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1938,6 +1938,7 @@ class gps_io(object):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ubxtool.orig 2018-10-19 12:45:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ubxtool 2018-11-18 16:35:45.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2068,6 +2068,7 @@ class gps_io(object):
</span> "Initialize class"
Serial = serial_class
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span> # buffer to hold read data
self.out = b''
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1997,6 +1998,9 @@ class gps_io(object):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2127,6 +2128,9 @@ class gps_io(object):
</span> # configure the serial connections (the parameters refer to
# the device you are connecting to)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> try:
self.ser = Serial.Serial(
baudrate=opts['input_speed'],
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2007,10 +2011,7 @@ class gps_io(object):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2137,10 +2141,7 @@ class gps_io(object):
</span> stopbits=Serial.STOPBITS_ONE,
# read timeout
timeout=0.05,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,8 +30,8 @@
</span> )
except Serial.serialutil.SerialException:
# this exception happens on bad serial port device name
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- zerk.orig 2018-10-02 15:51:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ zerk 2018-11-17 15:10:43.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- zerk.orig 2018-10-19 12:46:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ zerk 2018-11-18 16:35:45.000000000 -0800
</span> @@ -1402,6 +1402,7 @@ class gps_io(object):
"Initialize class"
</pre><pre style='margin:0'>
</pre>