Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 May 2026 19:58:03 +0000
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d8f606862b5d - main - graphics/kimageannotator: Deorbit Qt5 flavor
Message-ID:  <6a1b414b.26075.357a7b5@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by makc:

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

commit d8f606862b5dd939361616087e6e93861082fbd8
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2026-05-30 19:55:48 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2026-05-30 19:55:48 +0000

    graphics/kimageannotator: Deorbit Qt5 flavor
---
 MOVED                              |  2 +
 graphics/kimageannotator/Makefile  | 27 ++++---------
 graphics/kimageannotator/pkg-plist | 80 +++++++++++++++++++-------------------
 3 files changed, 49 insertions(+), 60 deletions(-)

diff --git a/MOVED b/MOVED
index a7135fac1ac7..b75ff0e1177f 100644
--- a/MOVED
+++ b/MOVED
@@ -5321,3 +5321,5 @@ math/hs-syfco||2026-05-30|Has expired: Depends on a deprecated compiler version
 lang/ghc94||2026-05-30|Has expired: Old version
 graphics/kcolorpicker@qt5||2026-05-30|Unflavorize, remove Qt5 flavor
 graphics/kcolorpicker@qt6|graphics/kcolorpicker|2026-05-30|Unflavorize
+graphics/kimageannotator@qt5||2026-05-30|Unflavorize, remove Qt5 flavor
+graphics/kimageannotator@qt6|graphics/kimageannotator|2026-05-30|Unflavorize
diff --git a/graphics/kimageannotator/Makefile b/graphics/kimageannotator/Makefile
index 377bd066e7fd..e18b5f147dcc 100644
--- a/graphics/kimageannotator/Makefile
+++ b/graphics/kimageannotator/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	kImageAnnotator
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.2
 CATEGORIES=	graphics kde
-PKGNAMESUFFIX=	-${FLAVOR}
+PKGNAMESUFFIX=	-qt6
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Library for image-annotation tools
@@ -11,33 +11,20 @@ WWW=		https://github.com/ksnip/kImageAnnotator
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-FLAVORS=		qt6 qt5
-FLAVOR?=		${FLAVORS:[1]}
-qt5_LIB_DEPENDS=	libkColorPicker-Qt5.so:graphics/kcolorpicker@qt5
-qt6_LIB_DEPENDS=	libkColorPicker-Qt6.so:graphics/kcolorpicker@qt6
+LIB_DEPENDS=	libkColorPicker-Qt6.so:graphics/kcolorpicker
 
