<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/40d3e7e2ea3af7fe251a55050127c7baf86a845d">https://github.com/macports/macports-ports/commit/40d3e7e2ea3af7fe251a55050127c7baf86a845d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 40d3e7e2ea3af7fe251a55050127c7baf86a845d
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Tue Jan 10 14:10:01 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> gpsd: update to 3.24
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Revbump to override previous 3.24.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Adds python310 and python311 variants.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Restores python34 variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Changes default Python variant to python310.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes "no python" error to avoid breaking "port clean" with -pythonXY.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Cleans up destroot setup.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> A few cosmetic tweaks to the Portfile.
</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, 10.5-10.15 x86_64, and
</span><span style='display:block; white-space:pre;color:#404040;'> 11.x-13.x arm64.
</span><span style='display:block; white-space:pre;color:#404040;'> Some variant combinations were excluded in some cases due to issues
</span><span style='display:block; white-space:pre;color:#404040;'> with the dependencies, though it's expected that they'd work if the
</span><span style='display:block; white-space:pre;color:#404040;'> broken dependencies were fixed.
</span><span style='display:block; white-space:pre;color:#404040;'> On 10.5, the python37 variant was excluded since python37 itself is
</span><span style='display:block; white-space:pre;color:#404040;'> broken (segfault from ctypes).
</span><span style='display:block; white-space:pre;color:#404040;'> Known not to build on 10.4.
</span>---
net/gpsd/Portfile | 44 ++++++++++++++++++++++++++------------------
1 file changed, 26 insertions(+), 18 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 f572e923e65..2496a862a36 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,12 +3,13 @@
</span> PortSystem 1.0
name gpsd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.23.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net
license BSD
maintainers {michaelld @michaelld} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {fwright.net:fw @fhgwright} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {fwright.net:fw @fhgwright} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span> platforms darwin
description GPS service daemon
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,19 +24,20 @@ 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 62a786fc520792e00496cc46014e39be66fe56ef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0b991ce9a46538c4ea450f7a8ee428ff44fb4f8d665fddf2ffe40fe0ae9a6c09 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4904121
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 74e2bba76cf8c11f62eed24a4482c6f2f31512c5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5152429
</span>
livecheck.type regex
livecheck.url https://download.savannah.gnu.org/releases/gpsd/
livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# GPSD requires Python 2.6, 2.7, or 3.2+; don't use 2.6, 3.2, 3.3, or 3.4,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# since we're weaning MP off of them.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythons_suffixes {27 35 36 37 38 39}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# GPSD requires Python 2.6, 2.7, or 3.2+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# We skip 2.6, 3.2, and 3.3, but keep 2.7 and 3.4+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Some variants may force a more restricted list.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_suffixes {27 34 35 36 37 38 39 310 311}
</span>
set pythons_ports {}
foreach s ${pythons_suffixes} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,8 +56,8 @@ foreach s ${pythons_suffixes} {
</span> variant ${p} description "Build ${name} to use Python ${v}" conflicts {*}${c} ""
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# default to +python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pyver_no_dot "27"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# default to +python310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pyver_no_dot "310"
</span> foreach s ${pythons_suffixes} {
if {[variant_isset python${s}]} {
set pyver_no_dot ${s}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,16 +65,18 @@ foreach s ${pythons_suffixes} {
</span> }
default_variants +python${pyver_no_dot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# make sure -python27 isn't specified alone
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# make sure some python variant is selected
</span> set pyver_no_dot ""
foreach s ${pythons_suffixes} {
if {[variant_isset python${s}]} {
set pyver_no_dot ${s}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${pyver_no_dot} eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select one of the Python variants (+pythonXY).\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-return -code error "Invalid Python variant selection"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${pyver_no_dot} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select one of the Python variants (+pythonXY).\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid Python variant selection"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
set pyver_dotted [dotted_ver ${pyver_no_dot}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,9 +155,9 @@ if { [info exists ::env(WRITE_PAD)] } {
</span> test.env-append WRITE_PAD=0.003
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot.args {*}${build.args}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append {*}${destroot.destdir} {*}${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.post_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append {*}${build.env} DESTDIR=${destroot}
</span>
# Although GPSD has successfully been built with Qt5 at one time, that build
# is currently broken. Until the build issue is sorted out, Qt support is
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,6 +190,7 @@ variant dbus description {Include support for DBUS} {
</span>
# The xgps programs recusively require a massive set of dependencies,
# so we make them optional.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</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;'>@@ -201,6 +206,7 @@ description {Include xgps/xgpsspeed X11 clients (dependency-intensive)} {
</span> # Although the files aren't large, installing programs which either fail
# or opportunistically work is undesirable, so we remove them.
# Similarly, we exclude the manpages for the nonexistent programs.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span> if {![variant_isset xgps]} {
post-destroot {
delete "${destroot}${prefix}/bin/xgps"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -212,12 +218,14 @@ if {![variant_isset xgps]} {
</span>
# The gpsplot program recusively requires a massive set of dependencies,
# so we make it optional. This currently has no upstream equivalent.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span> variant plot \
description {Include gpsplot client (dependency-intensive)} {
depends_lib-append port:py${pyver_no_dot}-matplotlib
}
# In the absence of the 'plot' variant, we remove the program and manpage.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span> if {![variant_isset plot]} {
post-destroot {
delete "${destroot}${prefix}/bin/gpsplot"
</pre><pre style='margin:0'>
</pre>