[gpsbabel/f20] Upstream update.

corsepiu corsepiu at fedoraproject.org
Sun Jan 18 07:19:16 UTC 2015


commit 1ce2903550bcab59b51246cf5ad3d489169ba8db
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Fri Jan 9 07:13:25 2015 +0100

    Upstream update.
    
    - Rebase patches.
    - Reflect upstream having stopped providing tarballs:
      - Add gpsbabel-tarball.
      - Remove gpsbabel-download-latest.py.

 .gitignore                                    |    2 +-
 0001-gpsbabel-1.4.2-xmldoc.patch              |    8 +-
 0002-gpsbabel-1.4.3-use-system-shapelib.patch |   32 +-
 0003-gpsbabel-1.4.3-gmapbase.patch            |    4 +-
 0004-gpsbabel-1.4.3-nosolicitation.patch      |    4 +-
 0005-gpsbabel-1.4.4-config.patch              |  153 -----
 0005-gpsbabel-1.5.2-config.patch              |  690 ++++++++++++++++++++
 0006-Use-system-zlib.patch                    |  863 ++++++++++++-------------
 gpsbabel-download-latest.py                   |   61 --
 gpsbabel-tarball                              |   15 +
 gpsbabel.spec                                 |   31 +-
 sources                                       |    3 +-
 12 files changed, 1164 insertions(+), 702 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 181a3f3..f1f0093 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /style3.css
-/gpsbabel-1.5.0.tar.gz
+/gpsbabel-1.5.2.tar.xz
diff --git a/0001-gpsbabel-1.4.2-xmldoc.patch b/0001-gpsbabel-1.4.2-xmldoc.patch
index cbc0db4..ad7b2fc 100644
--- a/0001-gpsbabel-1.4.2-xmldoc.patch
+++ b/0001-gpsbabel-1.4.2-xmldoc.patch
@@ -1,4 +1,4 @@
-From 5b933bfbab47daeff032c44c0874d2fc9c7262b1 Mon Sep 17 00:00:00 2001
+From 03533ead4cff7884567f9c7a4c9712daf4c0400a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
 Date: Tue, 15 Apr 2014 05:14:10 +0200
 Subject: [PATCH 1/6] gpsbabel-1.4.2-xmldoc
@@ -9,10 +9,10 @@ Subject: [PATCH 1/6] gpsbabel-1.4.2-xmldoc
  1 file changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index f9f7cf6..c147fa1 100644
+index c767fe2..63d0197 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -264,11 +264,8 @@ gpsbabel.html: FORCE # gpsbabel
+@@ -266,11 +266,8 @@ gpsbabel.html: FORCE # gpsbabel
  	xsltproc \
  	  --output $@ \
  	  --stringparam toc.section.depth "1" \
@@ -27,5 +27,5 @@ index f9f7cf6..c147fa1 100644
  	xmldoc/readme.xml
  
 -- 
-1.9.0
+2.1.0
 
diff --git a/0002-gpsbabel-1.4.3-use-system-shapelib.patch b/0002-gpsbabel-1.4.3-use-system-shapelib.patch
index 62769bb..aa671a2 100644
--- a/0002-gpsbabel-1.4.3-use-system-shapelib.patch
+++ b/0002-gpsbabel-1.4.3-use-system-shapelib.patch
@@ -1,4 +1,4 @@
-From 26b5c7824564536966d379d77e20f89cbc961b25 Mon Sep 17 00:00:00 2001
+From 4aaaa1f23720240572cf1f18811993d3c5ccda5a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
 Date: Tue, 15 Apr 2014 05:18:38 +0200
 Subject: [PATCH 2/6] gpsbabel-1.4.3-use-system-shapelib
@@ -12,10 +12,10 @@ Subject: [PATCH 2/6] gpsbabel-1.4.3-use-system-shapelib
  4 files changed, 5 insertions(+), 10 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index c147fa1..f950160 100644
+index 63d0197..751ec29 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -99,7 +99,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
+@@ -100,7 +100,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
  # Extra modules in Jeeps that we don't use
  # 	jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
  
@@ -24,24 +24,24 @@ index c147fa1..f950160 100644
  
  ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
  	zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
-@@ -910,11 +910,7 @@ sbp.o: sbp.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
+@@ -877,11 +877,7 @@ sbp.o: sbp.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
  session.o: session.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
  shape.o: shape.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
--  gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+-  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 -  shapelib/shapefil.h
 -shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
 -shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
 -shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
-+  gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
  skyforce.o: skyforce.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
  skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 diff --git a/configure b/configure
-index dd2c80a..fa7af8b 100755
+index 9a27451..e97f132 100755
 --- a/configure
 +++ b/configure
-@@ -4967,7 +4967,7 @@ fi
+@@ -5183,7 +5183,7 @@ done
  
  
  
@@ -50,7 +50,7 @@ index dd2c80a..fa7af8b 100755
  
  ac_config_files="$ac_config_files gui/makelinuxdist.sh"
  
-@@ -5670,7 +5670,6 @@ do
+@@ -5886,7 +5886,6 @@ do
      "tools/mkcapabilities") CONFIG_FILES="$CONFIG_FILES tools/mkcapabilities" ;;
      "win32/gpsbabel.rc") CONFIG_FILES="$CONFIG_FILES win32/gpsbabel.rc" ;;
      "jeeps/Makefile") CONFIG_FILES="$CONFIG_FILES jeeps/Makefile" ;;
@@ -59,10 +59,10 @@ index dd2c80a..fa7af8b 100755
      "gui/makelinuxdist.sh") CONFIG_FILES="$CONFIG_FILES gui/makelinuxdist.sh" ;;
  
 diff --git a/configure.in b/configure.in
-index db98f6d..066dc9b 100644
+index e10ee47..55dffff 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -386,7 +386,7 @@ AC_SUBST(QT_INC_OPT)
+@@ -397,7 +397,7 @@ AC_SUBST(QT_INC_OPT)
  AC_SUBST(QT_SYSINC_OPT)
  AC_SUBST(QT_LIBS)
  
@@ -72,7 +72,7 @@ index db98f6d..066dc9b 100644
  AC_OUTPUT
  
 diff --git a/shape.cc b/shape.cc
-index b8779f0..d402584 100644
+index 58157cb..153bc6c 100644
 --- a/shape.cc
 +++ b/shape.cc
 @@ -20,7 +20,7 @@
@@ -81,9 +81,9 @@ index b8779f0..d402584 100644
  #include "defs.h"
 -#include "shapelib/shapefil.h"
 +#include <shapefil.h>
+ #include <stdlib.h>
  
  #if SHAPELIB_ENABLED
- static SHPHandle ihandle;
 -- 
-1.9.0
+2.1.0
 
diff --git a/0003-gpsbabel-1.4.3-gmapbase.patch b/0003-gpsbabel-1.4.3-gmapbase.patch
index 6b7a414..d677553 100644
--- a/0003-gpsbabel-1.4.3-gmapbase.patch
+++ b/0003-gpsbabel-1.4.3-gmapbase.patch
@@ -1,4 +1,4 @@
-From 8468a98cb11d289dd7ac089a3004a816c1910dde Mon Sep 17 00:00:00 2001
+From 563b847b51bd225df3585b9740fa6f678fb2f26d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
 Date: Tue, 15 Apr 2014 05:20:16 +0200
 Subject: [PATCH 3/6] gpsbabel-1.4.3-gmapbase
@@ -34,5 +34,5 @@ index 3284376..dc8cec8 100644
      QMessageBox::critical(0, appName,
  			  tr("Missing \"gmapbase.html\" file.  Check installation"));
 -- 
-1.9.0
+2.1.0
 
diff --git a/0004-gpsbabel-1.4.3-nosolicitation.patch b/0004-gpsbabel-1.4.3-nosolicitation.patch
index b5074aa..9eef4ca 100644
--- a/0004-gpsbabel-1.4.3-nosolicitation.patch
+++ b/0004-gpsbabel-1.4.3-nosolicitation.patch
@@ -1,4 +1,4 @@
-From 4d9e1e95794730b22980c6c077e416d017a597a7 Mon Sep 17 00:00:00 2001
+From e08271b2674ccdcad9a27833cb79c52188ef208a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
 Date: Tue, 15 Apr 2014 05:21:09 +0200
 Subject: [PATCH 4/6] gpsbabel-1.4.3-nosolicitation
@@ -24,5 +24,5 @@ index 0619d69..0fdc8d2 100644
      ignoreVersionMismatch_(false),
      disableDonateDialog_(false),
 -- 
