geography/gpsbabel: Update to 1.6.0

This switches to qt5 (from qt4).

Upstream changes since 1.5.2 in 2015 are basically a very large number
of bugfixes and minor improvements, as well as modernizing
dependencies.

See https://www.gpsbabel.org/changes.html for details.

9 files changed, 122 insertions, 261 deletions

diff --git a/geography/gpsbabel/Makefile b/geography/gpsbabel/Makefile
index ae601b9de6b..7d8611e5a0f 100644
--- a/geography/gpsbabel/Makefile
+++ b/geography/gpsbabel/Makefile
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2019/04/09 00:21:03 gdt Exp $
+# $NetBSD: Makefile,v 1.21 2019/05/02 19:01:17 gdt Exp $
 #
 
-# Update to 1.5.4 is 99% done, but stalled due to incompatibility with
-# modern qt.  Please check with $MAINTAINER before changing.
-DISTNAME=	gpsbabel-1.5.2
-PKGREVISION=	3
+DISTNAME=	gpsbabel-1.6.0
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 # Download from official site apparently only via interactive form,
@@ -14,19 +11,33 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://www.gpsbabel.org/
+#HOMEPAGE=	https://github.com/gpsbabel/gpsbabel
 COMMENT=	Utility to convert and fetch GPS related data
 LICENSE=	gnu-gpl-v2
 
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=	c c++11
+USE_TOOLS=	gmake
 
 TEST_TARGET=	check
 
+# \todo Upstream recommends trying qmake.
+GNU_CONFIGURE=	yes
+
+CONFIGURE_ENV+=	QMAKE=${QTDIR}/bin/qmake
+CONFIGURE_ENV+=	LUPDATE=${QTDIR}/bin/lupdate
+CONFIGURE_ENV+=	LRELEASE=${QTDIR}/bin/lrelease
+
+# \todo This seems like a bug; explain why.
 LIBS.Darwin+=	-lexpat
 
-GNU_CONFIGURE=	yes
+# \todo Figure out stdarg warnings for code that looks correct.
+# util.cc: In function 'int xasprintf(char**, const char*, ...)':
+# util.cc:233:22: warning: second parameter of 'va_start' not last named argument [-Wvarargs]
+#    va_start(args, fmt);
+#                       ^
 
 .include "../../mk/libusb.buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/gpsbabel/distinfo b/geography/gpsbabel/distinfo
index 4726a913296..e18fa23f1ed 100644
--- a/geography/gpsbabel/distinfo
+++ b/geography/gpsbabel/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.11 2016/12/21 13:37:24 joerg Exp $
+$NetBSD: distinfo,v 1.12 2019/05/02 19:01:17 gdt Exp $
 
