astro/gpsbabel: Update to upstream 1.5.3

- Use system minizip
- Convert to Github master site
- Update jeeps patch

Reviewed by:	AMDmi3
Differential Revision:	https://reviews.freebsd.org/D6963

6 files changed, 51 insertions, 8 deletions

diff --git a/astro/gpsbabel/Makefile b/astro/gpsbabel/Makefile
index 2e82e86cf2d9..fda673c47ded 100644
--- a/astro/gpsbabel/Makefile
+++ b/astro/gpsbabel/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gpsbabel
-PORTVERSION=	1.5.2
-PORTREVISION=	1
+DISTVERSIONPREFIX=	${PORTNAME}_
+DISTVERSION=	1_5_3
 CATEGORIES=	astro geography
-MASTER_SITES=	https://secure.ohos.nl/downloads/ \
-		LOCAL/glebius
 
 MAINTAINER=	dev2@heesakkers.info
 COMMENT=	GPS file translating tool
@@ -14,11 +12,17 @@ COMMENT=	GPS file translating tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+# Unbundle libminizip
+LIB_DEPENDS=	libminizip.so:archivers/minizip
+
+USE_GITHUB=	yes
+
 CONFLICTS=	gpsbabel14-[0-9]*
 
 USE_QT4=	corelib qmake_build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-zlib=system
+USES=		localbase
 
 OPTIONS_DEFINE=	GUI
 OPTIONS_SUB=	GUI
@@ -32,6 +36,7 @@ post-patch:
 	@${REINPLACE_CMD} '/langPath_ = / \
 		s|QApplication::applicationDirPath()|"${DATADIR}"|' \
 			${WRKSRC}/gui/mainwindow.cc
+	@${RM} -rf ${WRKSRC}/zlib/contrib/minizip
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/
diff --git a/astro/gpsbabel/distinfo b/astro/gpsbabel/distinfo
index e6741d0bcd6e..314b22737120 100644
--- a/astro/gpsbabel/distinfo
+++ b/astro/gpsbabel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gpsbabel-1.5.2.tar.gz) = c1a2f07d014d69dcce80e2ef8f23fe2fe3154324957b04d488da1b32458fad7b
-SIZE (gpsbabel-1.5.2.tar.gz) = 8392465
+SHA256 (gpsbabel-gpsbabel-gpsbabel_1_5_3_GH0.tar.gz) = 10b7aaca44ce557fa1175fec37297b8df55611ab2c51cb199753a22dbf2d3997
+SIZE (gpsbabel-gpsbabel-gpsbabel_1_5_3_GH0.tar.gz) = 8516277
diff --git a/astro/gpsbabel/files/patch-Makefile.in b/astro/gpsbabel/files/patch-Makefile.in
new file mode 100644
index 000000000000..218684aeab3a
--- /dev/null
+++ b/astro/gpsbabel/files/patch-Makefile.in
@@ -0,0 +1,15 @@
+--- Makefile.in.orig
++++ Makefile.in
+@@ -148,10 +148,10 @@ toolinfo
+ 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) -lminizip @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) -lminizip @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
diff --git a/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc b/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc
index 74929c33aa48..60f7859af9dc 100644
--- a/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc
+++ b/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc
@@ -1,10 +1,11 @@
---- jeeps/gpslibusb.cc.orig	2014-09-16 03:49:59 UTC
+--- jeeps/gpslibusb.cc.orig
 +++ jeeps/gpslibusb.cc
-@@ -20,7 +20,8 @@
+@@ -20,8 +20,8 @@
   */
  
  
 -#include <stdio.h>
+-#include <stdlib.h>
 +#include <cstdio>
 +#include <cstdlib>
  #include <ctype.h>
diff --git a/astro/gpsbabel/files/patch-src-core-ziparchive.cc b/astro/gpsbabel/files/patch-src-core-ziparchive.cc
new file mode 100644
index 000000000000..283b5a6ddd2e
--- /dev/null
+++ b/astro/gpsbabel/files/patch-src-core-ziparchive.cc
@@ -0,0 +1,11 @@
+--- src/core/ziparchive.cc.orig
++++ src/core/ziparchive.cc
+@@ -23,7 +23,7 @@
+ 
+ #include "defs.h"
+ #include "src/core/logging.h"
+-#include "zlib/contrib/minizip/zip.h"
++#include <minizip/zip.h>
+ 
+ #include <QtCore/QFile>
+ #include <QtCore/QDebug>
diff --git a/astro/gpsbabel/files/patch-src-core-ziparchive.h b/astro/gpsbabel/files/patch-src-core-ziparchive.h
new file mode 100644
index 000000000000..3a2165d7be69
--- /dev/null
+++ b/astro/gpsbabel/files/patch-src-core-ziparchive.h
@@ -0,0 +1,11 @@
+--- src/core/ziparchive.h.orig
++++ src/core/ziparchive.h
+@@ -21,7 +21,7 @@
+ 
+ #include <QtCore/QString>
+ #include <QtCore/QStringList>
+-#include "zlib/contrib/minizip/zip.h"
++#include <minizip/zip.h>
+ 
+ class  ZipArchive
+ {