diff options
Diffstat (limited to 'astro')
27 files changed, 168 insertions, 103 deletions
diff --git a/astro/astroterm/Makefile b/astro/astroterm/Makefile index 1b4c6959a950..5b5cd1cbc684 100644 --- a/astro/astroterm/Makefile +++ b/astro/astroterm/Makefile @@ -1,6 +1,6 @@ PORTNAME= astroterm DISTVERSIONPREFIX= v -DISTVERSION= 1.0.7 +DISTVERSION= 1.0.8 CATEGORIES= astro MASTER_SITES= https://web.archive.org/web/20231007085824if_/http://tdc-www.harvard.edu/catalogs/:DATA DISTFILES= BSC5:DATA diff --git a/astro/astroterm/distinfo b/astro/astroterm/distinfo index 7dd77a8b1d08..8988a49e67cb 100644 --- a/astro/astroterm/distinfo +++ b/astro/astroterm/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1739416073 -SHA256 (astroterm-1.0.7/BSC5) = e471d02eaf4eecb61c12f879a1cb6432ba9d7b68a9a8c5654a1eb42a0c8cc340 -SIZE (astroterm-1.0.7/BSC5) = 291548 -SHA256 (astroterm-1.0.7/da-luce-astroterm-v1.0.7_GH0.tar.gz) = 3b8b1597afb31d1cb8ad54030b5766652b4d3f42f0a3d510bbc3191c0c6a4aa5 -SIZE (astroterm-1.0.7/da-luce-astroterm-v1.0.7_GH0.tar.gz) = 20463291 +TIMESTAMP = 1752484050 +SHA256 (astroterm-1.0.8/BSC5) = e471d02eaf4eecb61c12f879a1cb6432ba9d7b68a9a8c5654a1eb42a0c8cc340 +SIZE (astroterm-1.0.8/BSC5) = 291548 +SHA256 (astroterm-1.0.8/da-luce-astroterm-v1.0.8_GH0.tar.gz) = d7205aeca4a8de372938b103c4ed787a8430150f7d4254151e2148434e9d4430 +SIZE (astroterm-1.0.8/da-luce-astroterm-v1.0.8_GH0.tar.gz) = 20465560 diff --git a/astro/jday/Makefile b/astro/jday/Makefile index 86a2eb080a52..b0b49ebf47a3 100644 --- a/astro/jday/Makefile +++ b/astro/jday/Makefile @@ -8,18 +8,19 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Astronomical Julian date calculator WWW= https://jday.sourceforge.net/ -USES= pathfix libtool -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= libtool pathfix USE_LDCONFIG= yes +GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share INSTALL_TARGET= install-strip -CONFLICTS_INSTALL= netatalk3 +CONFLICTS_INSTALL= netatal3 -PLIST_FILES= bin/dbd bin/j2d bin/jday \ - include/jday.h lib/libjday.a \ - lib/libjday.so lib/libjday.so.2 \ - lib/libjday.so.2.0.4 libdata/pkgconfig/jday.pc \ - share/man/man1/jday.1.gz +PLIST_FILES= bin/dbd bin/j2d bin/jday include/jday.h lib/libjday.a \ + lib/libjday.so lib/libjday.so.2 lib/libjday.so.2.0.4 \ + libdata/pkgconfig/jday.pc share/man/man1/jday.1.gz .include <bsd.port.mk> diff --git a/astro/josm/Makefile b/astro/josm/Makefile index 26c5e87e5a8c..7406774cc125 100644 --- a/astro/josm/Makefile +++ b/astro/josm/Makefile @@ -1,5 +1,5 @@ PORTNAME= josm -PORTVERSION= 19396 +PORTVERSION= 19412 CATEGORIES= astro java MASTER_SITES= https://josm.openstreetmap.de/download/ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION}.jar diff --git a/astro/josm/distinfo b/astro/josm/distinfo index 88d068f20eb3..5dd680680b4c 100644 --- a/astro/josm/distinfo +++ b/astro/josm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746627489 -SHA256 (josm-snapshot-19396.jar) = 3387e6feda6c0ac0214af4c69204a2e88bab19ed2926ca9d4f45ec0b1826cc4a -SIZE (josm-snapshot-19396.jar) = 19208876 +TIMESTAMP = 1750167297 +SHA256 (josm-snapshot-19412.jar) = 953ec3a01e15266f7206e40bfaa61ce289bf4856899bc987dbd4773f79942e36 +SIZE (josm-snapshot-19412.jar) = 19233959 diff --git a/astro/pngphoon/Makefile b/astro/pngphoon/Makefile index 2a562534ae48..3bcc5b1df0ec 100644 --- a/astro/pngphoon/Makefile +++ b/astro/pngphoon/Makefile @@ -1,24 +1,27 @@ PORTNAME= pngphoon -DISTVERSION= 1.3 +DISTVERSION= 1.4 CATEGORIES= astro MASTER_SITES= https://svolli.de/software/pngphoon/ -COMMENT= PNG Phase of Moon MAINTAINER= fuz@FreeBSD.org +COMMENT= PNG Phase of Moon WWW= https://svolli.de/software/pngphoon/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpng.so:graphics/png +LIB_DEPENDS= libpng16.so:graphics/png -USES= gmake localbase:ldflags tar:bz2 +USES= gmake localbase:ldflags shebangfix tar:bz2 +SHEBANG_FILES= contrib/phoonX MAKE_ARGS= CC=${CC} CFLAGS="${CFLAGS}" -PLIST_FILES= bin/pngphoon +PLIST_FILES= bin/pngphoon bin/phoonX share/man/man1/pngphoon.1.gz do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/pngphoon ${STAGEDIR}${PREFIX}/bin/pngphoon + ${INSTALL_PROGRAM} ${WRKSRC}/pngphoon ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/contrib/phoonX ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/contrib/pngphoon.1 ${STAGEDIR}${PREFIX}/share/man/man1/ .include <bsd.port.mk> diff --git a/astro/pngphoon/distinfo b/astro/pngphoon/distinfo index 8532d06226f7..d06a2fcb694f 100644 --- a/astro/pngphoon/distinfo +++ b/astro/pngphoon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1703936409 -SHA256 (pngphoon-1.3.tar.bz2) = 86bd37d37d23da12aa38b239fa0b197d7a5052c6b96b82361716b54e152d3b23 -SIZE (pngphoon-1.3.tar.bz2) = 67264 +TIMESTAMP = 1752050037 +SHA256 (pngphoon-1.4.tar.bz2) = 5492a1b75edd90e37e7f71b69ca8ed57c71c32bd5a35328085c79fb417cfd524 +SIZE (pngphoon-1.4.tar.bz2) = 77764 diff --git a/astro/pngphoon/files/patch-moon.c b/astro/pngphoon/files/patch-moon.c new file mode 100644 index 000000000000..9fdf5936475c --- /dev/null +++ b/astro/pngphoon/files/patch-moon.c @@ -0,0 +1,11 @@ +--- moon.c.orig 2025-07-18 07:32:17 UTC ++++ moon.c +@@ -148,7 +148,7 @@ void mooncopy( image_t *image, moon_t *moondata, int c + moonoff = y * ( moondata->width ) / 8; + imageoff = (y + yoffset) * image->xbytes + xoffset / 8; + +- shade = blackflag ? shade = 0xff : shades[shadeindex][y % 8]; ++ shade = blackflag ? 0xff : shades[shadeindex][y % 8]; + + /* finally, hack the bits */ + if( bytexleft == bytexright ) diff --git a/astro/pngphoon/files/patch-tws.h b/astro/pngphoon/files/patch-tws.h new file mode 100644 index 000000000000..e4e6e992dfe8 --- /dev/null +++ b/astro/pngphoon/files/patch-tws.h @@ -0,0 +1,11 @@ +--- tws.h.orig 2025-07-18 07:31:08 UTC ++++ tws.h +@@ -33,7 +33,7 @@ struct tws + + /* Declarations of routines. */ + +-struct tws *dlocaltime( ); ++struct tws *dlocaltime( long * ); + /* dlocaltime( &clock ) turns a time(3) clock value into a tws */ + + struct tws *dtwstime( ); diff --git a/astro/pngphoon/pkg-descr b/astro/pngphoon/pkg-descr index 2e0f07f3e4cb..99f51534f4b5 100644 --- a/astro/pngphoon/pkg-descr +++ b/astro/pngphoon/pkg-descr @@ -13,4 +13,3 @@ program was originally written for. The image must have a width of at least 760 pixels to place the moon. If the image is smaller just the stars will be drawn. And by the way: it is pronounced "pingphoon" (like "typhoon"). - diff --git a/astro/py-skyfield/Makefile b/astro/py-skyfield/Makefile index 1d9498c127f2..250ca58939f0 100644 --- a/astro/py-skyfield/Makefile +++ b/astro/py-skyfield/Makefile @@ -1,5 +1,6 @@ PORTNAME= skyfield PORTVERSION= 1.53 +PORTREVISION= 1 CATEGORIES= astro python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +16,7 @@ BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}jplephem>0:astro/py-jplephem@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sgp4>0:astro/py-sgp4@${PY_FLAVOR} \ diff --git a/astro/py-sunpy/files/patch-sunpy_io_src_ana___pyana.c b/astro/py-sunpy/files/patch-sunpy_io_src_ana___pyana.c new file mode 100644 index 000000000000..d8846690c0ef --- /dev/null +++ b/astro/py-sunpy/files/patch-sunpy_io_src_ana___pyana.c @@ -0,0 +1,14 @@ +--- sunpy/io/src/ana/_pyana.c.orig 2025-07-01 07:29:54 UTC ++++ sunpy/io/src/ana/_pyana.c +@@ -6,11 +6,6 @@ a cleaned up version of the original anarw routines. + a cleaned up version of the original anarw routines. + */ + +-// Needed due to https://github.com/numpy/numpy/issues/16970 +-struct _typeobject { +- int foo; +-}; +- + #include <Python.h> // For python extension + #define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION + #include <numpy/arrayobject.h> // For numpy diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile index cf99714d0229..f362b5ecf6b4 100644 --- a/astro/qmapshack/Makefile +++ b/astro/qmapshack/Makefile @@ -1,7 +1,6 @@ PORTNAME= qmapshack -PORTVERSION= 1.17.1 DISTVERSIONPREFIX= V_ -PORTREVISION= 6 +DISTVERSION= 1.18.0 CATEGORIES= astro MAINTAINER= bofh@FreeBSD.org @@ -11,21 +10,20 @@ WWW= https://github.com/Maproom/qmapshack/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libgdal.so:graphics/gdal \ +BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers +LIB_DEPENDS= libalglib.so:math/alglib \ + libgdal.so:graphics/gdal \ libproj.so:graphics/proj \ - libquazip1-qt5.so:archivers/quazip@qt5 \ + libquazip1-qt6.so:archivers/quazip@qt6 \ libroutino.so:astro/routino RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks -USES= cmake compiler:c++11-lib desktop-file-utils gl jpeg \ - pkgconfig qt:5 xorg +USES= cmake desktop-file-utils gl jpeg qt:6 USE_GITHUB= yes -USE_GL= gl -USE_QT= buildtools core dbus declarative gui help linguisttools location network \ - printsupport qmake sql sql-sqlite3 uitools \ - webchannel webengine widgets xml - GH_ACCOUNT= Maproom +USE_GL= gl +USE_QT= 5compat base declarative positioning tools webchannel \ + webengine OPTIONS_DEFINE= DOCS diff --git a/astro/qmapshack/distinfo b/astro/qmapshack/distinfo index 5ece65ac51c8..64c1a5381f60 100644 --- a/astro/qmapshack/distinfo +++ b/astro/qmapshack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702454459 -SHA256 (Maproom-qmapshack-V_1.17.1_GH0.tar.gz) = 39c704087c3e93da31216a740b494c14502b4c0e692a941a7ee4d2d520570d74 -SIZE (Maproom-qmapshack-V_1.17.1_GH0.tar.gz) = 56704889 +TIMESTAMP = 1751715656 +SHA256 (Maproom-qmapshack-V_1.18.0_GH0.tar.gz) = e094123f7a0e68c466cbf39473402a6a06343c7fa1e54450eb8fdcc9c95625ca +SIZE (Maproom-qmapshack-V_1.18.0_GH0.tar.gz) = 58026362 diff --git a/astro/qmapshack/files/patch-CMakeLists.txt b/astro/qmapshack/files/patch-CMakeLists.txt index 1425b5d86060..55024b2f876f 100644 --- a/astro/qmapshack/files/patch-CMakeLists.txt +++ b/astro/qmapshack/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2023-07-20 14:13:59 UTC +--- CMakeLists.txt.orig 2025-07-04 12:38:57 UTC +++ CMakeLists.txt -@@ -47,6 +47,7 @@ include(TranslateDesktop) +@@ -46,6 +46,7 @@ include(DefineInstallationPaths) include(DefineCMakeDefaults) include(DefineCompilerFlags) include(DefineInstallationPaths) @@ -8,9 +8,9 @@ include(CPackConfig.cmake) include(ConfigureChecks.cmake) -@@ -185,7 +186,10 @@ find_package(Qt5WebEngineWidgets REQUIRED) - find_package(Qt5Qml REQUIRED) - find_package(Qt5Help REQUIRED) +@@ -192,7 +193,10 @@ find_package(GDAL REQUIRED) + find_package(Qt6Qml REQUIRED) + find_package(Qt6Help REQUIRED) find_package(GDAL REQUIRED) -find_package(PROJ REQUIRED) +find_package(PROJ) @@ -19,4 +19,4 @@ +endif() find_package(JPEG REQUIRED) find_package(ROUTINO REQUIRED) - find_package(QuaZip-Qt5 REQUIRED) + find_package(QuaZip-Qt6 REQUIRED) diff --git a/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake b/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake index 77acfa3e0c2b..e085606b1612 100644 --- a/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake +++ b/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake @@ -1,20 +1,20 @@ ---- cmake/Modules/DefineInstallationPaths.cmake.orig 2020-03-27 08:07:31 UTC +--- cmake/Modules/DefineInstallationPaths.cmake.orig 2025-07-04 12:38:57 UTC +++ cmake/Modules/DefineInstallationPaths.cmake -@@ -59,7 +59,7 @@ if (UNIX) - FORCE +@@ -51,7 +51,7 @@ if (UNIX) + CACHE PATH "The parent directory where applications can install their data (default prefix/share/${_PROJECT_NAME})" ) SET(HTML_INSTALL_DIR - "${DATA_INSTALL_PREFIX}/doc/HTML" + "${DATA_INSTALL_PREFIX}/doc/${_PROJECT_NAME}/HTML" CACHE PATH "The HTML install dir for documentation (default data/doc/html)" - FORCE ) -@@ -97,7 +97,7 @@ if (UNIX) - FORCE + SET(ICON_INSTALL_DIR +@@ -82,7 +82,7 @@ if (UNIX) + CACHE PATH "The ${_PROJECT_NAME} sysconfig install dir (default prefix/etc)" ) SET(MAN_INSTALL_DIR - "${SHARE_INSTALL_PREFIX}/man" + "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "The ${_PROJECT_NAME} man install dir (default prefix/man)" - FORCE ) + SET(INFO_INSTALL_DIR diff --git a/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt b/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt index 85e491ba02cc..da1acbc53c36 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt +++ b/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt @@ -1,7 +1,7 @@ ---- src/qmapshack/CMakeLists.txt.orig 2023-07-20 14:13:59 UTC +--- src/qmapshack/CMakeLists.txt.orig 2025-07-04 12:38:57 UTC +++ src/qmapshack/CMakeLists.txt -@@ -993,7 +993,7 @@ target_link_libraries(${APPLICATION_NAME} - Qt5::Help +@@ -977,7 +977,7 @@ target_link_libraries(${APPLICATION_NAME} + Qt6::Core5Compat ${DBUS_LIB} ${GDAL_LIBRARIES} - ${PROJ_LIBRARIES} diff --git a/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp b/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp index 349802a14a16..06929a6cacbe 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp @@ -1,6 +1,6 @@ ---- src/qmapshack/device/CDeviceWatcherLinux.cpp.orig 2023-07-20 14:13:59 UTC +--- src/qmapshack/device/CDeviceWatcherLinux.cpp.orig 2025-07-04 12:38:57 UTC +++ src/qmapshack/device/CDeviceWatcherLinux.cpp -@@ -47,6 +47,10 @@ void CDeviceWatcherLinux::slotDeviceAdded(const QDBusO +@@ -97,6 +97,10 @@ void CDeviceWatcherLinux::slotDeviceAdded(const QDBusO QDBusInterface* blockIface = new QDBusInterface("org.freedesktop.UDisks2", path.path(), "org.freedesktop.UDisks2.Block", QDBusConnection::systemBus(), this); QDBusObjectPath drive_object = blockIface->property("Drive").value<QDBusObjectPath>(); @@ -11,3 +11,26 @@ QString idLabel = blockIface->property("IdLabel").toString().toUpper(); // read vendor string attached to drive +@@ -207,14 +211,6 @@ QString CDeviceWatcherLinux::readMountPoint(const QStr + + const QDBusMessage& reply = QDBusConnection::systemBus().call(message); + +-#if defined(Q_OS_FREEBSD) +- // this is probably broken code and needs to be fixed +- for (const QVariant& arg : reply.arguments()) { +- if (!arg.value<QDBusVariant>().variant().value<QStringList>().isEmpty()) { +- points.append(arg.value<QDBusVariant>().variant().value<QStringList>().first()); +- } +- } +-#else + QStringList mountPoints; + + for (const QVariant& arg : reply.arguments()) { +@@ -246,7 +242,6 @@ QString CDeviceWatcherLinux::readMountPoint(const QStr + } + dbusArg.endArray(); + } +-#endif + + if (!mountPoints.isEmpty()) { + return mountPoints.first(); diff --git a/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp b/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp index 536f6ccbaefd..3ced1d52eadc 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp @@ -1,10 +1,10 @@ ---- src/qmapshack/gis/wpt/CGisItemWpt.cpp.orig 2021-05-24 09:18:08 UTC +--- src/qmapshack/gis/wpt/CGisItemWpt.cpp.orig 2025-07-04 12:38:57 UTC +++ src/qmapshack/gis/wpt/CGisItemWpt.cpp -@@ -40,6 +40,7 @@ +@@ -23,6 +23,7 @@ #include <QPainterPath> #include <QtWidgets> #include <QtXml> +#include <QPainterPath> - IGisItem::key_t CGisItemWpt::keyUserFocus; - QMap<searchProperty_e, CGisItemWpt::fSearch> CGisItemWpt::keywordLambdaMap; + #include "CMainWindow.h" + #include "canvas/CCanvas.h" diff --git a/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp b/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp index 5f8fe0f14ee3..bd88a2394df3 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp @@ -1,6 +1,6 @@ ---- src/qmapshack/helpers/CDraw.cpp.orig 2021-05-24 09:18:08 UTC +--- src/qmapshack/helpers/CDraw.cpp.orig 2025-07-04 12:38:57 UTC +++ src/qmapshack/helpers/CDraw.cpp -@@ -25,6 +25,7 @@ +@@ -24,6 +24,7 @@ #include <QPainterPath> #include <QPointF> #include <QtMath> diff --git a/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp b/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp index 1fa864a24aa5..699d58e3f027 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp @@ -1,10 +1,10 @@ ---- src/qmapshack/map/CMapIMG.cpp.orig 2021-05-24 09:18:08 UTC +--- src/qmapshack/map/CMapIMG.cpp.orig 2025-07-04 12:38:57 UTC +++ src/qmapshack/map/CMapIMG.cpp -@@ -34,6 +34,7 @@ +@@ -20,6 +20,7 @@ #include <QPainterPath> #include <QtWidgets> +#include <QPainterPath> - #undef DEBUG_SHOW_SECT_DESC - #undef DEBUG_SHOW_TRE_DATA + #include "CMainWindow.h" + #include "canvas/CCanvas.h" diff --git a/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp b/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp index 4a1bb4396314..a6b607850ae8 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp @@ -1,10 +1,10 @@ ---- src/qmapshack/mouse/IMouseSelect.cpp.orig 2021-05-24 09:18:08 UTC +--- src/qmapshack/mouse/IMouseSelect.cpp.orig 2025-07-04 12:38:57 UTC +++ src/qmapshack/mouse/IMouseSelect.cpp -@@ -24,6 +24,7 @@ +@@ -21,6 +21,7 @@ #include <QPainterPath> #include <QtWidgets> +#include <QPainterPath> - IMouseSelect::IMouseSelect(CGisDraw* gis, CCanvas* canvas, CMouseAdapter* mouse) - : IMouse(gis, canvas, mouse) + #include "gis/CGisDraw.h" + #include "mouse/CMouseAdapter.h" diff --git a/astro/qmapshack/files/patch-src_qmaptool_CMakeLists.txt b/astro/qmapshack/files/patch-src_qmaptool_CMakeLists.txt index 5578f1b4081b..3bbea7d0dcac 100644 --- a/astro/qmapshack/files/patch-src_qmaptool_CMakeLists.txt +++ b/astro/qmapshack/files/patch-src_qmaptool_CMakeLists.txt @@ -1,8 +1,8 @@ ---- src/qmaptool/CMakeLists.txt.orig 2021-05-24 09:18:08 UTC +--- src/qmaptool/CMakeLists.txt.orig 2025-07-04 12:38:57 UTC +++ src/qmaptool/CMakeLists.txt -@@ -259,7 +259,7 @@ target_link_libraries(${APPLICATION_NAME} - Qt5::Network - Qt5::Help +@@ -265,7 +265,7 @@ target_link_libraries(${APPLICATION_NAME} + Qt6::Network + Qt6::Help ${GDAL_LIBRARIES} - ${PROJ_LIBRARIES} + ${PROJ_LDFLAGS} ${PROJ_LIBRARIES} diff --git a/astro/qmapshack/files/patch-src_qmt__map2jnx_CMakeLists.txt b/astro/qmapshack/files/patch-src_qmt__map2jnx_CMakeLists.txt index 50f04b2be82d..38ea49d10fbf 100644 --- a/astro/qmapshack/files/patch-src_qmt__map2jnx_CMakeLists.txt +++ b/astro/qmapshack/files/patch-src_qmt__map2jnx_CMakeLists.txt @@ -1,8 +1,8 @@ ---- src/qmt_map2jnx/CMakeLists.txt.orig 2021-05-24 09:18:08 UTC +--- src/qmt_map2jnx/CMakeLists.txt.orig 2025-07-04 12:38:57 UTC +++ src/qmt_map2jnx/CMakeLists.txt @@ -53,7 +53,7 @@ TARGET_LINK_LIBRARIES(${APPLICATION_NAME} - Qt5::Core - Qt5::Gui + Qt6::Core + Qt6::Gui ${GDAL_LIBRARIES} - ${PROJ_LIBRARIES} + ${PROJ_LDFLAGS} ${PROJ_LIBRARIES} diff --git a/astro/qmapshack/files/patch-src_qmt__rgb2pct_CMakeLists.txt b/astro/qmapshack/files/patch-src_qmt__rgb2pct_CMakeLists.txt index 8afed710c6e0..349b0cd051f8 100644 --- a/astro/qmapshack/files/patch-src_qmt__rgb2pct_CMakeLists.txt +++ b/astro/qmapshack/files/patch-src_qmt__rgb2pct_CMakeLists.txt @@ -1,8 +1,8 @@ ---- src/qmt_rgb2pct/CMakeLists.txt.orig 2021-05-24 09:18:08 UTC +--- src/qmt_rgb2pct/CMakeLists.txt.orig 2025-07-04 12:38:57 UTC +++ src/qmt_rgb2pct/CMakeLists.txt -@@ -92,7 +92,7 @@ target_compile_definitions(${APPLICATION_NAME} PUBLIC +@@ -100,7 +100,7 @@ target_link_libraries(${APPLICATION_NAME} target_link_libraries(${APPLICATION_NAME} - Qt5::Core + Qt6::Core ${GDAL_LIBRARIES} - ${PROJ_LIBRARIES} + ${PROJ_LDFLAGS} ${PROJ_LIBRARIES} diff --git a/astro/qmapshack/pkg-plist b/astro/qmapshack/pkg-plist index 79e13c72fc1b..0195e40685c6 100644 --- a/astro/qmapshack/pkg-plist +++ b/astro/qmapshack/pkg-plist @@ -2,12 +2,12 @@ bin/qmapshack bin/qmaptool bin/qmt_map2jnx bin/qmt_rgb2pct -share/man/man1/qmapshack.1.gz -share/man/man1/qmaptool.1.gz -share/man/man1/qmt_map2jnx.1.gz -share/man/man1/qmt_rgb2pct.1.gz share/applications/qmapshack.desktop share/applications/qmaptool.desktop +%%PORTDOCS%%%%DOCSDIR%%/HTML/QMSHelp.qch +%%PORTDOCS%%%%DOCSDIR%%/HTML/QMSHelp.qhc +%%PORTDOCS%%%%DOCSDIR%%/HTML/QMTHelp.qch +%%PORTDOCS%%%%DOCSDIR%%/HTML/QMTHelp.qhc share/icons/hicolor/128x128/apps/QMapShack.png share/icons/hicolor/128x128/apps/QMapTool.png share/icons/hicolor/16x16/apps/QMapShack.png @@ -42,13 +42,13 @@ share/icons/hicolor/8x8/apps/QMapShack.png share/icons/hicolor/8x8/apps/QMapTool.png share/icons/hicolor/96x96/apps/QMapShack.png share/icons/hicolor/96x96/apps/QMapTool.png +share/man/man1/qmapshack.1.gz +share/man/man1/qmaptool.1.gz +share/man/man1/qmt_map2jnx.1.gz +share/man/man1/qmt_rgb2pct.1.gz share/pixmaps/QMapShack.png share/pixmaps/QMapTool.png -share/qmaptool/translations/qmaptool_de.qm -share/qmaptool/translations/qmaptool_es.qm -share/qmaptool/translations/qmaptool_it.qm -share/qmaptool/translations/qmaptool_ru.qm -share/qmt_rgb2pct/translations/qmt_rgb2pct_de.qm +%%DATADIR%%/translations/qmapshack.qm %%DATADIR%%/translations/qmapshack_ca.qm %%DATADIR%%/translations/qmapshack_cs.qm %%DATADIR%%/translations/qmapshack_de.qm @@ -57,7 +57,10 @@ share/qmt_rgb2pct/translations/qmt_rgb2pct_de.qm %%DATADIR%%/translations/qmapshack_it.qm %%DATADIR%%/translations/qmapshack_nl.qm %%DATADIR%%/translations/qmapshack_ru.qm -%%PORTDOCS%%%%DOCSDIR%%/HTML/QMSHelp.qch -%%PORTDOCS%%%%DOCSDIR%%/HTML/QMSHelp.qhc -%%PORTDOCS%%%%DOCSDIR%%/HTML/QMTHelp.qch -%%PORTDOCS%%%%DOCSDIR%%/HTML/QMTHelp.qhc +share/qmaptool/translations/qmaptool.qm +share/qmaptool/translations/qmaptool_de.qm +share/qmaptool/translations/qmaptool_es.qm +share/qmaptool/translations/qmaptool_it.qm +share/qmaptool/translations/qmaptool_ru.qm +share/qmt_rgb2pct/translations/qmt_rgb2pct.qm +share/qmt_rgb2pct/translations/qmt_rgb2pct_de.qm diff --git a/astro/xearth/files/freebsd.committers.markers b/astro/xearth/files/freebsd.committers.markers index cee35879b6f9..db6487183f4c 100644 --- a/astro/xearth/files/freebsd.committers.markers +++ b/astro/xearth/files/freebsd.committers.markers @@ -61,6 +61,7 @@ 58.234618, 12.832098, "joel" # Arentorp, Sweden 41.90000, 12.48333, "bar" # Roma, Italy 49.200270, 12.279196, "marius" # Cham, Germany + 42.4174, 12.1047, "olgeni" # Viterbo, Italy 48.32, 11.67, "mr" # Neufahrn, Germany 55.48821, 11.62152, "pho" # Soroe, Denmark 48.2116, 11.4522, "mfechner" # Karlsfeld, Germany @@ -72,7 +73,6 @@ 57.196092, 9.673923, "debdrup" # Kaas, Denmark 49.00, 9.5, "schweikh" # Weinstadt, Germany 51.20, 9.20, "dinoex" # Habichtswald, Germany - 42.4174, 12.1047, "olgeni" # Viterbo, Italy 45.488328, 9.164711, "ale" align=left # Milano, Italy 48.53778, 9.04111, "bz" # Baden-Wuerttemberg 46.051, 8.919, "gahr" # Bedano, Switzerland @@ -80,8 +80,8 @@ 53.0793, 8.8017, "tobik" # Bremen, Germany 47.420, 8.6, "beat" # Wallisellen, Switzerland 49.85958, 8.55246, "bcr" # Griesheim, Germany - 47.380458, 8.514722, "ehaupt" # Zurich, Switzerland 47.413337, 8.5523847, "tcberner" # Zurich, Switzerland + 47.380458, 8.514722, "ehaupt" # Zurich, Switzerland 49.48, 8.42, "naddy" # Ludwigshafen, Germany 51.4233, 7.76057, "flo" # Menden, Germany 50.73389, 7.09972, "egypcio" # Bonn, Germany @@ -98,11 +98,12 @@ 51.4748, 5.4792, "rene" # Eindhoven, the Netherlands 52.088936, 5.097134, "dim" # Utrecht, The Netherlands 45.636772, 4.949373, "thierry" align=left # Chaponnay, France + 50.696775, 4.471177, "obiwac" align=below # Ohain, Belgium 48.83, 2.36, "antoine" # Paris, France 48.79964, 2.35058, "bapt" # Villejuif, France 48.827111, 2.347019, "sbz" # Paris, France - 48.87, 2.33, "cognet" align=left # Paris, France 48.834312, 2.345937 "dumbbell" align=left # Paris, France + 48.87, 2.33, "cognet" align=left # Paris, France 48.8473, 2.2856, "mat" # Paris, France 48.912, 2.256, "mich" align=left # La Garenne-Colombes, France 48.818344, 2.245696, "roberto" align=left # Meudon, France @@ -153,8 +154,8 @@ 44.9504, -92.9122, "xride" # Lake Elmo, MN, USA 44.89, -93.35, "bdrewery" # Minneapolis, MN, USA 39.168, -96.620, "kevans" # Manhattan, KS, USA - 30.343, -97.881, " ,linimon" # Austin, TX, USA 30.616, -97.829, "ler" # Leander, TX, USA + 30.343, -97.881, " ,linimon" # Austin, TX, USA 39.897418, -104.981891, "brd" # Northglenn, CO, USA 39.897418, -105.074891, "will" # Westminster, CO, USA 40.01942534, -105.23914289, "imp" # Boulder, CO, USA |