-SHA1 (gpsbabel-1.5.2.tar.gz) = 4962a7e98bbfcbfd59baa970e9b33d1300053004
-RMD160 (gpsbabel-1.5.2.tar.gz) = 86a54f6e6647ed8eaa340641e9240565acf5ca99
-SHA512 (gpsbabel-1.5.2.tar.gz) = 6c19856b893f4f15019e4c66a2f7e7cc490c1dd404c0830704ca50f42f3242d5c76557fb8e41b80e43f0a747899ebe3845331dca769f089fbddb6e6cf55ffe50
-Size (gpsbabel-1.5.2.tar.gz) = 8392465 bytes
-SHA1 (patch-ad) = 9f7d481ddc1d2935fb05df687db25127fe3b37f0
-SHA1 (patch-af) = 5f066824b49f959ea8b06cdeccf21a4ce789fd1d
-SHA1 (patch-bushnell.cc) = 258c41eebe7a606c9143d6982d953da6719493d1
-SHA1 (patch-configure) = 1050c5c0117c41ea4aa276d774c34b47a89b56e2
-SHA1 (patch-configure.in) = f046a83e7ddf0a0f26d5623709ad799284875b49
-SHA1 (patch-testo) = 9c71a74aae088eb110c837114a7b691c3a8d9ff6
+SHA1 (gpsbabel-1.6.0.tar.gz) = 06232445b481f7617850576e31b0611e07329645
+RMD160 (gpsbabel-1.6.0.tar.gz) = ffa872cd4e5520c4bfa828f318647ae8b2bcdde6
+SHA512 (gpsbabel-1.6.0.tar.gz) = 369bf34aab957a88aeeb657fceb897cbe5e00e6c915760f9b278d9581d98c57084ff6ad65281a18dd7a24bec463335d5e0969c62aeddfbd05d0c5ab05fef6999
+Size (gpsbabel-1.6.0.tar.gz) = 14101201 bytes
+SHA1 (patch-ad) = a2712225fc3cb70bfdf6ce90e4197cf2ce7e27e0
+SHA1 (patch-af) = 8bb5d9392ae682fd098578ef7a25ad84683f68c6
+SHA1 (patch-configure) = 76c4b79c26712492e2f4b060fe70d5661415f42f
+SHA1 (patch-configure.ac) = 1269690568490dbb91cf25ad87dd3fb53b3ee3c1
diff --git a/geography/gpsbabel/patches/patch-ad b/geography/gpsbabel/patches/patch-ad
index 7afffec52dd..4b289f8310c 100644
--- a/geography/gpsbabel/patches/patch-ad
+++ b/geography/gpsbabel/patches/patch-ad
@@ -1,47 +1,10 @@
-$NetBSD: patch-ad,v 1.5 2015/06/06 12:57:58 gdt Exp $
+$NetBSD: patch-ad,v 1.6 2019/05/02 19:01:17 gdt Exp $
 
 This patch was rejected by upstream.  There is a comment in upstream
 Makefile.in that explains why there is no space, and output flag is
-set to "-o ", so that the output flag can be set to "-Fo" for MSVC.n
+set to "-o ", so that the output flag can be set to "-Fo" for MSVC.
 
 On NetBSD, the upstream version works, but there is some mysterious
 failure on Mac OS X.  This patch therefore needs investigation and
 resolution to be filed with upstream.  (It almost certainly breaks
 native compilation on Windows, but that's not a pkgsrc platform.)
-
---- Makefile.in.orig	2014-12-17 00:47:31.000000000 +0000
-+++ Makefile.in
-@@ -119,9 +119,9 @@ OBJS = main.o globals.o $(LIBOBJS) @FILE
- DEPFILES = $(OBJS:.o=.d)
- 
- .cc.o:
--	$(CXX) @CPPFLAGS@ @CXXFLAGS@ -c $(GBCFLAGS) $< $(OUTPUT_SWITCH)$@
-+	$(CXX) @CPPFLAGS@ @CXXFLAGS@ -c $(GBCFLAGS) $< $(OUTPUT_SWITCH) $@
- .c.o:
--	$(CC) @CPPFLAGS@ @CFLAGS@ -c $(GBCFLAGS) $< $(OUTPUT_SWITCH)$@
-+	$(CC) @CPPFLAGS@ @CFLAGS@ -c $(GBCFLAGS) $< $(OUTPUT_SWITCH) $@
- 
- 
- 
-@@ -141,10 +141,10 @@ gui linux-gui mac-gui mac-gui-dmg msvc-b
- all: gpsbabel$(EXEEXT)
- 
- gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ 
--	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH) $@
- 
- gpsbabel-debug: $(OBJS)
--	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH) $@
- 
- Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
- 	  gbversion.h.in gui/setup.iss.in
-@@ -157,7 +157,7 @@ config.status: configure 
- 	$(SHELL) config.status --recheck
- 
- jeeps/gpslibusb.o: 
--	$(CXX) @CPPFLAGS@ @CXXFLAGS@ -c $(GBCFLAGS) @USB_CFLAGS@ @srcdir@/jeeps/gpslibusb.cc $(OUTPUT_SWITCH)$@
-+	$(CXX) @CPPFLAGS@ @CXXFLAGS@ -c $(GBCFLAGS) @USB_CFLAGS@ @srcdir@/jeeps/gpslibusb.cc $(OUTPUT_SWITCH) $@
- 
- fileinfo.o: win32/gpsbabel.rc
- 	$(RC) -o fileinfo.o win32/gpsbabel.rc
diff --git a/geography/gpsbabel/patches/patch-af b/geography/gpsbabel/patches/patch-af
index 3c8d5d6b1b7..06fb40d1b16 100644
--- a/geography/gpsbabel/patches/patch-af
+++ b/geography/gpsbabel/patches/patch-af
@@ -1,61 +1,62 @@
-$NetBSD: patch-af,v 1.5 2015/06/06 12:57:58 gdt Exp $
+$NetBSD: patch-af,v 1.6 2019/05/02 19:01:17 gdt Exp $
 
 From Giles Lean, who places it in the public domain.  Workarounds for
 problems with buggy USB serial adapators.  Not applied by upstream
 2009-02-21 because it's too dangerous to work around problems without
 understanding them.
 
