Skip to content

Commit 7115713

Browse files
committed
gpsd: update to 3.27
Adds variants for python313 and python314. Removes obsolete distutils fix. Increases default WRITE_PAD, based on test behavior seen on some systems. Does not yet support Qt >4. TESTED: Tested (including building the usual set of variant combinations and running the tests) on 10.5 ppc, 10.5-10.6 i386, 10.5-12.x x86_64, and 11.x-26.x arm64. Some variant combinations were excluded in some cases due to issues with the dependencies, though it's expected that they'd work if the broken dependencies were fixed.
1 parent 953ba0c commit 7115713

File tree

1 file changed

+17
-21
lines changed

1 file changed

+17
-21
lines changed

net/gpsd/Portfile

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
PortSystem 1.0
44

55
name gpsd
6-
version 3.25
6+
version 3.27
77
revision 0
88
categories net
99
license BSD
@@ -23,20 +23,20 @@ long_description GPSD is a service daemon that handles GPSes and other \
2323
homepage https://gpsd.io
2424

2525
master_sites savannah
26-
checksums rmd160 9e2f36c5eb7fd888241da57a69765dd80493d064 \
27-
sha256 b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2 \
28-
size 5225194
26+
checksums rmd160 ead9c09e19ae5d2b92f91b5486146a5c83a29455 \
27+
sha256 6195292dd7910be68cb7018d45166283eaefd3f9db9773fcd6e9a78d49eac999 \
28+
size 5990617
2929

3030
livecheck.type regex
3131
livecheck.url https://download.savannah.gnu.org/releases/gpsd/
3232
livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
3333

3434

35-
# GPSD requires Python 2.6, 2.7, or 3.2+.
36-
# We skip 2.6, 3.2, and 3.3, but keep 2.7 and 3.4+.
35+
# GPSD requires Python 2.7 or 3.3+ (3.4+ for ubxtool and zerk).
36+
# We skip 3.3, but keep 2.7 and 3.4+.
3737
# Some variants may force a more restricted list.
3838
#
39-
set pythons_suffixes {27 34 35 36 37 38 39 310 311 312}
39+
set pythons_suffixes {27 34 35 36 37 38 39 310 311 312 313 314}
4040

4141
set pythons_ports {}
4242
foreach s ${pythons_suffixes} {
@@ -55,7 +55,10 @@ foreach s ${pythons_suffixes} {
5555
variant ${p} description "Build ${name} to use Python ${v}" conflicts {*}${c} ""
5656
}
5757

58-
# default to +python312
58+
# Default to +python312
59+
#
60+
# Don't be in a rush to make this the latest Python, since new Python versions
61+
# often have teething problems (even when nominally tested with this port).
5962
set pyver_no_dot "312"
6063
foreach s ${pythons_suffixes} {
6164
if {[variant_isset python${s}]} {
@@ -99,13 +102,6 @@ depends_build-append port:scons \
99102
port:docbook-xml-4.1.2 \
100103
port:asciidoctor
101104

102-
# Python 3.12+ has deprecated distutils, which is needed by the build.
103-
# It remains available via setuptools, so we add the dependency.
104-
# This requirement has not yet been fixed upstream.
105-
if {${pyver_no_dot} >= 312} {
106-
depends_build-append port:py${pyver_no_dot}-setuptools
107-
}
108-
109105
use_configure no
110106
use_xcode yes
111107

@@ -119,7 +115,7 @@ build.target
119115
build.args prefix=${prefix} \
120116
target_python=${configure.python} \
121117
python_shebang=${configure.python} \
122-
qt=no \
118+
qt=no qt_versioned=4 \
123119
usb=no \
124120
strip=no \
125121
dbus_export=no \
@@ -141,7 +137,7 @@ build.env-append "CC=${configure.cc} [get_canonical_archflags cc]" \
141137
# reported by the test framework and is visible with -v.
142138
#
143139
# UPDATE: The default 1ms WRITE_PAD currently seems to be marginal, so we
144-
# default it to 3ms.
140+
# default it to 10ms.
145141
#
146142
# The test phase duplicates the arguments and environment (except WRITE_PAD)
147143
# from the build phase, mainly to avoid gratuitous rebuilds between the phases.
@@ -158,16 +154,16 @@ test.env-append {*}${build.env}
158154
if { [info exists ::env(WRITE_PAD)] } {
159155
test.env-append WRITE_PAD=$::env(WRITE_PAD)
160156
} else {
161-
test.env-append WRITE_PAD=0.003
157+
test.env-append WRITE_PAD=0.01
162158
}
163159

164160
destroot.args {*}${build.args}
165161
destroot.post_args
166162
destroot.env-append {*}${build.env} DESTDIR=${destroot}
167163

168-
# Although GPSD has successfully been built with Qt5 at one time, that build
169-
# is currently broken. Until the build issue is sorted out, Qt support is
170-
# limited to Qt4.
164+
# This version of GPSD nominally supports Qt4, Qt5, and Qt6, but additional
165+
# build issues need to be sorted out for Qt5 and Qt6, so for now we still
166+
# limit it to Qt4 (see the 'qt_versioned' option in build.args).
171167
#
172168
variant qt description {Build Qt4 bindings} {
173169
PortGroup qt4 1.0

0 commit comments

Comments
 (0)