From 1f9776d421ac40faa59f797893033e99e4f919eb Mon Sep 17 00:00:00 2001 From: root Date: Sat, 20 Apr 2013 01:29:42 -0700 Subject: Sat Apr 20 01:28:56 PDT 2013 --- extra/gpsd/PKGBUILD | 26 +++++++++++--------------- extra/gpsd/gpsd | 43 ------------------------------------------- extra/gpsd/gpsd.conf | 5 +++++ extra/gpsd/gpsd.conf.d | 5 ----- 4 files changed, 16 insertions(+), 63 deletions(-) delete mode 100755 extra/gpsd/gpsd create mode 100644 extra/gpsd/gpsd.conf delete mode 100644 extra/gpsd/gpsd.conf.d (limited to 'extra/gpsd') diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 952c32cd9..452e166cb 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169832 2012-10-30 19:50:10Z tomegun $ +# $Id: PKGBUILD 183237 2013-04-19 00:40:14Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Andrea Scarpino # Contributor: Sergej Pupykin # Contributor: Giacomo Rizzo pkgname=gpsd -pkgver=3.7 +pkgver=3.8 pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64') @@ -16,11 +16,11 @@ optdepends=('php: generate a PHP status page for your GPS' 'php-gd: image support for the PHP status page' 'pygtk: GUI frontends') makedepends=('scons' 'docbook-xsl' 'chrpath') -backup=('etc/conf.d/gpsd') +backup=('etc/gpsd.conf') options=('!libtool') install="${pkgname}.install" source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} - 'gpsd' 'gpsd.conf.d') + 'gpsd.conf') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -48,17 +48,16 @@ package() { export DESTDIR="${pkgdir}" scons install - install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd" + install -D -m644 "${srcdir}/gpsd.conf" "${pkgdir}/etc/gpsd.conf" - sed -i 's|/lib/udev/gpsd|/usr/lib/udev/gpsd|' gpsd.rules + install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/25-gpsd-usb.rules" - install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules" - - sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug + sed -i 's|/etc/default/gpsd|/etc/gpsd|' gpsd.hotplug install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug" # GPSD needs RPATH - chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0 + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps.so.20.0.0 + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgpsd.so.21.0.0 chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps} chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl} chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so @@ -70,14 +69,11 @@ 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" } -md5sums=('52d9785eaf1a51298bb8900dbde88f98' - '07fa4bf23aa998dcb951790b63dbebff' - '6602d04bb037bc500424f00f24f58837' +md5sums=('1a3177b907f25c0ce6d1a0aa22597270' + 'SKIP' '3e963df3f9f7ef3572ecc648ae829315') diff --git a/extra/gpsd/gpsd b/extra/gpsd/gpsd deleted file mode 100755 index 2ca7efe26..000000000 --- a/extra/gpsd/gpsd +++ /dev/null @@ -1,43 +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/gpsd -PIDFILE=/run/gpsd.pid -PID=$(cat $PIDFILE 2>/dev/null) - -case "$1" in - start) - stat_busy "Starting gpsd" - [ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /run/gpsd.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/extra/gpsd/gpsd.conf b/extra/gpsd/gpsd.conf new file mode 100644 index 000000000..9fef72cb9 --- /dev/null +++ b/extra/gpsd/gpsd.conf @@ -0,0 +1,5 @@ +# Default settings for gpsd. +START_DAEMON="true" +GPSD_OPTIONS="" +DEVICES="" +USBAUTO="true" diff --git a/extra/gpsd/gpsd.conf.d b/extra/gpsd/gpsd.conf.d deleted file mode 100644 index 9fef72cb9..000000000 --- a/extra/gpsd/gpsd.conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# Default settings for gpsd. -START_DAEMON="true" -GPSD_OPTIONS="" -DEVICES="" -USBAUTO="true" -- cgit v1.2.3-54-g00ecf