---- jeeps/gpsread.cc.orig	2014-02-13 00:12:48.000000000 +0000
+--- jeeps/gpsread.cc.orig	2019-04-14 02:32:25.000000000 +0000
 +++ jeeps/gpsread.cc
-@@ -98,6 +98,36 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
+@@ -95,6 +95,37 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
        GPS_Diag("%02x ", u);
  
        if (!len) {
-+                /*
-+                 * Missed DLE characters have been observed with Geko
-+                 * 201 and Legend GPSRs with Prolific USB-serial
-+                 * cables.  The following kludge seems to help.
-+                 *
-+                 * It has been tested so far with the following
-+                 * combinations of software and hardware:
-+                 *
-+                 * OS X 10.4.x and 10.5.x:
-+                 *
-+                 * - a Geko 201 (firmware version 2.70) and a third
-+                 *   party cable using a Prolific USB-serial converter
-+                 * - a Legend using a serial cable with a non-integral
-+                 *   Prolific USB-serial converter.
-+                 *
-+                 * NetBSD-4.0/i386 with the Geko and cable as above.
-+                 *
-+                 * REVISIT GFL Should this be a switch in a .ini file?
-+                 *
-+                 * + it's a kludge, so leaving it always on is ugly
-+                 * - if it's harmless to properly working hardware,
-+                 *   then it's a better user experience to leave it on
-+                 */
-+                if (u == 0x06 || u == 0x15)
-+                {
-+                    ++len;
-+		    (void) fprintf(stderr,"GPS_Packet_Read: inserted DLE due to 0x%02x.\n", u);
-+                    goto dle_missed;
-+                }
 +
++	/*
++	 * Missed DLE characters have been observed with Geko
++	 * 201 and Legend GPSRs with Prolific USB-serial
++	 * cables.  The following kludge seems to help.
++	 *
++	 * It has been tested so far with the following
++	 * combinations of software and hardware:
++	 *
++	 * OS X 10.4.x and 10.5.x:
++	 *
++	 * - a Geko 201 (firmware version 2.70) and a third
++	 *   party cable using a Prolific USB-serial converter
++	 * - a Legend using a serial cable with a non-integral
++	 *   Prolific USB-serial converter.
++	 *
++	 * NetBSD-4.0/i386 with the Geko and cable as above.
++	 *
++	 * REVISIT GFL Should this be a switch in a .ini file?
++	 *
++	 * + it's a kludge, so leaving it always on is ugly
++	 * - if it's harmless to properly working hardware,
++	 *   then it's a better user experience to leave it on
++	 */
++	if (u == 0x06 || u == 0x15)
++	  {
++	    ++len;
++	    (void) fprintf(stderr,"GPS_Packet_Read: inserted DLE due to 0x%02x.\n", u);
++	    goto dle_missed;
++	  }
++	
          if (u != DLE) {
-           (void) fprintf(stderr,"GPS_Packet_Read: No DLE.  Data received, but probably not a garmin packet.\n");
+           (void) fprintf(stderr, "GPS_Packet_Read: No DLE.  Data received, but probably not a garmin packet.\n");
            (void) fflush(stderr);
-@@ -107,6 +137,7 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
+@@ -104,6 +135,7 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
          continue;
        }
  
-+dle_missed:
-       if (len==1) {
++    dle_missed:
+       if (len == 1) {
          (*packet).type = u;
          ++len;
-@@ -130,6 +161,20 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
+@@ -127,6 +159,20 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
        if (u == ETX)
          if (isDLE) {
-           if (p-(*packet).data-2 != (*packet).n) {
+           if (p - (*packet).data - 2 != (*packet).n) {
 +	    /*
 +	     * When used with a buggy Prolific USB-serial converter the
 +	     * calling sequence GPS_A000() -> GPS_Get_Ack() sometimes
diff --git a/geography/gpsbabel/patches/patch-bushnell.cc b/geography/gpsbabel/patches/patch-bushnell.cc
deleted file mode 100644
index 3802eb6f679..00000000000
--- a/geography/gpsbabel/patches/patch-bushnell.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bushnell.cc,v 1.1 2016/12/21 13:37:24 joerg Exp $
-
-Don't check pointer signs.
-
---- bushnell.cc.orig	2016-12-21 00:00:02.839899031 +0000
-+++ bushnell.cc
-@@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name
-     name = "Waypoint";
-   }
- 
--  for (t = bushnell_icons; t->icon > 0; t++) {
-+  for (t = bushnell_icons; t->icon; t++) {
-     if (0 == name.compare(t->icon, Qt::CaseInsensitive)) {
-       return t->symbol;
-     }
-@@ -147,7 +147,7 @@ static const char*
- bushnell_get_name_from_symbol(signed int s)
- {
-   icon_mapping_t* t;
--  for (t = bushnell_icons; t->icon > 0; t++) {
-+  for (t = bushnell_icons; t->icon; t++) {
-     if (s == t->symbol) {
-       return t->icon;
-     }
diff --git a/geography/gpsbabel/patches/patch-configure b/geography/gpsbabel/patches/patch-configure
index 9ab5d14704e..8f22ace09fb 100644
--- a/geography/gpsbabel/patches/patch-configure
+++ b/geography/gpsbabel/patches/patch-configure
@@ -1,25 +1,27 @@
-$NetBSD: patch-configure,v 1.1 2015/09/07 18:57:47 gdt Exp $
+$NetBSD: patch-configure,v 1.2 2019/05/02 19:01:17 gdt Exp $
 
---- configure.orig	2015-09-01 16:32:13.000000000 +0000
+--- configure.orig	2019-04-14 02:32:25.000000000 +0000
 +++ configure
-@@ -4816,19 +4816,7 @@ rm -f core conftest.err conftest.$ac_obj
-       $as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
+@@ -6310,21 +6310,7 @@ fi
+ 	$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
  
  
--      # On Mac, use frameworks for includes and library files.
--      # Macports uses a non-standard build of Qt with an added
--      # QT_INSTALL_FRAMEWORKS flag, so look for thier custom
--      # version first.  That will fail on 'normal' Qt so fall
--      # back to QT_INSTALL_LIBS.
--      QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
--      if test $QT_FW_OR_LIBS = "**Unknown**" ; then
--         QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
--      fi
--      QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
--      QT_INC="$QT_FW_OR_LIBS"
--      QT_INC_OPT="-F"
--      QT_SYSINC_OPT="-iframework"
-+      # In pkgsrc, we use the installed qt, not the framework.
-       ;;
-     *-*-freebsd*)
- 	GBSER=gbser_posix.o
+-	# On Mac, use frameworks for includes and library files.
+-	# Macports uses a non-standard build of Qt with an added
+-	# QT_INSTALL_FRAMEWORKS flag, so look for thier custom
+-	# version first.  That will fail on 'normal' Qt so fall
+-	# back to QT_INSTALL_LIBS.
+-	QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
+-	if test "$QT_FW_OR_LIBS" = "**Unknown**"; then :
+-
+-		QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
+-
+-fi
+-	QT_LIBS="-Wl,-rpath, $QT_FW_OR_LIBS -F$QT_FW_OR_LIBS -framework QtCore"
+-	QT_INC="$QT_FW_OR_LIBS"
+-	QT_INC_OPT="-F"
+-	QT_SYSINC_OPT="-iframework"
++	# In pkgsrc, we use the installed qt, not the framework.
+  ;; #(
+   *-*-freebsd*) :
+ 
diff --git a/geography/gpsbabel/patches/patch-configure.ac b/geography/gpsbabel/patches/patch-configure.ac
new file mode 100644
index 00000000000..16bf8ea36a6
--- /dev/null
+++ b/geography/gpsbabel/patches/patch-configure.ac
@@ -0,0 +1,29 @@
+$NetBSD: patch-configure.ac,v 1.1 2019/05/02 19:01:17 gdt Exp $
+
+In pkgsrc, we don't provide Qt as a framework.
+
+It's not clear how/if this should be addressed upstream.
+
+--- configure.ac.orig	2019-04-14 02:32:25.000000000 +0000
++++ configure.ac
+@@ -232,19 +232,7 @@ AS_CASE(["$target"], [*-*-cygwin* | *-*-
+ 	USB_LIBS="-framework  IOKit -framework CoreFoundation"
+ 	AC_DEFINE(HAVE_LIBUSB, 1)
+ 
+-	# On Mac, use frameworks for includes and library files.
+-	# Macports uses a non-standard build of Qt with an added
+-	# QT_INSTALL_FRAMEWORKS flag, so look for thier custom
+-	# version first.  That will fail on 'normal' Qt so fall
+-	# back to QT_INSTALL_LIBS.
+-	QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
+-	AS_IF([test "$QT_FW_OR_LIBS" = "**Unknown**"], [
+-		QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
+-	])
+-	QT_LIBS="-Wl,-rpath, $QT_FW_OR_LIBS -F$QT_FW_OR_LIBS -framework QtCore"
+-	QT_INC="$QT_FW_OR_LIBS"
+-	QT_INC_OPT="-F"
+-	QT_SYSINC_OPT="-iframework"
++	# In pkgsrc, we use the installed qt, not the framework.
+ ], [*-*-freebsd*], [
+ 	GBSER=gbser_posix.o
+ 	AC_MSG_CHECKING(for libusb)
diff --git a/geography/gpsbabel/patches/patch-configure.in b/geography/gpsbabel/patches/patch-configure.in
deleted file mode 100644
index 751b3acb0b1..00000000000
--- a/geography/gpsbabel/patches/patch-configure.in
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-configure.in,v 1.1 2015/09/07 18:57:47 gdt Exp $
-
-In pkgsrc, we don't provide Qt as a framework.
-
-It's not clear how/if this should be addressed upstream.
-
---- configure.in.orig	2015-01-02 23:02:55.000000000 +0000
-+++ configure.in
-@@ -214,20 +214,9 @@ case "$target" in
-       mac/libusb/usb.o "
-       USB_LIBS="-framework  IOKit -framework CoreFoundation"
-       AC_DEFINE(HAVE_LIBUSB, 1)
-- 
--      # On Mac, use frameworks for includes and library files.
--      # Macports uses a non-standard build of Qt with an added 
--      # QT_INSTALL_FRAMEWORKS flag, so look for thier custom
--      # version first.  That will fail on 'normal' Qt so fall 
--      # back to QT_INSTALL_LIBS.
--      QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
--      if test $QT_FW_OR_LIBS = "**Unknown**" ; then
--         QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
--      fi
--      QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
--      QT_INC="$QT_FW_OR_LIBS"
--      QT_INC_OPT="-F"
--      QT_SYSINC_OPT="-iframework"
-+
-+
-+      # In pkgsrc, we use the installed qt, not the framework.
-       ;;
-     *-*-freebsd*)
- 	GBSER=gbser_posix.o
diff --git a/geography/gpsbabel/patches/patch-testo b/geography/gpsbabel/patches/patch-testo
deleted file mode 100644
index 2907ee17f47..00000000000
--- a/geography/gpsbabel/patches/patch-testo
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-testo,v 1.1 2015/06/06 12:57:58 gdt Exp $
-
-Remove bashisms from testo and convert to /bin/sh.
-
-Sent upstream 20150606.
-
---- testo.orig	2014-12-22 19:30:03.000000000 +0000
-+++ testo
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- GPSBABEL_FREEZE_TIME=y
- export GPSBABEL_FREEZE_TIME
-@@ -38,7 +38,7 @@ bincompare()
- 		${OD} $2 >${TMPDIR}/bc2
- 		${DIFF} ${TMPDIR}/bc1 ${TMPDIR}/bc2 || {
- 		echo ERROR binary comparing $*
--		let errorcount=errorcount+1
-+		errorcount=`expr errorcount+1`
- 		#exit 1
- 	}
- }
-@@ -47,7 +47,7 @@ compare()
- {
- 	${DIFF} -u -b -w $* ||  {
- 		echo ERROR comparing $*
--		let errorcount=errorcount+1
-+		errorcount=`expr errorcount+1`
- 		#exit 1
- 	} 
- }
-@@ -64,7 +64,7 @@ gpsbabel()
- 	${PNAME} $* || {
- 		echo "$PNAME returned error $?"
- 		echo "($PNAME $*)"
--		let errorcount=errorcount+1
-+		errorcount=`expr errorcount+1`
- 		#exit 1
- 	}
- }
-@@ -72,9 +72,9 @@ gpsbabel()
- utf8bomcheck()
- {
-   if [ ${RUNNINGVALGRIND} -ne  0 ]; then
--    if [ "$(dd if=$1 bs=1 count=3 2>/dev/null)" == $'\xef\xbb\xbf' ]; then
-+    if [ "$(dd if=$1 bs=1 count=3 2>/dev/null)" = $'\xef\xbb\xbf' ]; then
-       echo "ERROR: UTF-8 BOM found in $1"
--      let errorcount=errorcount+1
-+      errorcount=`expr errorcount+1`
-     fi
-   fi
- }
-@@ -82,13 +82,13 @@ utf8bomcheck()
- xmlwfcheck()
- {
-   if [ ${RUNNINGVALGRIND} -ne 0 ]; then
--    if which ${XMLWF} >& /dev/null; then
-+    if which ${XMLWF} 2>&1 > /dev/null; then
-       # xmlwf is a bit lame, exit status is always 0
-       rm -f ${TMPDIR}/xmlwf.out
-       ${XMLWF} $1 2>&1 | tee ${TMPDIR}/xmlwf.out
-       if [ -s ${TMPDIR}/xmlwf.out ]; then
-         echo "ERROR: xml is not well-formed in $1"
--        let errorcount=errorcount+1
-+        errorcount=`expr errorcount+1`
-       fi
-     fi
-   fi
-@@ -108,7 +108,7 @@ xmlwfcheck()
- # cambridge
- # cup
- 
--let errorcount=0;
-+errorcount=0;
- 
- if [ $# -ge 1 ]; then
-   while [ $# -ge 1 ];
-@@ -144,7 +144,7 @@ if [ ${RUNNINGVALGRIND} -ne  0 ]; then
- fi
- 
- if [ ${RUNNINGVALGRIND} -ne  0 ]; then
--  if which ${XMLWF} >& /dev/null; then
-+  if which ${XMLWF} 2>&1 > /dev/null; then
-     echo "Running well-formed XML test"
-     for i in ${XMLS}
-     do