From e9a5c646563c984f362db1777f8c6bc7da63a4ab Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 21 Aug 2011 23:14:35 +0000
Subject: Sun Aug 21 23:14:34 UTC 2011

---
 testing/gpsd/PKGBUILD | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'testing/gpsd/PKGBUILD')

diff --git a/testing/gpsd/PKGBUILD b/testing/gpsd/PKGBUILD
index d4c1119cd..88fdd571d 100644
--- a/testing/gpsd/PKGBUILD
+++ b/testing/gpsd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 135847 2011-08-19 16:38:40Z andrea $
+# $Id: PKGBUILD 135939 2011-08-20 16:11:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
@@ -6,7 +6,7 @@
 
 pkgname=gpsd
 pkgver=3.0
-pkgrel=1
+pkgrel=3
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64')
 url="http://gpsd.berlios.de"
@@ -19,9 +19,10 @@ backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules')
 options=('!libtool' '!buildflags')
 install="${pkgname}.install"
 source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'gpsd')
+        'gpsd' 'gpsd.conf.d')
 md5sums=('c63d41a26868e9bdd48d9e311a9cc42c'
-         'e287d4b34a4eb1da27f12533ae9b6dd5')
+         '1f3402f8e33a7032b9ae6dfd077234f7'
+         '3e963df3f9f7ef3572ecc648ae829315')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -43,15 +44,13 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # Fix man pages path (FS#21715)
+  sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
+
   export DESTDIR="${pkgdir}"
   scons install
 
-  # Our own udev-install since the Makefile uses absolute paths
-  # Original file names are [mostly] unmodified: useful to match process name in case of error
-  # Following the switch from hotplug to udev helper scripts now live in /lib/udev/ instead of /etc/hotplug/
-  sed -i 's|GPSD_OPTIONS=""|GPSD_OPTIONS="-P /var/run/gpsd/gpsd.pid"|' packaging/deb/etc_default_gpsd
-  sed -i 's|"/var/run/gpsd.sock"|"/var/run/gpsd/gpsd.sock"|' packaging/deb/etc_default_gpsd
-  install -D -m644 "packaging/deb/etc_default_gpsd" "${pkgdir}/etc/conf.d/gpsd"
+  install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd"
 
   install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules"
 
@@ -74,5 +73,3 @@ package() {
 
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-md5sums=('c63d41a26868e9bdd48d9e311a9cc42c'
-         '0d5879df32833ca67a5491ce1ff98dcc')
-- 
cgit v1.2.3-54-g00ecf