system/gpsd: Updated for version 2.39

6 files changed, 92 insertions, 64 deletions

diff --git a/system/gpsd/README b/system/gpsd/README
index 80b0737248..6bf5e8e836 100644
--- a/system/gpsd/README
+++ b/system/gpsd/README
@@ -8,60 +8,4 @@ GPSes without contention or loss of data.
 Applications that presently use gpsd include pyGPS, Kismet, GPSdrive, 
 gpeGPS, position, roadmap, roadnav, and gaia.
 
-
-Enabling and disabling devices and features
--------------------------------------------
-
-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
-
-
-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
-  oceanserver    enable OceanServer support
-  profiling      enable profiling support
-  pps-on-cts     Enable PPS pulse on CTS rather than DCD
-  gpsd-user=username
-                 GPSD privilege revokation user (default 'nobody')
-  fixed-port-speed=nnn
-                 compile with fixed serial port speed
-  max-clients=nnn
-                 compile with limited maximum clients
-  max-devices=nnn
-                 compile with maximum allowed devices
-  squelch        squelch gpsd_report and gpsd_hexdump to save cpu
-
-
-The following devices and features may be disabled
-(by default they are enabled).
-
-  dbus          disable DBUS support
-  nmea          disable NMEA support
-  sirf          disable SiRF chipset support
-  superstar2    disable SuperStarII chipset support
-  tsip          disable Trimble TSIP support
-  fv18          disable San Jose Navigation FV-18 support
-  tripmate      disable DeLorme TripMate support
-  earthmate     disable DeLorme EarthMate Zodiac support
-  itrax         disable iTrax hardware support
-  ashtech       disable Ashtech support
-  navcom        disable Navcom support
-  garmin        disable Garmin kernel driver support
-  ubx           disable UBX Protocol support
-  evermore      disable EverMore binary support
-  mkt3301       disable MKT-3301 support
-  gpsclock      disable GPSClock support
-  rtcm104v2     disable rtcm104v2 support
-  rtcm104v3     disable rtcm104v3 support
-  ntrip         disable NTRIP support
-  aivdm         disable Aivdm support
-  ntpshm        disable NTP time hinting support
-  pps           disable PPS time syncing support
-  reconfigure   do not allow gpsd to change device settings
-  controlsend   do not allow gpsd to change device settings
+See README.build for some additional build options that might be useful.
diff --git a/system/gpsd/README.build b/system/gpsd/README.build
new file mode 100644
index 0000000000..a3b58bfa11
--- /dev/null
+++ b/system/gpsd/README.build
@@ -0,0 +1,56 @@
+Enabling and disabling devices and features
+-------------------------------------------
+
+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
+
+
+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
+  oceanserver    enable OceanServer support
+  profiling      enable profiling support
+  pps-on-cts     Enable PPS pulse on CTS rather than DCD
+  gpsd-user=username
+                 GPSD privilege revokation user (default 'nobody')
+  fixed-port-speed=nnn
+                 compile with fixed serial port speed
+  max-clients=nnn
+                 compile with limited maximum clients
+  max-devices=nnn
+                 compile with maximum allowed devices
+  squelch        squelch gpsd_report and gpsd_hexdump to save cpu
+
+
+The following devices and features may be disabled
+(by default they are enabled).
+
+  dbus          disable DBUS support
+  nmea          disable NMEA support
+  sirf          disable SiRF chipset support
+  superstar2    disable SuperStarII chipset support
+  tsip          disable Trimble TSIP support
+  fv18          disable San Jose Navigation FV-18 support
+  tripmate      disable DeLorme TripMate support
+  earthmate     disable DeLorme EarthMate Zodiac support
+  itrax         disable iTrax hardware support
+  ashtech       disable Ashtech support
+  navcom        disable Navcom support
+  garmin        disable Garmin kernel driver support
+  ubx           disable UBX Protocol support
+  evermore      disable EverMore binary support
+  mkt3301       disable MKT-3301 support
+  gpsclock      disable GPSClock support
+  rtcm104v2     disable rtcm104v2 support
+  rtcm104v3     disable rtcm104v3 support
+  ntrip         disable NTRIP support
+  aivdm         disable Aivdm support
+  ntpshm        disable NTP time hinting support
+  pps           disable PPS time syncing 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-pkgconfig_templates.patch b/system/gpsd/gpsd-pkgconfig_templates.patch
new file mode 100644
index 0000000000..572225b932
--- /dev/null
+++ b/system/gpsd/gpsd-pkgconfig_templates.patch
@@ -0,0 +1,22 @@
+diff -Nur gpsd-2.39.orig/libgps.pc.in gpsd-2.39/libgps.pc.in
+--- gpsd-2.39.orig/libgps.pc.in	2009-02-17 06:56:57.000000000 -0600
++++ gpsd-2.39/libgps.pc.in	2009-10-05 14:30:12.894417725 -0500
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include
+ 
+ Name: GPSD
+diff -Nur gpsd-2.39.orig/libgpsd.pc.in gpsd-2.39/libgpsd.pc.in
+--- gpsd-2.39.orig/libgpsd.pc.in	2009-02-17 06:56:57.000000000 -0600
++++ gpsd-2.39/libgpsd.pc.in	2009-10-05 14:30:22.191417725 -0500
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include
+ 
+ Name: libgpsd
diff --git a/system/gpsd/gpsd.SlackBuild b/system/gpsd/gpsd.SlackBuild
index a534478e73..70f1ab037e 100644
--- a/system/gpsd/gpsd.SlackBuild
+++ b/system/gpsd/gpsd.SlackBuild
@@ -3,13 +3,12 @@
 # Written by David Spencer <nobbutl@yahoo.co.uk>
 # This script is dedicated to the public domain
 
