system/gpsd: Updated for version 2.94.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 33 insertions, 26 deletions

diff --git a/system/gpsd/README b/system/gpsd/README
index 6bf5e8e83675..5a1d1b850891 100644
--- a/system/gpsd/README
+++ b/system/gpsd/README
@@ -1,11 +1,8 @@
-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/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 pyGPS, Kismet, GPSdrive, 
-gpeGPS, position, roadmap, roadnav, and gaia.
+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 and Kismet.
 
 See README.build for some additional build options that might be useful.
diff --git a/system/gpsd/README.build b/system/gpsd/README.build
index a3b58bfa11d9..54a6679c16d1 100644
--- a/system/gpsd/README.build
+++ b/system/gpsd/README.build
@@ -5,7 +5,10 @@ Support for various devices and features may be enabled
 and/or disabled by setting the variables ENABLE and DISABLE
 before running gpsd.SlackBuild, for example 
 
-ENABLE=garmintxt DISABLE="garmin dbus" ./gpsd.SlackBuild
+ENABLE=garmintxt DISABLE="garmin,dbus" ./gpsd.SlackBuild
+
+Multiple options may be separated by commas (as shown above)
+or by spaces.
 
 
 The following devices and features may be enabled 
@@ -25,6 +28,7 @@ The following devices and features may be enabled
   max-devices=nnn
                  compile with maximum allowed devices
   squelch        squelch gpsd_report and gpsd_hexdump to save cpu
+  raw            enable raw measurement processing
 
 
 The following devices and features may be disabled
@@ -50,7 +54,9 @@ The following devices and features may be disabled
   rtcm104v3     disable rtcm104v3 support
   ntrip         disable NTRIP support
   aivdm         disable Aivdm support
+  oncore        disable Motorola OnCore chipset support
   ntpshm        disable NTP time hinting support
   pps           disable PPS time syncing support
+  timing        disable latency timing support
   reconfigure   do not allow gpsd to change device settings
   controlsend   do not allow gpsd to change device settings
diff --git a/system/gpsd/gpsd.SlackBuild b/system/gpsd/gpsd.SlackBuild
index 13c61d03e93b..4ebde3fcb318 100644
--- a/system/gpsd/gpsd.SlackBuild
+++ b/system/gpsd/gpsd.SlackBuild
@@ -1,19 +1,17 @@
 #!/bin/sh
 # Slackware build script for gpsd
-# Written by David Spencer <nobbutl@yahoo.co.uk>
+# Written by David Spencer <baildon.research@googlemail.com>
 # This script is dedicated to the public domain
 
 PRGNAM=gpsd
-VERSION=2.39
+VERSION=2.94
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -40,14 +38,14 @@ fi
 set -e
 
 ENABLELIST=""
-set -- $ENABLE
+set -- $(echo $ENABLE | sed 's/,/ /g')
 while [[ "$1" != "" ]]
 do
   ENABLELIST+=" --enable-$1"
   shift
 done
 DISABLELIST=""
-set -- $DISABLE
+set -- $(echo $DISABLE | sed 's/,/ /g')
 while [[ "$1" != "" ]]
 do
   DISABLELIST+=" --disable-$1"
@@ -64,8 +62,12 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 # Fixup the pkgconfig file templates
+# (force "pkg-config --libs libgps[d]" to return -L/usr/lib64 on x86_64)
 patch -p1 < $CWD/gpsd-pkgconfig_templates.patch
 
+# Fix libusb detection (thanks Niels Horn!)
+sed "s|/usr/lib/libusb|/usr/lib$LIBDIRSUFFIX/libusb|" -i configure
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -75,16 +77,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --enable-dbus \
+  --build=$ARCH-slackware-linux \
   $ENABLELIST \
   $DISABLELIST
 
 make
-make install-strip DESTDIR=$PKG
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+# --no-print-directory prevents crazy gps-2.94-py2.6.egg-info install path
+# (thanks again Niels Horn!)
+make --no-print-directory install-strip DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING INSTALL README TODO $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/gpsd/gpsd.info b/system/gpsd/gpsd.info
index 984c5c5fdc94..dc0754004ab4 100644
--- a/system/gpsd/gpsd.info
+++ b/system/gpsd/gpsd.info
@@ -1,10 +1,10 @@
 PRGNAM="gpsd"
-VERSION="2.39"
+VERSION="2.94"
 HOMEPAGE="http://gpsd.berlios.de/"
-DOWNLOAD="http://download.berlios.de/gpsd/gpsd-2.39.tar.gz"
-MD5SUM="3db437196a6840c252fca99b6c19d4d0"
+DOWNLOAD="http://download.berlios.de/gpsd/gpsd-2.94.tar.gz"
+MD5SUM="ce70bcd707ac1df861d4c72f503c09d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
-EMAIL="nobbutl@yahoo.co.uk"
-APPROVED="dsomero"
+EMAIL="baildon.research@googlemail.com"
+APPROVED="rworkman"