git: aa382964eaf3 - main - graphics/kf6-kimageformats: fix packaging with non default options

From: Max Brazhnikov <makc_at_FreeBSD.org>
Date: Mon, 15 Sep 2025 09:37:08 UTC
The branch main has been updated by makc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aa382964eaf3f404e3c6ba6358136f6c433b5e51

commit aa382964eaf3f404e3c6ba6358136f6c433b5e51
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2025-09-15 09:28:49 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2025-09-15 09:36:30 +0000

    graphics/kf6-kimageformats: fix packaging with non default options
    
    PR:             289609
    Reported by:    Anton Saietskii
---
 graphics/kf6-kimageformats/Makefile  | 11 +++++++----
 graphics/kf6-kimageformats/pkg-plist |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/graphics/kf6-kimageformats/Makefile b/graphics/kf6-kimageformats/Makefile
index 486c61aae2d5..706109823369 100644
--- a/graphics/kf6-kimageformats/Makefile
+++ b/graphics/kf6-kimageformats/Makefile
@@ -10,9 +10,9 @@ USE_GL=		gl opengl
 USE_KDE=	archive ecm:build
 USE_QT=		base
 
-OPTIONS_DEFINE=	AVIF JXL HEIF OPENEXR RAW
-OPTIONS_DEFAULT=	AVIF JXL HEIF OPENEXR RAW
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		AVIF JXL HEIF OPENEXR OPENJPEG RAW
+OPTIONS_DEFAULT:=	${OPTIONS_DEFINE}
+OPTIONS_SUB=		yes
 
 AVIF_LIB_DEPENDS=	libavif.so:graphics/libavif
 AVIF_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_libavif
@@ -27,7 +27,10 @@ OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr \
 			libImath.so:math/Imath
 OPENEXR_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
 
+OPENJPEG_LIB_DEPENDS=		libopenjp2.so:graphics/openjpeg
+OPENJPEG_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenJPEG
+
 RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
-RAW_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_libraw
+RAW_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_LibRaw
 
 .include <bsd.port.mk>
diff --git a/graphics/kf6-kimageformats/pkg-plist b/graphics/kf6-kimageformats/pkg-plist
index c6220810c367..cbc86f2543d0 100644
--- a/graphics/kf6-kimageformats/pkg-plist
+++ b/graphics/kf6-kimageformats/pkg-plist
@@ -8,7 +8,7 @@ lib/cmake/KF6ImageFormats/KF6ImageFormatsConfigVersion.cmake
 %%QT_PLUGINDIR%%/imageformats/kimg_hdr.so
 %%HEIF%%%%QT_PLUGINDIR%%/imageformats/kimg_heif.so
 %%QT_PLUGINDIR%%/imageformats/kimg_iff.so
-%%QT_PLUGINDIR%%/imageformats/kimg_jp2.so
+%%OPENJPEG%%%%QT_PLUGINDIR%%/imageformats/kimg_jp2.so
 %%JXL%%%%QT_PLUGINDIR%%/imageformats/kimg_jxl.so
 %%QT_PLUGINDIR%%/imageformats/kimg_kra.so
 %%QT_PLUGINDIR%%/imageformats/kimg_ora.so