-set -e
-
 PRGNAM=gpsd
 VERSION=2.39
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -26,6 +25,8 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 ENABLELIST=""
 set -- $ENABLE
 while [[ "$1" != "" ]]
@@ -50,6 +51,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Fixup the pkgconfig file templates
+patch -p1 < $CWD/gpsd-pkgconfig_templates.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -60,7 +64,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --enable-dbus \
   $ENABLELIST \
-  $DISABLELIST || exit 1
+  $DISABLELIST
 
 make
 make install-strip DESTDIR=$PKG
@@ -78,4 +82,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/gpsd/gpsd.info b/system/gpsd/gpsd.info
index 03a3fa2508..f7b841a246 100644
--- a/system/gpsd/gpsd.info
+++ b/system/gpsd/gpsd.info
@@ -2,7 +2,9 @@ PRGNAM="gpsd"
 VERSION="2.39"
 HOMEPAGE="http://gpsd.berlios.de/"
 DOWNLOAD="http://download.berlios.de/gpsd/gpsd-2.39.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="3db437196a6840c252fca99b6c19d4d0"
+MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
 EMAIL="nobbutl@yahoo.co.uk"
 APPROVED="dsomero"
diff --git a/system/gpsd/slack-desc b/system/gpsd/slack-desc
index f346f178c1..30eba3cd67 100644
--- a/system/gpsd/slack-desc
+++ b/system/gpsd/slack-desc
@@ -7,13 +7,13 @@
 
     |-----handy-ruler------------------------------------------------------|
 gpsd: gpsd (GPS service daemon)
-gpsd: 
+gpsd:
 gpsd: gpsd is a service daemon that monitors one or more GPSes attached to 
 gpsd: a host computer through serial or USB ports, making all data on the 
 gpsd: location/course/velocity available to be queried on TCP port 2947 
 gpsd: of the host computer. With gpsd, multiple GPS client applications 
 gpsd: (such as navigational and wardriving software) can share access to 
 gpsd: GPSes without contention or loss of data.
-gpsd: 
+gpsd:
 gpsd: Homepage: http://gpsd.berlios.de/
-gpsd: 
+gpsd: