science/gpsbabel: version 1.7.0

4 files changed, 27 insertions, 26 deletions

diff --git a/science/gpsbabel/0001-do-not-download-during-build.patch b/science/gpsbabel/0001-do-not-download-during-build.patch
index 4466a8caeb..fd1398d388 100644
--- a/science/gpsbabel/0001-do-not-download-during-build.patch
+++ b/science/gpsbabel/0001-do-not-download-during-build.patch
@@ -1,24 +1,24 @@
-From 51966b307deb21e0a35999aa2e2cc413fcdd9f9e Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran@hawo.net>
-Date: Thu, 26 Feb 2015 20:23:53 +0100
-Subject: [PATCH] do not download during build
+From 5c7cc50ee395e5d1ac5d2d4337df9d2769ee9ec8 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf@bandrate.org>
+Date: Sun, 26 Jul 2020 11:59:03 +0200
+Subject: [PATCH] Do not download during build
 
 ---
  Makefile.in | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile.in b/Makefile.in
-index c767fe2..e3da604 100644
+index 5ace8da..807c515 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -271,6 +271,7 @@ gpsbabel.html: FORCE # gpsbabel
+@@ -282,6 +282,7 @@ gpsbabel.html: FORCE # gpsbabel
  	  --stringparam html.valid.html "1" \
  	  --stringparam html.stylesheet \
- 	  "http://www.gpsbabel.org/style3.css" \
-+	  --nonet \
+ 	  "https://www.gpsbabel.org/style3.css" \
++    --nonet \
  	  http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
  	xmldoc/readme.xml
  
 -- 
-2.1.0
+2.27.0
 
diff --git a/science/gpsbabel/DEPENDS b/science/gpsbabel/DEPENDS
index 13b6242103..236e5d647c 100755
--- a/science/gpsbabel/DEPENDS
+++ b/science/gpsbabel/DEPENDS
@@ -1,7 +1,11 @@
-depends libusb-compat &&
-depends expat         &&
-optional_depends qt4 "" "" "for GUI support" &&
-if is_depends_enabled $SPELL qt4; then
-  depends -sub CXX gcc
+depends expat                     &&
+depends zlib "--with-zlib=system" &&
+
+optional_depends libusb-compat "--with-libusb" "--without-libusb" "support for libusb" &&
+
+optional_depends qtbase "" "" "for GUI support" &&
+if is_depends_enabled $SPELL qtbase; then
+  depends -sub CXX gcc &&
+  depends qttools
 fi &&
 optional_depends perl "" "" "to install documentation"
diff --git a/science/gpsbabel/DETAILS b/science/gpsbabel/DETAILS
index 0babd63cb7..695a5f90a0 100755
--- a/science/gpsbabel/DETAILS
+++ b/science/gpsbabel/DETAILS
@@ -1,19 +1,10 @@
 . "$GRIMOIRE/FUNCTIONS"
            SPELL=gpsbabel
-if [[ $GPSBABEL_BRANCH == "scm" ]]; then
-         VERSION=$(get_scm_version)
-          SOURCE="$SPELL-scm.tar.bz2"
-   SOURCE_URL[0]="svn_http://${SPELL}.googlecode.com/svn/trunk/gpsbabel:$SPELL-scm"
-  FORCE_DOWNLOAD=on
-   SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
-else
-         VERSION=1.5.2
+         VERSION=1.7.0
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://www.hawo.net/~siflfran/smgl/${SOURCE}
-     SOURCE_HASH=sha512:6c19856b893f4f15019e4c66a2f7e7cc490c1dd404c0830704ca50f42f3242d5c76557fb8e41b80e43f0a747899ebe3845331dca769f089fbddb6e6cf55ffe50
+   SOURCE_URL[0]=https://smgl.bandrate.org/GPSBabel-${VERSION}.tar.gz
+     SOURCE_HASH=sha512:b47bbea39b494f7a1c3c243d05d3fb0a50ffc747b9a759d0a1a5d5c603b144b1a1ec5146c74651688ce4009d055e10cd241680f558fabb0d72f483db1b9631b9
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-fi
 if is_depends_enabled $SPELL perl; then
          SOURCE2=gpsbabel.org-style3.css
   SOURCE2_URL[0]=http://www.gpsbabel.org/style3.css
diff --git a/science/gpsbabel/HISTORY b/science/gpsbabel/HISTORY
index 8a49530171..846801ea04 100644
--- a/science/gpsbabel/HISTORY
+++ b/science/gpsbabel/HISTORY
@@ -1,3 +1,9 @@
+2020-07-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.7.0
+	* 0001-do-not-download-during-build.patch: regenerate patch
+	* DEPENDS: use qt5, make the dependency on libusb-compat optional, use
+	  system zlib
+
 2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
 	* DEPENDS: depends -sub CXX gcc (half-automated)