git: 59a0f90d1fb2 - main - x11-toolkits/qml-box2d: Update to latest commit

The branch main has been updated by jhale:

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

commit 59a0f90d1fb2a8d254eb48b333603de7e8c8917f
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-10-26 04:38:25 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-10-26 05:43:28 +0000

    x11-toolkits/qml-box2d: Update to latest commit
    
    Flavorize for Qt5 and Qt6.
    Add LICENSE (ZLIB).
    Upstream switched build system to CMake.
    
    Adapt consumers to the new plugin name and location.
---
 games/gcompris-qt/Makefile       | 17 +++++++++++++----
 x11-toolkits/qml-box2d/Makefile  | 28 +++++++++++++++++++++-------
 x11-toolkits/qml-box2d/distinfo  |  6 +++---
 x11-toolkits/qml-box2d/pkg-plist |  4 ++--
 4 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/games/gcompris-qt/Makefile b/games/gcompris-qt/Makefile
index c60164d4801b..830691988aa7 100644
--- a/games/gcompris-qt/Makefile
+++ b/games/gcompris-qt/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gcompris-qt
 DISTVERSION=	4.1
+PORTREVISION=	1
 CATEGORIES=	games education kde
 MASTER_SITES=	https://gcompris.net/download/qt/src/
 
@@ -7,12 +8,14 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Educational games and activities for kids ages 2 to 10
 WWW=		https://gcompris.net/
 
-LICENSE=	AGPLv3 GPLv3
-LICENSE_COMB=	multi
+LICENSE=		AGPLv3 GPLv3
+LICENSE_COMB=		multi
 LICENSE_FILE_AGPLv3=	${WRKSRC}/LICENSES/AGPL-3.0-only.txt
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSES/GPL-3.0-or-later.txt
 
-LIB_DEPENDS=	libBox2D.so:x11-toolkits/qml-box2d
+# libqmlbox2d.so is a QML plugin...don't use LIB_DEPENDS
+BUILD_DEPENDS=	${_BOX2D_PATH}/libqmlbox2d.so:x11-toolkits/qml-box2d@qt5
+RUN_DEPENDS=	${_BOX2D_PATH}/libqmlbox2d.so:x11-toolkits/qml-box2d@qt5
 
 USES=		cmake kde:5 qt:5 tar:xz
 USE_KDE=	doctools:build ecm:build
@@ -21,6 +24,12 @@ USE_QT=		charts core declarative graphicaleffects gui multimedia \
 		buildtools:build linguisttools:build qmake:build testlib:build \
 		imageformats:run
 
-CMAKE_ARGS=	-DQML_BOX2D_LIBRARY=${QT_QMLDIR}/Box2D.2.0
+CMAKE_ARGS=	-DQML_BOX2D_LIBRARY=${_BOX2D_PATH}
+
+_BOX2D_PATH=	${QT_QMLDIR}/Box2D
+
+post-patch:
+	${REINPLACE_CMD} -e 's|Box2D\.2\.0|Box2D|g' \
+		${WRKSRC}/src/core/ApplicationInfo.cpp
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qml-box2d/Makefile b/x11-toolkits/qml-box2d/Makefile
index 48f86cdf84e2..8d8c3a6545d5 100644
--- a/x11-toolkits/qml-box2d/Makefile
+++ b/x11-toolkits/qml-box2d/Makefile
@@ -1,18 +1,32 @@
 PORTNAME=	qml-box2d
-DISTVERSION=	2.0.20180109
-PORTREVISION=	5
+DISTVERSION=	2.0.20240415
 CATEGORIES=	x11-toolkits
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	QML Box2D plugin
 WWW=		https://github.com/qml-box2d/qml-box2d
 
-USES=		compiler:c++11-lang gl qmake:outsource qt:5
+LICENSE=	ZLIB
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+FLAVORS=	qt5 qt6
+FLAVOR?=	qt5
+
+USES=		cmake compiler:c++11-lang gl qt:${FLAVOR:S/qt//}
 USE_GITHUB=	yes
-GH_TAGNAME=	21e57f
-USE_GL=		gl
-USE_QT=		core declarative gui network \
+GH_TAGNAME=	3a85439
+_USE_GL=qt5=	# empty
+_USE_GL_qt6=	gl opengl # glx
+USE_GL=		${_USE_GL_${FLAVOR}}
+_USE_QT_qt5=	core declarative gui network \
 		buildtools:build qmake:build
-USE_LDCONFIG=	${QT_QMLDIR}/Box2D.2.0/
+_USE_QT_qt6=	base declarative
+USE_QT=		${_USE_QT_${FLAVOR}}
+
+CMAKE_ARGS=	-DCMAKE_INSTALL_LIBDIR:STRING="${QT_QMLDIR}"
+_CMAKE_OFF_qt5=	USE_QT6
+CMAKE_OFF=	BUILD_EXAMPLES \
+		${_CMAKE_OFF_${FLAVOR}}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qml-box2d/distinfo b/x11-toolkits/qml-box2d/distinfo
index f5a504e49fb1..4d12155201a1 100644
--- a/x11-toolkits/qml-box2d/distinfo
+++ b/x11-toolkits/qml-box2d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518295822
-SHA256 (qml-box2d-qml-box2d-2.0.20180109-21e57f_GH0.tar.gz) = 71b72949dd5a46fc1ba42c4de218d56c308733fa65ffb1319316503e41250f2f
-SIZE (qml-box2d-qml-box2d-2.0.20180109-21e57f_GH0.tar.gz) = 7768436
+TIMESTAMP = 1729483010
+SHA256 (qml-box2d-qml-box2d-2.0.20240415-3a85439_GH0.tar.gz) = 97056b340ad81344fd6d26e2c7226f428d313c474c7131870c15bf24a2896477
+SIZE (qml-box2d-qml-box2d-2.0.20240415-3a85439_GH0.tar.gz) = 7772229
diff --git a/x11-toolkits/qml-box2d/pkg-plist b/x11-toolkits/qml-box2d/pkg-plist
index 0e2d62e6a366..9f1bea8c4a9d 100644
--- a/x11-toolkits/qml-box2d/pkg-plist
+++ b/x11-toolkits/qml-box2d/pkg-plist
@@ -1,2 +1,2 @@
-%%QT_QMLDIR%%/Box2D.2.0/libBox2D.so
-%%QT_QMLDIR%%/Box2D.2.0/qmldir
+%%QT_QMLDIR%%/Box2D/libqmlbox2d.so
+%%QT_QMLDIR%%/Box2D/qmldir