-1.9.0
+2.1.0
 
diff --git a/0005-gpsbabel-1.5.2-config.patch b/0005-gpsbabel-1.5.2-config.patch
new file mode 100644
index 0000000..2d56be5
--- /dev/null
+++ b/0005-gpsbabel-1.5.2-config.patch
@@ -0,0 +1,690 @@
+From 548f5f96ef365809310955ea1e839bb2eb3598bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
+Date: Tue, 15 Apr 2014 05:24:22 +0200
+Subject: [PATCH 5/6] gpsbabel-1.5.2-config
+
+---
+ config.guess | 313 +++++++++++++++++++----------------------------------------
+ config.sub   |  58 ++++++-----
+ 2 files changed, 132 insertions(+), 239 deletions(-)
+
+diff --git a/config.guess b/config.guess
+index 1804e9f..1f5c50c 100755
+--- a/config.guess
++++ b/config.guess
+@@ -1,10 +1,8 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-#   2011, 2012, 2013 Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+-timestamp='2012-12-29'
++timestamp='2014-03-23'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -26,7 +24,7 @@ timestamp='2012-12-29'
+ # program.  This Exception is an additional permission under section 7
+ # of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# Originally written by Per Bothner. 
++# Originally written by Per Bothner.
+ #
+ # You can get the latest version of this script from:
+ # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+@@ -52,9 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+-2012, 2013 Free Software Foundation, Inc.
++Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
++case "${UNAME_SYSTEM}" in
++Linux|GNU|GNU/*)
++	# If the system lacks a compiler, then just pick glibc.
++	# We could probably try harder.
++	LIBC=gnu
++
++	eval $set_cc_for_build
++	cat <<-EOF > $dummy.c
++	#include <features.h>
++	#if defined(__UCLIBC__)
++	LIBC=uclibc
++	#elif defined(__dietlibc__)
++	LIBC=dietlibc
++	#else
++	LIBC=gnu
++	#endif
++	EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
++	;;
++esac
++
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -809,7 +826,7 @@ EOF
+     *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
+-    i*:MSYS*:*)
++    *:MSYS*:*)
+ 	echo ${UNAME_MACHINE}-pc-msys
+ 	exit ;;
+     i*:windows32*:*)
+@@ -857,21 +874,21 @@ EOF
+ 	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit ;;
+     *:GNU/*:*:*)
+ 	# other systems with GNU libc and userland
+-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ 	exit ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+     aarch64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     aarch64_be:Linux:*:*)
+ 	UNAME_MACHINE=aarch64_be
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -884,59 +901,54 @@ EOF
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+ 	esac
+ 	objdump --private-headers /bin/sh | grep -q ld.so.1
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    arc:Linux:*:* | arceb:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 	    | grep -q __ARM_EABI__
+ 	then
+-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	else
+ 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ 		| grep -q __ARM_PCS_VFP
+ 	    then
+-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ 	    else
+-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ 	    fi
+ 	fi
+ 	exit ;;
+     avr32*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo ${UNAME_MACHINE}-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo ${UNAME_MACHINE}-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ 	exit ;;
+     frv:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     hexagon:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     i*86:Linux:*:*)
+-	LIBC=gnu
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ 	exit ;;
+     ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     m32r*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     m68*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+@@ -955,54 +967,63 @@ EOF
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ 	;;
+-    or32:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++    openrisc*:Linux:*:*)
++	echo or1k-unknown-linux-${LIBC}
++	exit ;;
++    or32:Linux:*:* | or1k*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     padre:Linux:*:*)
+-	echo sparc-unknown-linux-gnu
++	echo sparc-unknown-linux-${LIBC}
+ 	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++	echo hppa64-unknown-linux-${LIBC}
+ 	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+-	  *)    echo hppa-unknown-linux-gnu ;;
++	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
++	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
++	  *)    echo hppa-unknown-linux-${LIBC} ;;
+ 	esac
+ 	exit ;;
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
++	echo powerpc64-unknown-linux-${LIBC}
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
++	echo powerpc-unknown-linux-${LIBC}
++	exit ;;
++    ppc64le:Linux:*:*)
++	echo powerpc64le-unknown-linux-${LIBC}
++	exit ;;
++    ppcle:Linux:*:*)
++	echo powerpcle-unknown-linux-${LIBC}
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+-	echo ${UNAME_MACHINE}-ibm-linux
++	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ 	exit ;;
+     sh64*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     sh*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     tile*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     vax:Linux:*:*)
+-	echo ${UNAME_MACHINE}-dec-linux-gnu
++	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     xtensa*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -1235,19 +1256,31 @@ EOF
+ 	exit ;;
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+-	case $UNAME_PROCESSOR in
+-	    i386)
+-		eval $set_cc_for_build
+-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+-		      grep IS_64BIT_ARCH >/dev/null
+-		  then
+-		      UNAME_PROCESSOR="x86_64"
+-		  fi
+-		fi ;;
+-	    unknown) UNAME_PROCESSOR=powerpc ;;
+-	esac
++	eval $set_cc_for_build
++	if test "$UNAME_PROCESSOR" = unknown ; then
++	    UNAME_PROCESSOR=powerpc
++	fi
++	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
++	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		    grep IS_64BIT_ARCH >/dev/null
++		then
++		    case $UNAME_PROCESSOR in
++			i386) UNAME_PROCESSOR=x86_64 ;;
++			powerpc) UNAME_PROCESSOR=powerpc64 ;;
++		    esac
++		fi
++	    fi
++	elif test "$UNAME_PROCESSOR" = i386 ; then
++	    # Avoid executing cc on OS X 10.9, as it ships with a stub
++	    # that puts up a graphical alert prompting to install
++	    # developer tools.  Any system running Mac OS X 10.7 or
++	    # later (Darwin 11 and later) is required to have a 64-bit
++	    # processor. This is not true of the ARM version of Darwin
++	    # that Apple uses in portable devices.
++	    UNAME_PROCESSOR=x86_64
++	fi
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ 	exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+@@ -1338,154 +1371,6 @@ EOF
+ 	exit ;;
+ esac
+ 
+-eval $set_cc_for_build
+-cat >$dummy.c <<EOF
+-#ifdef _SEQUENT_
+-# include <sys/types.h>
+-# include <sys/utsname.h>
+-#endif
+-main ()
+-{
+-#if defined (sony)
+-#if defined (MIPSEB)
+-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+-     I don't know....  */
+-  printf ("mips-sony-bsd\n"); exit (0);
+-#else
+-#include <sys/param.h>
+-  printf ("m68k-sony-newsos%s\n",
+-#ifdef NEWSOS4
+-	"4"
+-#else
+-	""
+-#endif
+-	); exit (0);
+-#endif
+-#endif
+-
+-#if defined (__arm) && defined (__acorn) && defined (__unix)
+-  printf ("arm-acorn-riscix\n"); exit (0);
+-#endif
+-
+-#if defined (hp300) && !defined (hpux)
+-  printf ("m68k-hp-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (NeXT)
+-#if !defined (__ARCHITECTURE__)
+-#define __ARCHITECTURE__ "m68k"
+-#endif
+-  int version;
+-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+-  if (version < 4)
+-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+-  else
+-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+-  exit (0);
+-#endif
+-
+-#if defined (MULTIMAX) || defined (n16)
+-#if defined (UMAXV)
+-  printf ("ns32k-encore-sysv\n"); exit (0);
+-#else
+-#if defined (CMU)
+-  printf ("ns32k-encore-mach\n"); exit (0);
+-#else
+-  printf ("ns32k-encore-bsd\n"); exit (0);
+-#endif
+-#endif
+-#endif
+-
+-#if defined (__386BSD__)
+-  printf ("i386-pc-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (sequent)
+-#if defined (i386)
+-  printf ("i386-sequent-dynix\n"); exit (0);
+-#endif
+-#if defined (ns32000)
+-  printf ("ns32k-sequent-dynix\n"); exit (0);
+-#endif
+-#endif
+-
+-#if defined (_SEQUENT_)
+-    struct utsname un;
+-
+-    uname(&un);
+-
+-    if (strncmp(un.version, "V2", 2) == 0) {
+-	printf ("i386-sequent-ptx2\n"); exit (0);
+-    }
+-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+-	printf ("i386-sequent-ptx1\n"); exit (0);
+-    }
+-    printf ("i386-sequent-ptx\n"); exit (0);
+-
+-#endif
+-
+-#if defined (vax)
+-# if !defined (ultrix)
+-#  include <sys/param.h>
+-#  if defined (BSD)
+-#   if BSD == 43
+-      printf ("vax-dec-bsd4.3\n"); exit (0);
+-#   else
+-#    if BSD == 199006
+-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+-#    else
+-      printf ("vax-dec-bsd\n"); exit (0);
+-#    endif
+-#   endif
+-#  else
+-    printf ("vax-dec-bsd\n"); exit (0);
+-#  endif
+-# else
+-    printf ("vax-dec-ultrix\n"); exit (0);
+-# endif
+-#endif
+-
+-#if defined (alliant) && defined (i860)
+-  printf ("i860-alliant-bsd\n"); exit (0);
+-#endif
+-
+-  exit (1);
+-}
+-EOF
+-
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+-	{ echo "$SYSTEM_NAME"; exit; }
+-
+-# Apollos put the system type in the environment.
+-
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+-
+-# Convex versions that predate uname can use getsysinfo(1)
+-
+-if [ -x /usr/convex/getsysinfo ]
+-then
+-    case `getsysinfo -f cpu_type` in
+-    c1*)
+-	echo c1-convex-bsd
+-	exit ;;
+-    c2*)
+-	if getsysinfo -f scalar_acc
+-	then echo c32-convex-bsd
+-	else echo c2-convex-bsd
+-	fi
+-	exit ;;
+-    c34*)
+-	echo c34-convex-bsd
+-	exit ;;
+-    c38*)
+-	echo c38-convex-bsd
+-	exit ;;
+-    c4*)
+-	echo c4-convex-bsd
+-	exit ;;
+-    esac
+-fi
+-
+ cat >&2 <<EOF
+ $0: unable to guess system type
+ 
+diff --git a/config.sub b/config.sub
+index 802a224..66c5074 100755
+--- a/config.sub
++++ b/config.sub
+@@ -1,10 +1,8 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-#   2011, 2012, 2013 Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+-timestamp='2012-12-29'
++timestamp='2014-07-28'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -70,9 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+-2012, 2013 Free Software Foundation, Inc.
++Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -256,12 +252,12 @@ case $basic_machine in
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+-	| arc \
++	| arc | arceb \
+ 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ 	| avr | avr32 \
+ 	| be32 | be64 \
+ 	| bfin \
+-	| c4x | clipper \
++	| c4x | c8051 | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+ 	| epiphany \
+ 	| fido | fr30 | frv \
+@@ -269,6 +265,7 @@ case $basic_machine in
+ 	| hexagon \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
++	| k1om \
+ 	| le32 | le64 \
+ 	| lm32 \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+@@ -286,20 +283,22 @@ case $basic_machine in
+ 	| mips64vr5900 | mips64vr5900el \
+ 	| mipsisa32 | mipsisa32el \
+ 	| mipsisa32r2 | mipsisa32r2el \
++	| mipsisa32r6 | mipsisa32r6el \
+ 	| mipsisa64 | mipsisa64el \
+ 	| mipsisa64r2 | mipsisa64r2el \
++	| mipsisa64r6 | mipsisa64r6el \
+ 	| mipsisa64sb1 | mipsisa64sb1el \
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
++	| mipsr5900 | mipsr5900el \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
+ 	| moxie \
+ 	| mt \
+ 	| msp430 \
+ 	| nds32 | nds32le | nds32be \
+-	| nios | nios2 \
++	| nios | nios2 | nios2eb | nios2el \
+ 	| ns16k | ns32k \
+-	| open8 \
+-	| or32 \
++	| open8 | or1k | or1knd | or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+ 	| pyramid \
+@@ -327,7 +326,7 @@ case $basic_machine in
+ 	c6x)
+ 		basic_machine=tic6x-unknown
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+@@ -369,13 +368,13 @@ case $basic_machine in
+ 	| aarch64-* | aarch64_be-* \
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* | avr32-* \
+ 	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+-	| clipper-* | craynv-* | cydra-* \
++	| c8051-* | clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+ 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+@@ -384,6 +383,7 @@ case $basic_machine in
+ 	| hexagon-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
++	| k1om-* \
+ 	| le32-* | le64-* \
+ 	| lm32-* \
+ 	| m32c-* | m32r-* | m32rle-* \
+@@ -403,18 +403,22 @@ case $basic_machine in
+ 	| mips64vr5900-* | mips64vr5900el-* \
+ 	| mipsisa32-* | mipsisa32el-* \
+ 	| mipsisa32r2-* | mipsisa32r2el-* \
++	| mipsisa32r6-* | mipsisa32r6el-* \
+ 	| mipsisa64-* | mipsisa64el-* \
+ 	| mipsisa64r2-* | mipsisa64r2el-* \
++	| mipsisa64r6-* | mipsisa64r6el-* \
+ 	| mipsisa64sb1-* | mipsisa64sb1el-* \
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
++	| mipsr5900-* | mipsr5900el-* \
+ 	| mipstx39-* | mipstx39el-* \
+ 	| mmix-* \
+ 	| mt-* \
+ 	| msp430-* \
+ 	| nds32-* | nds32le-* | nds32be-* \
+-	| nios-* | nios2-* \
++	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
+ 	| open8-* \
++	| or1k*-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+@@ -796,7 +800,7 @@ case $basic_machine in
+ 		os=-mingw64
+ 		;;
+ 	mingw32)
+-		basic_machine=i386-pc
++		basic_machine=i686-pc
+ 		os=-mingw32
+ 		;;
+ 	mingw32ce)
+@@ -824,6 +828,10 @@ case $basic_machine in
+ 		basic_machine=powerpc-unknown
+ 		os=-morphos
+ 		;;
++	moxiebox)
++		basic_machine=moxie-unknown
++		os=-moxiebox
++		;;
+ 	msdos)
+ 		basic_machine=i386-pc
+ 		os=-msdos
+@@ -832,7 +840,7 @@ case $basic_machine in
+ 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ 		;;
+ 	msys)
+-		basic_machine=i386-pc
++		basic_machine=i686-pc
+ 		os=-msys
+ 		;;
+ 	mvs)
+@@ -1008,7 +1016,7 @@ case $basic_machine in
+ 		;;
+ 	ppc64)	basic_machine=powerpc64-unknown
+ 		;;
+-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ 		basic_machine=powerpc64le-unknown
+@@ -1354,7 +1362,7 @@ case $os in
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+-	      | -sym* | -kopensolaris* \
++	      | -sym* | -kopensolaris* | -plan9* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ 	      | -aos* | -aros* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1369,14 +1377,14 @@ case $os in
+ 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+-	      | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1500,9 +1508,6 @@ case $os in
+ 	-aros*)
+ 		os=-aros
+ 		;;
+-	-kaos*)
+-		os=-kaos
+-		;;
+ 	-zvmoe)
+ 		os=-zvmoe
+ 		;;
+@@ -1551,6 +1556,9 @@ case $basic_machine in
+ 	c4x-* | tic4x-*)
+ 		os=-coff
+ 		;;
++	c8051-*)
++		os=-elf
++		;;
+ 	hexagon-*)
+ 		os=-elf
+ 		;;
+-- 
+2.1.0
+
diff --git a/0006-Use-system-zlib.patch b/0006-Use-system-zlib.patch
index 2719d11..a6655dc 100644
--- a/0006-Use-system-zlib.patch
+++ b/0006-Use-system-zlib.patch
@@ -1,18 +1,18 @@
-From ad2fb0c49590258b2c8b0e856a2efdc2b823885b Mon Sep 17 00:00:00 2001
+From 6f0a0d0b59aaf703904c8fc369c2d45a655a323a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
 Date: Tue, 15 Apr 2014 08:37:29 +0200
 Subject: [PATCH 6/6] Use system zlib
 
 ---
- Makefile.in | 446 ++++++++++++++++++++++++++++--------------------------------
- gbfile.cc   |   4 +
- 2 files changed, 212 insertions(+), 238 deletions(-)
+ Makefile.in | 460 ++++++++++++++++++++++++++++--------------------------------
+ gbfile.cc   |   5 +
+ 2 files changed, 220 insertions(+), 245 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index f950160..f278463 100644
+index 751ec29..7276f85 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -101,10 +101,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
+@@ -102,10 +102,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
  
  SHAPE=-lshp
  
@@ -24,204 +24,202 @@ index f950160..f278463 100644
  
  LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
            csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \
-@@ -423,30 +420,30 @@ cov-upload: FORCE
+@@ -418,93 +415,93 @@ cov-upload: FORCE
  	cov-upload
  
  # Machine generated from here down. 
 -alan.o: alan.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +alan.o: alan.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   cet.h inifile.h session.h src/core/datetime.h
 -an1.o: an1.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +an1.o: an1.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h an1sym.h
+   cet.h inifile.h session.h src/core/datetime.h an1sym.h
 -arcdist.o: arcdist.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +arcdist.o: arcdist.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   filterdefs.h grtcirc.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h filterdefs.h \
+   grtcirc.h
 -bcr.o: bcr.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +bcr.o: bcr.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h csv_util.h \
