Updated init and conf files for bug #281705.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 21 insertions, 17 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 63a98faf1b26..9c4dc60c4f51 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.42 2009/08/01 17:01:19 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.43 2009/08/23 00:01:40 nerdboy Exp $
+
+  22 Aug 2009; Steve Arnold <nerdboy@gentoo.org> files/gpsd.conf,
+  files/gpsd.init:
+  Updated init and conf files for bug #281705.  Newer gpsd appears to play
+  much better with start-stop-daemon now (plus the gpsd arguments have
+  changed again).
 
   01 Aug 2009; Steve Arnold <nerdboy@gentoo.org> gpsd-2.39.ebuild:
   Made python a hard dependency for this version (upstream changes, see 
diff --git a/sci-geosciences/gpsd/files/gpsd.conf b/sci-geosciences/gpsd/files/gpsd.conf
index f9c7c4a2d763..baf9bb1695d0 100644
--- a/sci-geosciences/gpsd/files/gpsd.conf
+++ b/sci-geosciences/gpsd/files/gpsd.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v 1.6 2008/02/23 20:03:59 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v 1.7 2009/08/23 00:01:40 nerdboy Exp $
 
 # Config file for gpsd server
 
@@ -8,21 +8,19 @@
 # setup for USB/Serial, Garmin, or other, however, without hotplug,
 # gpsd still needs to have the device set on the commandline.
 
-# Set GPS_DEV to the device to be used by the gpsd server.
-# This device must have the group tty and be writable (see
-# the INSTALL file in the docs).
+# A device may be a local serial device for GPS input, or a URL of 
+# the form:
+#      [{dgpsip|ntrip}://][user:passwd@]host[:port][/stream]
+# in which case it specifies an input source for DGPS or ntrip data.
+# Set GPS_DEV to the device to be used by the gpsd server (see the
+# INSTALL file in the docs for more info).  Run gpsd -h to see a list
+# supported driver types (most are enabled by default).
 
 # This example is for a Deluo GPS Serial/USB converter dongle, really
 # a pl2303 chip - CONFIG_USB_SERIAL_PL2303 in modern 2.6 kernels.
 # The normal udev config provides the correct /dev/ttyUSB0 device.
-# The second example is just a normal serial port...
 
-#GPS_DEV="/dev/ttyUSB0"
+GPS_DEV="/dev/ttyUSB0"
 
-#GPS_DEV="/dev/ttyS0
-
-# Use the following for gpsd with ntp instead of the older one below
-#GPSD_OPTS="-n ${GPS_DEV}"
-
-GPSD_OPTS="-P /var/run/gpsd.pid -f GPS0 -F /var/run/gpsd.sock"
+GPSD_OPTS="-b -n -P /var/run/gpsd.pid -F /var/run/gpsd.sock"
 
diff --git a/sci-geosciences/gpsd/files/gpsd.init b/sci-geosciences/gpsd/files/gpsd.init
index d3b7d3501006..35219c2a46f6 100755
--- a/sci-geosciences/gpsd/files/gpsd.init
+++ b/sci-geosciences/gpsd/files/gpsd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v 1.6 2007/06/11 03:04:29 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v 1.7 2009/08/23 00:01:40 nerdboy Exp $
 
 # You can use this init script to manage a serial port GPS or other
 # non-hotplug device (or any device for that matter).  By design,
@@ -22,14 +22,14 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting gpsd"
-	touch /var/run/gpsd.pid
-	/usr/sbin/gpsd ${GPSD_OPTS} ${GPS_DEV}
+	start-stop-daemon --start --quiet --exec /usr/sbin/gpsd \
+		-- ${GPSD_OPTS} ${GPS_DEV}
 	eend $? "Failed to start gpsd"
 }
 
 stop() {
 	ebegin "Stopping gpsd"
-	killall -q gpsd >/dev/null
+	start-stop-daemon --stop --quiet --pidfile /var/run/gpsd.pid
 	eend $? "Failed to stop gpsd"
 	rm -f /var/run/gpsd.pid
 }