Date: Tue, 28 Jun 2016 17:29:20 +0000 (UTC) From: "Conrad E. Meyer" <cem@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417740 - in head/astro/gpsbabel: . files Message-ID: <201606281729.u5SHTKVJ076959@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem (src committer) Date: Tue Jun 28 17:29:20 2016 New Revision: 417740 URL: https://svnweb.freebsd.org/changeset/ports/417740 Log: 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 Added: head/astro/gpsbabel/files/patch-Makefile.in (contents, props changed) head/astro/gpsbabel/files/patch-src-core-ziparchive.cc (contents, props changed) head/astro/gpsbabel/files/patch-src-core-ziparchive.h (contents, props changed) Modified: head/astro/gpsbabel/Makefile head/astro/gpsbabel/distinfo head/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc Modified: head/astro/gpsbabel/Makefile ============================================================================== --- head/astro/gpsbabel/Makefile Tue Jun 28 17:07:17 2016 (r417739) +++ head/astro/gpsbabel/Makefile Tue Jun 28 17:29:20 2016 (r417740) @@ -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/ Modified: head/astro/gpsbabel/distinfo ============================================================================== --- head/astro/gpsbabel/distinfo Tue Jun 28 17:07:17 2016 (r417739) +++ head/astro/gpsbabel/distinfo Tue Jun 28 17:29:20 2016 (r417740) @@ -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 Added: head/astro/gpsbabel/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/gpsbabel/files/patch-Makefile.in Tue Jun 28 17:29:20 2016 (r417740) @@ -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 Modified: head/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc ============================================================================== --- head/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc Tue Jun 28 17:07:17 2016 (r417739) +++ head/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc Tue Jun 28 17:29:20 2016 (r417740) @@ -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> Added: head/astro/gpsbabel/files/patch-src-core-ziparchive.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/gpsbabel/files/patch-src-core-ziparchive.cc Tue Jun 28 17:29:20 2016 (r417740) @@ -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> Added: head/astro/gpsbabel/files/patch-src-core-ziparchive.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/gpsbabel/files/patch-src-core-ziparchive.h Tue Jun 28 17:29:20 2016 (r417740) @@ -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 + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606281729.u5SHTKVJ076959>