diff --git a/graphics/kcolorpicker/Makefile b/graphics/kcolorpicker/Makefile
index 6899f1a9e90c..17f9f169b59c 100644
--- a/graphics/kcolorpicker/Makefile
+++ b/graphics/kcolorpicker/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	kColorPicker
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.0
+DISTVERSION=	0.3.1
 CATEGORIES=	graphics kde
 PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt-based color picker library with popup menu
 WWW=		https://github.com/ksnip/kColorPicker
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 FLAVORS=	qt5 qt6
 FLAVOR?=	${FLAVORS:[1]}
 
 USES=		cmake compiler:c++17-lang gl qt:${FLAVOR:S/qt//}
 USE_GITHUB=	yes
 GH_ACCOUNT=	ksnip
 _USE_GL_qt5=	# empty
 _USE_GL_qt6=	opengl
 USE_GL=		${_USE_GL_${FLAVOR}}
 _USE_QT_qt5=	core gui widgets \
 		buildtools:build qmake:build testlib:build
 _USE_QT_qt6=	base
 USE_QT=		${_USE_QT_${FLAVOR}}
 
 CMAKE_ON=	BUILD_SHARED_LIBS BUILD_WITH_QT${FLAVOR:S/qt//}
 
 PLIST_SUB=	QT_VER=${FLAVOR:S/qt//} \
 		SHLIB_VER=${DISTVERSION} \
 		SHLIB_VER_MAJ=${DISTVERSION:R:R}
 
 .include <bsd.port.mk>
diff --git a/graphics/kcolorpicker/distinfo b/graphics/kcolorpicker/distinfo
index a5697cc5ae49..d4915df28251 100644
--- a/graphics/kcolorpicker/distinfo
+++ b/graphics/kcolorpicker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1706133480
-SHA256 (ksnip-kColorPicker-v0.3.0_GH0.tar.gz) = cab1efae1ca345a831dc6975b81c344da5c9425d934d73584dd7d0d512af3946
-SIZE (ksnip-kColorPicker-v0.3.0_GH0.tar.gz) = 12998
+TIMESTAMP = 1714541691
+SHA256 (ksnip-kColorPicker-v0.3.1_GH0.tar.gz) = e78c785ec4a8a22a48a91835c97601f5704b5076b154415353b0d2697dc0b4f7
+SIZE (ksnip-kColorPicker-v0.3.1_GH0.tar.gz) = 12861
diff --git a/graphics/kcolorpicker/files/patch-CMakeLists.txt b/graphics/kcolorpicker/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..bb65dc5e9f66
--- /dev/null
+++ b/graphics/kcolorpicker/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2024-05-01 05:41:27 UTC
++++ CMakeLists.txt
+@@ -65,6 +65,7 @@ set_target_properties(kColorPicker
+ 					  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin
+ 		 			  VERSION ${PROJECT_VERSION}
+ 					  SOVERSION 0
++					  OUTPUT_NAME kColorPicker-Qt${QT_MAJOR_VERSION}
+ 					  )
+ 
+ install(TARGETS kColorPicker
diff --git a/graphics/kcolorpicker/pkg-plist b/graphics/kcolorpicker/pkg-plist
index 6686f2421287..fb5a775efecb 100644
--- a/graphics/kcolorpicker/pkg-plist
+++ b/graphics/kcolorpicker/pkg-plist
@@ -1,9 +1,9 @@
 include/kColorPicker-Qt%%QT_VER%%/kColorPicker/KColorPicker.h
 include/kColorPicker-Qt%%QT_VER%%/kColorPicker/KColorPickerExport.h
-lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-Qt%%QT_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-Qt%%QT_VER%%-targets.cmake
+lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-targets.cmake
 lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-Qt%%QT_VER%%Config-version.cmake
 lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-Qt%%QT_VER%%Config.cmake
 lib/libkColorPicker-Qt%%QT_VER%%.so
 lib/libkColorPicker-Qt%%QT_VER%%.so.%%SHLIB_VER_MAJ%%
 lib/libkColorPicker-Qt%%QT_VER%%.so.%%SHLIB_VER%%
diff --git a/graphics/ksnip/files/patch-CMakeLists.txt b/graphics/ksnip/files/patch-CMakeLists.txt
index 5e61c4b81bb2..ba8af04872fe 100644
--- a/graphics/ksnip/files/patch-CMakeLists.txt
+++ b/graphics/ksnip/files/patch-CMakeLists.txt
@@ -1,16 +1,18 @@
 --- CMakeLists.txt.orig	2023-03-15 09:08:40 UTC
 +++ CMakeLists.txt
-@@ -61,10 +61,10 @@ set(KIMAGEANNOTATOR_MIN_VERSION 0.6.1)
+@@ -60,11 +60,11 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED ${QT_COMPO
+ 
  find_package(Qt5 ${QT_MIN_VERSION} REQUIRED ${QT_COMPONENTS})
  
- set(KIMAGEANNOTATOR_MIN_VERSION 0.6.1)
+-set(KIMAGEANNOTATOR_MIN_VERSION 0.6.1)
 -find_package(kImageAnnotator ${KIMAGEANNOTATOR_MIN_VERSION} REQUIRED)
++set(KIMAGEANNOTATOR_MIN_VERSION 0.7.0)
 +find_package(kImageAnnotator-Qt5 ${KIMAGEANNOTATOR_MIN_VERSION} REQUIRED)
  
 -set(KCOLORPICKER_MIN_VERSION 0.2.0)
 -find_package(kColorPicker ${KCOLORPICKER_MIN_VERSION} REQUIRED)
 +set(KCOLORPICKER_MIN_VERSION 0.3.0)
 +find_package(kColorPicker-Qt5 ${KCOLORPICKER_MIN_VERSION} REQUIRED)
  
  set(BASEPATH "${CMAKE_SOURCE_DIR}")
  include_directories("${BASEPATH}")
diff --git a/graphics/ksnip/files/patch-src_CMakeLists.txt b/graphics/ksnip/files/patch-src_CMakeLists.txt
deleted file mode 100644
index f2c09bbd1540..000000000000
--- a/graphics/ksnip/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/CMakeLists.txt.orig	2024-01-26 06:54:23 UTC
-+++ src/CMakeLists.txt
-@@ -273,7 +273,7 @@ elseif (UNIX)
-                 Qt5::DBus
-                 Qt5::X11Extras
-                 kImageAnnotator::kImageAnnotator
--                kColorPicker::kColorPicker
-+                kColorPicker::kColorPicker-Qt5
-                 XCB::XFIXES
-                 )
-