From e8b9413ac2b347c10d3151a5b650273e63e95e7c Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Thu, 29 Nov 2012 04:20:46 +0000
Subject: [PATCH] update gpsd, removing obsolete rc.conf files, install to
 /usr/lib

---
 {support-pkg-gpsd => gpsd}/PKGBUILD     | 25 +++++++-------
 {support-pkg-gpsd => gpsd}/gpsd.install |  0
 support-pkg-gpsd/gpsd                   | 44 -------------------------
 support-pkg-gpsd/gpsd.conf.d            |  5 ---
 4 files changed, 11 insertions(+), 63 deletions(-)
 rename {support-pkg-gpsd => gpsd}/PKGBUILD (77%)
 rename {support-pkg-gpsd => gpsd}/gpsd.install (100%)
 delete mode 100644 support-pkg-gpsd/gpsd
 delete mode 100644 support-pkg-gpsd/gpsd.conf.d

diff --git a/support-pkg-gpsd/PKGBUILD b/gpsd/PKGBUILD
similarity index 77%
rename from support-pkg-gpsd/PKGBUILD
rename to gpsd/PKGBUILD
index dd8658131..082d96cd0 100644
--- a/support-pkg-gpsd/PKGBUILD
+++ b/gpsd/PKGBUILD
@@ -1,30 +1,26 @@
 #
 # KDE SC Packages for Chakra, part of chakra-project.org
 #
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=gpsd
-pkgver=3.4
+pkgver=3.7
 pkgrel=1
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://catb.org/gpsd/"
 screenshot="http://www.catb.org/gpsd/gpsd2.png"
 license=('BSD')
 depends=('python2' 'libusb' 'bluez' 'desktop-file-utils')
 optdepends=('php: generate a PHP status page for your GPS'
-            'php-gd: image support for the PHP status page'
-            'pygtk: GUI frontends')
+            'php-gd: image support for the PHP status page')
 makedepends=('scons' 'docbook-xsl' 'chrpath')
 backup=('etc/conf.d/gpsd')
 options=('!libtool')
 install="${pkgname}.install"
-source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'gpsd' 'gpsd.conf.d')
-md5sums=('c01353459faa68834309109d4e868460'
-         '8aea27e1b0c23f254f94861f7d898106'
-         '1f3402f8e33a7032b9ae6dfd077234f7'
-         '3e963df3f9f7ef3572ecc648ae829315')
+source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+md5sums=('52d9785eaf1a51298bb8900dbde88f98'
+         '07fa4bf23aa998dcb951790b63dbebff')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -46,13 +42,13 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Fix man pages path (FS#21715)
+  # Fix man pages path 
   sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
 
   export DESTDIR="${pkgdir}"
   scons install
 
-  install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd"
+  sed -i 's|/lib/udev/gpsd|/usr/lib/udev/gpsd|' gpsd.rules
 
   install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules"
 
@@ -72,7 +68,8 @@ package() {
   install -D -m644 packaging/X11/gpsd-logo.png \
     "${pkgdir}/usr/share/gpsd/gpsd-logo.png"
 
-  install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd"
+  install -D -m644 systemd/gpsd.service "${pkgdir}/usr/lib/systemd/system/gpsd.service"
+  install -D -m644 systemd/gpsd.socket "${pkgdir}/usr/lib/systemd/system/gpsd.socket"
 
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/support-pkg-gpsd/gpsd.install b/gpsd/gpsd.install
similarity index 100%
rename from support-pkg-gpsd/gpsd.install
rename to gpsd/gpsd.install
diff --git a/support-pkg-gpsd/gpsd b/support-pkg-gpsd/gpsd
deleted file mode 100644
index b510a7542..000000000
--- a/support-pkg-gpsd/gpsd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd
-
-NAME=gpsd
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME/$NAME.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-
-case "$1" in
-   start)
-	stat_busy "Starting $NAME"
-	[ ! -d /var/run/$NAME ] && install -d /var/run/$NAME
-	[ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /var/run/$NAME/$NAME.sock ${GPSD_OPTIONS} ${DEVICES}
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		add_daemon $NAME
-		stat_done
-	fi
-   ;;
-   stop)
-	stat_busy "Stopping $NAME"
-	[ ! -z "$PID" ]  && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-	    rm -f $PIDFILE &>/dev/null
-	    rm_daemon $NAME
-	    stat_done
-	fi
-   ;;
-
-   restart)
-	$0 stop
-	sleep 2
-	$0 start
-   ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/support-pkg-gpsd/gpsd.conf.d b/support-pkg-gpsd/gpsd.conf.d
deleted file mode 100644
index 9fef72cb9..000000000
--- a/support-pkg-gpsd/gpsd.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default settings for gpsd.
-START_DAEMON="true"
-GPSD_OPTIONS=""
-DEVICES=""
-USBAUTO="true"