head 1.14; access; symbols pkgsrc-2026Q1:1.14.0.8 pkgsrc-2026Q1-base:1.14 pkgsrc-2025Q4:1.14.0.6 pkgsrc-2025Q4-base:1.14 pkgsrc-2025Q3:1.14.0.4 pkgsrc-2025Q3-base:1.14 pkgsrc-2025Q2:1.14.0.2 pkgsrc-2025Q2-base:1.14 pkgsrc-2025Q1:1.12.0.2 pkgsrc-2025Q1-base:1.12 pkgsrc-2024Q4:1.10.0.2 pkgsrc-2024Q4-base:1.10 pkgsrc-2024Q3:1.9.0.14 pkgsrc-2024Q3-base:1.9 pkgsrc-2024Q2:1.9.0.12 pkgsrc-2024Q2-base:1.9 pkgsrc-2024Q1:1.9.0.10 pkgsrc-2024Q1-base:1.9 pkgsrc-2023Q4:1.9.0.8 pkgsrc-2023Q4-base:1.9 pkgsrc-2023Q3:1.9.0.6 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.9.0.4 pkgsrc-2023Q2-base:1.9 pkgsrc-2023Q1:1.9.0.2 pkgsrc-2023Q1-base:1.9 pkgsrc-2022Q4:1.7.0.2 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.6.0.4 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.2 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.5.0.2 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.4.0.2 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.3.0.2 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.1.0.4 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.2 pkgsrc-2021Q1-base:1.1; locks; strict; comment @# @; 1.14 date 2025.05.30.22.16.10; author tnn; state Exp; branches; next 1.13; commitid MuLh0iM2wNfXRYWF; 1.13 date 2025.05.17.23.11.52; author gdt; state Exp; branches; next 1.12; commitid OI8CzNCqIbj6BjVF; 1.12 date 2025.02.10.14.29.59; author wiz; state Exp; branches; next 1.11; commitid 9xAzXSydoPslNVIF; 1.11 date 2025.02.10.14.29.28; author wiz; state Exp; branches; next 1.10; commitid R1ROtmvbAC07NVIF; 1.10 date 2024.10.11.14.01.48; author wiz; state Exp; branches; next 1.9; commitid NxGHBRlmEADMyftF; 1.9 date 2023.03.11.22.26.47; author wiz; state Exp; branches; next 1.8; commitid P9DniPWk09tWZKgE; 1.8 date 2023.03.09.00.52.42; author gdt; state Exp; branches; next 1.7; commitid 4nkHwlp8dxlWTngE; 1.7 date 2022.11.14.14.07.34; author gdt; state Exp; branches; next 1.6; commitid v2mPP96r9UqbZF1E; 1.6 date 2022.04.28.11.43.15; author gdt; state Exp; branches; next 1.5; commitid dLt1FolNAzbWCXBD; 1.5 date 2022.01.02.11.59.06; author ryoon; state Exp; branches; next 1.4; commitid 6RE5CnwLgsltr3nD; 1.4 date 2021.11.09.11.51.11; author nia; state Exp; branches; next 1.3; commitid sGX0qgvCvD7p87gD; 1.3 date 2021.08.08.15.20.14; author gdt; state Exp; branches; next 1.2; commitid mRJWQzi7UNMnhb4D; 1.2 date 2021.08.07.23.22.48; author gdt; state Exp; branches; next 1.1; commitid fWCDv3y86xz3Z54D; 1.1 date 2021.03.23.10.49.44; author jperkin; state Exp; branches; next ; commitid ixZU1QAMvvOndqMC; desc @@ 1.14 log @gpsd: don't detect graphics/dia If installed, the build fails with: www/cycle.dia:1: parser error : Start tag expected, '<' not found Also dia requires $DISPLAY to be set during build, so not suitable for pkgsrc regardless. @ text @$NetBSD: patch-SConscript,v 1.13 2025/05/17 23:11:52 gdt Exp $ gpspipe requires libgpsd for serial.c cfmakeraw() compat. \todo Fix upstream? - disable check for graphics/dia --- SConscript.orig 2025-05-16 04:18:05.000000000 +0000 +++ SConscript @@@@ -1535,7 +1535,7 @@@@ if not cleaning and not helping: have_canplayer = config.CheckProg('canplayer') have_coverage = config.CheckProg('coverage') have_cppcheck = config.CheckProg('cppcheck') - have_dia = config.CheckProg('dia') + # have_dia = config.CheckProg('dia') have_flake8 = config.CheckProg('flake8') have_pycodestyle = config.CheckProg('pycodestyle') have_pylint = config.CheckProg('pylint') @@@@ -2078,7 +2078,7 @@@@ gpsmon = env.Program('gpsmon/gpsmon', gp LIBS=[libgpsd_static, libgps_static], parse_flags=gpsdflags + gpsflags + ncurseslibs) gpspipe = env.Program('clients/gpspipe', ['clients/gpspipe.c'], - LIBS=[libgps_static], + LIBS=[libgpsd_static, libgps_static], parse_flags=gpsflags) gpsrinex = env.Program('clients/gpsrinex', ['clients/gpsrinex.c'], LIBS=[libgps_static], @ 1.13 log @geography/gpsd: Update to 3.26.1 3.26.1: 17 May 2025 Increment libgps version Update Debian Trixie in build.adoc Fix buffer overrun in cgps. Make gpsmon deprecation slightly more obvious. Fix some *BSD compiler warnings Fix numerous typos. 3.26: 11 May 2025 Handle NTRIPv2 that comes in "chunks". Add many UBX decodes. Mostly in ubxtool, some in gpsd. Improve TSIP and UBX intitalization. Gather Antenna Status (ant_stat) and Jamming (jam) and send to JSON. Always build u-blox, RTCM104V2, RTCM104V3 drivers. Add partial support for badly documented ALLYSTAR GNSS messages. Add minimal support for Unicore GNSS messages. Add minimal support for CASIC GNSS messages. Add minimal support for buggy Inertial Sense GNSS messages. Try to work better as non-root using non-standard "capabilities". Add SUBSYSTEM=gnss rule to gpsd.rules Moved ntploggps from NTPSec to GPSD and renamed to gpslogntp. Fix many build, Coverity, and Codacy warnings. Improved Python interface for the lexer. Add support for new BeiDou PRNs and subframes. Officially deprecate gpsmon. Improve support for NMEA 4.11 (a stealthy moving target). Remove Oceanserver IMU support. Never worked well. Always with build ubx, NMEA 103, rtcm104v2 and rtcm104v3 support. Add support for jamming detection. Add Go client example. Add support for RTCM3.2 Note: The new "chunk" code led to a short lived bug that led to CVE-2023-43628, a buffer overrun. That bug never appeared in any gpsd release. @ text @d1 1 a1 1 $NetBSD: patch-SConscript,v 1.12 2025/02/10 14:29:59 wiz Exp $ d6 3 a8 1 --- SConscript.orig 2025-05-12 02:16:11.000000000 +0000 d10 9 @ 1.12 log @gpsd: fix patch offset NFCI @ text @d1 1 a1 4 $NetBSD: patch-SConscript,v 1.11 2025/02/10 14:29:28 wiz Exp $ Support Ruby 3.2, 3.3, and 3.4 versioned asciidoctor binaries. https://gitlab.com/gpsd/gpsd/-/issues/302 d6 1 a6 1 --- SConscript.orig 2023-01-10 22:38:26.000000000 +0000 d8 1 a8 14 @@@@ -1410,6 +1410,12 @@@@ if not cleaning and not helping: # do we have asciidoctor, perhaps versioned? adoc_prog = env.WhereIs('asciidoctor') if (not adoc_prog): + adoc_prog = env.WhereIs('asciidoctor34') + if (not adoc_prog): + adoc_prog = env.WhereIs('asciidoctor33') + if (not adoc_prog): + adoc_prog = env.WhereIs('asciidoctor32') + if (not adoc_prog): adoc_prog = env.WhereIs('asciidoctor31') if (not adoc_prog): adoc_prog = env.WhereIs('asciidoctor30') @@@@ -2054,7 +2060,7 @@@@ gpsmon = env.Program('gpsmon/gpsmon', gp @ 1.11 log @gpsd: handle ruby-3.4-versioned asciidoctor Fixes build with Ruby 3.4. @ text @d1 1 a1 1 $NetBSD: patch-SConscript,v 1.10 2024/10/11 14:01:48 wiz Exp $ d24 1 a24 1 @@@@ -2054,7 +2058,7 @@@@ gpsmon = env.Program('gpsmon/gpsmon', gp @ 1.10 log @gpsd: support Ruby 3.3 File bug report upstream, and refer to it. @ text @d1 1 a1 1 $NetBSD: patch-SConscript,v 1.9 2023/03/11 22:26:47 wiz Exp $ d3 1 a3 1 Support Ruby 3.2 and 3.3 versioned asciidoctor binaries. d11 1 a11 1 @@@@ -1410,6 +1410,10 @@@@ if not cleaning and not helping: d15 2 @ 1.9 log @gpsd: fix build with ruby 3.2 @ text @d1 1 a1 1 $NetBSD: patch-SConscript,v 1.8 2023/03/09 00:52:42 gdt Exp $ d3 2 a4 2 Catch up with ruby default version changes. \todo Fix upstream. d11 1 a11 1 @@@@ -1410,6 +1410,8 @@@@ if not cleaning and not helping: d15 2 d22 1 a22 1 @@@@ -2054,7 +2056,7 @@@@ gpsmon = env.Program('gpsmon/gpsmon', gp @ 1.8 log @geography/gpsd: Update to 3.25 3.25: 2022-01-09 Have ubxtool "-w 0" run forever. Bump libgps version to 30.0 Change fixsource_t, store server locally, make pointers const. Move gpsd_hexpack() to gps.h as gps_hexpack() Move gpsd_hexdump() to gps.h as gps_hexdump() Allow gpsctl -s/--ship to work without -f. Grab prRes and quality from u-blox 8+, into JSON, then into xgps. New GPSD-MIB, installed in share/mibs/gpsd. gpssnmp supports GPSD-MIB in pass and pass_persist modes Add decodes for NMEA $xxHDM, $xxROT and $xxXDR Add Magnetic Heading (mheading) and Rate of Rotation (rot) to attitude_t Allow NTP time from gpsd://, tcp:// and udp:// sources Add the -B, --nobuffer, option to gpspipe. gpsd opens $RUNDIR/chrony.clk.XXX.sock to supply serial time to chronyd. Add -g and --garmin options to gpxlogger for depth. Add -F and --filein options to gpxlogger to read GPSD JSON from a file. @ text @d1 1 a1 1 $NetBSD: patch-SConscript,v 1.7 2022/11/14 14:07:34 gdt Exp $ d9 1 a9 1 --- SConscript.orig 2022-04-27 21:31:21.000000000 +0000 d11 10 a20 1 @@@@ -2018,7 +2020,7 @@@@ gpsmon = env.Program('gpsmon/gpsmon', gp @ 1.7 log @geography/gpsd: Catch up with ruby version changes The pathname of asciidoctor changes when pkgsrc changes the default ruby version. Upstream gpsd has code to look for asciidoctorNN for several NN, but not 31. However, pkg_alternatives provides asciidoctor which is found, making this not noticeable when building on normal systems -- but of course bulk builds failed. @ text @d1 1 a1 1 $NetBSD: patch-SConscript,v 1.6 2022/04/28 11:43:15 gdt Exp $ a10 14 @@@@ -1380,9 +1380,11 @@@@ if not cleaning and not helping: # do we have asciidoctor, perhaps versioned? adoc_prog = env.WhereIs('asciidoctor') if (not adoc_prog): - adoc_prog = env.WhereIs('asciidoctor27') + adoc_prog = env.WhereIs('asciidoctor31') + if (not adoc_prog): + adoc_prog = env.WhereIs('asciidoctor30') if (not adoc_prog): - adoc_prog = env.WhereIs('asciidoctor26') + adoc_prog = env.WhereIs('asciidoctor27') config.env['manbuild'] = config.env['manbuild'].lower() if ((not config.env['manbuild'] or @ 1.6 log @geography/gpsd: Update to 3.24 3.24: 2022-04-22 NTRIP 2.0 now works. But still only plain HTML, not RTP, etc. Remove ntrip option and NTRIP_ENABLE. Always build. Remove passthrough option and PASSTHROUGH_ENABLE. Always build. Remove nmea0183 option and NMEA0183_ENABLE. Always build. Remove netfeed option and NETFEED_ENABLE. Always build. gpsd will retry ntrip:// and tcp:// connections cgps can expand to show more sats. Added --rtk option. maidenhead() checks for input errors. Better SHM logs. PPS and TOFF JSON now include shm used, and real precision. Add initial, untested, TSIPv1 support split debug messages into different syslog() levels. New ppscheck options, and can use /dev/ppsX devices. First try at TSIPv1 protocol decodes. Decode Quectel $PQVERNO for firmware version Decode Skytrak PX1172RH_DS messages. @ text @d1 4 a4 1 $NetBSD: patch-SConscript,v 1.4 2021/11/09 11:51:11 nia Exp $ d9 1 a9 1 --- SConscript.orig 2021-09-21 21:53:44.000000000 +0000 d11 15 a25 1 @@@@ -1930,7 +1930,7 @@@@ gpsmon = env.Program('gpsmon/gpsmon', gp @ 1.5 log @gpsd: Fix build with Python 3.10 @ text @d1 1 a1 1 $NetBSD$ a5 2 Support Python 3.10 or later. d8 1 a8 20 @@@@ -1516,15 +1516,13 @@@@ if not cleaning and not helping and conf # announce(python_config) # aiogps is only available on Python >= 3.6 - sysver = config.GetPythonValue('target version', - 'import sys', - '"%d.%d" % sys.version_info[0:2]') + sysver = sys.version_info - if 3 > int(sysver[0]) or 6 > int(sysver[2]): + if 3 > sysver[0] or 6 > sysver[1]: config.env['aiogps'] = False announce("WARNING: Python%s too old (need 3.6): " "gps/aiogps.py will not be installed" % - (sysver), end=True) + (str(sysver[0]) + "." + str(sysver[1])), end=True) else: config.env['aiogps'] = True @@@@ -1930,7 +1928,7 @@@@ gpsmon = env.Program('gpsmon/gpsmon', gp @ 1.4 log @gpsd: Properly detect and honor the user's preferred Ruby version. @ text @d1 1 a1 1 $NetBSD: patch-SConscript,v 1.3 2021/08/08 15:20:14 gdt Exp $ d6 2 d10 20 a29 1 @@@@ -1930,7 +1930,7 @@@@ gpsmon = env.Program('gpsmon/gpsmon', gp @ 1.3 log @gpsd: Add patch to use asciidoctor27 (in addition to asciidoctor26) @ text @d1 1 a1 4 $NetBSD: patch-SConscript,v 1.2 2021/08/07 23:22:48 gdt Exp $ Search for asciidoctor from ruby27 also. \todo Apply upstream. d6 1 a6 1 --- SConscript.orig 2021-08-05 22:14:52.000000000 +0000 d8 1 a8 10 @@@@ -1308,6 +1308,8 @@@@ if not cleaning and not helping: # do we have asciidoctor, perhaps versioned? adoc_prog = env.WhereIs('asciidoctor') if (not adoc_prog): + adoc_prog = env.WhereIs('asciidoctor27') + if (not adoc_prog): adoc_prog = env.WhereIs('asciidoctor26') config.env['manbuild'] = config.env['manbuild'].lower() @@@@ -1901,7 +1903,7 @@@@ gpsmon = env.Program('gpsmon/gpsmon', gp @ 1.2 log @gpsd: Update to 3.23 packaging changes: Clean up scons arg scheme, and ensure that scons is always called with the same args (other than the action). 3.23: 2020-08-06 doc/*xml all moved into www/internals.adoc Convert all DocBook (.xml) to AsciiDoctor (.adoc) Remove all XSL remnants. gpsplot: speedup, add new options. driver_ubx.c: Add decode for UBX-NAV-STATUS gps/ubx.py: Improve decode for UBX-NAV-STATUS cgps: Add popup help, interactive options. Reorganize and split the man pages. Small updates for u-blox M8 and M10 Deprecated mtk3331 and ashtech build options. Use nmea0183 instead. gpssnmp: Move from contrib/ to clients, add manpage Add www/gpsd-client-example-code.adoc Add gpsdebuginfo script and man page. ubxtool: Add BeiDou, Galileo, GLONASS, QZSS, and partial SBAS subframe decodes Max serial port speed raised to 921,600. SUBFRAME JSON now includes new fields to support multiple constellations. gpsd: Add some ADR and UDR message partial decodes. ubxtool: Add some ADR and UDR message polls and decodes. Remove COMPASS_ENABLE. Always compile attitude code. contrib/webgps.py: use argparse, arguments -V, --version, --no-html-head. Add readonly flag to DEVICE JSON. Control messages to gpsd now return JSON, instead of, sometimes, OK or ERROR. gpsfake uses "# Date: yyyy-mm-dd" to set initial time. Don't compute wrong GPS rollover after 2021-10-23. Bump libgps to version 29. @ text @d1 4 a4 1 $NetBSD: patch-SConscript,v 1.1 2021/03/23 10:49:44 jperkin Exp $ d7 1 d9 1 a9 1 --- SConscript.orig 2021-07-31 00:09:29.000000000 +0000 d11 10 a20 1 @@@@ -1901,7 +1901,7 @@@@ gpsmon = env.Program('gpsmon/gpsmon', gp @ 1.1 log @gpsd: Support OS that lack cfmakeraw(). Fixes NetBSD/pkgsrc#79 and NetBSD/pkgsrc#80. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- SConscript.orig 2021-01-09 02:35:30.000000000 +0000 d7 3 a9 3 @@@@ -1975,7 +1975,7 @@@@ gpsdctl = env.Program('clients/gpsdctl', LIBS=[libgps_static], parse_flags=gpsflags) @