Page MenuHomeFreeBSD
Files F148365326

D6963.id17883.diff
No OneTemporary
Actions

D6963.id17883.diff
View Options

Index: astro/gpsbabel/Makefile
===================================================================
--- astro/gpsbabel/Makefile
+++ astro/gpsbabel/Makefile
@@ -2,11 +2,9 @@
# $FreeBSD$
PORTNAME= gpsbabel
-PORTVERSION= 1.5.2
-PORTREVISION= 1
CATEGORIES= astro geography
-MASTER_SITES= https://secure.ohos.nl/downloads/ \
- LOCAL/glebius
+DISTVERSIONPREFIX= ${PORTNAME}_
+DISTVERSION= 1_5_3
MAINTAINER= dev2@heesakkers.info
COMMENT= GPS file translating tool
@@ -14,11 +12,18 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USE_GITHUB= yes
+
CONFLICTS= gpsbabel14-[0-9]*
USE_QT4= corelib qmake_build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-zlib=system
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
+# Unbundle libminizip
+LIB_DEPENDS= libminizip.so:archivers/minizip
OPTIONS_DEFINE= GUI
OPTIONS_SUB= GUI
@@ -32,6 +37,7 @@
@${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/
Index: astro/gpsbabel/distinfo
===================================================================
--- astro/gpsbabel/distinfo
+++ 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
Index: astro/gpsbabel/files/patch-Makefile.in
===================================================================
--- /dev/null
+++ astro/gpsbabel/files/patch-Makefile.in
@@ -0,0 +1,30 @@
+--- Makefile.in.orig
++++ Makefile.in
+@@ -102,13 +102,10 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
+
+ SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
+
+-MINIZIP=zlib/contrib/minizip/zip.o \
+- zlib/contrib/minizip/ioapi.o
+-
+ ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
+ zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
+ zlib/uncompr.o zlib/gzlib.o zlib/gzclose.o zlib/gzread.o \
+- zlib/gzwrite.o zlib/zutil.o $(MINIZIP)
++ zlib/gzwrite.o zlib/zutil.o
+
+
+ LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
+@@ -148,10 +145,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
Index: astro/gpsbabel/files/patch-jeeps-gpslibusb.cc
===================================================================
--- astro/gpsbabel/files/patch-jeeps-gpslibusb.cc
+++ 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>
Index: astro/gpsbabel/files/patch-src-core-ziparchive.h
===================================================================
--- /dev/null
+++ 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
+ {
Index: astro/gpsbabel/files/patch-src-core-ziparchive.cc
===================================================================
--- /dev/null
+++ 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>

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 18, 9:35 AM (1 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29873342
Default Alt Text
D6963.id17883.diff (4 KB)

Event Timeline