diff --git a/astro/gpsbabel/Makefile b/astro/gpsbabel/Makefile index 43766c47e031..c6f13d4a86c6 100644 --- a/astro/gpsbabel/Makefile +++ b/astro/gpsbabel/Makefile @@ -1,58 +1,35 @@ PORTNAME= gpsbabel DISTVERSIONPREFIX= ${PORTNAME}_ -DISTVERSION= 1_7_0 +DISTVERSION= 1_10_0 CATEGORIES= astro geography MAINTAINER= dev2@heesakkers.info COMMENT= GPS file translating tool WWW= https://www.gpsbabel.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++11-lang gmake localbase qt:5 -USE_QT= core qmake:build - -CONFLICTS= gpsbabel14 - +USES= cmake compiler:c++20-lang qt:6 +USE_QT= 5compat base declarative serialport webchannel webengine \ + tools:build USE_GITHUB= yes -GNU_CONFIGURE= yes - -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}" +CMAKE_ARGS= -DGPSBABEL_WITH_LIBUSB=custom \ + -DGPSBABEL_EXTRA_LINK_LIBRARIES=usb -do-build: - (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 +CONFLICTS= gpsbabel14 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/ - -do-install-GUI-on: - ${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe \ + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gui/GPSBabelFE/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 diff --git a/astro/gpsbabel/distinfo b/astro/gpsbabel/distinfo index b222ef3d1106..b0069dc5cb13 100644 --- a/astro/gpsbabel/distinfo +++ b/astro/gpsbabel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1599906857 -SHA256 (gpsbabel-gpsbabel-gpsbabel_1_7_0_GH0.tar.gz) = 30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797 -SIZE (gpsbabel-gpsbabel-gpsbabel_1_7_0_GH0.tar.gz) = 16718984 +TIMESTAMP = 1760640561 +SHA256 (gpsbabel-gpsbabel-gpsbabel_1_10_0_GH0.tar.gz) = a89756fb988a54f5c5f371413845b9aecb66628a594cd83bd529c0f18382c968 +SIZE (gpsbabel-gpsbabel-gpsbabel_1_10_0_GH0.tar.gz) = 14885291 diff --git a/astro/gpsbabel/files/patch-configure b/astro/gpsbabel/files/patch-configure deleted file mode 100644 index 010dcf4283a3..000000000000 --- a/astro/gpsbabel/files/patch-configure +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 diff --git a/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc b/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc deleted file mode 100644 index c9e6c822082e..000000000000 --- a/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" diff --git a/astro/gpsbabel/pkg-plist b/astro/gpsbabel/pkg-plist index 461eeea22ba9..d3a795787aa4 100644 --- a/astro/gpsbabel/pkg-plist +++ b/astro/gpsbabel/pkg-plist @@ -1,10 +1,10 @@ bin/gpsbabel -%%GUI%%bin/gpsbabelfe -%%GUI%%share/applications/gpsbabel.desktop -%%GUI%%%%DATADIR%%/translations/gpsbabelfe_de.qm -%%GUI%%%%DATADIR%%/translations/gpsbabelfe_es.qm -%%GUI%%%%DATADIR%%/translations/gpsbabelfe_fr.qm -%%GUI%%%%DATADIR%%/translations/gpsbabelfe_hu.qm -%%GUI%%%%DATADIR%%/translations/gpsbabelfe_it.qm -%%GUI%%%%DATADIR%%/translations/gpsbabelfe_ru.qm -%%GUI%%share/pixmaps/gpsbabel.png +bin/gpsbabelfe +share/applications/gpsbabel.desktop +%%DATADIR%%/translations/gpsbabelfe_de.qm +%%DATADIR%%/translations/gpsbabelfe_es.qm +%%DATADIR%%/translations/gpsbabelfe_fr.qm +%%DATADIR%%/translations/gpsbabelfe_hu.qm +%%DATADIR%%/translations/gpsbabelfe_it.qm +%%DATADIR%%/translations/gpsbabelfe_ru.qm +share/pixmaps/gpsbabel.png