Update garmin-utils to 2.2. Changed since 2.1:

 - Upload altitude in D108/D109 waypoints

4 files changed, 15 insertions, 16 deletions

diff --git a/geography/garmin-utils/Makefile b/geography/garmin-utils/Makefile
index 849f8d34e3f..fd94976cd7f 100644
--- a/geography/garmin-utils/Makefile
+++ b/geography/garmin-utils/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:59 tv Exp $
+# $NetBSD: Makefile,v 1.4 2006/07/11 17:33:27 gson Exp $
 #
 
-DISTNAME=		garmin-utils-2.1
-PKGREVISION=		1
+DISTNAME=		garmin-utils-2.2
 CATEGORIES=		geography
 MASTER_SITES=		ftp://ftp.snafu.org/pub/
 
diff --git a/geography/garmin-utils/distinfo b/geography/garmin-utils/distinfo
index 5e5105bbfb1..1784590506a 100644
--- a/geography/garmin-utils/distinfo
+++ b/geography/garmin-utils/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/22 21:08:31 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/07/11 17:33:27 gson Exp $
 
-SHA1 (garmin-utils-2.1.tar.gz) = 4d145034ec60d88000644ec3ed074a6595e0ce14
-RMD160 (garmin-utils-2.1.tar.gz) = 8b53f0cf9b1e9d9c77aa89ab375355389a80551f
-Size (garmin-utils-2.1.tar.gz) = 172468 bytes
-SHA1 (patch-aa) = fadc8e68041d468837bfdd3b57f7773ed32603bc
-SHA1 (patch-ab) = 6cc8d41b36e3565e3ccdc1a53800e7f3e06f0845
+SHA1 (garmin-utils-2.2.tar.gz) = 05416b402caae1d0852e557cb9b01def264dadd2
+RMD160 (garmin-utils-2.2.tar.gz) = 7696287c1255448171f7042ad0f425ca5f07579c
+Size (garmin-utils-2.2.tar.gz) = 172886 bytes
+SHA1 (patch-aa) = 042115771e3c680e192d7de4dbe3fdfc2007427d
+SHA1 (patch-ab) = eed00c08892c83f91e683d9873c991bb4d164855
diff --git a/geography/garmin-utils/patches/patch-aa b/geography/garmin-utils/patches/patch-aa
index 83c51b9ac01..d3ffa846bc7 100644
--- a/geography/garmin-utils/patches/patch-aa
+++ b/geography/garmin-utils/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2004/09/08 20:47:54 gson Exp $
+$NetBSD: patch-aa,v 1.2 2006/07/11 17:33:27 gson Exp $
 
---- Makefile.inc.orig	2004-02-15 00:14:35.000000000 +0200
+--- Makefile.inc.orig	2004-08-19 05:45:29.000000000 +0300
 +++ Makefile.inc
 @@ -4,6 +4,7 @@
  #
diff --git a/geography/garmin-utils/patches/patch-ab b/geography/garmin-utils/patches/patch-ab
index ecbe3707fea..17b1513bd0a 100644
--- a/geography/garmin-utils/patches/patch-ab
+++ b/geography/garmin-utils/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2004/12/08 16:28:50 gson Exp $
+$NetBSD: patch-ab,v 1.2 2006/07/11 17:33:27 gson Exp $
 
---- lib/gpsformat.c.orig	2004-12-04 15:53:31.000000000 +0200
+--- lib/gpsformat.c.orig	2004-08-19 05:45:29.000000000 +0300
 +++ lib/gpsformat.c
-@@ -153,7 +153,7 @@ wpt_common(int *datalen, int state, char
+@@ -147,7 +147,7 @@ wpt_common(int *datalen, int state, char
  
  	/* byte 1-6: waypoint name */
  	for (ix = 0; ix < 6; ix += 1) {
@@ -11,12 +11,12 @@ $NetBSD: patch-ab,v 1.1 2004/12/08 16:28:50 gson Exp $
  	}
  
  	/* byte 7-10: latitude */
-@@ -584,7 +584,7 @@ waypoints(gps_handle gps, u_char *buf, i
+@@ -574,7 +574,7 @@ waypoints(gps_handle gps, u_char *buf, i
  			len = end - beg - 2;
  		if (len > GPS_STRING_MAX)
  			len = GPS_STRING_MAX;
 -		switch (toupper(beg[-1])) {
 +		switch (toupper((unsigned char)(beg[-1]))) {
  		case 'A':
- 			/* altitude ignored */
+ 			sscanf(&beg[1], "%f", &alt);
  			break;