- Update to upstream release 1.5.2

- Properly strip installed binary

PR:		197879
Submitted by:	dev2@heesakkers.info
Reviewed by:	riggs

5 files changed, 18 insertions, 55 deletions

diff --git a/astro/gpsbabel/Makefile b/astro/gpsbabel/Makefile
index 07ad9648da0d..1b9e89860194 100644
--- a/astro/gpsbabel/Makefile
+++ b/astro/gpsbabel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gpsbabel
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	astro geography
 MASTER_SITES=	https://secure.ohos.nl/downloads/ \
 		LOCAL/glebius
@@ -26,4 +26,7 @@ PLIST_FILES=	bin/gpsbabel
 
 CONFLICTS=	gpsbabel14-[0-9]*
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gpsbabel
+
 .include <bsd.port.mk>
diff --git a/astro/gpsbabel/distinfo b/astro/gpsbabel/distinfo
index c2d8c7f624c6..e6741d0bcd6e 100644
--- a/astro/gpsbabel/distinfo
+++ b/astro/gpsbabel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gpsbabel-1.5.1.tar.gz) = 3feec7d43ca6cb5393645fe0df893d9f7bf5334849fa8abd4c5c3ee775c8cac3
-SIZE (gpsbabel-1.5.1.tar.gz) = 8402088
+SHA256 (gpsbabel-1.5.2.tar.gz) = c1a2f07d014d69dcce80e2ef8f23fe2fe3154324957b04d488da1b32458fad7b
+SIZE (gpsbabel-1.5.2.tar.gz) = 8392465
diff --git a/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc b/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc
new file mode 100644
index 000000000000..3de10b4cf7dc
--- /dev/null
+++ b/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc
@@ -0,0 +1,12 @@
+--- jeeps/gpslibusb.cc.orig	2014-09-16 05:49:59.000000000 +0200
++++ jeeps/gpslibusb.cc	2015-03-14 19:33:11.690407708 +0100
+@@ -20,7 +20,8 @@
+  */
+ 
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
+ #include <ctype.h>
+ #if HAVE_CONFIG_H
+ #include "config.h"
diff --git a/astro/gpsbabel/files/patch-libusb b/astro/gpsbabel/files/patch-libusb
deleted file mode 100644
index 4bf7613de5d0..000000000000
--- a/astro/gpsbabel/files/patch-libusb
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.in.orig	2008-10-31 15:43:21.000000000 +0300
-+++ configure.in	2009-03-07 01:08:46.000000000 +0300
-@@ -170,6 +169,28 @@
-       AC_DEFINE(HAVE_LIBUSB, 1)
-       CFLAGS="$CFLAGS -Imac/libusb/"
-       ;;
-+    *-*-freebsd*)
-+	GBSER=gbser_posix.o
-+	AC_MSG_CHECKING(for libusb)
-+	if test "$with_libusb" = no ; then
-+		AC_MSG_RESULT(check not done)
-+		OSJEEPS=jeeps/gpsusbstub.o
-+	else
-+		OLDFLAGS=$LDFLAGS
-+		OCFLAGS=$CFLAGS
-+		LDFLAGS="$LDFLAGS -lusb"
-+		CFLAGS="$OCFLAGS"
-+
-+		AC_CHECK_LIB([usb], [usb_interrupt_read],
-+			AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb])
-+			[USB_CFLAGS=""]
-+			[USB_LIBS="-lusb"]
-+#			,[AC_MSG_ERROR([libusb is needed])]
-+			)
-+		OSJEEPS=jeeps/gpslibusb.o
-+		CFLAGS="$OCFLAGS"
-+	fi
-+	;;
-     *)
- 	GBSER=gbser_posix.o
- 	AC_MSG_CHECKING(for libusb)
diff --git a/astro/gpsbabel/files/patch-mkstyle b/astro/gpsbabel/files/patch-mkstyle
deleted file mode 100644
index 7d7223862bb6..000000000000
--- a/astro/gpsbabel/files/patch-mkstyle
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./mkstyle.sh.orig	2013-09-01 16:29:29.000000000 +0200
-+++ ./mkstyle.sh	2014-06-10 13:47:27.000000000 +0200
-@@ -9,17 +9,7 @@
- LC_COLLATE=C
- export LC_COLLATE
- 
--# require gnu sed even though we aren't using gnu extensions.
--# this avoids portability issues with other seds.
--if gsed v /dev/null 1>/dev/null 2>&1; then
--    SED=gsed
--elif sed v /dev/null 1>/dev/null 2>&1; then
--	# sed is gnu sed
--    SED=sed
--else
--	echo "Error: can't find gnu sed" 1>&2
--	exit 1
--fi
-+SED=sed
- 
- echo "#include \"defs.h\""
- echo "#if CSVFMTS_ENABLED"