summaryrefslogtreecommitdiff
path: root/geography
diff options
context:
space:
mode:
Diffstat (limited to 'geography')
-rw-r--r--geography/gpsbabel/Makefile12
-rw-r--r--geography/gpsbabel/distinfo12
-rw-r--r--geography/gpsbabel/patches/patch-ad4
-rw-r--r--geography/gpsbabel/patches/patch-af70
4 files changed, 49 insertions, 49 deletions
diff --git a/geography/gpsbabel/Makefile b/geography/gpsbabel/Makefile
index 3e3fbdfc71a..a124c6e1f3c 100644
--- a/geography/gpsbabel/Makefile
+++ b/geography/gpsbabel/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2012/10/04 09:19:17 asau Exp $
+# $NetBSD: Makefile,v 1.13 2013/03/16 18:52:58 gdt Exp $
#
-DISTNAME= gpsbabel-1.4.2
+DISTNAME= gpsbabel-1.4.4
CATEGORIES= geography
-#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpsbabel/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpsbabel/}
# Download from official site apparently only via interactive form,
-# but code is gnu-gpl-v2 so hosted elsewhere as a convenience to
-# pkgsrc users.
-MASTER_SITES+= http://www.lexort.com/pkgsrc/distfiles/
+# but code is gnu-gpl-v2 so hosted elsewhere.
MASTER_SITES+= http://archlinux-stuff.googlecode.com/files/
MAINTAINER= gdt@NetBSD.org
@@ -15,6 +13,8 @@ HOMEPAGE= http://www.gpsbabel.org/
COMMENT= Utility to convert and fetch GPS related data
LICENSE= gnu-gpl-v2
+TEST_TARGET= check
+
LIBS.Darwin+= -lexpat
GNU_CONFIGURE= yes
diff --git a/geography/gpsbabel/distinfo b/geography/gpsbabel/distinfo
index 9587a89235b..f0fb8a1d42d 100644
--- a/geography/gpsbabel/distinfo
+++ b/geography/gpsbabel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2011/04/27 18:57:11 schwarz Exp $
+$NetBSD: distinfo,v 1.7 2013/03/16 18:52:58 gdt Exp $
-SHA1 (gpsbabel-1.4.2.tar.gz) = e97f949716d786638af7235d7a2979bf50547426
-RMD160 (gpsbabel-1.4.2.tar.gz) = 45987878b811f7b146511e859e89d0e28ccc1fb3
-Size (gpsbabel-1.4.2.tar.gz) = 5551502 bytes
-SHA1 (patch-ad) = 25e49b539668163359a0ff7d9b4a4a8d88bcd014
-SHA1 (patch-af) = a2f891ca6242b0bd3564e037a0ccd651f587cbdc
+SHA1 (gpsbabel-1.4.4.tar.gz) = d7ff40f044a0ee5d81c5554da51394204e75599c
+RMD160 (gpsbabel-1.4.4.tar.gz) = 95a042fb035a5aaa2dcb50d430e36f384a575f4f
+Size (gpsbabel-1.4.4.tar.gz) = 7811264 bytes
+SHA1 (patch-ad) = 19a1319a33a0ee131557ac07ef58f388e99b1f3e
+SHA1 (patch-af) = 3ebde4baa1f34733520e08c89dbdab938358c71a
diff --git a/geography/gpsbabel/patches/patch-ad b/geography/gpsbabel/patches/patch-ad
index e4cb6b72983..414a8be3609 100644
--- a/geography/gpsbabel/patches/patch-ad
+++ b/geography/gpsbabel/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2010/07/05 00:05:23 gdt Exp $
+$NetBSD: patch-ad,v 1.4 2013/03/16 18:52:58 gdt Exp $
This patch was rejected by upstream. There is a comment in upstream
Makefile.in that explains why there is no space, and output flag is
@@ -8,7 +8,7 @@ On NetBSD, the upstream versoni works, but there is some mysterious
failure on Mac OS X. This patch therefore needs investigation and
resolution to be filed with upstream.
---- Makefile.in.orig 2010-06-20 04:16:20.000000000 +0000
+--- Makefile.in.orig 2012-03-29 00:19:29.000000000 +0000
+++ Makefile.in
@@ -102,7 +102,7 @@ LIBOBJS = queue.o route.o waypt.o filter
OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
diff --git a/geography/gpsbabel/patches/patch-af b/geography/gpsbabel/patches/patch-af
index bce878d66e9..16e10cd9294 100644
--- a/geography/gpsbabel/patches/patch-af
+++ b/geography/gpsbabel/patches/patch-af
@@ -1,16 +1,16 @@
-$NetBSD: patch-af,v 1.3 2010/07/05 00:05:23 gdt Exp $
+$NetBSD: patch-af,v 1.4 2013/03/16 18:52:58 gdt Exp $
From Giles Lean, who places it in the public domain. Workarounds for
problems with buggy USB serial adapators. Not applied by upstream
2009-02-21 because it's too dangerous to work around problems without
understanding them.
---- jeeps/gpsread.c.orig 2010-03-26 03:09:20.000000000 +0000
+--- jeeps/gpsread.c.orig 2011-07-26 01:56:33.000000000 +0000
+++ jeeps/gpsread.c
-@@ -103,6 +103,36 @@ int32 GPS_Serial_Packet_Read(gpsdevh *fd
+@@ -98,6 +98,36 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
+ GPS_Diag("%02x ", u);
- if(!len)
- {
+ if (!len) {
+ /*
+ * Missed DLE characters have been observed with Geko
+ * 201 and Legend GPSRs with Prolific USB-serial
@@ -41,35 +41,35 @@ understanding them.
+ goto dle_missed;
+ }
+
- if(u != DLE)
- {
- (void) fprintf(stderr,"GPS_Packet_Read: No DLE. Data received, but probably not a garmin packet.\n");
-@@ -113,6 +143,7 @@ int32 GPS_Serial_Packet_Read(gpsdevh *fd
- continue;
- }
+ if (u != DLE) {
+ (void) fprintf(stderr,"GPS_Packet_Read: No DLE. Data received, but probably not a garmin packet.\n");
+ (void) fflush(stderr);
+@@ -107,6 +137,7 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
+ continue;
+ }
+dle_missed:
- if(len==1)
- {
- (*packet)->type = u;
-@@ -215,6 +246,20 @@ int32 GPS_Serial_Get_Ack(gpsdevh *fd, GP
-
- if(*(*rec)->data != (*tra)->type)
- {
-+ /*
-+ * When used with a buggy Prolific USB-serial converter the
-+ * calling sequence GPS_A000() -> GPS_Get_Ack() sometimes
-+ * returns data != type causing this routine to fail and the
-+ * following error message to be emitted:
-+ *
-+ * GARMIN:Can't init /dev/cu.usbserial
-+ *
-+ * Manually retrying usually works, and subsequent
-+ * investigation shows that the call that fails is made from
-+ * GPS_Init() which in this case is GPS_Serial_Init(). Simply
-+ * retrying the call a workaround: see note and retry loop in
-+ * gpsapp.c:GPS_Init().
-+ */
- gps_error = FRAMING_ERROR;
- return 0;
- }
+ if (len==1) {
+ (*packet)->type = u;
+ ++len;
+@@ -130,6 +161,20 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
+ if (u == ETX)
+ if (isDLE) {
+ if (p-(*packet)->data-2 != (*packet)->n) {
++ /*
++ * When used with a buggy Prolific USB-serial converter the
++ * calling sequence GPS_A000() -> GPS_Get_Ack() sometimes
++ * returns data != type causing this routine to fail and the
++ * following error message to be emitted:
++ *
++ * GARMIN:Can't init /dev/cu.usbserial
++ *
++ * Manually retrying usually works, and subsequent
++ * investigation shows that the call that fails is made from
++ * GPS_Init() which in this case is GPS_Serial_Init(). Simply
++ * retrying the call a workaround: see note and retry loop in
++ * gpsapp.c:GPS_Init().
++ */
+ GPS_Error("GPS_Packet_Read: Bad count");
+ gps_errno = FRAMING_ERROR;
+ return 0;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 14:57:54 +0000