<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/a091af09feb3290a70c50fd58e4dce4392d66d81">https://github.com/macports/macports-ports/commit/a091af09feb3290a70c50fd58e4dce4392d66d81</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 a091af09feb gpsd: Update to 3.22
</span>a091af09feb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a091af09feb3290a70c50fd58e4dce4392d66d81
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Thu Jan 14 18:14:55 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> gpsd: Update to 3.22
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Adds a missing docbook build dependency.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Removes the note related to xgps variant. At the time this variant
</span><span style='display:block; white-space:pre;color:#404040;'> was added, the note was included to avoid surprising users who'd
</span><span style='display:block; white-space:pre;color:#404040;'> expected xgps* to be included by default. Since that was more than
</span><span style='display:block; white-space:pre;color:#404040;'> three years ago, it's reasonable to suppose that users either know
</span><span style='display:block; white-space:pre;color:#404040;'> about the variant by now or don't care.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Explicitly deletes xgps* in the -xgps case. Although the upstream
</span><span style='display:block; white-space:pre;color:#404040;'> code has an option for xgps, it installs the xgps* programs even with
</span><span style='display:block; white-space:pre;color:#404040;'> xgps=no, though they may or may not work based on the opportunistic
</span><span style='display:block; white-space:pre;color:#404040;'> availability of the dependencies. Now they (and the related manpages)
</span><span style='display:block; white-space:pre;color:#404040;'> are excluded in that case.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Adds a new 'plot' variant. The new 'gpsplot' program requires
</span><span style='display:block; white-space:pre;color:#404040;'> pyXX-matplotlib, which is another heavyweight dependency. The variant
</span><span style='display:block; white-space:pre;color:#404040;'> makes that dependency optional. Since 'gpsplot' is not optional
</span><span style='display:block; white-space:pre;color:#404040;'> upstream, it's explicitly removed (along with its manpage) in the
</span><span style='display:block; white-space:pre;color:#404040;'> -plot case. This variant defaults off, for consistency with the
</span><span style='display:block; white-space:pre;color:#404040;'> behavior of earlier versions.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Changes the default WRITE_PAD to 3ms for the tests. The upstream
</span><span style='display:block; white-space:pre;color:#404040;'> default 1ms value has become somewhat marginal.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes Python version handling for a future python310 variant.
</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;'> Tested (including building the usual set of variant combinations and
</span><span style='display:block; white-space:pre;color:#404040;'> running the tests) on 10.5 ppc, 10.5-10.6 i386, and 10.6-10.15 x86_64.
</span><span style='display:block; white-space:pre;color:#404040;'> The 'plot' and 'xgps' variants were excluded in some cases due to
</span><span style='display:block; white-space:pre;color:#404040;'> issues with the dependencies, though it's expected that they'd work
</span><span style='display:block; white-space:pre;color:#404040;'> if the broken dependencies were fixed.
</span><span style='display:block; white-space:pre;color:#404040;'> Not tested on 10.16/11.0.
</span><span style='display:block; white-space:pre;color:#404040;'> Known not to build on 10.4.
</span>---
net/gpsd/Portfile | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 44 insertions(+), 9 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 d8fef730cc6..04630dd29f1 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,8 +3,8 @@
</span> PortSystem 1.0
name gpsd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net
license BSD
maintainers {michaelld @michaelld} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ long_description GPSD is a service daemon that handles GPSes and other \
</span> homepage https://gpsd.io
master_sites savannah
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3c521009854e2ae19bcd4f7fb0f0c33c334bcbc5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 65504c3af8d3b0cce3c07405b8815d7730d2d2be2da7d28d275f1a9c57c6fe91 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3984157
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 916829bad167ef8313ea348cfaac71201ab77cc1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 783fdf2a5f78a593230c7bfa8b409956545765563224c6c56ad69cc6c2a637a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4758761
</span>
livecheck.type regex
livecheck.url https://download.savannah.gnu.org/releases/gpsd/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,9 +42,13 @@ foreach s ${pythons_suffixes} {
</span> lappend pythons_ports python${s}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc dotted_ver {nodot} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [string index ${nodot} 0].[string range ${nodot} 1 99]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach s ${pythons_suffixes} {
set p python${s}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [dotted_ver ${s}]
</span> set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
variant ${p} description "Build ${name} to use Python ${v}" conflicts {*}${c} ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +75,7 @@ if {${pyver_no_dot} eq ""} {
</span> return -code error "Invalid Python variant selection"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pyver_dotted [join [split ${pyver_no_dot} ""] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pyver_dotted [dotted_ver ${pyver_no_dot}]
</span>
# NOTE: All Python dependencies which are conceptually depends_run actually
# need to be depends_lib, since the build procedure references them, usually
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +91,7 @@ depends_lib-append port:python${pyver_no_dot} \
</span> configure.python ${prefix}/bin/python${pyver_dotted}
depends_lib-append port:ncurses
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:scons port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:scons port:pkgconfig port:docbook-xml-4.1.2
</span>
use_configure no
use_xcode yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,6 +127,9 @@ build.env-append "CC=${configure.cc} [get_canonical_archflags cc]" \
</span> # extra_env in macports.conf. In all cases, the WRITE_PAD value in use is
# reported by the test framework and is visible with -v.
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# UPDATE: The default 1ms WRITE_PAD currently seems to be marginal, so we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# default it to 3ms.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span> # The test phase duplicates the arguments and environment (except WRITE_PAD)
# from the build phase, mainly to avoid gratuitous rebuilds between the phases.
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,8 +144,11 @@ test.args {*}${build.args}
</span> test.env-append {*}${build.env}
if { [info exists ::env(WRITE_PAD)] } {
test.env-append WRITE_PAD=$::env(WRITE_PAD)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env-append WRITE_PAD=0.003
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.args {*}${build.args}
destroot.env-append {*}${destroot.destdir} {*}${build.env}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,6 +181,8 @@ variant dbus description {Include support for DBUS} {
</span> destroot.args-replace dbus_export=no dbus_export=yes
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The xgps programs recusively require a massive set of dependencies,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# so we make them optional.
</span> variant xgps \
description {Include xgps/xgpsspeed X11 clients (dependency-intensive)} {
depends_lib-append port:py${pyver_no_dot}-cairo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,10 +194,33 @@ description {Include xgps/xgpsspeed X11 clients (dependency-intensive)} {
</span> destroot.args-replace xgps=no xgps=yes
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The upstream build script installs xgps* even with xgps=no.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Although the files aren't large, installing programs which either fail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# or opportunistically work is undesirable, so we remove them.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Similarly, we exclude the manpages for the nonexistent programs.
</span> if {![variant_isset xgps]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- notes "The xgps variant is now needed to get the xgps and xgpsspeed programs."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete "${destroot}${prefix}/bin/xgps"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete "${destroot}${prefix}/bin/xgpsspeed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete "${destroot}${prefix}/share/man/man1/xgps.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete "${destroot}${prefix}/share/man/man1/xgpsspeed.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The gpsplot program recusively requires a massive set of dependencies,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# so we make it optional. This currently has no upstream equivalent.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant plot \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description {Include gpsplot client (dependency-intensive)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${pyver_no_dot}-matplotlib
</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;'>+# In the absence of the 'plot' variant, we remove the program and manpage.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset plot]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete "${destroot}${prefix}/bin/gpsplot"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete "${destroot}${prefix}/share/man/man1/gpsplot.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# The gpsd-devel subport is obsolete as of 04-Jan-2020.
# Handle it last so that it can override the dependencies.
</pre><pre style='margin:0'>
</pre>