summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--geography/gpsbabel/Makefile8
-rw-r--r--geography/gpsbabel/distinfo13
-rw-r--r--geography/gpsbabel/patches/patch-ad36
-rw-r--r--geography/gpsbabel/patches/patch-af10
-rw-r--r--geography/gpsbabel/patches/patch-testo87
5 files changed, 125 insertions, 29 deletions
diff --git a/geography/gpsbabel/Makefile b/geography/gpsbabel/Makefile
index a124c6e1f3c..1da8b4458cc 100644
--- a/geography/gpsbabel/Makefile
+++ b/geography/gpsbabel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2013/03/16 18:52:58 gdt Exp $
+# $NetBSD: Makefile,v 1.14 2015/06/06 12:57:58 gdt Exp $
#
-DISTNAME= gpsbabel-1.4.4
+DISTNAME= gpsbabel-1.5.2
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpsbabel/}
# Download from official site apparently only via interactive form,
@@ -13,6 +13,8 @@ HOMEPAGE= http://www.gpsbabel.org/
COMMENT= Utility to convert and fetch GPS related data
LICENSE= gnu-gpl-v2
+USE_LANGUAGES= c c++
+
TEST_TARGET= check
LIBS.Darwin+= -lexpat
@@ -21,4 +23,6 @@ GNU_CONFIGURE= yes
.include "../../devel/libusb/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/geography/gpsbabel/distinfo b/geography/gpsbabel/distinfo
index f0fb8a1d42d..468b6949a49 100644
--- a/geography/gpsbabel/distinfo
+++ b/geography/gpsbabel/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2013/03/16 18:52:58 gdt Exp $
+$NetBSD: distinfo,v 1.8 2015/06/06 12:57:58 gdt Exp $
-SHA1 (gpsbabel-1.4.4.tar.gz) = d7ff40f044a0ee5d81c5554da51394204e75599c
-RMD160 (gpsbabel-1.4.4.tar.gz) = 95a042fb035a5aaa2dcb50d430e36f384a575f4f
-Size (gpsbabel-1.4.4.tar.gz) = 7811264 bytes
-SHA1 (patch-ad) = 19a1319a33a0ee131557ac07ef58f388e99b1f3e
-SHA1 (patch-af) = 3ebde4baa1f34733520e08c89dbdab938358c71a
+SHA1 (gpsbabel-1.5.2.tar.gz) = 4962a7e98bbfcbfd59baa970e9b33d1300053004
+RMD160 (gpsbabel-1.5.2.tar.gz) = 86a54f6e6647ed8eaa340641e9240565acf5ca99
+Size (gpsbabel-1.5.2.tar.gz) = 8392465 bytes
+SHA1 (patch-ad) = 9f7d481ddc1d2935fb05df687db25127fe3b37f0
+SHA1 (patch-af) = 5f066824b49f959ea8b06cdeccf21a4ce789fd1d
+SHA1 (patch-testo) = 9c71a74aae088eb110c837114a7b691c3a8d9ff6
diff --git a/geography/gpsbabel/patches/patch-ad b/geography/gpsbabel/patches/patch-ad
index 414a8be3609..7afffec52dd 100644
--- a/geography/gpsbabel/patches/patch-ad
+++ b/geography/gpsbabel/patches/patch-ad
@@ -1,43 +1,47 @@
-$NetBSD: patch-ad,v 1.4 2013/03/16 18:52:58 gdt Exp $
+$NetBSD: patch-ad,v 1.5 2015/06/06 12:57:58 gdt Exp $
This patch was rejected by upstream. There is a comment in upstream
Makefile.in that explains why there is no space, and output flag is
set to "-o ", so that the output flag can be set to "-Fo" for MSVC.n
-On NetBSD, the upstream versoni works, but there is some mysterious
+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.
+resolution to be filed with upstream. (It almost certainly breaks
+native compilation on Windows, but that's not a pkgsrc platform.)
---- Makefile.in.orig 2012-03-29 00:19:29.000000000 +0000
+--- Makefile.in.orig 2014-12-17 00:47:31.000000000 +0000
+++ Makefile.in
-@@ -102,7 +102,7 @@ LIBOBJS = queue.o route.o waypt.o filter
- OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
+@@ -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@ -c $(GBCFLAGS) $< $(OUTPUT_SWITCH)$@
-+ $(CC) @CPPFLAGS@ -c $(GBCFLAGS) $< $(OUTPUT_SWITCH) $@
+- $(CC) @CPPFLAGS@ @CFLAGS@ -c $(GBCFLAGS) $< $(OUTPUT_SWITCH)$@
++ $(CC) @CPPFLAGS@ @CFLAGS@ -c $(GBCFLAGS) $< $(OUTPUT_SWITCH) $@
-@@ -113,10 +113,10 @@ WEB=@DOCDIR@
+@@ -141,10 +141,10 @@ gui linux-gui mac-gui mac-gui-dmg msvc-b
all: gpsbabel$(EXEEXT)
gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
-- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH) $@
+- $(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)
-- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH) $@
+- $(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
-@@ -129,7 +129,7 @@ config.status: configure
+@@ -157,7 +157,7 @@ config.status: configure
$(SHELL) config.status --recheck
jeeps/gpslibusb.o:
-- $(CC) @CPPFLAGS@ -c $(GBCFLAGS) @USB_CFLAGS@ @srcdir@/jeeps/gpslibusb.c $(OUTPUT_SWITCH)$@
-+ $(CC) @CPPFLAGS@ -c $(GBCFLAGS) @USB_CFLAGS@ @srcdir@/jeeps/gpslibusb.c $(OUTPUT_SWITCH) $@
+- $(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 16e10cd9294..3c8d5d6b1b7 100644
--- a/geography/gpsbabel/patches/patch-af
+++ b/geography/gpsbabel/patches/patch-af
@@ -1,12 +1,12 @@
-$NetBSD: patch-af,v 1.4 2013/03/16 18:52:58 gdt Exp $
+$NetBSD: patch-af,v 1.5 2015/06/06 12:57:58 gdt Exp $
From Giles Lean, who places it in the public domain. Workarounds for
problems with buggy USB serial adapators. Not applied by upstream
2009-02-21 because it's too dangerous to work around problems without
understanding them.
---- jeeps/gpsread.c.orig 2011-07-26 01:56:33.000000000 +0000
-+++ jeeps/gpsread.c
+--- jeeps/gpsread.cc.orig 2014-02-13 00:12:48.000000000 +0000
++++ jeeps/gpsread.cc
@@ -98,6 +98,36 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
GPS_Diag("%02x ", u);
@@ -50,12 +50,12 @@ understanding them.
+dle_missed:
if (len==1) {
- (*packet)->type = u;
+ (*packet).type = u;
++len;
@@ -130,6 +161,20 @@ int32 GPS_Serial_Packet_Read(gpsdevh* fd
if (u == ETX)
if (isDLE) {
- if (p-(*packet)->data-2 != (*packet)->n) {
+ 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-testo b/geography/gpsbabel/patches/patch-testo
new file mode 100644
index 00000000000..2907ee17f47
--- /dev/null
+++ b/geography/gpsbabel/patches/patch-testo
@@ -0,0 +1,87 @@
+$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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 07:08:20 +0000