Date: Sat, 10 Oct 2020 07:11:46 +0000 (UTC) From: =?UTF-8?Q?Lo=c3=afc_Bartoletti?= <lbartoletti@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551858 - in head/astro/gpsbabel: . files Message-ID: <202010100711.09A7BkWr042157@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lbartoletti Date: Sat Oct 10 07:11:46 2020 New Revision: 551858 URL: https://svnweb.freebsd.org/changeset/ports/551858 Log: astro/gpsbabel: update to 1.7.0 PR: 248866 Submitted by: Oliver Heesakkers (maintainer) Reported by: Harry Matthiesen Jensen Added: head/astro/gpsbabel/files/patch-configure (contents, props changed) head/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc (contents, props changed) Deleted: head/astro/gpsbabel/files/patch-gui_gpsbabel.desktop Modified: head/astro/gpsbabel/Makefile head/astro/gpsbabel/distinfo Modified: head/astro/gpsbabel/Makefile ============================================================================== --- head/astro/gpsbabel/Makefile Sat Oct 10 06:37:36 2020 (r551857) +++ head/astro/gpsbabel/Makefile Sat Oct 10 07:11:46 2020 (r551858) @@ -3,8 +3,7 @@ PORTNAME= gpsbabel DISTVERSIONPREFIX= ${PORTNAME}_ -DISTVERSION= 1_6_0 -PORTREVISION= 1 +DISTVERSION= 1_7_0 CATEGORIES= astro geography MAINTAINER= dev2@heesakkers.info @@ -20,7 +19,6 @@ CONFLICTS= gpsbabel14-[0-9]* USE_GITHUB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-zlib=system OPTIONS_DEFINE= GUI OPTIONS_SUB= yes @@ -36,7 +34,7 @@ CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAG MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" do-build: - (cd ${WRKSRC}; ${CONFIGURE_ENV} ${CONFIGURE_CMD} --with-zlib-system; ${MAKE_ENV} ${GMAKE}) + (cd ${WRKSRC}; ${CONFIGURE_ENV} ${CONFIGURE_CMD}; ${MAKE_ENV} ${GMAKE}) do-build-GUI-on: (cd ${WRKSRC}/gui; ${QMAKE} USE_GUI=qt5; ${LRELEASE} *.ts; ${GMAKE}) Modified: head/astro/gpsbabel/distinfo ============================================================================== --- head/astro/gpsbabel/distinfo Sat Oct 10 06:37:36 2020 (r551857) +++ head/astro/gpsbabel/distinfo Sat Oct 10 07:11:46 2020 (r551858) @@ -1,3 +1,3 @@ -TIMESTAMP = 1559490562 -SHA256 (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090 -SIZE (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = 14098867 +TIMESTAMP = 1599906857 +SHA256 (gpsbabel-gpsbabel-gpsbabel_1_7_0_GH0.tar.gz) = 30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797 +SIZE (gpsbabel-gpsbabel-gpsbabel_1_7_0_GH0.tar.gz) = 16718984 Added: head/astro/gpsbabel/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/gpsbabel/files/patch-configure Sat Oct 10 07:11:46 2020 (r551858) @@ -0,0 +1,28 @@ +--- configure.orig 2020-09-12 23:44:42 UTC ++++ configure +@@ -6278,13 +6278,13 @@ fi + else + + # Die if libusb-1.0 not found. This prevents link failures later. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb-1.0" >&5 +-$as_echo_n "checking for libusb_init in -lusb-1.0... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb" >&5 ++$as_echo_n "checking for libusb_init in -lusb... " >&6; } + if ${ac_cv_lib_usb_1_0_libusb_init+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lusb-1.0 $LIBS" ++LIBS="-lusb $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -6319,7 +6319,7 @@ if test "x$ac_cv_lib_usb_1_0_libusb_init" = xyes; then + #define HAVE_LIBUSB_1_0 1 + _ACEOF + +- LIBS="-lusb-1.0 $LIBS" ++ LIBS="-lusb $LIBS" + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 Added: head/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc Sat Oct 10 07:11:46 2020 (r551858) @@ -0,0 +1,11 @@ +--- jeeps/gpslibusb.cc.orig 2020-09-12 23:57:25 UTC ++++ jeeps/gpslibusb.cc +@@ -32,7 +32,7 @@ + // We use our own libusb. + # include "mac/libusb/libusb.h" + # else +-# include <libusb-1.0/libusb.h> ++# include <libusb.h> + # endif + #include "../defs.h" + #include "garminusb.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010100711.09A7BkWr042157>