Index: head/astro/gpsbabel/Makefile =================================================================== --- head/astro/gpsbabel/Makefile (revision 551857) +++ head/astro/gpsbabel/Makefile (revision 551858) @@ -1,62 +1,60 @@ # Created by: Laurent Courty # $FreeBSD$ PORTNAME= gpsbabel DISTVERSIONPREFIX= ${PORTNAME}_ -DISTVERSION= 1_6_0 -PORTREVISION= 1 +DISTVERSION= 1_7_0 CATEGORIES= astro geography MAINTAINER= dev2@heesakkers.info COMMENT= GPS file translating tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c++11-lang gmake localbase qt:5 USE_QT= core qmake_build CONFLICTS= gpsbabel14-[0-9]* USE_GITHUB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-zlib=system OPTIONS_DEFINE= GUI OPTIONS_SUB= yes GUI_USES= gl GUI_USE= GL=gl \ QT=declarative,gui,location,network,printsupport,webchannel \ QT=webengine,widgets,xml,buildtools_build,linguisttools_build GUI_ALL_TARGET= gui GUI_VARS= MAKE_JOBS_UNSAFE=yes CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" 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}) post-patch: @${REINPLACE_CMD} '/langPath_ = / \ s|QApplication::applicationDirPath()|"${DATADIR}"|' \ ${WRKSRC}/gui/mainwindow.cc @${RM} -r ${WRKSRC}/zlib/contrib/minizip do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/ do-install-GUI-on: ${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe \ ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/gui/gpsbabel.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${DATADIR}/translations ${INSTALL_DATA} ${WRKSRC}/gui/*.qm ${STAGEDIR}${DATADIR}/translations/ ${INSTALL_DATA} ${WRKSRC}/gui/images/appicon.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/gpsbabel.png .include Index: head/astro/gpsbabel/distinfo =================================================================== --- head/astro/gpsbabel/distinfo (revision 551857) +++ head/astro/gpsbabel/distinfo (revision 551858) @@ -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 Index: head/astro/gpsbabel/files/patch-gui_gpsbabel.desktop =================================================================== --- head/astro/gpsbabel/files/patch-gui_gpsbabel.desktop (revision 551857) +++ head/astro/gpsbabel/files/patch-gui_gpsbabel.desktop (nonexistent) @@ -1,10 +0,0 @@ ---- 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; Property changes on: head/astro/gpsbabel/files/patch-gui_gpsbabel.desktop ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/astro/gpsbabel/files/patch-configure =================================================================== --- head/astro/gpsbabel/files/patch-configure (nonexistent) +++ head/astro/gpsbabel/files/patch-configure (revision 551858) @@ -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 Property changes on: head/astro/gpsbabel/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc =================================================================== --- head/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc (nonexistent) +++ head/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc (revision 551858) @@ -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 ++# include + # endif + #include "../defs.h" + #include "garminusb.h" Property changes on: head/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property