Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Jul 2020 19:13:00 +0000 (UTC)
From:      Luca Pizzamiglio <pizzamig@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r542043 - in head/astro/gpsbabel: . files
Message-ID:  <202007111913.06BJD0gc085069@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pizzamig
Date: Sat Jul 11 19:12:59 2020
New Revision: 542043
URL: https://svnweb.freebsd.org/changeset/ports/542043

Log:
  astro/gpsbabel: Update to latest 1.6.0
  
  Changes: https://www.gpsbabel.org/news/gpsbabel-1.6.0.html
  
  PR:		237733
  Submitted by:	Conrad Meyer <cem@freebsd.org>
  Approved by:	dev2@heesakkers.info (maintainer)
  Event: July 2020 Bugathon

Added:
  head/astro/gpsbabel/files/patch-gui_gpsbabel.desktop   (contents, props changed)
Deleted:
  head/astro/gpsbabel/files/patch-Makefile.in
  head/astro/gpsbabel/files/patch-bushnell.cc
  head/astro/gpsbabel/files/patch-garmin__device__xml.cc
  head/astro/gpsbabel/files/patch-gpx.cc
  head/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc
  head/astro/gpsbabel/files/patch-lowranceusr.cc
  head/astro/gpsbabel/files/patch-magproto.cc
  head/astro/gpsbabel/files/patch-psitrex.cc
  head/astro/gpsbabel/files/patch-src_core_ziparchive.cc
  head/astro/gpsbabel/files/patch-src_core_ziparchive.h
  head/astro/gpsbabel/files/patch-tef_xml.cc
  head/astro/gpsbabel/files/patch-unicsv.cc
Modified:
  head/astro/gpsbabel/Makefile
  head/astro/gpsbabel/distinfo
  head/astro/gpsbabel/pkg-plist

Modified: head/astro/gpsbabel/Makefile
==============================================================================
--- head/astro/gpsbabel/Makefile	Sat Jul 11 19:01:42 2020	(r542042)
+++ head/astro/gpsbabel/Makefile	Sat Jul 11 19:12:59 2020	(r542043)
@@ -3,8 +3,7 @@
 
 PORTNAME=	gpsbabel
 DISTVERSIONPREFIX=	${PORTNAME}_
-DISTVERSION=	1_5_4
-PORTREVISION=	4
+DISTVERSION=	1_6_0
 CATEGORIES=	astro geography
 
 MAINTAINER=	dev2@heesakkers.info
@@ -13,15 +12,12 @@ COMMENT=	GPS file translating tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-# Unbundle libminizip
-LIB_DEPENDS=	libminizip.so:archivers/minizip
+USES=		compiler:c++11-lang gmake localbase qt:5
+USE_QT=		core qmake_build
 
-USE_GITHUB=	yes
-
 CONFLICTS=	gpsbabel14-[0-9]*
 
-USES=		compiler:c++11-lang localbase qt:5
-USE_QT=		core qmake_build
+USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-zlib=system
 
@@ -29,10 +25,16 @@ OPTIONS_DEFINE=	GUI
 OPTIONS_SUB=	yes
 
 GUI_ALL_TARGET=	gui
-GUI_USE=	QT=gui,xml,network,webkit
+GUI_USE=	QT=qmake_build,gui,xml,network,webkit
 GUI_USE+=	QT=linguisttools_build,webengine,buildtools
 GUI_VARS=	MAKE_JOBS_UNSAFE=yes
+GUI_QMAKE_SOURCE_PATH=	${WRKSRC}/gui
 
+do-build:
+	(cd ${WRKSRC}; ${CONFIGURE_CMD} --with-zlib-system; ${GMAKE})
+do-build-GUI-on:
+	(cd ${WRKSRC}/gui; ${QMAKE} USE_GUI=qt5; ${LRELEASE} *.ts; ${GMAKE})
+
 post-patch:
 	@${REINPLACE_CMD} '/langPath_ = / \
 		s|QApplication::applicationDirPath()|"${DATADIR}"|' \
@@ -43,7 +45,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/
 
 do-install-GUI-on:
-	${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe-bin \
+	${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe \
 		${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/gui/gpsbabel.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/

Modified: head/astro/gpsbabel/distinfo
==============================================================================
--- head/astro/gpsbabel/distinfo	Sat Jul 11 19:01:42 2020	(r542042)
+++ head/astro/gpsbabel/distinfo	Sat Jul 11 19:12:59 2020	(r542043)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523450580
-SHA256 (gpsbabel-gpsbabel-gpsbabel_1_5_4_GH0.tar.gz) = 8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
-SIZE (gpsbabel-gpsbabel-gpsbabel_1_5_4_GH0.tar.gz) = 9121510
+TIMESTAMP = 1559490562
+SHA256 (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090
+SIZE (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = 14098867

Added: head/astro/gpsbabel/files/patch-gui_gpsbabel.desktop
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/astro/gpsbabel/files/patch-gui_gpsbabel.desktop	Sat Jul 11 19:12:59 2020	(r542043)
@@ -0,0 +1,10 @@
+--- gui/gpsbabel.desktop.orig	2020-07-06 17:33:15 UTC
++++ gui/gpsbabel.desktop
+@@ -4,6 +4,6 @@ Name=GPSBabel
+ Comment=Qt GUI interface for GPSBabel
+ GenericName=GPSBabel
+ Icon=gpsbabel
+-Exec=gpsbabelfe-bin
++Exec=gpsbabelfe
+ Terminal=false
+ Categories=Geography;Education;Utility;

Modified: head/astro/gpsbabel/pkg-plist
==============================================================================
--- head/astro/gpsbabel/pkg-plist	Sat Jul 11 19:01:42 2020	(r542042)
+++ head/astro/gpsbabel/pkg-plist	Sat Jul 11 19:12:59 2020	(r542043)
@@ -1,8 +1,6 @@
 bin/gpsbabel
-%%GUI%%bin/gpsbabelfe-bin
+%%GUI%%bin/gpsbabelfe
 %%GUI%%share/applications/gpsbabel.desktop
-%%GUI%%%%DATADIR%%/translations/gpsbabel.qm
-%%GUI%%%%DATADIR%%/translations/gpsbabelfe.qm
 %%GUI%%%%DATADIR%%/translations/gpsbabelfe_de.qm
 %%GUI%%%%DATADIR%%/translations/gpsbabelfe_es.qm
 %%GUI%%%%DATADIR%%/translations/gpsbabelfe_fr.qm



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007111913.06BJD0gc085069>