From 4fbc554260be4b80ede86518123154d0aff8fdc6 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Wed, 8 Dec 2010 11:52:49 -0200
Subject: system/gpsd: Updated for version 2.95

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

(limited to 'system/gpsd')

diff --git a/system/gpsd/README.build b/system/gpsd/README.build
index 54a6679c16..8455d5182e 100644
--- a/system/gpsd/README.build
+++ b/system/gpsd/README.build
@@ -16,7 +16,6 @@ The following devices and features may be enabled
 
   garmintxt      enable Garmin Simple Text support
   tnt            enable True North Technologies support
-  oceanserver    enable OceanServer support
   profiling      enable profiling support
   pps-on-cts     Enable PPS pulse on CTS rather than DCD
   gpsd-user=username
@@ -29,6 +28,7 @@ The following devices and features may be enabled
                  compile with maximum allowed devices
   squelch        squelch gpsd_report and gpsd_hexdump to save cpu
   raw            enable raw measurement processing
+  bluetooth      enable experimental Bluetooth support via BlueZ
 
 
 The following devices and features may be disabled
@@ -46,6 +46,7 @@ The following devices and features may be disabled
   ashtech       disable Ashtech support
   navcom        disable Navcom support
   garmin        disable Garmin kernel driver support
+  oceanserver   disable OceanServer support
   ubx           disable UBX Protocol support
   evermore      disable EverMore binary support
   mkt3301       disable MKT-3301 support
diff --git a/system/gpsd/gpsd.SlackBuild b/system/gpsd/gpsd.SlackBuild
index 4ebde3fcb3..12687976c4 100644
--- a/system/gpsd/gpsd.SlackBuild
+++ b/system/gpsd/gpsd.SlackBuild
@@ -4,7 +4,7 @@
 # This script is dedicated to the public domain
 
 PRGNAM=gpsd
-VERSION=2.94
+VERSION=${VERSION:-2.95}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -39,14 +39,14 @@ set -e
 
 ENABLELIST=""
 set -- $(echo $ENABLE | sed 's/,/ /g')
-while [[ "$1" != "" ]]
+while [ "$1" != "" ]
 do
   ENABLELIST+=" --enable-$1"
   shift
 done
 DISABLELIST=""
 set -- $(echo $DISABLE | sed 's/,/ /g')
-while [[ "$1" != "" ]]
+while [ "$1" != "" ]
 do
   DISABLELIST+=" --disable-$1"
   shift
@@ -65,9 +65,6 @@ chmod -R u+w,go+r-w,a-s .
 # (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 \
@@ -76,6 +73,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --disable-static \
   --enable-dbus \
   --build=$ARCH-slackware-linux \
   $ENABLELIST \
diff --git a/system/gpsd/gpsd.info b/system/gpsd/gpsd.info
index dc0754004a..9dc93c9805 100644
--- a/system/gpsd/gpsd.info
+++ b/system/gpsd/gpsd.info
@@ -1,10 +1,10 @@
 PRGNAM="gpsd"
-VERSION="2.94"
+VERSION="2.95"
 HOMEPAGE="http://gpsd.berlios.de/"
-DOWNLOAD="http://download.berlios.de/gpsd/gpsd-2.94.tar.gz"
-MD5SUM="ce70bcd707ac1df861d4c72f503c09d1"
+DOWNLOAD="http://download.berlios.de/gpsd/gpsd-2.95.tar.gz"
+MD5SUM="12535a9ed9fecf9ea2c5bdc9840da5ae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
 EMAIL="baildon.research@googlemail.com"
-APPROVED="rworkman"
+APPROVED="Niels Horn"
-- 
cgit v1.2.3