Subject: [alpine-devel] [PATCH] main/gpsd version bump to 3.10

From: Nathan Angelacos <[email-masked]>
Date: Mon, 17 Feb 2014 20:53:24 +0000

Also include fixes to correctly enable PPS from the pps_ldisc module
---
 main/gpsd/APKBUILD                            | 25 ++++++++++++-------------
 main/gpsd/gpsd-use-local-timepps-header.patch |  6 +++---
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/main/gpsd/APKBUILD b/main/gpsd/APKBUILD
index 691a6a2..a27ba1a 100644
--- a/main/gpsd/APKBUILD
+++ b/main/gpsd/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Nathan Angelacos <[email-masked]>
 # Maintainer: Nathan Angelacos <[email-masked]>
 pkgname=gpsd
-pkgver=3.9
-pkgrel=1
+pkgver=3.10
+pkgrel=0
 pkgdesc="A GPS daemon"
 arch=all
 url="http://catb.org/gpsd/"
@@ -12,20 +12,21 @@ makedepends="scons python-dev libcap-dev"
 install=
 # subpackages="$pkgname-doc $pkgname-dev"
 source="http://download-mirror.savannah.gnu.org/releases/gpsd/$pkgname-$pkgver.tar.gz
-	gpsd-use-local-timepps-header.patch
 	timepps.h
+	gpsd-use-local-timepps-header.patch
 	gpsd.initd
 	gpsd.confd"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
+
 prepare() {
 	local i
 
     # We copy timepps.h to the local build directory instead of 
     # creating a pps-tools-dev package for ppstime.h
     # (See https://github.com/ago/pps-tools)
-    mkdir "$_builddir"/sys
+    mkdir -p "$_builddir"/sys
     cp timepps.h "$_builddir"/sys/

@@ -40,9 +41,7 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	CPPSFLAGS="$CPPSFLAGS -I."
-	export CPPFLAGS=\"$CPPFLAGS\"
-	echo $CPPFLAGS
+        CPPFLAGS="-I."
 	scons -j${JOBS:-2} \
 		prefix=/usr \
 		|| return 1
@@ -63,18 +62,18 @@ package() {
     install -m644 -D "$srcdir"/gpsd.confd "$pkgdir"/etc/conf.d/gpsd
 }
 
-md5sums="53a88f24a0973d23427e82e9a8914f19  gpsd-3.9.tar.gz
-2cfc595c7cbd979970f8a0dae0b7d982  gpsd-use-local-timepps-header.patch
+md5sums="fc5b03aae38b9b5b6880b31924d0ace3  gpsd-3.10.tar.gz
 28f6835098a216f4a620f9218d15b5b8  timepps.h
+95854a73414f67a39a97de3b6a7163ca  gpsd-use-local-timepps-header.patch
 ac2c2a034c15df16c28c755d47d3dd74  gpsd.initd
 453f3d1d75d2b048f0987cfb9cf250fd  gpsd.confd"
-sha256sums="d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a  gpsd-3.9.tar.gz
-d9c9393f46ca0fa17bc37cf309092e3afef0b6008de411f08a30405e9c7b9931  gpsd-use-local-timepps-header.patch
+sha256sums="706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320  gpsd-3.10.tar.gz
 ab4f459ee9d1037d7fa962a66ea652b08935539a4f443dc216e82b5717d8bb22  timepps.h
+9181770e1dc32980a0c8c265a098ef7c8443e922ba5c09b74f2d54ce28efb00d  gpsd-use-local-timepps-header.patch
 21efede3e94ef5795ea4b1998c8b165d757953b77480c42381794c27d8a6626e  gpsd.initd
 218a7f044f902070922c45f3b543c9ff6af25be5305648899565c1fbdc0d5da9  gpsd.confd"
-sha512sums="082524a7744da5212074123ab7920fe77bfa35f99cb12a900ad7b2718ea563803f988d09d7a063d08784d790c8c7e65503daefce4e6dd6bd1bc77bf580db638f  gpsd-3.9.tar.gz
-3fb7d91cb5f00ce52e3ccc6f3c56375410c4257c0be3be6e2253c6ed0c27d49fd0408008379925e96348027b59404e089cb7f64212221e1c950fdf5302044c41  gpsd-use-local-timepps-header.patch
+sha512sums="fd452185a8a9f9b8dfb2a5c2d5b6410f795d56dc46a7c216d8fcd686e43c5555a5f0421434060e9bb7afa465bb8a45a1e358108c4de42300eeb972caa334d8b6  gpsd-3.10.tar.gz
 eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048  timepps.h
+32e08ba706e733d9c66ffd32b025b91a62031b2ed4e332f0fc87e6157399b59b366088029c78438cc957ff817c1d17773777470b2c4b0fbe76383c71436fb2e8  gpsd-use-local-timepps-header.patch
 680b891375bb4896cb210ae04a08e1f38cc2127346dbb2942cb61045100adf3ca76909e63e239e840f7676c9869fe1ca19219e2197af6e6ba1354e2ce825001c  gpsd.initd
 55d4a51f82d445d3ac93b2855132ef4380908ed045feba6298ed1d0b607cd9054b5325c024dc52b370983ebd5d9b377537aee7d7128c97aa22e3075f4134d404  gpsd.confd"
diff --git a/main/gpsd/gpsd-use-local-timepps-header.patch b/main/gpsd/gpsd-use-local-timepps-header.patch
index 46bd300..719891e 100644
--- a/main/gpsd/gpsd-use-local-timepps-header.patch
+++ b/main/gpsd/gpsd-use-local-timepps-header.patch
@@ -1,11 +1,11 @@
 --- a/gpsd.h-tail
 +++ b/gpsd.h-tail
-@@ -19,7 +19,7 @@
- // include unistd.h here as it is missing on older pps-tools releases.
+@@ -35,7 +35,7 @@
  // 'close' is not defined otherwise.
  #include <unistd.h>
+ #include <sys/time.h>
 -#include <sys/timepps.h>
 +#include "sys/timepps.h"
+ #endif /* S_SPLINT_S */
  #endif
  
- #ifdef _WIN32
-- 
1.8.4.3

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---