From 0c609c69e52f9753f3cd98501d5abde6c60c64e3 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Fri, 27 May 2011 20:53:27 -0300
Subject: system/gpsd: Updated for version 2.96.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 system/gpsd/README.build    | 11 ++++++-----
 system/gpsd/gpsd.SlackBuild | 11 ++++++-----
 system/gpsd/gpsd.info       |  6 +++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/system/gpsd/README.build b/system/gpsd/README.build
index 8455d5182e..1aeeea6739 100644
--- a/system/gpsd/README.build
+++ b/system/gpsd/README.build
@@ -5,7 +5,7 @@ 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="bluetooth,pps-on-cts" DISABLE=pps ./gpsd.SlackBuild
 
 Multiple options may be separated by commas (as shown above)
 or by spaces.
@@ -14,8 +14,6 @@ or by spaces.
 The following devices and features may be enabled 
 (by default they are disabled).
 
-  garmintxt      enable Garmin Simple Text support
-  tnt            enable True North Technologies support
   profiling      enable profiling support
   pps-on-cts     Enable PPS pulse on CTS rather than DCD
   gpsd-user=username
@@ -36,6 +34,7 @@ The following devices and features may be disabled
 
   dbus          disable DBUS support
   nmea          disable NMEA support
+  oncore        disable Motorola OnCore chipset support
   sirf          disable SiRF chipset support
   superstar2    disable SuperStarII chipset support
   tsip          disable Trimble TSIP support
@@ -46,8 +45,11 @@ The following devices and features may be disabled
   ashtech       disable Ashtech support
   navcom        disable Navcom support
   garmin        disable Garmin kernel driver support
+  garmintxt     disable Garmin Simple Text support
+  tnt           disable True North Technologies support
   oceanserver   disable OceanServer support
   ubx           disable UBX Protocol support
+  geostar       disable Geostar Protocol support
   evermore      disable EverMore binary support
   mkt3301       disable MKT-3301 support
   gpsclock      disable GPSClock support
@@ -55,9 +57,8 @@ 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
+  controlsend   do not allow gpsctl/gpsmon to change device settings
diff --git a/system/gpsd/gpsd.SlackBuild b/system/gpsd/gpsd.SlackBuild
index 12687976c4..e9c0adc5f6 100644
--- a/system/gpsd/gpsd.SlackBuild
+++ b/system/gpsd/gpsd.SlackBuild
@@ -1,10 +1,11 @@
 #!/bin/sh
+
 # Slackware build script for gpsd
 # Written by David Spencer <baildon.research@googlemail.com>
 # This script is dedicated to the public domain
 
 PRGNAM=gpsd
-VERSION=${VERSION:-2.95}
+VERSION=${VERSION:-2.96}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,7 +57,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+#  2.96 has a tarball pathname snafu
+TARVERSION="${VERSION}bis"
+tar xvf $CWD/$PRGNAM-$TARVERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -81,9 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 
-# --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
+make 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
diff --git a/system/gpsd/gpsd.info b/system/gpsd/gpsd.info
index 9dc93c9805..47d9e66b96 100644
--- a/system/gpsd/gpsd.info
+++ b/system/gpsd/gpsd.info
@@ -1,8 +1,8 @@
 PRGNAM="gpsd"
-VERSION="2.95"
+VERSION="2.96"
 HOMEPAGE="http://gpsd.berlios.de/"
-DOWNLOAD="http://download.berlios.de/gpsd/gpsd-2.95.tar.gz"
-MD5SUM="12535a9ed9fecf9ea2c5bdc9840da5ae"
+DOWNLOAD="http://download.berlios.de/gpsd/gpsd-2.96bis.tar.gz"
+MD5SUM="52b00cab0fb34bbf1923ae35c7ced6c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
-- 
cgit v1.2.3