-   garmin_tables.h
+   cet.h inifile.h session.h src/core/datetime.h csv_util.h \
+   garmin_tables.h cet_util.h
 -bend.o: bend.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +bend.o: bend.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h filterdefs.h \
-   grtcirc.h
+   cet.h inifile.h session.h src/core/datetime.h filterdefs.h grtcirc.h
 -brauniger_iq.o: brauniger_iq.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +brauniger_iq.o: brauniger_iq.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h gbser.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   gbser.h
 -bushnell.o: bushnell.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +bushnell.o: bushnell.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
--bushnell_trl.o: bushnell_trl.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
 +bushnell_trl.o: bushnell_trl.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
+-bushnell_trl.o: bushnell_trl.cc defs.h config.h queue.h zlib/zlib.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -cet.o: cet.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +cet.o: cet.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   cet.h inifile.h session.h src/core/datetime.h
 -cet_util.o: cet_util.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +cet_util.o: cet_util.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   cet/ansi_x3_4_1968.h cet/iso_8859_1.h cet/iso_8859_8.h \
-   cet/iso_8859_15.h cet/cp1252.h cet/cp1255.h cet/iso_8859_2.h \
-@@ -458,67 +455,67 @@ cet_util.o: cet_util.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
-   cet/iso_8859_13.h cet/iso_8859_14.h cet/iso_8859_3.h cet/iso_8859_4.h \
-   cet/iso_8859_5.h cet/iso_8859_6.h cet/iso_8859_7.h cet/iso_8859_9.h \
-   cet/koi8_r.h cet/koi8_ru.h cet/koi_8.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
+   cet/ansi_x3_4_1968.h cet/cp1252.h cet/iso_8859_8.h
 -compegps.o: compegps.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +compegps.o: compegps.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
    csv_util.h jeeps/gpsmath.h jeeps/gpsport.h
 -cst.o: cst.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +cst.o: cst.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h strptime.h
+   cet.h inifile.h session.h src/core/datetime.h cet_util.h strptime.h
 -csv_util.o: csv_util.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +csv_util.o: csv_util.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   csv_util.h grtcirc.h strptime.h jeeps/gpsmath.h jeeps/gpsport.h \
-   garmin_fs.h jeeps/gps.h jeeps/gpsdevice.h jeeps/gpssend.h \
-   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
-   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmem.h jeeps/gpsrqst.h \
-   jeeps/gpsinput.h jeeps/gpsproj.h xcsv_tokens.gperf
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
+   csv_util.h garmin_fs.h jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h \
+   jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
+   jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
+   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
+   grtcirc.h src/core/logging.h strptime.h xcsv_tokens.gperf
 -delbin.o: delbin.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +delbin.o: delbin.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h \
    src/core/xmltag.h
 -delgpl.o: delgpl.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +delgpl.o: delgpl.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -destinator.o: destinator.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +destinator.o: destinator.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h garmin_fs.h jeeps/gps.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
-   jeeps/gpsproj.h strptime.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   cet_util.h garmin_fs.h jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h \
+   jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
+   jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
+   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
+   strptime.h
 -dg-100.o: dg-100.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +dg-100.o: dg-100.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   gbser.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h gbser.h
 -discard.o: discard.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +discard.o: discard.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   filterdefs.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h filterdefs.h
 -dmtlog.o: dmtlog.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +dmtlog.o: dmtlog.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   jeeps/gpsmath.h jeeps/gpsport.h xmlgeneric.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h jeeps/gpsmath.h \
+   jeeps/gpsport.h xmlgeneric.h
 -duplicate.o: duplicate.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +duplicate.o: duplicate.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h filterdefs.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   filterdefs.h
 -easygps.o: easygps.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +easygps.o: easygps.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
++energympro.o: energympro.cc defs.h config.h queue.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
+-energympro.o: energympro.cc defs.h config.h queue.h zlib/zlib.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -enigma.o: enigma.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +enigma.o: enigma.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -exif.o: exif.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +exif.o: exif.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h
+   cet.h inifile.h session.h src/core/datetime.h garmin_tables.h \
+   jeeps/gpsmath.h jeeps/gpsport.h
 -explorist_ini.o: explorist_ini.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +explorist_ini.o: explorist_ini.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h explorist_ini.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   explorist_ini.h
+-f90g_track.o: f90g_track.cc defs.h config.h queue.h zlib/zlib.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -fatal.o: fatal.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
++f90g_track.o: f90g_track.cc defs.h config.h queue.h \
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
 +fatal.o: fatal.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -filter_vecs.o: filter_vecs.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +filter_vecs.o: filter_vecs.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h filterdefs.h gbversion.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   filterdefs.h gbversion.h
 -formspec.o: formspec.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +formspec.o: formspec.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -g7towin.o: g7towin.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +g7towin.o: g7towin.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   csv_util.h garmin_fs.h jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h csv_util.h \
+   cet_util.h garmin_fs.h jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h \
    jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
    jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
    jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
    garmin_tables.h strptime.h
 -garmin.o: garmin.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +garmin.o: garmin.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
    grtcirc.h jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h \
    jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
-@@ -526,165 +523,165 @@ garmin.o: garmin.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
+@@ -512,82 +509,82 @@ garmin.o: garmin.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
    jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
-   garmin_tables.h garmin_fs.h garmin_device_xml.h
+   jeeps/gpsserial.h garmin_tables.h garmin_fs.h garmin_device_xml.h
  garmin_device_xml.o: garmin_device_xml.cc defs.h config.h queue.h \
--  zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h session.h \
++  gbfile.h cet.h inifile.h session.h \
    src/core/datetime.h xmlgeneric.h garmin_device_xml.h
 -garmin_fit.o: garmin_fit.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
-+garmin_fit.o: garmin_fit.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -garmin_fs.o: garmin_fs.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
++garmin_fit.o: garmin_fit.cc defs.h config.h queue.h \
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
 +garmin_fs.o: garmin_fs.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h garmin_fs.h jeeps/gps.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
-   jeeps/gpsproj.h garmin_tables.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   cet_util.h garmin_fs.h jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h \
+   jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
+   jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
+   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
+   garmin_tables.h
 -garmin_gpi.o: garmin_gpi.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +garmin_gpi.o: garmin_gpi.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h jeeps/gpsmath.h jeeps/gpsport.h garmin_fs.h \
-   jeeps/gps.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-   jeeps/gpsfmt.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
-   jeeps/gpsproj.h garmin_gpi.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   cet_util.h jeeps/gpsmath.h jeeps/gpsport.h garmin_fs.h jeeps/gps.h \
+   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
+   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
+   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
+   garmin_gpi.h
  garmin_tables.o: garmin_tables.cc garmin_tables.h defs.h config.h queue.h \
--  zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h jeeps/gpsmath.h jeeps/gpsport.h
+-  zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h session.h \
++  gbfile.h cet.h inifile.h session.h \
+   src/core/datetime.h src/core/logging.h jeeps/gpsmath.h jeeps/gpsport.h
 -garmin_txt.o: garmin_txt.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +garmin_txt.o: garmin_txt.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h csv_util.h garmin_fs.h jeeps/gps.h jeeps/gpsport.h \
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   cet_util.h csv_util.h garmin_fs.h jeeps/gps.h jeeps/gpsport.h \
    jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
    jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
    jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
    jeeps/gpsproj.h garmin_tables.h grtcirc.h strptime.h
 -garmin_xt.o: garmin_xt.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
-+garmin_xt.o: garmin_xt.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -gbfile.o: gbfile.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
++garmin_xt.o: garmin_xt.cc defs.h config.h queue.h \
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
 +gbfile.o: gbfile.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   src/core/logging.h
 -gbser.o: gbser.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +gbser.o: gbser.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   gbser.h gbser_private.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h gbser.h \
