Download raw body.
Merge graphics/kdiagram-qt6 to graphics/kdiagram
On 2026/01/11 11:00, Rafael Sadowski wrote:
> I would like to remove graphics/kdiagram-qt6, as calligraplan has
> been migrated to Qt6. I would like to do this by merging
> graphics/kdiagram-qt6 with graphics/kdiagram.
>
> Full diff below, OK?
IIRC you'll need to have a higher version number in the PKGNAME,
currently kdiagram-qt6-3.0.1 so you'll need REVISION=0.
Otherwise ok.
> Index: devel/quirks/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> diff -u -p -r1.1766 Makefile
> --- devel/quirks/Makefile 10 Jan 2026 15:37:43 -0000 1.1766
> +++ devel/quirks/Makefile 11 Jan 2026 09:57:40 -0000
> @@ -3,7 +3,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-7.173
> +PKGNAME = quirks-7.174
> PKG_ARCH = *
> MAINTAINER = Marc Espie <espie@openbsd.org>
>
> Index: devel/quirks/files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> diff -u -p -r1.1778 Quirks.pm
> --- devel/quirks/files/Quirks.pm 10 Jan 2026 15:37:43 -0000 1.1778
> +++ devel/quirks/files/Quirks.pm 11 Jan 2026 09:57:40 -0000
> @@ -503,6 +503,7 @@ my $stem_extensions = {
> 'GSL' => 'microsoft-gsl',
> 'kdegraphics-mobipocket-kf5' => 'kf6-kdegraphics-mobipocket',
> 'libkdcraw-kf5' => 'kf6-libkdcraw',
> + 'kdiagram-qt6' => 'kdiagram',
> };
>
> my $obsolete_reason = {};
> Index: editors/calligra/Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/calligra/Makefile,v
> diff -u -p -r1.67 Makefile
> --- editors/calligra/Makefile 27 Sep 2025 19:17:25 -0000 1.67
> +++ editors/calligra/Makefile 11 Jan 2026 09:57:41 -0000
> @@ -3,6 +3,7 @@ COMMENT = KDE office suite
> HOMEPAGE = https://www.calligra.org
>
> DISTNAME = calligra-${MODKDE_GEAR_VERSION}
> +REVISION = 0
>
> CATEGORIES = editors
>
> @@ -116,7 +117,7 @@ LIB_DEPENDS = devel/gsl \
> devel/kf6/solid \
> devel/kf6/sonnet \
> multimedia/phonon,qt6 \
> - graphics/kdiagram-qt6 \
> + graphics/kdiagram \
> graphics/lcms2 \
> math/imath \
> print/poppler,-qt6 \
> Index: editors/calligraplan/Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/calligraplan/Makefile,v
> diff -u -p -r1.5 Makefile
> --- editors/calligraplan/Makefile 11 Jan 2026 09:23:59 -0000 1.5
> +++ editors/calligraplan/Makefile 11 Jan 2026 09:57:41 -0000
> @@ -2,6 +2,7 @@ COMMENT = KDE Calligra project managemen
>
> VERSION = 4.0.1
> DISTNAME = calligraplan-${VERSION}
> +REVISION = 0
>
> CATEGORIES = editors x11
>
> @@ -83,7 +84,7 @@ LIB_DEPENDS = devel/kf6/karchive \
> devel/kf6/kxmlgui \
> devel/kf6/solid \
> devel/kf6/sonnet \
> - graphics/kdiagram-qt6 \
> + graphics/kdiagram \
> security/qca-qt6
>
> # Running D-Bus daemon is required
> Index: graphics/Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/Makefile,v
> diff -u -p -r1.652 Makefile
> --- graphics/Makefile 28 Dec 2025 17:22:53 -0000 1.652
> +++ graphics/Makefile 11 Jan 2026 09:57:44 -0000
> @@ -126,7 +126,6 @@
> SUBDIR += jpegpixi
> SUBDIR += kcolorpicker
> SUBDIR += kdiagram
> - SUBDIR += kdiagram-qt6
> SUBDIR += kimageannotator
> SUBDIR += kirigami-addons
> SUBDIR += kplot
> Index: graphics/kdiagram/Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/kdiagram/Makefile,v
> diff -u -p -r1.12 Makefile
> --- graphics/kdiagram/Makefile 21 Oct 2025 07:24:00 -0000 1.12
> +++ graphics/kdiagram/Makefile 11 Jan 2026 09:57:45 -0000
> @@ -1,28 +1,28 @@
> COMMENT = libraries for creating business diagrams
>
> -VERSION = 2.8.0
> +VERSION = 3.0.1
> DISTNAME = kdiagram-${VERSION}
> -REVISION = 0
>
> CATEGORIES = graphics
>
> -SHARED_LIBS += KChart 1.1 # 2.8
> -SHARED_LIBS += KGantt 1.1 # 2.8
> +SHARED_LIBS += KChart6 0.0 # 0.0
> +SHARED_LIBS += KGantt6 0.0 # 0.0
>
> MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
>
> # GPLv2+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5PrintSupport Qt5Svg
> -WANTLIB += Qt5Widgets c m
> +WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6PrintSupport
> +WANTLIB += Qt6Svg Qt6Widgets m
>
> -SITES = ${SITE_KDE:=Attic/kdiagram/${VERSION}/}
> +SITES = ${SITE_KDE:=stable/kdiagram/${VERSION}/}
> +EXTRACT_SUFX = .tar.xz
>
> MODULES = devel/cmake \
> - devel/kf5
> + devel/kf6
>
> -LIB_DEPENDS = x11/qt5/qtsvg
> +LIB_DEPENDS = x11/qt6/qtsvg
>
> TEST_IS_INTERACTIVE = X11
>
> Index: graphics/kdiagram/distinfo
> ===================================================================
> RCS file: /cvs/ports/graphics/kdiagram/distinfo,v
> diff -u -p -r1.4 distinfo
> --- graphics/kdiagram/distinfo 26 Jan 2021 11:44:08 -0000 1.4
> +++ graphics/kdiagram/distinfo 11 Jan 2026 09:57:45 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (kdiagram-2.8.0.tar.xz) = V52tO9HqRLWiDA8TPr9HYi44lg+cfIs6MWvjCjafQx8=
> -SIZE (kdiagram-2.8.0.tar.xz) = 691044
> +SHA256 (kdiagram-3.0.1.tar.xz) = Rlmwws2dsYFD9avZyAYJHDqrarwalWu/goFas9MYnG0=
> +SIZE (kdiagram-3.0.1.tar.xz) = 693440
> Index: graphics/kdiagram/patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: graphics/kdiagram/patches/patch-CMakeLists_txt
> diff -N graphics/kdiagram/patches/patch-CMakeLists_txt
> --- graphics/kdiagram/patches/patch-CMakeLists_txt 21 Oct 2025 07:24:00 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,9 +0,0 @@
> -Index: CMakeLists.txt
> ---- CMakeLists.txt.orig
> -+++ CMakeLists.txt
> -@@ -1,4 +1,4 @@
> --cmake_minimum_required(VERSION 2.8.12)
> -+cmake_minimum_required(VERSION 3.5)
> -
> - project( kdiagram )
> -
> Index: graphics/kdiagram/patches/patch-src_KChart_CMakeLists_txt
> ===================================================================
> RCS file: graphics/kdiagram/patches/patch-src_KChart_CMakeLists_txt
> diff -N graphics/kdiagram/patches/patch-src_KChart_CMakeLists_txt
> --- graphics/kdiagram/patches/patch-src_KChart_CMakeLists_txt 21 Oct 2025 07:24:00 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -Index: src/KChart/CMakeLists.txt
> ---- src/KChart/CMakeLists.txt.orig
> -+++ src/KChart/CMakeLists.txt
> -@@ -360,6 +360,7 @@ ecm_generate_pri_file(
> - BASE_NAME KChart
> - LIB_NAME KChart
> - DEPS "widgets svg"
> -+ VERSION 2.8.0
> - FILENAME_VAR PRI_FILENAME
> - INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/KChart
> - )
> Index: graphics/kdiagram/patches/patch-src_KGantt_CMakeLists_txt
> ===================================================================
> RCS file: graphics/kdiagram/patches/patch-src_KGantt_CMakeLists_txt
> diff -N graphics/kdiagram/patches/patch-src_KGantt_CMakeLists_txt
> --- graphics/kdiagram/patches/patch-src_KGantt_CMakeLists_txt 21 Oct 2025 07:24:00 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -Index: src/KGantt/CMakeLists.txt
> ---- src/KGantt/CMakeLists.txt.orig
> -+++ src/KGantt/CMakeLists.txt
> -@@ -184,6 +184,7 @@ ecm_generate_pri_file(
> - BASE_NAME KGantt
> - LIB_NAME KGantt
> - DEPS "widgets printsupport"
> -+ VERSION 2.8.0
> - FILENAME_VAR PRI_FILENAME
> - INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/KGantt
> - )
> Index: graphics/kdiagram/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/graphics/kdiagram/pkg/PLIST,v
> diff -u -p -r1.5 PLIST
> --- graphics/kdiagram/pkg/PLIST 11 Mar 2022 19:22:37 -0000 1.5
> +++ graphics/kdiagram/pkg/PLIST 11 Jan 2026 09:57:45 -0000
> @@ -1,261 +1,274 @@
> -include/KChart/
> -include/KChart/KChart
> -include/KChart/KChartAbstractArea
> -include/KChart/KChartAbstractArea.h
> -include/KChart/KChartAbstractAreaBase
> -include/KChart/KChartAbstractAreaBase.h
> -include/KChart/KChartAbstractAreaWidget
> -include/KChart/KChartAbstractAreaWidget.h
> -include/KChart/KChartAbstractAxis
> -include/KChart/KChartAbstractAxis.h
> -include/KChart/KChartAbstractCartesianDiagram
> -include/KChart/KChartAbstractCartesianDiagram.h
> -include/KChart/KChartAbstractCoordinatePlane
> -include/KChart/KChartAbstractCoordinatePlane.h
> -include/KChart/KChartAbstractDiagram
> -include/KChart/KChartAbstractDiagram.h
> -include/KChart/KChartAbstractPieDiagram
> -include/KChart/KChartAbstractPieDiagram.h
> -include/KChart/KChartAbstractPolarDiagram
> -include/KChart/KChartAbstractPolarDiagram.h
> -include/KChart/KChartAbstractProxyModel
> -include/KChart/KChartAbstractProxyModel.h
> -include/KChart/KChartAbstractTernaryDiagram
> -include/KChart/KChartAbstractTernaryDiagram.h
> -include/KChart/KChartAbstractThreeDAttributes
> -include/KChart/KChartAbstractThreeDAttributes.h
> -include/KChart/KChartAttributesModel
> -include/KChart/KChartAttributesModel.h
> -include/KChart/KChartBackgroundAttributes
> -include/KChart/KChartBackgroundAttributes.h
> -include/KChart/KChartBarAttributes
> -include/KChart/KChartBarAttributes.h
> -include/KChart/KChartBarDiagram
> -include/KChart/KChartBarDiagram.h
> -include/KChart/KChartCartesianAxis
> -include/KChart/KChartCartesianAxis.h
> -include/KChart/KChartCartesianCoordinatePlane
> -include/KChart/KChartCartesianCoordinatePlane.h
> -include/KChart/KChartChart
> -include/KChart/KChartChart.h
> -include/KChart/KChartDataValueAttributes
> -include/KChart/KChartDataValueAttributes.h
> -include/KChart/KChartDatasetProxyModel
> -include/KChart/KChartDatasetProxyModel.h
> -include/KChart/KChartDatasetSelector
> -include/KChart/KChartDatasetSelector.h
> -include/KChart/KChartDiagramObserver
> -include/KChart/KChartDiagramObserver.h
> -include/KChart/KChartEnums
> -include/KChart/KChartEnums.h
> -include/KChart/KChartFrameAttributes
> -include/KChart/KChartFrameAttributes.h
> -include/KChart/KChartGlobal
> -include/KChart/KChartGlobal.h
> -include/KChart/KChartGridAttributes
> -include/KChart/KChartGridAttributes.h
> -include/KChart/KChartHeaderFooter
> -include/KChart/KChartHeaderFooter.h
> -include/KChart/KChartLayoutItems
> -include/KChart/KChartLayoutItems.h
> -include/KChart/KChartLegend
> -include/KChart/KChartLegend.h
> -include/KChart/KChartLeveyJenningsAxis
> -include/KChart/KChartLeveyJenningsAxis.h
> -include/KChart/KChartLeveyJenningsCoordinatePlane
> -include/KChart/KChartLeveyJenningsCoordinatePlane.h
> -include/KChart/KChartLeveyJenningsDiagram
> -include/KChart/KChartLeveyJenningsDiagram.h
> -include/KChart/KChartLeveyJenningsGridAttributes
> -include/KChart/KChartLeveyJenningsGridAttributes.h
> -include/KChart/KChartLineAttributes
> -include/KChart/KChartLineAttributes.h
> -include/KChart/KChartLineDiagram
> -include/KChart/KChartLineDiagram.h
> -include/KChart/KChartMarkerAttributes
> -include/KChart/KChartMarkerAttributes.h
> -include/KChart/KChartMeasure
> -include/KChart/KChartMeasure.h
> -include/KChart/KChartPaintContext
> -include/KChart/KChartPaintContext.h
> -include/KChart/KChartPalette
> -include/KChart/KChartPalette.h
> -include/KChart/KChartPieAttributes
> -include/KChart/KChartPieAttributes.h
> -include/KChart/KChartPieDiagram
> -include/KChart/KChartPieDiagram.h
> -include/KChart/KChartPlotter
> -include/KChart/KChartPlotter.h
> -include/KChart/KChartPolarCoordinatePlane
> -include/KChart/KChartPolarCoordinatePlane.h
> -include/KChart/KChartPolarDiagram
> -include/KChart/KChartPolarDiagram.h
> -include/KChart/KChartPosition
> -include/KChart/KChartPosition.h
> -include/KChart/KChartRadarCoordinatePlane
> -include/KChart/KChartRadarCoordinatePlane.h
> -include/KChart/KChartRadarDiagram
> -include/KChart/KChartRadarDiagram.h
> -include/KChart/KChartRelativePosition
> -include/KChart/KChartRelativePosition.h
> -include/KChart/KChartRingDiagram
> -include/KChart/KChartRingDiagram.h
> -include/KChart/KChartRulerAttributes
> -include/KChart/KChartRulerAttributes.h
> -include/KChart/KChartStockBarAttributes
> -include/KChart/KChartStockBarAttributes.h
> -include/KChart/KChartStockDiagram
> -include/KChart/KChartStockDiagram.h
> -include/KChart/KChartTernaryAxis
> -include/KChart/KChartTernaryAxis.h
> -include/KChart/KChartTernaryCoordinatePlane
> -include/KChart/KChartTernaryCoordinatePlane.h
> -include/KChart/KChartTernaryLineDiagram
> -include/KChart/KChartTernaryLineDiagram.h
> -include/KChart/KChartTernaryPointDiagram
> -include/KChart/KChartTernaryPointDiagram.h
> -include/KChart/KChartTextArea
> -include/KChart/KChartTextArea.h
> -include/KChart/KChartTextAttributes
> -include/KChart/KChartTextAttributes.h
> -include/KChart/KChartThreeDBarAttributes
> -include/KChart/KChartThreeDBarAttributes.h
> -include/KChart/KChartThreeDLineAttributes
> -include/KChart/KChartThreeDLineAttributes.h
> -include/KChart/KChartThreeDPieAttributes
> -include/KChart/KChartThreeDPieAttributes.h
> -include/KChart/KChartValueTrackerAttributes
> -include/KChart/KChartValueTrackerAttributes.h
> -include/KChart/KChartWidget
> -include/KChart/KChartWidget.h
> -include/KChart/kchart_export.h
> -include/KGantt/
> -include/KGantt/KGanttAbstractGrid
> -include/KGantt/KGanttAbstractRowController
> -include/KGantt/KGanttConstraint
> -include/KGantt/KGanttConstraintGraphicsItem
> -include/KGantt/KGanttConstraintModel
> -include/KGantt/KGanttConstraintProxy
> -include/KGantt/KGanttDateTimeGrid
> -include/KGantt/KGanttDateTimeTimeLine
> -include/KGantt/KGanttDateTimeTimeLineDialog
> -include/KGantt/KGanttForwardingProxyModel
> -include/KGantt/KGanttGlobal
> -include/KGantt/KGanttGraphicsItem
> -include/KGantt/KGanttGraphicsScene
> -include/KGantt/KGanttGraphicsView
> -include/KGantt/KGanttItemDelegate
> -include/KGantt/KGanttLegend
> -include/KGantt/KGanttListViewRowController
> -include/KGantt/KGanttPenStyleComboBox
> -include/KGantt/KGanttPrintingContext
> -include/KGantt/KGanttProxyModel
> -include/KGantt/KGanttStyleOptionGanttItem
> -include/KGantt/KGanttSummaryHandlingProxyModel
> -include/KGantt/KGanttTreeViewRowController
> -include/KGantt/KGanttView
> -include/KGantt/kgantt_export.h
> -include/KGantt/kganttabstractgrid.h
> -include/KGantt/kganttabstractgrid_p.h
> -include/KGantt/kganttabstractrowcontroller.h
> -include/KGantt/kganttconstraint.h
> -include/KGantt/kganttconstraintgraphicsitem.h
> -include/KGantt/kganttconstraintmodel.h
> -include/KGantt/kganttconstraintproxy.h
> -include/KGantt/kganttdatetimegrid.h
> -include/KGantt/kganttdatetimetimeline.h
> -include/KGantt/kganttdatetimetimelinedialog.h
> -include/KGantt/kganttforwardingproxymodel.h
> -include/KGantt/kganttglobal.h
> -include/KGantt/kganttgraphicsitem.h
> -include/KGantt/kganttgraphicsscene.h
> -include/KGantt/kganttgraphicsview.h
> -include/KGantt/kganttitemdelegate.h
> -include/KGantt/kganttlegend.h
> -include/KGantt/kganttlistviewrowcontroller.h
> -include/KGantt/kganttpenstylecombobox.h
> -include/KGantt/kganttprintingcontext.h
> -include/KGantt/kganttproxymodel.h
> -include/KGantt/kganttstyleoptionganttitem.h
> -include/KGantt/kganttsummaryhandlingproxymodel.h
> -include/KGantt/kgantttreeviewrowcontroller.h
> -include/KGantt/kganttview.h
> -include/kchart_version.h
> -include/kgantt_version.h
> -lib/cmake/KChart/
> -lib/cmake/KChart/KChartConfig.cmake
> -lib/cmake/KChart/KChartConfigVersion.cmake
> -lib/cmake/KChart/KChartTargets${MODCMAKE_BUILD_SUFFIX}
> -lib/cmake/KChart/KChartTargets.cmake
> -lib/cmake/KGantt/
> -lib/cmake/KGantt/KGanttConfig.cmake
> -lib/cmake/KGantt/KGanttConfigVersion.cmake
> -lib/cmake/KGantt/KGanttTargets${MODCMAKE_BUILD_SUFFIX}
> -lib/cmake/KGantt/KGanttTargets.cmake
> -@lib lib/libKChart.so.${LIBKChart_VERSION}
> -@lib lib/libKGantt.so.${LIBKGantt_VERSION}
> -share/kf5/
> -share/kf5/mkspecs/
> -share/kf5/mkspecs/qt_KChart.pri
> -share/kf5/mkspecs/qt_KGantt.pri
> -share/locale/ar/LC_MESSAGES/kchart_qt.qm
> -share/locale/ar/LC_MESSAGES/kgantt_qt.qm
> -share/locale/ast/LC_MESSAGES/kchart_qt.qm
> -share/locale/ast/LC_MESSAGES/kgantt_qt.qm
> -share/locale/bg/LC_MESSAGES/kgantt_qt.qm
> -share/locale/bs/LC_MESSAGES/kchart_qt.qm
> -share/locale/bs/LC_MESSAGES/kgantt_qt.qm
> -share/locale/ca/LC_MESSAGES/kchart_qt.qm
> -share/locale/ca/LC_MESSAGES/kgantt_qt.qm
> -share/locale/ca@valencia/LC_MESSAGES/kchart_qt.qm
> -share/locale/ca@valencia/LC_MESSAGES/kgantt_qt.qm
> -share/locale/cs/LC_MESSAGES/kchart_qt.qm
> -share/locale/cs/LC_MESSAGES/kgantt_qt.qm
> -share/locale/da/LC_MESSAGES/kgantt_qt.qm
> -share/locale/de/LC_MESSAGES/kchart_qt.qm
> -share/locale/de/LC_MESSAGES/kgantt_qt.qm
> -share/locale/el/LC_MESSAGES/kchart_qt.qm
> -share/locale/el/LC_MESSAGES/kgantt_qt.qm
> -share/locale/en_GB/LC_MESSAGES/kchart_qt.qm
> -share/locale/en_GB/LC_MESSAGES/kgantt_qt.qm
> -share/locale/es/LC_MESSAGES/kchart_qt.qm
> -share/locale/es/LC_MESSAGES/kgantt_qt.qm
> -share/locale/et/LC_MESSAGES/kchart_qt.qm
> -share/locale/et/LC_MESSAGES/kgantt_qt.qm
> -share/locale/eu/LC_MESSAGES/kchart_qt.qm
> -share/locale/eu/LC_MESSAGES/kgantt_qt.qm
> -share/locale/fi/LC_MESSAGES/kchart_qt.qm
> -share/locale/fi/LC_MESSAGES/kgantt_qt.qm
> -share/locale/fr/LC_MESSAGES/kchart_qt.qm
> -share/locale/fr/LC_MESSAGES/kgantt_qt.qm
> -share/locale/gl/LC_MESSAGES/kchart_qt.qm
> -share/locale/gl/LC_MESSAGES/kgantt_qt.qm
> -share/locale/it/LC_MESSAGES/kchart_qt.qm
> -share/locale/it/LC_MESSAGES/kgantt_qt.qm
> -share/locale/ko/LC_MESSAGES/kchart_qt.qm
> -share/locale/ko/LC_MESSAGES/kgantt_qt.qm
> -share/locale/nl/LC_MESSAGES/kchart_qt.qm
> -share/locale/nl/LC_MESSAGES/kgantt_qt.qm
> -share/locale/nn/LC_MESSAGES/kchart_qt.qm
> -share/locale/nn/LC_MESSAGES/kgantt_qt.qm
> -share/locale/pl/LC_MESSAGES/kchart_qt.qm
> -share/locale/pl/LC_MESSAGES/kgantt_qt.qm
> -share/locale/pt/LC_MESSAGES/kchart_qt.qm
> -share/locale/pt/LC_MESSAGES/kgantt_qt.qm
> -share/locale/pt_BR/LC_MESSAGES/kchart_qt.qm
> -share/locale/pt_BR/LC_MESSAGES/kgantt_qt.qm
> -share/locale/ro/LC_MESSAGES/kchart_qt.qm
> -share/locale/ru/LC_MESSAGES/kchart_qt.qm
> -share/locale/ru/LC_MESSAGES/kgantt_qt.qm
> -share/locale/sk/LC_MESSAGES/kchart_qt.qm
> -share/locale/sk/LC_MESSAGES/kgantt_qt.qm
> -share/locale/sv/LC_MESSAGES/kchart_qt.qm
> -share/locale/sv/LC_MESSAGES/kgantt_qt.qm
> -share/locale/tr/LC_MESSAGES/kchart_qt.qm
> -share/locale/tr/LC_MESSAGES/kgantt_qt.qm
> -share/locale/uk/LC_MESSAGES/kchart_qt.qm
> -share/locale/uk/LC_MESSAGES/kgantt_qt.qm
> -share/locale/zh_CN/LC_MESSAGES/kchart_qt.qm
> -share/locale/zh_CN/LC_MESSAGES/kgantt_qt.qm
> -share/locale/zh_TW/LC_MESSAGES/kchart_qt.qm
> -share/locale/zh_TW/LC_MESSAGES/kgantt_qt.qm
> +@conflict kdiagram-qt6-*
> +@pkgpath graphics/kdiagram-qt6
> +include/KChart6/
> +include/KChart6/KChart
> +include/KChart6/KChartAbstractArea
> +include/KChart6/KChartAbstractArea.h
> +include/KChart6/KChartAbstractAreaBase
> +include/KChart6/KChartAbstractAreaBase.h
> +include/KChart6/KChartAbstractAreaWidget
> +include/KChart6/KChartAbstractAreaWidget.h
> +include/KChart6/KChartAbstractAxis
> +include/KChart6/KChartAbstractAxis.h
> +include/KChart6/KChartAbstractCartesianDiagram
> +include/KChart6/KChartAbstractCartesianDiagram.h
> +include/KChart6/KChartAbstractCoordinatePlane
> +include/KChart6/KChartAbstractCoordinatePlane.h
> +include/KChart6/KChartAbstractDiagram
> +include/KChart6/KChartAbstractDiagram.h
> +include/KChart6/KChartAbstractPieDiagram
> +include/KChart6/KChartAbstractPieDiagram.h
> +include/KChart6/KChartAbstractPolarDiagram
> +include/KChart6/KChartAbstractPolarDiagram.h
> +include/KChart6/KChartAbstractProxyModel
> +include/KChart6/KChartAbstractProxyModel.h
> +include/KChart6/KChartAbstractTernaryDiagram
> +include/KChart6/KChartAbstractTernaryDiagram.h
> +include/KChart6/KChartAbstractThreeDAttributes
> +include/KChart6/KChartAbstractThreeDAttributes.h
> +include/KChart6/KChartAttributesModel
> +include/KChart6/KChartAttributesModel.h
> +include/KChart6/KChartBackgroundAttributes
> +include/KChart6/KChartBackgroundAttributes.h
> +include/KChart6/KChartBarAttributes
> +include/KChart6/KChartBarAttributes.h
> +include/KChart6/KChartBarDiagram
> +include/KChart6/KChartBarDiagram.h
> +include/KChart6/KChartCartesianAxis
> +include/KChart6/KChartCartesianAxis.h
> +include/KChart6/KChartCartesianCoordinatePlane
> +include/KChart6/KChartCartesianCoordinatePlane.h
> +include/KChart6/KChartChart
> +include/KChart6/KChartChart.h
> +include/KChart6/KChartDataValueAttributes
> +include/KChart6/KChartDataValueAttributes.h
> +include/KChart6/KChartDatasetProxyModel
> +include/KChart6/KChartDatasetProxyModel.h
> +include/KChart6/KChartDatasetSelector
> +include/KChart6/KChartDatasetSelector.h
> +include/KChart6/KChartDiagramObserver
> +include/KChart6/KChartDiagramObserver.h
> +include/KChart6/KChartEnums
> +include/KChart6/KChartEnums.h
> +include/KChart6/KChartFrameAttributes
> +include/KChart6/KChartFrameAttributes.h
> +include/KChart6/KChartGlobal
> +include/KChart6/KChartGlobal.h
> +include/KChart6/KChartGridAttributes
> +include/KChart6/KChartGridAttributes.h
> +include/KChart6/KChartHeaderFooter
> +include/KChart6/KChartHeaderFooter.h
> +include/KChart6/KChartLayoutItems
> +include/KChart6/KChartLayoutItems.h
> +include/KChart6/KChartLegend
> +include/KChart6/KChartLegend.h
> +include/KChart6/KChartLeveyJenningsAxis
> +include/KChart6/KChartLeveyJenningsAxis.h
> +include/KChart6/KChartLeveyJenningsCoordinatePlane
> +include/KChart6/KChartLeveyJenningsCoordinatePlane.h
> +include/KChart6/KChartLeveyJenningsDiagram
> +include/KChart6/KChartLeveyJenningsDiagram.h
> +include/KChart6/KChartLeveyJenningsGridAttributes
> +include/KChart6/KChartLeveyJenningsGridAttributes.h
> +include/KChart6/KChartLineAttributes
> +include/KChart6/KChartLineAttributes.h
> +include/KChart6/KChartLineDiagram
> +include/KChart6/KChartLineDiagram.h
> +include/KChart6/KChartMarkerAttributes
> +include/KChart6/KChartMarkerAttributes.h
> +include/KChart6/KChartMeasure
> +include/KChart6/KChartMeasure.h
> +include/KChart6/KChartPaintContext
> +include/KChart6/KChartPaintContext.h
> +include/KChart6/KChartPalette
> +include/KChart6/KChartPalette.h
> +include/KChart6/KChartPieAttributes
> +include/KChart6/KChartPieAttributes.h
> +include/KChart6/KChartPieDiagram
> +include/KChart6/KChartPieDiagram.h
> +include/KChart6/KChartPlotter
> +include/KChart6/KChartPlotter.h
> +include/KChart6/KChartPolarCoordinatePlane
> +include/KChart6/KChartPolarCoordinatePlane.h
> +include/KChart6/KChartPolarDiagram
> +include/KChart6/KChartPolarDiagram.h
> +include/KChart6/KChartPosition
> +include/KChart6/KChartPosition.h
> +include/KChart6/KChartRadarCoordinatePlane
> +include/KChart6/KChartRadarCoordinatePlane.h
> +include/KChart6/KChartRadarDiagram
> +include/KChart6/KChartRadarDiagram.h
> +include/KChart6/KChartRelativePosition
> +include/KChart6/KChartRelativePosition.h
> +include/KChart6/KChartRingDiagram
> +include/KChart6/KChartRingDiagram.h
> +include/KChart6/KChartRulerAttributes
> +include/KChart6/KChartRulerAttributes.h
> +include/KChart6/KChartStockBarAttributes
> +include/KChart6/KChartStockBarAttributes.h
> +include/KChart6/KChartStockDiagram
> +include/KChart6/KChartStockDiagram.h
> +include/KChart6/KChartTernaryAxis
> +include/KChart6/KChartTernaryAxis.h
> +include/KChart6/KChartTernaryCoordinatePlane
> +include/KChart6/KChartTernaryCoordinatePlane.h
> +include/KChart6/KChartTernaryLineDiagram
> +include/KChart6/KChartTernaryLineDiagram.h
> +include/KChart6/KChartTernaryPointDiagram
> +include/KChart6/KChartTernaryPointDiagram.h
> +include/KChart6/KChartTextArea
> +include/KChart6/KChartTextArea.h
> +include/KChart6/KChartTextAttributes
> +include/KChart6/KChartTextAttributes.h
> +include/KChart6/KChartThreeDBarAttributes
> +include/KChart6/KChartThreeDBarAttributes.h
> +include/KChart6/KChartThreeDLineAttributes
> +include/KChart6/KChartThreeDLineAttributes.h
> +include/KChart6/KChartThreeDPieAttributes
> +include/KChart6/KChartThreeDPieAttributes.h
> +include/KChart6/KChartValueTrackerAttributes
> +include/KChart6/KChartValueTrackerAttributes.h
> +include/KChart6/KChartWidget
> +include/KChart6/KChartWidget.h
> +include/KChart6/kchart_export.h
> +include/KChart6/kchart_version.h
> +include/KGantt6/
> +include/KGantt6/KGanttAbstractGrid
> +include/KGantt6/KGanttAbstractRowController
> +include/KGantt6/KGanttConstraint
> +include/KGantt6/KGanttConstraintGraphicsItem
> +include/KGantt6/KGanttConstraintModel
> +include/KGantt6/KGanttConstraintProxy
> +include/KGantt6/KGanttDateTimeGrid
> +include/KGantt6/KGanttDateTimeTimeLine
> +include/KGantt6/KGanttDateTimeTimeLineDialog
> +include/KGantt6/KGanttForwardingProxyModel
> +include/KGantt6/KGanttGlobal
> +include/KGantt6/KGanttGraphicsItem
> +include/KGantt6/KGanttGraphicsScene
> +include/KGantt6/KGanttGraphicsView
> +include/KGantt6/KGanttItemDelegate
> +include/KGantt6/KGanttLegend
> +include/KGantt6/KGanttListViewRowController
> +include/KGantt6/KGanttPenStyleComboBox
> +include/KGantt6/KGanttPrintingContext
> +include/KGantt6/KGanttProxyModel
> +include/KGantt6/KGanttStyleOptionGanttItem
> +include/KGantt6/KGanttSummaryHandlingProxyModel
> +include/KGantt6/KGanttTreeViewRowController
> +include/KGantt6/KGanttView
> +include/KGantt6/kgantt_export.h
> +include/KGantt6/kgantt_version.h
> +include/KGantt6/kganttabstractgrid.h
> +include/KGantt6/kganttabstractgrid_p.h
> +include/KGantt6/kganttabstractrowcontroller.h
> +include/KGantt6/kganttconstraint.h
> +include/KGantt6/kganttconstraintgraphicsitem.h
> +include/KGantt6/kganttconstraintmodel.h
> +include/KGantt6/kganttconstraintproxy.h
> +include/KGantt6/kganttdatetimegrid.h
> +include/KGantt6/kganttdatetimetimeline.h
> +include/KGantt6/kganttdatetimetimelinedialog.h
> +include/KGantt6/kganttforwardingproxymodel.h
> +include/KGantt6/kganttglobal.h
> +include/KGantt6/kganttgraphicsitem.h
> +include/KGantt6/kganttgraphicsscene.h
> +include/KGantt6/kganttgraphicsview.h
> +include/KGantt6/kganttitemdelegate.h
> +include/KGantt6/kganttlegend.h
> +include/KGantt6/kganttlistviewrowcontroller.h
> +include/KGantt6/kganttpenstylecombobox.h
> +include/KGantt6/kganttprintingcontext.h
> +include/KGantt6/kganttproxymodel.h
> +include/KGantt6/kganttstyleoptionganttitem.h
> +include/KGantt6/kganttsummaryhandlingproxymodel.h
> +include/KGantt6/kgantttreeviewrowcontroller.h
> +include/KGantt6/kganttview.h
> +lib/cmake/KChart6/
> +lib/cmake/KChart6/KChart6Config.cmake
> +lib/cmake/KChart6/KChart6ConfigVersion.cmake
> +lib/cmake/KChart6/KChart6Targets${MODCMAKE_BUILD_SUFFIX}
> +lib/cmake/KChart6/KChart6Targets.cmake
> +lib/cmake/KGantt6/
> +lib/cmake/KGantt6/KGantt6Config.cmake
> +lib/cmake/KGantt6/KGantt6ConfigVersion.cmake
> +lib/cmake/KGantt6/KGantt6Targets${MODCMAKE_BUILD_SUFFIX}
> +lib/cmake/KGantt6/KGantt6Targets.cmake
> +@lib lib/libKChart6.so.${LIBKChart6_VERSION}
> +@lib lib/libKGantt6.so.${LIBKGantt6_VERSION}
> +share/kf6/
> +share/kf6/mkspecs/
> +share/kf6/mkspecs/qt_KChart6.pri
> +share/kf6/mkspecs/qt_KGantt6.pri
> +share/locale/ar/LC_MESSAGES/kchart6_qt.qm
> +share/locale/ar/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/bg/LC_MESSAGES/kchart6_qt.qm
> +share/locale/bg/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/bs/LC_MESSAGES/kchart6_qt.qm
> +share/locale/bs/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/ca/LC_MESSAGES/kchart6_qt.qm
> +share/locale/ca/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/ca@valencia/LC_MESSAGES/kchart6_qt.qm
> +share/locale/ca@valencia/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/cs/LC_MESSAGES/kchart6_qt.qm
> +share/locale/cs/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/da/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/de/LC_MESSAGES/kchart6_qt.qm
> +share/locale/de/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/el/LC_MESSAGES/kchart6_qt.qm
> +share/locale/el/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/en_GB/LC_MESSAGES/kchart6_qt.qm
> +share/locale/en_GB/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/eo/LC_MESSAGES/kchart6_qt.qm
> +share/locale/eo/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/es/LC_MESSAGES/kchart6_qt.qm
> +share/locale/es/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/et/LC_MESSAGES/kchart6_qt.qm
> +share/locale/et/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/eu/LC_MESSAGES/kchart6_qt.qm
> +share/locale/eu/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/fi/LC_MESSAGES/kchart6_qt.qm
> +share/locale/fi/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/fr/LC_MESSAGES/kchart6_qt.qm
> +share/locale/fr/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/gl/LC_MESSAGES/kchart6_qt.qm
> +share/locale/gl/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/ia/LC_MESSAGES/kchart6_qt.qm
> +share/locale/ia/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/it/LC_MESSAGES/kchart6_qt.qm
> +share/locale/it/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/ja/LC_MESSAGES/kchart6_qt.qm
> +share/locale/ja/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/ka/LC_MESSAGES/kchart6_qt.qm
> +share/locale/ka/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/ko/LC_MESSAGES/kchart6_qt.qm
> +share/locale/ko/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/lt/LC_MESSAGES/kchart6_qt.qm
> +share/locale/lt/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/nl/LC_MESSAGES/kchart6_qt.qm
> +share/locale/nl/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/nn/LC_MESSAGES/kchart6_qt.qm
> +share/locale/nn/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/pl/LC_MESSAGES/kchart6_qt.qm
> +share/locale/pl/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/pt/LC_MESSAGES/kchart6_qt.qm
> +share/locale/pt/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/pt_BR/LC_MESSAGES/kchart6_qt.qm
> +share/locale/pt_BR/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/ro/LC_MESSAGES/kchart6_qt.qm
> +share/locale/ru/LC_MESSAGES/kchart6_qt.qm
> +share/locale/ru/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/sk/LC_MESSAGES/kchart6_qt.qm
> +share/locale/sk/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/sl/LC_MESSAGES/kchart6_qt.qm
> +share/locale/sl/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/sv/LC_MESSAGES/kchart6_qt.qm
> +share/locale/sv/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/tr/LC_MESSAGES/kchart6_qt.qm
> +share/locale/tr/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/uk/LC_MESSAGES/kchart6_qt.qm
> +share/locale/uk/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/zh_CN/LC_MESSAGES/kchart6_qt.qm
> +share/locale/zh_CN/LC_MESSAGES/kgantt6_qt.qm
> +share/locale/zh_TW/LC_MESSAGES/kchart6_qt.qm
> +share/locale/zh_TW/LC_MESSAGES/kgantt6_qt.qm
> Index: productivity/kmymoney/Makefile
> ===================================================================
> RCS file: /cvs/ports/productivity/kmymoney/Makefile,v
> diff -u -p -r1.68 Makefile
> --- productivity/kmymoney/Makefile 19 Dec 2025 13:41:37 -0000 1.68
> +++ productivity/kmymoney/Makefile 11 Jan 2026 09:57:51 -0000
> @@ -4,7 +4,7 @@ COMMENT = personal finance manager
>
> V = 5.2.1
> DISTNAME = kmymoney-${V}
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = productivity x11
>
> @@ -107,7 +107,7 @@ LIB_DEPENDS = databases/db/v4 \
> devel/kf6/solid \
> devel/kf6/sonnet \
> devel/libofx \
> - graphics/kdiagram-qt6 \
> + graphics/kdiagram \
> productivity/libalkimia>=8.2.1 \
> security/qtkeychain,qt6 \
> security/qgpgme \
> Index: x11/kde-applications/eventviews/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/kde-applications/eventviews/Makefile,v
> diff -u -p -r1.23 Makefile
> --- x11/kde-applications/eventviews/Makefile 11 Jan 2026 08:57:08 -0000 1.23
> +++ x11/kde-applications/eventviews/Makefile 11 Jan 2026 09:58:01 -0000
> @@ -1,6 +1,7 @@
> COMMENT = KDE PIM library for creating events
> DISTNAME = eventviews-${VERSION}
> CATEGORIES = devel
> +REVISION = 0
>
> SHARED_LIBS += KPim6EventViews 0.1 # 0.0
>
> @@ -37,7 +38,7 @@ LIB_DEPENDS = devel/kf6/kcalendarcore \
> devel/kf6/kitemmodels \
> devel/kf6/kservice \
> devel/kf6/kwidgetsaddons \
> - graphics/kdiagram-qt6 \
> + graphics/kdiagram \
> x11/kde-applications/akonadi-calendar>=${VERSION} \
> x11/kde-applications/akonadi>=${VERSION} \
> x11/kde-applications/calendarsupport>=${VERSION} \
> Index: x11/kde-applications/incidenceeditor/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/kde-applications/incidenceeditor/Makefile,v
> diff -u -p -r1.25 Makefile
> --- x11/kde-applications/incidenceeditor/Makefile 27 Sep 2025 19:17:27 -0000 1.25
> +++ x11/kde-applications/incidenceeditor/Makefile 11 Jan 2026 09:58:01 -0000
> @@ -1,5 +1,6 @@
> COMMENT = KDE PIM incidence editor
> DISTNAME = incidenceeditor-${VERSION}
> +REVISION = 0
> CATEGORIES = devel
>
> SHARED_LIBS += KPim6IncidenceEditor 0.0 # 0.0
> @@ -25,7 +26,7 @@ MODKF5_L10N_CONFLICT = yes
>
> BUILD_DEPENDS = devel/boost
>
> -LIB_DEPENDS = graphics/kdiagram-qt6 \
> +LIB_DEPENDS = graphics/kdiagram \
> devel/kf6/kcalendarcore \
> devel/kf6/kcodecs \
> devel/kf6/kcolorscheme \
>
Merge graphics/kdiagram-qt6 to graphics/kdiagram