git: b85d4d8b2409 - main - audio/kid3: Remove kf5 flavor

The branch main has been updated by jhale:

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

commit b85d4d8b240965e7b2aa95f737c35948649e36eb
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-02-05 06:31:08 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-02-05 06:42:22 +0000

    audio/kid3: Remove kf5 flavor
    
    Since Plasma5 is gone and most KDE Applications have been switched to
    kf6, there is no more reason to keep the kf5 flavor.
    
    Refactor common variables.
    
    While here, fix warnings about locale settings in tests (again).
---
 MOVED               |  1 +
 audio/kid3/Makefile | 49 +++++++++++++++----------------------------------
 2 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/MOVED b/MOVED
index 7ff0d6f7fde2..6ee4305a1942 100644
--- a/MOVED
+++ b/MOVED
@@ -4135,3 +4135,4 @@ devel/p5-Test-HTML-Tidy||2025-02-04|Has expired: Depends on expired textproc/p5-
 www/p5-CGI-Application-Plugin-HtmlTidy||2025-02-04|Has expired: Depends on expired textproc/p5-HTML-Tidy
 textproc/p5-HTML-Tidy||2025-02-04|Has expired: Depends on expired textproc/tidyp
 textproc/tidyp||2025-02-04|Has expired: The repository has been archived by upstream on Apr 14, 2019
+audio/kid3@kf5|audio/kid3@kf6|2025-02-05|kf5 support has been removed. Use kf6 flavor instead
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index fad024eafbd6..07e02ae3e321 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -14,57 +14,42 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
 LIB_DEPENDS=	libtag.so:audio/taglib
 
-FLAVORS=	qt6 kf5 kf6
+FLAVORS=	qt6 kf6
 FLAVOR?=	${FLAVORS:[1]}
 
-USES=		cmake compiler:c++17-lang desktop-file-utils gnome pkgconfig \
-		tar:xz
+USES=		cmake compiler:c++17-lang desktop-file-utils gl gnome \
+		pkgconfig qt:6 tar:xz
+USE_GL=		opengl
 USE_GNOME=	libxslt:build
 USE_LDCONFIG=	yes
+USE_QT=		base multimedia tools:build
 
 CMAKE_ARGS=	-DWITH_DOCBOOKDIR="${LOCALBASE}/share/xsl/docbook" \
 		-DWITH_LIBDIR=lib \
 		-DWITH_MANDIR=share/man \
 		-DWITH_PLUGINSDIR=lib/kid3 \
 		-DFFMPEG_ROOT="${LOCALBASE}" \
-		-DWITH_APPS="${KID3_APPS:S/ /;/gW}"
+		-DWITH_APPS="${_KID3_APPS:S/ /;/gW}"
 CMAKE_OFF=	WITH_ID3LIB \
 		WITH_MP4V2 \
 		WITH_QML
-CMAKE_ON=	WITH_TAGLIB
+CMAKE_ON=	BUILD_WITH_QT6 \
+		WITH_TAGLIB
 PLIST_SUB+=	SHLIB_VER=${PORTVERSION}
 
 .if ${FLAVOR} == qt6
-USES+=		gl qt:6
-USE_GL=		opengl
-USE_QT=		base multimedia tools:build
-CMAKE_ON+=	BUILD_WITH_QT6
 PLIST_SUB+=	KF="@comment " \
 		QT="" \
 		QT_SUFX="-qt"
-KID3_APPS+=	QT
-.elif ${FLAVOR} == kf5
-USES+=		kde:5 qt:5
-USE_KDE=	auth codecs config configwidgets coreaddons kio \
-		service widgetsaddons xmlgui doctools:build ecm:build
-USE_QT=		concurrent core dbus gui multimedia network xml widgets \
-		buildtools:build linguisttools:build qmake:build
-CMAKE_OFF+=	BUILD_WITH_QT6
-PLIST_SUB+=	KF="" \
-		QT="@comment " \
-		QT_SUFX=""
-KID3_APPS+=	KDE
+_KID3_APPS+=	QT
 .elif ${FLAVOR} == kf6
-USES+=		gl kde:6 qt:6
-USE_GL=		opengl
+USES+=		kde:6
 USE_KDE=	colorscheme config configwidgets coreaddons kio \
 		widgetsaddons xmlgui doctools:build ecm:build
-USE_QT=		base multimedia tools:build
-CMAKE_ON+=	BUILD_WITH_QT6
 PLIST_SUB+=	KF="" \
 		QT="@comment " \
 		QT_SUFX=""
-KID3_APPS+=	KDE
+_KID3_APPS+=	KDE
 .endif
 
 .for f in ${FLAVORS}
@@ -84,20 +69,16 @@ ACOUSTID_CMAKE_BOOL=	WITH_CHROMAPRINT WITH_FFMPEG
 
 CLI_DESC=		Build and install command line utility
 CLI_USES=		python:test readline
-CLI_VARS=		KID3_APPS+=CLI
+CLI_VARS=		_KID3_APPS+=CLI
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CMAKE_BOOL=	WITH_FLAC
 FLAC_IMPLIES=		VORBIS
 
-TEST_USE=		LOCALE=en_US.UTF-8
-.if ${FLAVOR} == kf5
-TEST_USE+=		QT=testlib:build
-.endif
 TEST_CMAKE_BOOL=	BUILD_TESTING
 TEST_TARGET=		# define to override CMAKE_ARGS from Uses/kde.mk
 TEST_WRKSRC=		${BUILD_WRKSRC}/src/test
-TEST_VARS=		KID3_APPS+=TEST
+TEST_VARS=		_KID3_APPS+=TEST
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
@@ -109,9 +90,9 @@ pre-test:
 	@${CP} ${WRKSRC}/src/test/*.py ${TEST_WRKSRC}
 
 do-test:
-	-@(cd ${TEST_WRKSRC}; ${SETENV} ${TEST_ENV} ./kid3-test)
+	-@(cd ${TEST_WRKSRC}; ${SETENVI} ${WRK_ENV} ${TEST_ENV} ./kid3-test)
 
 do-test-CLI-on:
-	-@(cd ${TEST_WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHON_CMD} test_cli_functions.py)
+	-@(cd ${TEST_WRKSRC}; ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} test_cli_functions.py)
 
 .include <bsd.port.mk>