+   gbser_private.h
 -gbser_posix.o: gbser_posix.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +gbser_posix.o: gbser_posix.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h gbser.h gbser_private.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   gbser.h gbser_private.h
  gbsleep.o: gbsleep.cc config.h
 -gdb.o: gdb.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +gdb.o: gdb.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h csv_util.h \
+   cet.h inifile.h session.h src/core/datetime.h cet_util.h csv_util.h \
    garmin_fs.h jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h \
    jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
    jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
@@ -229,529 +227,513 @@ index f950160..f278463 100644
    garmin_tables.h grtcirc.h
 -geo.o: geo.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +geo.o: geo.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   src/core/file.h
+   cet.h inifile.h session.h src/core/datetime.h src/core/file.h
 -ggv_log.o: ggv_log.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +ggv_log.o: ggv_log.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   grtcirc.h jeeps/gpsmath.h jeeps/gpsport.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h grtcirc.h \
+   jeeps/gpsmath.h jeeps/gpsport.h
 -ggv_ovl.o: ggv_ovl.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +ggv_ovl.o: ggv_ovl.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
    grtcirc.h
 -globals.o: globals.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +globals.o: globals.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   gbversion.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h gbversion.h
 -glogbook.o: glogbook.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +glogbook.o: glogbook.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   xmlgeneric.h src/core/file.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h \
+   src/core/file.h
 -gnav_trl.o: gnav_trl.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +gnav_trl.o: gnav_trl.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -google.o: google.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +google.o: google.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   xmlgeneric.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h
 -googledir.o: googledir.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +googledir.o: googledir.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h xmlgeneric.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   xmlgeneric.h
 -gopal.o: gopal.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +gopal.o: gopal.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
    csv_util.h strptime.h jeeps/gpsmath.h jeeps/gpsport.h grtcirc.h
 -gpssim.o: gpssim.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +gpssim.o: gpssim.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -gpsutil.o: gpsutil.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +gpsutil.o: gpsutil.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
    magellan.h
 -gpx.o: gpx.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +gpx.o: gpx.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h garmin_fs.h \
+   cet.h inifile.h session.h src/core/datetime.h cet_util.h garmin_fs.h \
    jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
    jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
-   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
-   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h src/core/file.h \
-   src/core/xmlstreamwriter.h src/core/xmltag.h
+@@ -595,79 +592,79 @@ gpx.o: gpx.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h \
+   src/core/logging.h src/core/file.h src/core/xmlstreamwriter.h \
+   src/core/xmltag.h
 -grtcirc.o: grtcirc.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +grtcirc.o: grtcirc.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   grtcirc.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h grtcirc.h
 -gtm.o: gtm.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +gtm.o: gtm.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   jeeps/gpsmath.h jeeps/gpsport.h
+   cet.h inifile.h session.h src/core/datetime.h jeeps/gpsmath.h \
+   jeeps/gpsport.h
 -gtrnctr.o: gtrnctr.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +gtrnctr.o: gtrnctr.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   xmlgeneric.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h
 -height.o: height.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +height.o: height.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   filterdefs.h height.h
- hiketech.o: hiketech.cc src/core/xmlstreamwriter.h defs.h config.h \
--  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
-+  queue.h gbfile.h cet.h cet_util.h inifile.h \
-   session.h src/core/datetime.h xmlgeneric.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h filterdefs.h \
+   height.h
+-hiketech.o: hiketech.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
++hiketech.o: hiketech.cc defs.h config.h queue.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h \
+   src/core/xmlstreamwriter.h
 -holux.o: holux.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +holux.o: holux.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   holux.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h holux.h
 -html.o: html.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +html.o: html.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   jeeps/gpsmath.h jeeps/gpsport.h src/core/xmltag.h
+   cet.h inifile.h session.h src/core/datetime.h jeeps/gpsmath.h \
+   jeeps/gpsport.h src/core/xmltag.h
 -humminbird.o: humminbird.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
-+humminbird.o: humminbird.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -igc.o: igc.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
++humminbird.o: humminbird.cc defs.h config.h queue.h \
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
 +igc.o: igc.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   cet.h inifile.h session.h src/core/datetime.h cet_util.h
 -ignrando.o: ignrando.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +ignrando.o: ignrando.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   xmlgeneric.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h
 -igo8.o: igo8.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +igo8.o: igo8.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   cet.h inifile.h session.h src/core/datetime.h cet_util.h
 -ik3d.o: ik3d.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +ik3d.o: ik3d.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h xmlgeneric.h
+   cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h
 -inifile.o: inifile.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +inifile.o: inifile.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
--internal_styles.o: internal_styles.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
 +internal_styles.o: internal_styles.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
+-internal_styles.o: internal_styles.cc defs.h config.h queue.h zlib/zlib.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -interpolate.o: interpolate.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +interpolate.o: interpolate.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h filterdefs.h grtcirc.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   filterdefs.h grtcirc.h
 -itracku.o: itracku.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +itracku.o: itracku.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   gbser.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h gbser.h
  jeeps/gpsapp.o: jeeps/gpsapp.cc jeeps/gps.h jeeps/../defs.h config.h \
--  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
-+  queue.h gbfile.h cet.h cet_util.h inifile.h \
+-  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h session.h \
++  queue.h gbfile.h cet.h inifile.h session.h \
+   src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
+   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/garminusb.h \
+   jeeps/gpsusbint.h jeeps/gpsserial.h
+ jeeps/gpscom.o: jeeps/gpscom.cc jeeps/gps.h jeeps/../defs.h config.h \
+-  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h session.h \
++  queue.h gbfile.h cet.h inifile.h session.h \
+   src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
+   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
+ jeeps/gpsdevice.o: jeeps/gpsdevice.cc jeeps/gps.h jeeps/../defs.h \
+-  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h \
++  config.h queue.h gbfile.h cet.h inifile.h \
    session.h src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h \
    jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
    jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
    jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
-   jeeps/garminusb.h jeeps/gpsusbint.h
- jeeps/gpscom.o: jeeps/gpscom.cc jeeps/gps.h jeeps/../defs.h config.h \
--  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
-+  queue.h gbfile.h cet.h cet_util.h inifile.h \
+   jeeps/gpsserial.h
+ jeeps/gpsdevice_ser.o: jeeps/gpsdevice_ser.cc jeeps/gps.h jeeps/../defs.h \
+-  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h \
++  config.h queue.h gbfile.h cet.h inifile.h \
    session.h src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h \
    jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
    jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
-   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
- jeeps/gpsdevice.o: jeeps/gpsdevice.cc jeeps/gps.h jeeps/../defs.h \
--  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h \
-+  config.h queue.h gbfile.h cet.h cet_util.h \
-   inifile.h session.h src/core/datetime.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
-   jeeps/gpsproj.h jeeps/gpsserial.h
- jeeps/gpsdevice_ser.o: jeeps/gpsdevice_ser.cc jeeps/gps.h jeeps/../defs.h \
--  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h \
-+  config.h queue.h gbfile.h cet.h cet_util.h \
-   inifile.h session.h src/core/datetime.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
-   jeeps/gpsproj.h jeeps/gpsserial.h
+   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
+   jeeps/gpsserial.h
  jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gps.h jeeps/../defs.h \
--  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h \
-+  config.h queue.h gbfile.h cet.h cet_util.h \
-   inifile.h session.h src/core/datetime.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-@@ -692,7 +689,7 @@ jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gps.h jeeps/../defs.h \
-   jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbint.h \
-   jeeps/gpsusbcommon.h
- jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/usb.h \
--  jeeps/gps.h jeeps/../defs.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
-+  jeeps/gps.h jeeps/../defs.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-@@ -700,93 +697,93 @@ jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/usb.h \
-   jeeps/gpsinput.h jeeps/gpsproj.h jeeps/garminusb.h \
-   jeeps/gpsusbcommon.h jeeps/../garmin_device_xml.h
- jeeps/gpsmath.o: jeeps/gpsmath.cc jeeps/gps.h jeeps/../defs.h config.h \
--  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
-+  queue.h gbfile.h cet.h cet_util.h inifile.h \
+-  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h \
++  config.h queue.h gbfile.h cet.h inifile.h \
    session.h src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h \
    jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
    jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
    jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
