gis/gpsd: Updated for version 3.25.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 30 insertions, 26 deletions

diff --git a/gis/gpsd/README b/gis/gpsd/README
index 379d93e8bd5c..6f36471687a5 100644
--- a/gis/gpsd/README
+++ b/gis/gpsd/README
@@ -1,19 +1,21 @@
-gpsd is a service daemon that monitors one or more GPSes attached to
-a host computer through serial or USB ports, making all data on the
-location, course, and velocity available to be queried on TCP port
-2947 of the host computer.  With gpsd, multiple GPS client applications
-(such as navigational and wardriving software) can share access to GPSes
-without contention or loss of data.  Applications that presently use
-gpsd include Viking, foxtrotgps and Kismet.
+gpsd is a userland daemon acting as a translator between GPS, GNSS, and
+AIS receivers and their clients. gpsd listens on port 2947 for clients
+requesting position/time/velocity information.  The receivers are
+expected to generate position information in a well-known format -- as
+NMEA-0183 sentences, SiRF binary, Rockwell binary, Garmin binary
+format, or other vendor binary protocols.  gpsd takes this
+information from the GPS and translates it into something uniform and
+easier to understand for clients.  The distribution includes sample
+clients, application interface libraries, and test/profiling tools.
 
 See README.build for some build options that might be useful.
 
 To enable automatic startup of gpsd at boot time, or when a GPS device
 is connected via USB, you need to do the following four steps:
 
-1. Copy the file /lib/udev/rules.d/97-gpsd.rules to /etc/udev/rules.d/
+1. Copy the file /lib/udev/rules.d/25-gpsd.rules to /etc/udev/rules.d/
 
-2. Edit the file /etc/udev/rules.d/97-gpsd.rules and uncomment the line
+2. Edit the file /etc/udev/rules.d/25-gpsd.rules and uncomment the line
 (or lines) beginning '#ATTRS' that corresponds to your GPS hardware.
 To avoid confusion with other USB serial devices that you might have,
 do not uncomment lines that do not correspond to your GPS hardware.
@@ -32,3 +34,7 @@ Configuration options may be set in the file /etc/rc.d/rc.gpsd.conf.
 The defaults will usually be adequate.  However, if your GPS is on a
 real (non-USB) serial port -- for example, /dev/ttyS0 -- you should add
 /dev/ttyS0 to GPS_DEVICES in /etc/rc.d/rc.gpsd.conf.
+
+Optional dependencies:
+- python3-matplotlib-inline is required for gpsplot
+- pyserial is an optional dependency for ubxtool and zerk
diff --git a/gis/gpsd/gpsd.SlackBuild b/gis/gpsd/gpsd.SlackBuild
index f2befd62112d..64ef46a3a53e 100644
--- a/gis/gpsd/gpsd.SlackBuild
+++ b/gis/gpsd/gpsd.SlackBuild
@@ -22,15 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# 20230629 bkw: Modified by SlackBuilds.org, BUILD=2:
-# - /usr/sbin/gpsinit was missing +x permission.
-# - rm generic INSTALL from doc dir.
+# Maintained by Roberto Puzzanghera <admin {at} sagredo [dot] eu>
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gpsd
-VERSION=${VERSION:-3.18.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.25}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -105,11 +103,13 @@ find -L . \
 # g++ may throw an 'internal compiler error' in the QT bindings.
 # *Nothing* actually uses this, but you can enable it by deleting
 # 'qt=no' below (and you should keep the libQgpsmm manpage)
+PYTHONPATH=/usr/lib${LIBDIRSUFFIX}/python$(python3 -c 'import sys; print(sys.version[:3]);')/site-packages \
 CFLAGS=$SLKCFLAGS \
 scons \
   prefix=/usr \
   libdir=/usr/lib${LIBDIRSUFFIX} \
-  python_libdir=/usr/lib${LIBDIRSUFFIX}/python$(python -c 'import sys; print sys.version[:3]')/site-packages \
+  target_python=python3 \
+  python_libdir=/usr/lib${LIBDIRSUFFIX}/python$(python3 -c 'import sys; print(sys.version[:3]);')/site-packages \
   pkgconfigdir=/usr/lib${LIBDIRSUFFIX}/pkgconfig \
   mandir=/usr/man \
   chrpath=no \
@@ -120,7 +120,7 @@ scons \
 DESTDIR=$PKG \
 scons \
   --implicit-deps-unchanged \
- install
+  udev-install
 
 # Fix daft permission from upstream
 chmod 755 $PKG/usr/bin/gpsprof
@@ -148,9 +148,7 @@ mkdir -p $PKG/lib/udev/rules.d
 
 # Comment out all udev rules: the user is expected to enable only the
 # rules required (see README)
-cat gpsd.rules | \
-  sed 's/^ATTRS/#&/' \
-  >$PKG/lib/udev/rules.d/97-gpsd.rules
+sed -i 's/^ATTRS/#&/g' $PKG/lib/udev/rules.d/25-gpsd.rules
 
 install -D -m 0644 $CWD/rc.gpsd.new \
   $PKG/etc/rc.d/rc.gpsd.new
@@ -158,7 +156,7 @@ install -D -m 0644 $CWD/rc.gpsd.conf.new \
   $PKG/etc/rc.d/rc.gpsd.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING README TODO build.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README.adoc TODO build.adoc $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/gis/gpsd/gpsd.info b/gis/gpsd/gpsd.info
index 5a822b34736b..eb14c475ba30 100644
--- a/gis/gpsd/gpsd.info
+++ b/gis/gpsd/gpsd.info
@@ -1,10 +1,10 @@
 PRGNAM="gpsd"
-VERSION="3.18.1"
-HOMEPAGE="http://catb.org/gpsd/"
-DOWNLOAD="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-3.18.1.tar.gz"
-MD5SUM="3b11f26b295010666b1767b308f90bc5"
+VERSION="3.25"
+HOMEPAGE="https://gpsd.gitlab.io/gpsd/index.html"
+DOWNLOAD="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-3.25.tar.gz"
+MD5SUM="e8903e7af2d56445b82a4c3be6ec8e26"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Spencer"
-EMAIL="baildon.research@googlemail.com"
+MAINTAINER="Roberto Puzzanghera"
+EMAIL="admin@sagredo.eu"