3 files changed, 51 insertions, 44 deletions

diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index c3cbd8e33dc0..7b706a1abaa5 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -1,30 +1,25 @@
 PORTNAME=	kdiff3
-DISTVERSION=	1.11.5
-PORTREVISION=	1
+DISTVERSION=	1.12.1
 CATEGORIES=	textproc kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE graphical frontend for diff
-WWW=		https://kdiff3.sourceforge.net/
+WWW=		https://apps.kde.org/kdiff3/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/range/algorithm.hpp:devel/boost-libs \
 		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
+LIB_DEPENDS=	libicuuc.so:devel/icu
 
-USES=		cmake compiler:c++11-lang gettext-tools:build kde:6 qt:6 tar:xz \
-		xorg
-USE_KDE=	config coreaddons crash i18n kio widgetsaddons xmlgui \
+USES=		cmake compiler:c++17-lang gettext-tools gl kde:6 qt:6 tar:xz xorg
+USE_GL=		gl opengl # GLX
+USE_KDE=	colorscheme completion config configwidgets coreaddons crash \
+		i18n jobwidgets kio service solid widgetsaddons xmlgui \
 		doctools:build ecm:build
-USE_QT=		5compat base
+USE_QT=		base
 USE_XORG=	x11
 
-CMAKE_ARGS=	-DBUILD_WITH_QT6=ON
-
-DOCSDIR_REL=	share/doc/HTML
-
-OPTIONS_DEFINE=	DOCS
-
 .include <bsd.port.mk>
diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo
index 591ffeb0c300..5f8745b4ea6b 100644
--- a/textproc/kdiff3/distinfo
+++ b/textproc/kdiff3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731040454
-SHA256 (kdiff3-1.11.5.tar.xz) = 420f18b3b9689698a05e102f8a41719049074da68f96c94be18d1b8297eeb545
-SIZE (kdiff3-1.11.5.tar.xz) = 1142840
+TIMESTAMP = 1740040183
+SHA256 (kdiff3-1.12.1.tar.xz) = 17234ed446d41d2c59026b7937915dbe368e56f5999ae435dab756966166334b
+SIZE (kdiff3-1.12.1.tar.xz) = 1204916
diff --git a/textproc/kdiff3/pkg-plist b/textproc/kdiff3/pkg-plist
index db2239fefc6d..66a09284d311 100644
--- a/textproc/kdiff3/pkg-plist
+++ b/textproc/kdiff3/pkg-plist
@@ -1,34 +1,38 @@
 bin/kdiff3
 %%QT_PLUGINDIR%%/kf6/kfileitemaction/kdiff3fileitemaction.so
 share/applications/org.kde.kdiff3.desktop