-   jeeps/gpsdatum.h
+   jeeps/garminusb.h jeeps/gpsusbint.h jeeps/gpsusbcommon.h
+ jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/usb.h \
+-  jeeps/gps.h jeeps/../defs.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
++  jeeps/gps.h jeeps/../defs.h queue.h gbfile.h \
+   cet.h inifile.h session.h src/core/datetime.h jeeps/gpsport.h \
+   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
+   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
+@@ -675,89 +672,89 @@ jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/usb.h \
+   jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbcommon.h \
+   jeeps/../garmin_device_xml.h
+ jeeps/gpsmath.o: jeeps/gpsmath.cc jeeps/gps.h jeeps/../defs.h config.h \
+-  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h session.h \
++  queue.h gbfile.h cet.h inifile.h session.h \
+   src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
+   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/gpsdatum.h
  jeeps/gpsmem.o: jeeps/gpsmem.cc jeeps/gps.h jeeps/../defs.h config.h \
--  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
-+  queue.h gbfile.h cet.h cet_util.h inifile.h \
-   session.h src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h \
-   jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
-   jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
-   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
+-  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h session.h \
++  queue.h gbfile.h cet.h inifile.h session.h \
+   src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
+   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
  jeeps/gpsprot.o: jeeps/gpsprot.cc jeeps/gps.h jeeps/../defs.h config.h \
--  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
-+  queue.h gbfile.h cet.h cet_util.h inifile.h \
-   session.h src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h \
-   jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
-   jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
-   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
+-  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h session.h \
++  queue.h gbfile.h cet.h inifile.h session.h \
+   src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
+   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
  jeeps/gpsread.o: jeeps/gpsread.cc jeeps/gps.h jeeps/../defs.h config.h \
--  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
-+  queue.h gbfile.h cet.h cet_util.h inifile.h \
+-  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h session.h \
++  queue.h gbfile.h cet.h inifile.h session.h \
+   src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
+   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/gpsserial.h
+ jeeps/gpsrqst.o: jeeps/gpsrqst.cc jeeps/gps.h jeeps/../defs.h config.h \
+-  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h session.h \
++  queue.h gbfile.h cet.h inifile.h session.h \
+   src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
+   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
+ jeeps/gpssend.o: jeeps/gpssend.cc jeeps/gps.h jeeps/../defs.h config.h \
+-  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h session.h \
++  queue.h gbfile.h cet.h inifile.h session.h \
+   src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
+   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/gpsserial.h
+ jeeps/gpsserial.o: jeeps/gpsserial.cc jeeps/gps.h jeeps/../defs.h \
+-  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h \
++  config.h queue.h gbfile.h cet.h inifile.h \
    session.h src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h \
    jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
    jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
    jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
-   jeeps/gpsserial.h
- jeeps/gpsrqst.o: jeeps/gpsrqst.cc jeeps/gps.h jeeps/../defs.h config.h \
--  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
-+  queue.h gbfile.h cet.h cet_util.h inifile.h \
+   jeeps/gpsserial.h jeeps/../gbser.h gbser_posix.h
+ jeeps/gpsusbcommon.o: jeeps/gpsusbcommon.cc jeeps/gps.h jeeps/../defs.h \
+-  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h \
++  config.h queue.h gbfile.h cet.h inifile.h \
    session.h src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h \
    jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
    jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
-   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
- jeeps/gpssend.o: jeeps/gpssend.cc jeeps/gps.h jeeps/../defs.h config.h \
--  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
-+  queue.h gbfile.h cet.h cet_util.h inifile.h \
+   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
+   jeeps/garminusb.h jeeps/gpsusbcommon.h
+ jeeps/gpsusbread.o: jeeps/gpsusbread.cc jeeps/gps.h jeeps/../defs.h \
+-  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h \
++  config.h queue.h gbfile.h cet.h inifile.h \
    session.h src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h \
    jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
    jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
    jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
-   jeeps/gpsserial.h
- jeeps/gpsserial.o: jeeps/gpsserial.cc jeeps/gps.h jeeps/../defs.h \
--  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h \
-+  config.h queue.h gbfile.h cet.h cet_util.h \
-   inifile.h session.h src/core/datetime.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
-   jeeps/gpsproj.h jeeps/gpsserial.h jeeps/../gbser.h
- jeeps/gpsusbcommon.o: jeeps/gpsusbcommon.cc jeeps/gps.h jeeps/../defs.h \
--  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h \
-+  config.h queue.h gbfile.h cet.h cet_util.h \
-   inifile.h session.h src/core/datetime.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
-   jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbcommon.h
- jeeps/gpsusbread.o: jeeps/gpsusbread.cc jeeps/gps.h jeeps/../defs.h \
--  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h \
-+  config.h queue.h gbfile.h cet.h cet_util.h \
-   inifile.h session.h src/core/datetime.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
-   jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbint.h
+   jeeps/garminusb.h jeeps/gpsusbint.h
  jeeps/gpsusbsend.o: jeeps/gpsusbsend.cc jeeps/gps.h jeeps/../defs.h \
--  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h \
-+  config.h queue.h gbfile.h cet.h cet_util.h \
-   inifile.h session.h src/core/datetime.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
-   jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbint.h
- jeeps/jgpsutil.o: jeeps/jgpsutil.cc jeeps/gps.h jeeps/../defs.h config.h \
--  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
-+  queue.h gbfile.h cet.h cet_util.h inifile.h \
+-  config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h \
++  config.h queue.h gbfile.h cet.h inifile.h \
    session.h src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h \
    jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
    jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
-   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
+   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
+   jeeps/garminusb.h jeeps/gpsusbint.h
+ jeeps/jgpsutil.o: jeeps/jgpsutil.cc jeeps/gps.h jeeps/../defs.h config.h \
+-  queue.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h inifile.h session.h \
++  queue.h gbfile.h cet.h inifile.h session.h \
+   src/core/datetime.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
+   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
 -jogmap.o: jogmap.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +jogmap.o: jogmap.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   xmlgeneric.h jeeps/gpsmath.h jeeps/gpsport.h garmin_tables.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h garmin_tables.h \
+   jeeps/gpsmath.h jeeps/gpsport.h xmlgeneric.h
 -jtr.o: jtr.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +jtr.o: jtr.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h csv_util.h
+   cet.h inifile.h session.h src/core/datetime.h csv_util.h
 -kml.o: kml.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +kml.o: kml.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h xmlgeneric.h \
-   grtcirc.h src/core/file.h src/core/xmlstreamwriter.h src/core/xmltag.h
+   cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h grtcirc.h \
+   src/core/file.h src/core/xmlstreamwriter.h src/core/xmltag.h
 -lmx.o: lmx.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +lmx.o: lmx.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h xmlgeneric.h
+   cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h
 -lowranceusr.o: lowranceusr.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
-+lowranceusr.o: lowranceusr.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -lowranceusr4.o: lowranceusr4.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
++lowranceusr.o: lowranceusr.cc defs.h config.h queue.h \
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
 +lowranceusr4.o: lowranceusr4.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
  mac/libusb/darwin.o: mac/libusb/darwin.c config.h mac/libusb/usbi.h \
    mac/libusb/usb.h mac/libusb/error.h
-@@ -796,267 +793,240 @@ mac/libusb/error.o: mac/libusb/error.c mac/libusb/usb.h \
+ mac/libusb/descriptors.o: mac/libusb/descriptors.c mac/libusb/usbi.h \
+@@ -766,257 +763,230 @@ mac/libusb/error.o: mac/libusb/error.c mac/libusb/usb.h \
    mac/libusb/error.h
  mac/libusb/usb.o: mac/libusb/usb.c mac/libusb/usbi.h mac/libusb/usb.h \
    mac/libusb/error.h
 -maggeo.o: maggeo.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +maggeo.o: maggeo.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   csv_util.h xmlgeneric.h magellan.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h csv_util.h \
+   xmlgeneric.h magellan.h
 -magproto.o: magproto.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +magproto.o: magproto.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   magellan.h gbser.h explorist_ini.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h magellan.h \
+   gbser.h explorist_ini.h
 -main.o: main.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +main.o: main.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h filterdefs.h \
-   csv_util.h
+   cet.h inifile.h session.h src/core/datetime.h filterdefs.h cet_util.h \
+   csv_util.h src/core/usasciicodec.h
 -mapasia.o: mapasia.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +mapasia.o: mapasia.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -mapbar_track.o: mapbar_track.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
+-mapfactor.o: mapfactor.cc defs.h config.h queue.h zlib/zlib.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +mapbar_track.o: mapbar_track.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
++mapfactor.o: mapfactor.cc defs.h config.h queue.h \
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   src/core/file.h src/core/xmlstreamwriter.h
 -mapsend.o: mapsend.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +mapsend.o: mapsend.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   mapsend.h magellan.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h mapsend.h \
