Update to 1.4.1. (Read waypoints ok on netbsd-5/i386 from Garmin

etrex vista HCx.)

Summary of Changes:
(details at http://www.gpsbabel.org/news/20100620.html)

Many new formats.

New Features

    * KML writer now sets the extents of the time sliders
      automatically for Google Earth 5.0, can now generate gx:Track
      for Google Earth 5.2.
    * Improved handling of from Garmin extensions in GPX including
      ambient temperature, depth, heartrate, and cadence.
    * Reworked Garmin transparency device matching to work with more
      devices such as Nuvi 500 and Dakota
    * Add 'erase_only' option to dg-100.
    * GDB module now handles Garmin Basecamp files, too.
    * Try to preserve Ozi icon data in waypoints.
    * Holux GR245 waypoint now supported.
    * GUI detects host OS serial ports.
    * Add HDOP and VDOP to VPL 900.
    * Added track segment support for many formats, including GPX,
      delbin, and Garmin protocol.
    * Added track->tracksegment conversion filter option to track
      filter.
    * Convert tracks to courses on Garmin fitness upload.

Major Fixes

    * Fix memory corruption in gbfile when line sizes were a multiple
      of internal buffer sizes.
    * Globalsat: flush receive on startup to make BT-335 more
      reliable.
    * Add Mega event icon, Whereigo cache type to GPX and KML.
    * Tweak Earth 5's realtime KML to include end of time window.
    * Several improvements to Garmin GPI reader.
    * Read and write fix information in delgpl format.
    * Garmin Venture HC and Legend H now works better on Mac and
      Linux. (especially Japanese models.)
    * Several improvements for OS/X Snow Leopard.
    * Alllow character set overwrite when sending to USB Garmins.
    * When writing Garmin routes, don't duplicate waypoints for via
      points.

8 files changed, 29 insertions, 102 deletions

diff --git a/geography/gpsbabel/Makefile b/geography/gpsbabel/Makefile
index db4491b1c03..2582ab68d75 100644
--- a/geography/gpsbabel/Makefile
+++ b/geography/gpsbabel/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.8 2009/05/12 12:27:19 martti Exp $
+# $NetBSD: Makefile,v 1.9 2010/07/05 00:05:22 gdt Exp $
 #
 
-DISTNAME=	gpsbabel-1.3.6
+DISTNAME=	gpsbabel-1.4.1
 CATEGORIES=	geography
 #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/
+MASTER_SITES+=	http://www.lexort.com/pkgsrc/distfiles/
 
 MAINTAINER=	martti@NetBSD.org
 # MAINTAINER+=	gdt@NetBSD.org
diff --git a/geography/gpsbabel/distinfo b/geography/gpsbabel/distinfo
index 69624d364db..e3506bb60d1 100644
--- a/geography/gpsbabel/distinfo
+++ b/geography/gpsbabel/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.4 2009/02/21 21:10:08 gdt Exp $
+$NetBSD: distinfo,v 1.5 2010/07/05 00:05:22 gdt Exp $
 
-SHA1 (gpsbabel-1.3.6.tar.gz) = 8ff86e356539ca493b33527b91032adb3b452a78
-RMD160 (gpsbabel-1.3.6.tar.gz) = db405e020fb4340da7f40acf266e27a89330ad94
-Size (gpsbabel-1.3.6.tar.gz) = 6637505 bytes
-SHA1 (patch-aa) = dcf29d4319b23e9261d71ebdfa4c77ef7a2716a9
-SHA1 (patch-ab) = 78389661eac12d4a7d918710ec703bb087c439c1
-SHA1 (patch-ac) = 3ca985785c7b3ebc58113b48c1ae6938e2997743
-SHA1 (patch-ad) = 2649772c2e6fba5a46c3f1fbe7b37646926a9b18
-SHA1 (patch-af) = 7a697b787856992935848b7f572beb72efa84f50
-SHA1 (patch-ag) = 04590a6781a487e03a2492671902ed83dd6ec686
+SHA1 (gpsbabel-1.4.1.tar.gz) = 28d891887487a3ff4b4433e1320124956be96e61
+RMD160 (gpsbabel-1.4.1.tar.gz) = 67918d040451b98187725f196fe019eea34a6468
+Size (gpsbabel-1.4.1.tar.gz) = 7412519 bytes
+SHA1 (patch-ad) = 25e49b539668163359a0ff7d9b4a4a8d88bcd014
+SHA1 (patch-af) = a2f891ca6242b0bd3564e037a0ccd651f587cbdc
diff --git a/geography/gpsbabel/patches/patch-aa b/geography/gpsbabel/patches/patch-aa
deleted file mode 100644
index c1dfbb89364..00000000000
--- a/geography/gpsbabel/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/02/21 18:54:41 gdt Exp $
-
-Applied upstream 2009-02-21.
-
---- tools/mkfilelist.orig	2007-09-21 08:06:37.000000000 +0000
-+++ tools/mkfilelist	2007-09-21 08:06:53.000000000 +0000
-@@ -34,7 +34,7 @@
- 		echo "$LINE" |
- 		(
- 			read LEAD NAME READ
--			test "x$NAME" == "x" && continue
-+			test "x$NAME" = "x" && continue
- 			case $LEAD in
- 			D)	
- 				loop "$1/$NAME/" "$2"
diff --git a/geography/gpsbabel/patches/patch-ab b/geography/gpsbabel/patches/patch-ab
deleted file mode 100644
index c4a477e0095..00000000000
--- a/geography/gpsbabel/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/02/21 18:54:41 gdt Exp $
-
-Applied upstream 2009-02-21.
-
---- tools/mkspec.orig	2007-09-21 08:07:45.000000000 +0000
-+++ tools/mkspec	2007-09-21 08:07:57.000000000 +0000
-@@ -6,7 +6,7 @@
- RELEASE=$3	# may be empty
- 
- REL=`echo $RELEASE | sed 's/^-//'`
--test "$REL" == "" && REL=0
-+test "$REL" = "" && REL=0
- 
- cat << EOF
- Summary:   GPSBabel
diff --git a/geography/gpsbabel/patches/patch-ac b/geography/gpsbabel/patches/patch-ac
deleted file mode 100644
index 5ff8b307667..00000000000
--- a/geography/gpsbabel/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2009/02/21 18:54:41 gdt Exp $
-
-Applied upstream 2009-02-21.
-
---- testw.orig	2007-09-21 08:08:32.000000000 +0000
-+++ testw	2007-09-21 08:08:48.000000000 +0000
-@@ -58,7 +58,7 @@
-     while read type caps format comment; do
-     
- 	for i in $EXCL; do
--	    if [ "$format" == "$i" ]; then
-+	    if [ "$format" = "$i" ]; then
- 		caps="------"
- 	    fi
- 	done
-@@ -97,7 +97,7 @@
-     while read type caps format comment; do
-     
- 	for i in $EXCL; do
--		if [ "$format" == "$i" ]; then
-+		if [ "$format" = "$i" ]; then
- 			caps="------"
- 		fi
- 	done
diff --git a/geography/gpsbabel/patches/patch-ad b/geography/gpsbabel/patches/patch-ad
index 2d6c4b5b5e8..e4cb6b72983 100644
--- a/geography/gpsbabel/patches/patch-ad
+++ b/geography/gpsbabel/patches/patch-ad
@@ -1,13 +1,16 @@
-$NetBSD: patch-ad,v 1.2 2009/02/21 18:54:41 gdt Exp $
+$NetBSD: patch-ad,v 1.3 2010/07/05 00:05:23 gdt Exp $
 
-Rejected by upstream.  There is comment in Makefile.in that explains
-why there is no space, and output flag is set to "-o ".  This needs a
-comment explaining why the change is made and why the original scheme
-of putting the space in the variable doesn't work.
+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
+set to "-o ", so that the output flag can be set to "-Fo" for MSVC.n
 
---- Makefile.in.orig	2007-07-23 22:30:00.000000000 +0100
+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
-@@ -90,7 +90,7 @@ LIBOBJS = queue.o route.o waypt.o filter
+@@ -102,7 +102,7 @@ LIBOBJS = queue.o route.o waypt.o filter
  OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
  
  .c.o:
@@ -16,7 +19,7 @@ of putting the space in the variable doesn't work.
  
  
  
-@@ -101,10 +101,10 @@ WEB=@DOCDIR@
+@@ -113,10 +113,10 @@ WEB=@DOCDIR@
  all: gpsbabel$(EXEEXT)
  
  gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ 
@@ -27,9 +30,9 @@ of putting the space in the variable doesn't work.
 -	$(CC)  $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
 +	$(CC)  $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH) $@
  
- Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in gbversion.h.in
- 	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status 
-@@ -113,7 +113,7 @@ config.status: configure 
+ Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
+ 	  gbversion.h.in gui/setup.iss.in
+@@ -129,7 +129,7 @@ config.status: configure 
  	$(SHELL) config.status --recheck
  
  jeeps/gpslibusb.o: 
diff --git a/geography/gpsbabel/patches/patch-af b/geography/gpsbabel/patches/patch-af
index ef484c4c1a5..bce878d66e9 100644
--- a/geography/gpsbabel/patches/patch-af
+++ b/geography/gpsbabel/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.2 2009/02/21 18:54:41 gdt Exp $
+$NetBSD: patch-af,v 1.3 2010/07/05 00:05:23 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	2006-04-19 22:20:18.000000000 -0400
+--- jeeps/gpsread.c.orig	2010-03-26 03:09:20.000000000 +0000
 +++ jeeps/gpsread.c
-@@ -103,6 +103,37 @@ int32 GPS_Serial_Packet_Read(gpsdevh *fd
+@@ -103,6 +103,36 @@ int32 GPS_Serial_Packet_Read(gpsdevh *fd
  
  	    if(!len)
  	    {
@@ -36,16 +36,15 @@ understanding them.
 +                 */
 +                if (u == 0x06 || u == 0x15)
 +                {
-+                    (*packet)->dle = DLE;
 +                    ++len;
 +		    (void) fprintf(stderr,"GPS_Packet_Read: inserted DLE due to 0x%02x.\n", u);
 +                    goto dle_missed;
 +                }
 +
- 		(*packet)->dle = u;
  		if(u != DLE)
  		{
-@@ -114,6 +145,7 @@ int32 GPS_Serial_Packet_Read(gpsdevh *fd
+ 		    (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;
  	    }
  
@@ -53,7 +52,7 @@ understanding them.
  	    if(len==1)
  	    {
  		(*packet)->type = u;
-@@ -212,6 +244,20 @@ int32 GPS_Serial_Get_Ack(gpsdevh *fd, GP
+@@ -215,6 +246,20 @@ int32 GPS_Serial_Get_Ack(gpsdevh *fd, GP
      
      if(*(*rec)->data != (*tra)->type)
      {
diff --git a/geography/gpsbabel/patches/patch-ag b/geography/gpsbabel/patches/patch-ag
deleted file mode 100644
index d89beb5502c..00000000000
--- a/geography/gpsbabel/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2009/02/21 18:54:41 gdt Exp $
-
-From Giles Lean.  Discards characters that may be waiting in the tty
-on open to get a fresh start.  Upstream said would be applied on
-2009-02-21.
-
---- jeeps/gpsserial.c.orig	2008-09-18 16:16:14.000000000 -0400
-+++ jeeps/gpsserial.c
-@@ -281,7 +281,7 @@ int32 GPS_Serial_Open(gpsdevh *dh, const
-     tty.c_cc[VMIN] = 1;
-     tty.c_cc[VTIME] = 0;
- 
--    if(tcsetattr(psd->fd,TCSANOW,&tty)==-1)
-+    if(tcsetattr(psd->fd,TCSANOW|TCSAFLUSH,&tty)==-1)
-     {
- 	GPS_Serial_Error("SERIAL: tcsetattr error");
- 	return 0;