-%%PORTDOCS%%%%DOCSDIR%%/ca/kdiff3/index.cache.bz2
-%%PORTDOCS%%%%DOCSDIR%%/ca/kdiff3/index.docbook
-%%PORTDOCS%%%%DOCSDIR%%/ca/kdiff3/open_dialog.png
-%%PORTDOCS%%%%DOCSDIR%%/de/kdiff3/index.cache.bz2
-%%PORTDOCS%%%%DOCSDIR%%/de/kdiff3/index.docbook
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/dirbrowser.png
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/dirmergebig.png
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/index.cache.bz2
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/index.docbook
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/iteminfo.png
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/letter_by_letter.png
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/merge_current.png
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/new.png
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/open_dialog.png
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/screenshot_diff.png
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/screenshot_merge.png
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/triple_diff.png
-%%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/white_space.png
-%%PORTDOCS%%%%DOCSDIR%%/es/kdiff3/index.cache.bz2
-%%PORTDOCS%%%%DOCSDIR%%/es/kdiff3/index.docbook
-%%PORTDOCS%%%%DOCSDIR%%/it/kdiff3/index.cache.bz2
-%%PORTDOCS%%%%DOCSDIR%%/it/kdiff3/index.docbook
-%%PORTDOCS%%%%DOCSDIR%%/nl/kdiff3/index.cache.bz2
-%%PORTDOCS%%%%DOCSDIR%%/nl/kdiff3/index.docbook
-%%PORTDOCS%%%%DOCSDIR%%/sv/kdiff3/index.cache.bz2
-%%PORTDOCS%%%%DOCSDIR%%/sv/kdiff3/index.docbook
-%%PORTDOCS%%%%DOCSDIR%%/uk/kdiff3/index.cache.bz2
-%%PORTDOCS%%%%DOCSDIR%%/uk/kdiff3/index.docbook
+share/doc/HTML/ca/kdiff3/index.cache.bz2
+share/doc/HTML/ca/kdiff3/index.docbook
+share/doc/HTML/ca/kdiff3/open_dialog.png
+share/doc/HTML/de/kdiff3/index.cache.bz2
+share/doc/HTML/de/kdiff3/index.docbook
+share/doc/HTML/en/kdiff3/dirbrowser.png
+share/doc/HTML/en/kdiff3/dirmergebig.png
+share/doc/HTML/en/kdiff3/index.cache.bz2
+share/doc/HTML/en/kdiff3/index.docbook
+share/doc/HTML/en/kdiff3/iteminfo.png
+share/doc/HTML/en/kdiff3/letter_by_letter.png
+share/doc/HTML/en/kdiff3/merge_current.png
+share/doc/HTML/en/kdiff3/new.png
+share/doc/HTML/en/kdiff3/open_dialog.png
+share/doc/HTML/en/kdiff3/screenshot_diff.png
+share/doc/HTML/en/kdiff3/screenshot_merge.png
+share/doc/HTML/en/kdiff3/triple_diff.png
+share/doc/HTML/en/kdiff3/white_space.png
+share/doc/HTML/es/kdiff3/index.cache.bz2
+share/doc/HTML/es/kdiff3/index.docbook
+share/doc/HTML/it/kdiff3/index.cache.bz2
+share/doc/HTML/it/kdiff3/index.docbook
+share/doc/HTML/nl/kdiff3/index.cache.bz2
+share/doc/HTML/nl/kdiff3/index.docbook
+share/doc/HTML/pt/kdiff3/index.cache.bz2
+share/doc/HTML/pt/kdiff3/index.docbook
+share/doc/HTML/sl/kdiff3/index.cache.bz2
+share/doc/HTML/sl/kdiff3/index.docbook
+share/doc/HTML/sv/kdiff3/index.cache.bz2
+share/doc/HTML/sv/kdiff3/index.docbook
+share/doc/HTML/uk/kdiff3/index.cache.bz2
+share/doc/HTML/uk/kdiff3/index.docbook
 share/icons/hicolor/128x128/apps/kdiff3.png
 share/icons/hicolor/16x16/apps/kdiff3.png
 share/icons/hicolor/22x22/apps/kdiff3.png
@@ -38,6 +42,9 @@ share/icons/hicolor/48x48/apps/kdiff3.png
 share/icons/hicolor/64x64/apps/kdiff3.png
 share/icons/hicolor/scalable/apps/kdiff3.svgz
 share/locale/ar/LC_MESSAGES/kdiff3.mo
+share/locale/ast/LC_MESSAGES/diff_ext.mo
+share/locale/ast/LC_MESSAGES/kdiff3.mo
+share/locale/ast/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/bg/LC_MESSAGES/diff_ext.mo
 share/locale/bg/LC_MESSAGES/kdiff3.mo
 share/locale/bg/LC_MESSAGES/kdiff3fileitemactionplugin.mo
@@ -88,6 +95,9 @@ share/locale/ga/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/gl/LC_MESSAGES/diff_ext.mo
 share/locale/gl/LC_MESSAGES/kdiff3.mo
 share/locale/gl/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/he/LC_MESSAGES/diff_ext.mo
+share/locale/he/LC_MESSAGES/kdiff3.mo
+share/locale/he/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/hi/LC_MESSAGES/kdiff3.mo
 share/locale/hne/LC_MESSAGES/kdiff3.mo
 share/locale/hr/LC_MESSAGES/kdiff3.mo
@@ -112,6 +122,7 @@ share/locale/ka/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/ko/LC_MESSAGES/diff_ext.mo
 share/locale/ko/LC_MESSAGES/kdiff3.mo
 share/locale/ko/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/lt/LC_MESSAGES/diff_ext.mo
 share/locale/lt/LC_MESSAGES/kdiff3.mo
 share/locale/lt/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/mai/LC_MESSAGES/kdiff3.mo
@@ -181,6 +192,7 @@ share/man/es/man1/kdiff3.1.gz
 share/man/it/man1/kdiff3.1.gz
 share/man/man1/kdiff3.1.gz
 share/man/nl/man1/kdiff3.1.gz
+share/man/sl/man1/kdiff3.1.gz
 share/man/sv/man1/kdiff3.1.gz
 share/man/uk/man1/kdiff3.1.gz
 share/metainfo/org.kde.kdiff3.appdata.xml