+   magellan.h
 -mapsource.o: mapsource.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +mapsource.o: mapsource.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h
 -mkshort.o: mkshort.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +mkshort.o: mkshort.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h
 -mmo.o: mmo.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +mmo.o: mmo.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   cet.h inifile.h session.h src/core/datetime.h
 -mtk_locus.o: mtk_locus.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +mtk_locus.o: mtk_locus.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h gbser.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   gbser.h
 -mtk_logger.o: mtk_logger.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +mtk_logger.o: mtk_logger.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h gbser.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   gbser.h
+-mynav.o: mynav.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
++mynav.o: mynav.cc defs.h config.h queue.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -navicache.o: navicache.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +navicache.o: navicache.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h src/core/file.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   cet_util.h src/core/file.h
 -naviguide.o: naviguide.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +naviguide.o: naviguide.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h csv_util.h jeeps/gpsmath.h jeeps/gpsport.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   csv_util.h jeeps/gpsmath.h jeeps/gpsport.h
 -navilink.o: navilink.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +navilink.o: navilink.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   gbser.h jeeps/gpsmath.h jeeps/gpsport.h navilink.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h gbser.h \
+   jeeps/gpsmath.h jeeps/gpsport.h navilink.h
 -navitel.o: navitel.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +navitel.o: navitel.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   jeeps/gpsmath.h jeeps/gpsport.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h jeeps/gpsmath.h \
+   jeeps/gpsport.h
 -netstumbler.o: netstumbler.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +netstumbler.o: netstumbler.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h csv_util.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   cet_util.h csv_util.h
 -nmea.o: nmea.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +nmea.o: nmea.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h gbser.h \
+   cet.h inifile.h session.h src/core/datetime.h cet_util.h gbser.h \
    strptime.h jeeps/gpsmath.h jeeps/gpsport.h
 -nmn4.o: nmn4.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +nmn4.o: nmn4.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h csv_util.h
+   cet.h inifile.h session.h src/core/datetime.h cet_util.h csv_util.h
 -nukedata.o: nukedata.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +nukedata.o: nukedata.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   filterdefs.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h filterdefs.h
 -osm.o: osm.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +osm.o: osm.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h xmlgeneric.h
+   cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h
 -ozi.o: ozi.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +ozi.o: ozi.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h csv_util.h \
+   cet.h inifile.h session.h src/core/datetime.h cet_util.h csv_util.h \
    jeeps/gpsmath.h jeeps/gpsport.h
 -parse.o: parse.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +parse.o: parse.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   jeeps/gpsmath.h jeeps/gpsport.h strptime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h jeeps/gpsmath.h \
+   jeeps/gpsport.h strptime.h
 -pcx.o: pcx.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +pcx.o: pcx.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   garmin_tables.h csv_util.h
+   cet.h inifile.h session.h src/core/datetime.h garmin_tables.h \
+   cet_util.h csv_util.h
 -pocketfms_bc.o: pocketfms_bc.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
-+pocketfms_bc.o: pocketfms_bc.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -pocketfms_fp.o: pocketfms_fp.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
++pocketfms_bc.o: pocketfms_bc.cc defs.h config.h queue.h \
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
 +pocketfms_fp.o: pocketfms_fp.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h xmlgeneric.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   xmlgeneric.h
 -pocketfms_wp.o: pocketfms_wp.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +pocketfms_wp.o: pocketfms_wp.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h csv_util.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   csv_util.h
 -polygon.o: polygon.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +polygon.o: polygon.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   filterdefs.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h filterdefs.h
 -position.o: position.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +position.o: position.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   filterdefs.h grtcirc.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h filterdefs.h \
+   grtcirc.h
 -psitrex.o: psitrex.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +psitrex.o: psitrex.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   garmin_tables.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h garmin_tables.h
  queue.o: queue.cc queue.h
 -radius.o: radius.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +radius.o: radius.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   filterdefs.h grtcirc.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h filterdefs.h \
+   grtcirc.h
 -random.o: random.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +random.o: random.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   garmin_fs.h jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h \
-   jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
-   jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
-   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h garmin_fs.h \
+   jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
+   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
 -raymarine.o: raymarine.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +raymarine.o: raymarine.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h csv_util.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   cet_util.h csv_util.h
 -reverse_route.o: reverse_route.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +reverse_route.o: reverse_route.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h filterdefs.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   filterdefs.h
 -rgbcolors.o: rgbcolors.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
-+rgbcolors.o: rgbcolors.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -route.o: route.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
++rgbcolors.o: rgbcolors.cc defs.h config.h queue.h \
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
 +route.o: route.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   grtcirc.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h grtcirc.h
 -saroute.o: saroute.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +saroute.o: saroute.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   grtcirc.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h grtcirc.h
 -sbn.o: sbn.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +sbn.o: sbn.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h navilink.h
+   cet.h inifile.h session.h src/core/datetime.h navilink.h
 -sbp.o: sbp.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +sbp.o: sbp.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h navilink.h
+   cet.h inifile.h session.h src/core/datetime.h navilink.h
 -session.o: session.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +session.o: session.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -shape.o: shape.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +shape.o: shape.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -skyforce.o: skyforce.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +skyforce.o: skyforce.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +skytraq.o: skytraq.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   gbser.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h gbser.h
 -smplrout.o: smplrout.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +smplrout.o: smplrout.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   filterdefs.h grtcirc.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h filterdefs.h \
+   grtcirc.h
 -sort.o: sort.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +sort.o: sort.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h filterdefs.h
+   cet.h inifile.h session.h src/core/datetime.h filterdefs.h
+ src/core/usasciicodec.o: src/core/usasciicodec.cc src/core/usasciicodec.h
  src/core/xmlstreamwriter.o: src/core/xmlstreamwriter.cc \
    src/core/xmlstreamwriter.h
 -stackfilter.o: stackfilter.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +stackfilter.o: stackfilter.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h filterdefs.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   filterdefs.h
 -stmsdf.o: stmsdf.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +stmsdf.o: stmsdf.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
    csv_util.h strptime.h jeeps/gpsmath.h jeeps/gpsport.h grtcirc.h
 -stmwpp.o: stmwpp.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +stmwpp.o: stmwpp.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   csv_util.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h csv_util.h \
+   cet_util.h
  strptime.o: strptime.c config.h strptime.h
 -subrip.o: subrip.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +subrip.o: subrip.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -swapdata.o: swapdata.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +swapdata.o: swapdata.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   filterdefs.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h filterdefs.h
 -tef_xml.o: tef_xml.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +tef_xml.o: tef_xml.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   xmlgeneric.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h
 -teletype.o: teletype.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +teletype.o: teletype.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -text.o: text.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +text.o: text.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   jeeps/gpsmath.h jeeps/gpsport.h src/core/xmltag.h
+   cet.h inifile.h session.h src/core/datetime.h jeeps/gpsmath.h \
+   jeeps/gpsport.h src/core/xmltag.h
 -tiger.o: tiger.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +tiger.o: tiger.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
    csv_util.h
 -tmpro.o: tmpro.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +tmpro.o: tmpro.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
    csv_util.h
 -tomtom.o: tomtom.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +tomtom.o: tomtom.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -tpg.o: tpg.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +tpg.o: tpg.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   jeeps/gpsmath.h jeeps/gpsport.h
+   cet.h inifile.h session.h src/core/datetime.h jeeps/gpsmath.h \
+   jeeps/gpsport.h
 -tpo.o: tpo.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +tpo.o: tpo.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   jeeps/gpsmath.h jeeps/gpsport.h
+   cet.h inifile.h session.h src/core/datetime.h jeeps/gpsmath.h \
+   jeeps/gpsport.h
 -trackfilter.o: trackfilter.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +trackfilter.o: trackfilter.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h filterdefs.h strptime.h grtcirc.h xmlgeneric.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   filterdefs.h grtcirc.h strptime.h xmlgeneric.h
 -transform.o: transform.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +transform.o: transform.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h filterdefs.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   filterdefs.h
 -unicsv.o: unicsv.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +unicsv.o: unicsv.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
    csv_util.h garmin_fs.h jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h \
    jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
    jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
@@ -759,82 +741,77 @@ index f950160..f278463 100644
    garmin_tables.h
 -units.o: units.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +units.o: units.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -util.o: util.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +util.o: util.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   src/core/xmltag.h jeeps/gpsmath.h jeeps/gpsport.h
