<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/8eae529e866e076f759da59c1a9e49e8e3d77827">https://github.com/macports/macports-ports/commit/8eae529e866e076f759da59c1a9e49e8e3d77827</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8eae529e866e076f759da59c1a9e49e8e3d77827
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sat Jan 4 14:31:10 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> gpsd: update to 3.20
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The gpsd-devel subport is now rendered obsolete, and replaced by gpsd.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The compiler blacklisting hacks for OSX <=10.6 are still present,
</span><span style='display:block; white-space:pre;color:#404040;'> since the issues haven't been fixed upstream.
</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 the xgps variant
</span><span style='display:block; white-space:pre;color:#404040;'> (except on 10.5) with each non-default python. Ran this on a
</span><span style='display:block; white-space:pre;color:#404040;'> MacPro/10.9, a MacPro/10.14, a MacPro 10.15, a MacBook Pro/10.9, a
</span><span style='display:block; white-space:pre;color:#404040;'> PowerBook G4/10.5, and VMs for all 10.5-10.13 versions.
</span><span style='display:block; white-space:pre;color:#404040;'> The -devel port now reports as obsolete.
</span>---
net/gpsd/Portfile | 71 +++++++++++++++++++++----------------------------------
1 file changed, 27 insertions(+), 44 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 3d1e9b6..d8bfbd4 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;'>@@ -3,9 +3,10 @@
</span> PortSystem 1.0
name gpsd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span> maintainers {michaelld @michaelld} \
{fwright.net:fw @fhgwright} openmaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,46 +22,15 @@ long_description GPSD is a service daemon that handles GPSes and other \
</span>
homepage https://gpsd.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport gpsd-devel {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts gpsd-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b9f41521519f6887585eb4cafa85a058ad1385b0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10581777
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites savannah
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites savannah
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a87ed286b4a42092de54986889f0253990163d7e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3600835
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url https://download.savannah.gnu.org/releases/gpsd/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://download.savannah.gnu.org/releases/gpsd/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts gpsd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch a4ecde71556018f6d7a70831165169fffd0cc3a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190817-[string range ${git.branch} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 9c365e553ebd80b173b0ddbbadb317d1103ff776 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 16318c956793aa78f269dc5274d737da69c616c35746dd18b569eba6ca3d1048 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8698196
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://gitlab.com/gpsd/gpsd/-/archive/${git.branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${name}-${git.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regexm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.version ${git.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url https://gitlab.com/gpsd/gpsd/commits/master?format=atom
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {gpsd/gpsd/commit/([0-9a-f]{40}).*}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
# GPSD requires Python 2.6, 2.7, or 3.2+; don't use 2.6, 3.2, or
# 3.3, since we're weaning MP off of them.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,8 +87,6 @@ set pyver_dotted [join [split ${pyver_no_dot} ""] .]
</span> # Portfile. However, unlike the latter, we don't include the clang_dependency
# portgroup outside the conditional, since it's not known to be needed in such
# cases, and its mere presence alters the compiler selection.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The upstream code will not have this fixed in the (imminent) new release.
</span>
if {[variant_isset python27]} {
# Code copied (approximately) from python27 Portfile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,8 +101,6 @@ if {[variant_isset python27]} {
</span> # warning causes clang-9.0++ to choke when targeting 10.6. The relevant code
# shouldn't really be built as C++ at all, but until that's fixed, we avoid
# the problem by blacklisting clang-9.0 with +qt on OSX <10.7.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The upstream code will not have this fixed in the (imminent) new release.
</span>
if {[variant_isset qt]} {
if {${os.platform} eq "darwin" && ${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,3 +232,20 @@ description {Include xgps/xgpsspeed X11 clients (dependency-intensive)} {
</span> if {![variant_isset xgps]} {
notes "The xgps variant is now needed to get the xgps and xgpsspeed programs."
}
<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;'>+# The gpsd-devel subport is obsolete as of 04-Jan-2020.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Handle it last so that it can override the dependencies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport gpsd-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy last pre-obsolete version, with revbump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch a4ecde71556018f6d7a70831165169fffd0cc3a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190817-[string range ${git.branch} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by gpsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>