-USES=		cmake localbase compiler:c++17-lang gl qt:${FLAVOR:S/qt//} xorg
+USES=		cmake localbase compiler:c++17-lang gl qt:6 xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	ksnip
-_USE_GL_qt5=	# empty
-_USE_GL_qt6=	opengl
-USE_GL=		${_USE_GL_${FLAVOR}}
-_USE_QT_qt5=	core gui svg widgets \
-		buildtools:build linguisttools:build qmake:build
-_USE_QT_qt6=	base svg \
+USE_GL=		opengl
+USE_QT=		base svg \
 		tools:build
-USE_QT=		${_USE_QT_${FLAVOR}}
 USE_XORG=	x11
 
-CMAKE_ON=	BUILD_SHARED_LIBS BUILD_WITH_${FLAVOR:tu}
+CMAKE_ON=	BUILD_SHARED_LIBS BUILD_WITH_QT6
 CMAKE_OFF=	BUILD_EXAMPLE
 
-_QT6_ONLY_qt5=	"@comment "
-_QT6_ONLY_qt6=	#
-
-PLIST_SUB=	QT6_ONLY=${_QT6_ONLY_${FLAVOR}} \
-		QT_VER=${FLAVOR:S/qt/Qt/} \
-		SHLIB_VER=${DISTVERSION} \
+PLIST_SUB=	SHLIB_VER=${DISTVERSION} \
 		SHLIB_VER_MAJ=${DISTVERSION:R:R}
 
 .include <bsd.port.mk>
diff --git a/graphics/kimageannotator/pkg-plist b/graphics/kimageannotator/pkg-plist
index 1339745b2d75..c6dc61f8d9e7 100644
--- a/graphics/kimageannotator/pkg-plist
+++ b/graphics/kimageannotator/pkg-plist
@@ -1,40 +1,40 @@
-include/kImageAnnotator-%%QT_VER%%/kImageAnnotator/KImageAnnotator.h
-include/kImageAnnotator-%%QT_VER%%/kImageAnnotator/KImageAnnotatorExport.h
-lib/cmake/kImageAnnotator-%%QT_VER%%/kImageAnnotator-%%QT_VER%%Config-version.cmake
-lib/cmake/kImageAnnotator-%%QT_VER%%/kImageAnnotator-%%QT_VER%%Config.cmake
-lib/cmake/kImageAnnotator-%%QT_VER%%/kImageAnnotator-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/kImageAnnotator-%%QT_VER%%/kImageAnnotator-targets.cmake
-lib/libkImageAnnotator-%%QT_VER%%.so
-lib/libkImageAnnotator-%%QT_VER%%.so.%%SHLIB_VER_MAJ%%
-lib/libkImageAnnotator-%%QT_VER%%.so.%%SHLIB_VER%%
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_ar.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_bg.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_ca.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_cs.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_da.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_de.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_el.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_es.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_eu.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_fr.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_fr_CA.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_gl.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_hr.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_hu.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_id.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_it.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_ja.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_ko.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_nl.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_no.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_pl.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_pt.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_pt_BR.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_ro.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_ru.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_si.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_sq.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_sv.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_tr.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_uk.qm
-%%QT6_ONLY%%%%DATADIR%%/translations/kImageAnnotator_zh_CN.qm
+include/kImageAnnotator-Qt6/kImageAnnotator/KImageAnnotator.h
+include/kImageAnnotator-Qt6/kImageAnnotator/KImageAnnotatorExport.h
+lib/cmake/kImageAnnotator-Qt6/kImageAnnotator-Qt6Config-version.cmake
+lib/cmake/kImageAnnotator-Qt6/kImageAnnotator-Qt6Config.cmake
+lib/cmake/kImageAnnotator-Qt6/kImageAnnotator-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/kImageAnnotator-Qt6/kImageAnnotator-targets.cmake
+lib/libkImageAnnotator-Qt6.so
+lib/libkImageAnnotator-Qt6.so.%%SHLIB_VER_MAJ%%
+lib/libkImageAnnotator-Qt6.so.%%SHLIB_VER%%
+%%DATADIR%%/translations/kImageAnnotator_ar.qm
+%%DATADIR%%/translations/kImageAnnotator_bg.qm
+%%DATADIR%%/translations/kImageAnnotator_ca.qm
+%%DATADIR%%/translations/kImageAnnotator_cs.qm
+%%DATADIR%%/translations/kImageAnnotator_da.qm
+%%DATADIR%%/translations/kImageAnnotator_de.qm
+%%DATADIR%%/translations/kImageAnnotator_el.qm
+%%DATADIR%%/translations/kImageAnnotator_es.qm
+%%DATADIR%%/translations/kImageAnnotator_eu.qm
+%%DATADIR%%/translations/kImageAnnotator_fr.qm
+%%DATADIR%%/translations/kImageAnnotator_fr_CA.qm
+%%DATADIR%%/translations/kImageAnnotator_gl.qm
+%%DATADIR%%/translations/kImageAnnotator_hr.qm
+%%DATADIR%%/translations/kImageAnnotator_hu.qm
+%%DATADIR%%/translations/kImageAnnotator_id.qm
+%%DATADIR%%/translations/kImageAnnotator_it.qm
+%%DATADIR%%/translations/kImageAnnotator_ja.qm
+%%DATADIR%%/translations/kImageAnnotator_ko.qm
+%%DATADIR%%/translations/kImageAnnotator_nl.qm
+%%DATADIR%%/translations/kImageAnnotator_no.qm
+%%DATADIR%%/translations/kImageAnnotator_pl.qm
+%%DATADIR%%/translations/kImageAnnotator_pt.qm
+%%DATADIR%%/translations/kImageAnnotator_pt_BR.qm
+%%DATADIR%%/translations/kImageAnnotator_ro.qm
+%%DATADIR%%/translations/kImageAnnotator_ru.qm
+%%DATADIR%%/translations/kImageAnnotator_si.qm
+%%DATADIR%%/translations/kImageAnnotator_sq.qm
+%%DATADIR%%/translations/kImageAnnotator_sv.qm
+%%DATADIR%%/translations/kImageAnnotator_tr.qm
+%%DATADIR%%/translations/kImageAnnotator_uk.qm
+%%DATADIR%%/translations/kImageAnnotator_zh_CN.qm


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1b414b.26075.357a7b5>