+   cet.h inifile.h session.h src/core/datetime.h src/core/xmltag.h \
+   jeeps/gpsmath.h jeeps/gpsport.h
  util_crc.o: util_crc.cc
 -v900.o: v900.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +v900.o: v900.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   cet.h inifile.h session.h src/core/datetime.h
 -validate.o: validate.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +validate.o: validate.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   filterdefs.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h filterdefs.h
 -vcf.o: vcf.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +vcf.o: vcf.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   jeeps/gpsmath.h jeeps/gpsport.h
+   cet.h inifile.h session.h src/core/datetime.h jeeps/gpsmath.h \
+   jeeps/gpsport.h
 -vecs.o: vecs.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +vecs.o: vecs.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h csv_util.h \
-   gbversion.h
+   cet.h inifile.h session.h src/core/datetime.h csv_util.h gbversion.h
 -vidaone.o: vidaone.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +vidaone.o: vidaone.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -vitosmt.o: vitosmt.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +vitosmt.o: vitosmt.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   grtcirc.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h grtcirc.h
 -vitovtt.o: vitovtt.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +vitovtt.o: vitovtt.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -vpl.o: vpl.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +vpl.o: vpl.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h
+   cet.h inifile.h session.h src/core/datetime.h
 -waypt.o: waypt.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +waypt.o: waypt.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
    grtcirc.h garmin_fs.h jeeps/gps.h jeeps/gpsport.h jeeps/gpsdevice.h \
    jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
    jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
-   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
+   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
+   src/core/logging.h
 -wbt-200.o: wbt-200.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +wbt-200.o: wbt-200.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   gbser.h grtcirc.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h gbser.h \
+   grtcirc.h
 -wfff_xml.o: wfff_xml.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +wfff_xml.o: wfff_xml.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   xmlgeneric.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h
 -wintec_tes.o: wintec_tes.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
-+wintec_tes.o: wintec_tes.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h
 -xcsv.o: xcsv.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
++wintec_tes.o: wintec_tes.cc defs.h config.h queue.h \
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h
 +xcsv.o: xcsv.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h csv_util.h \
+   cet.h inifile.h session.h src/core/datetime.h cet_util.h csv_util.h \
    jeeps/gpsmath.h jeeps/gpsport.h
  xhtmlent.o: xhtmlent.cc
 -xmlgeneric.o: xmlgeneric.cc defs.h config.h queue.h zlib/zlib.h \
--  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  zlib/zconf.h gbfile.h cet.h inifile.h session.h src/core/datetime.h \
 +xmlgeneric.o: xmlgeneric.cc defs.h config.h queue.h \
-+  gbfile.h cet.h cet_util.h inifile.h session.h \
-   src/core/datetime.h xmlgeneric.h src/core/file.h
++  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
+   xmlgeneric.h cet_util.h src/core/file.h
 -xmltag.o: xmltag.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +xmltag.o: xmltag.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h cet_util.h \
    src/core/xmltag.h
 -xol.o: xol.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h gbfile.h \
 +xol.o: xol.cc defs.h config.h queue.h gbfile.h \
-   cet.h cet_util.h inifile.h session.h src/core/datetime.h xmlgeneric.h \
+   cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h \
    jeeps/gpsmath.h jeeps/gpsport.h garmin_tables.h
 -yahoo.o: yahoo.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
 +yahoo.o: yahoo.cc defs.h config.h queue.h \
-   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \
-   xmlgeneric.h
+   gbfile.h cet.h inifile.h session.h src/core/datetime.h xmlgeneric.h
 -zlib/adler32.o: zlib/adler32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \
 -  config.h
 -zlib/compress.o: zlib/compress.c zlib/zlib.h zlib/zconf.h config.h
@@ -867,21 +844,21 @@ index f950160..f278463 100644
  internal_styles.cc: mkstyle.sh $(srcdir)/style/*.style
  	$(srcdir)/mkstyle.sh > internal_styles.cc || (rm -f internal_styles.cc ; exit 1)
 diff --git a/gbfile.cc b/gbfile.cc
-index 1b5d3f5..9a97ff4 100644
+index 22fc16b..5c6d211 100644
 --- a/gbfile.cc
 +++ b/gbfile.cc
-@@ -21,7 +21,11 @@
+@@ -21,6 +21,11 @@
   */
  
  #include "defs.h"
 +#if HAVE_LIBZ
 +#include <zconf.h>
 +#elif !ZLIB_INHIBITED
- #include "zlib/zconf.h"
++#include "zlib/zconf.h"
 +#endif
  #include "gbfile.h"
+ #include "src/core/logging.h"
  
- #include <assert.h>
 -- 
-1.9.0
+2.1.0
 
diff --git a/gpsbabel-tarball b/gpsbabel-tarball
new file mode 100755
index 0000000..2803707
--- /dev/null
+++ b/gpsbabel-tarball
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Download gpsbabel and create a tarball from gpsbabel.googlecode.com's svn
+# usage: ./gpsbabel-tarball <dotversion>
+# Example: ./gpsbabel-tarball 1.5.0
+# 
+dotversion="$1"
+
+# transpose '.' into '_'
+underscoreversion=$(echo "$dotversion" | tr '.' '_' )
+
+svn export \
+  http://gpsbabel.googlecode.com/svn/tags/gpsbabel_$underscoreversion/gpsbabel \
+  gpsbabel-$dotversion
+tar cJvf gpsbabel-$dotversion.tar.xz gpsbabel-$dotversion
diff --git a/gpsbabel.spec b/gpsbabel.spec
index f582a09..5b33adb 100644
--- a/gpsbabel.spec
+++ b/gpsbabel.spec
@@ -1,27 +1,15 @@
 Name:          gpsbabel
-Version:       1.5.0
+Version:       1.5.2
 Release:       1%{?dist}
 Summary:       A tool to convert between various formats used by GPS devices
 
 Group:         Applications/Text
 License:       GPLv2+
 URL:           http://www.gpsbabel.org
-# There is no Source0 URL as upstream only offers download via HTTP
-# POST, and only for the latest release.  Point your web browser to
-# http://www.gpsbabel.org/download.html, scroll down to the linux
-# source tarball download button and click on it.  Or try the included
-# gpsbabel-download-latest.py script to download the latest tarball
-# (requires the python-BeautifulSoup package):
-#
-# $ ./gpsbabel-download-latest.py
-# Loading HTML page http://www.gpsbabel.org/download.html
-# Running curl to get tarball via HTTP POST: gpsbabel-1.4.2.tar.gz
-#   % Total   % Received % Xferd  Average Speed   Time    Time     Time  Current
-#                                 Dload  Upload   Total   Spent    Left  Speed
-# 100 5421k 100 5421k  100   260   252k     12  0:00:21  0:00:21 --:--:--  263k
-# Successfully downloaded tarball: gpsbabel-1.4.2.tar.gz
-# $
-Source0:       %{name}-%{version}.tar.gz
+# Upstream doesn't provide tarballs anymore.
+# Resort to creating a tarball from svn:
+# ./gpsbabel-download %{version}
+Source0:       %{name}-%{version}.tar.xz
 Source2:       %{name}.png
 Source21:      http://www.gpsbabel.org/style3.css
 # Remove network access requirement for XML doc builds and HTML doc reading
@@ -33,7 +21,7 @@ Patch3:        0003-gpsbabel-1.4.3-gmapbase.patch
 # No automatic phone home by default (RHBZ 668865)
 Patch4:        0004-gpsbabel-1.4.3-nosolicitation.patch
 # Add aarch64 (RHBZ 925480)
-Patch5:        0005-gpsbabel-1.4.4-config.patch
+Patch5:        0005-gpsbabel-1.5.2-config.patch
 # Use system zlib
 Patch6:        0006-Use-system-zlib.patch
 
@@ -158,6 +146,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Fri Jan 09 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.5.2-1
+- Upstream update.
+- Rebase patches.
+- Reflect upstream having stopped providing tarballs:
+  - Add gpsbabel-tarball. 
+  - Remove gpsbabel-download-latest.py.
+
 * Wed Apr 16 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.5.0-1
 - Update to 1.5.0.
 - Rebase/rework patches.
diff --git a/sources b/sources
index 24701fa..29c7e8d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-993d828189a53b353b9606fa45fe9480  style3.css
-fe536f1e091522a4bb0676700f195187  gpsbabel-1.5.0.tar.gz
+ac2e5c99f9fdf32d5b33af36117b21d9  gpsbabel-1.5.2.tar.xz


More information about the scm-commits mailing list