devel/qxlsx: update the port to version 1.4.7

Now that Qt5/Qt6 versions are fully coinstallable,
provide both flavors.

Reported by:	portscout

4 files changed, 50 insertions, 38 deletions

diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index d7db47ab7888..fb699aef2063 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -75,7 +75,7 @@ TEXTURES_DISTFILES=	textures-1K.zip:gfx
 WEBENGINE_USE=		QT=declarative,webchannel,webengine
 WEBENGINE_CMAKE_OFF=	-DENABLE_QTWEBENGINE:BOOL=OFF
 
-XLSX_LIB_DEPENDS=	libQXlsx.so:devel/qxlsx
+XLSX_LIB_DEPENDS=	libQXlsxQt5.so:devel/qxlsx@qt5
 XLSX_CMAKE_OFF=		-DENABLE_XLSX:BOOL=OFF
 
 .include <bsd.port.options.mk>
diff --git a/devel/qxlsx/Makefile b/devel/qxlsx/Makefile
index b63b06082aab..bb87c1adc98e 100644
--- a/devel/qxlsx/Makefile
+++ b/devel/qxlsx/Makefile
@@ -1,11 +1,8 @@
 PORTNAME=	${GH_PROJECT:tl}
-PORTVERSION=	1.4.4
+PORTVERSION=	1.4.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	8e83402db866ae7a67582da28aa68c83545f13c8.patch:-p2
-
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Excel file reader/writer library using Qt
 WWW=		https://qtexcel.github.io/QXlsx/
@@ -13,14 +10,31 @@ WWW=		https://qtexcel.github.io/QXlsx/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-USES=		cmake qt:5
+USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	QtExcel
 GH_PROJECT=	QXlsx
 USE_LDCONFIG=	yes
-USE_QT=		buildtools:build qmake:build core gui
 
 CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_ARGS=	-DQT_VERSION_MAJOR:STRING=${_QT_LIBVER}
 WRKSRC_SUBDIR=	${GH_PROJECT}
+PLIST_SUB=	QTVER=${_QT_LIBVER}
+
+FLAVORS=	qt5 qt6
+
+.if ${FLAVOR:U} == qt6
+USES+=		qt:6
+USE_QT=		base
+PKGNAMESUFFIX=	-${FLAVOR}
+.else
+USES+=		qt:5
+USE_QT=		buildtools:build qmake:build core gui
+.endif
+
+post-patch:
+# Sanitize SOVERSION (we know about lack of ABI guarantees but don't care)
+	@${REINPLACE_CMD} -E '/SOVERSION/s,([[:digit:]]+)\..*,\1,' \
+		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/devel/qxlsx/distinfo b/devel/qxlsx/distinfo
index 40ddec859331..b7e4372ef4a4 100644
--- a/devel/qxlsx/distinfo
+++ b/devel/qxlsx/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1658513489
-SHA256 (QtExcel-QXlsx-v1.4.4_GH0.tar.gz) = 5c6f7117000c7559d6557d00a2f7b836bee670f9bc16309a72bc23aaedf994d9
-SIZE (QtExcel-QXlsx-v1.4.4_GH0.tar.gz) = 4703732
-SHA256 (8e83402db866ae7a67582da28aa68c83545f13c8.patch) = a3d0a12b093cebc8a27e156c67871e43f020d6db207b3d7ab447562b042107fc
-SIZE (8e83402db866ae7a67582da28aa68c83545f13c8.patch) = 749
+TIMESTAMP = 1702873179
+SHA256 (QtExcel-QXlsx-v1.4.7_GH0.tar.gz) = 6f2de3e3bcfd09b7be0f9ad06c363cfe29a7a4c14280b36a91d8968f54be796a
+SIZE (QtExcel-QXlsx-v1.4.7_GH0.tar.gz) = 4705261
diff --git a/devel/qxlsx/pkg-plist b/devel/qxlsx/pkg-plist
index aa548777b0b7..026bf60c3f4a 100644
--- a/devel/qxlsx/pkg-plist
+++ b/devel/qxlsx/pkg-plist
@@ -1,26 +1,26 @@
-include/QXlsx/xlsxabstractooxmlfile.h
-include/QXlsx/xlsxabstractsheet.h
-include/QXlsx/xlsxabstractsheet_p.h
-include/QXlsx/xlsxcell.h
-include/QXlsx/xlsxcellformula.h
-include/QXlsx/xlsxcelllocation.h
-include/QXlsx/xlsxcellrange.h
-include/QXlsx/xlsxcellreference.h
-include/QXlsx/xlsxchart.h
-include/QXlsx/xlsxchartsheet.h
-include/QXlsx/xlsxconditionalformatting.h
-include/QXlsx/xlsxdatavalidation.h
-include/QXlsx/xlsxdatetype.h
-include/QXlsx/xlsxdocument.h
-include/QXlsx/xlsxformat.h
-include/QXlsx/xlsxglobal.h
-include/QXlsx/xlsxrichstring.h
-include/QXlsx/xlsxworkbook.h
-include/QXlsx/xlsxworksheet.h
-lib/cmake/QXlsx/QXlsxConfig.cmake
-lib/cmake/QXlsx/QXlsxConfigVersion.cmake
-lib/cmake/QXlsx/QXlsxTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/QXlsx/QXlsxTargets.cmake
-lib/libQXlsx.so
-lib/libQXlsx.so.0
-lib/libQXlsx.so.1.4.4
+include/QXlsxQt%%QTVER%%/xlsxabstractooxmlfile.h
+include/QXlsxQt%%QTVER%%/xlsxabstractsheet.h
+include/QXlsxQt%%QTVER%%/xlsxabstractsheet_p.h
+include/QXlsxQt%%QTVER%%/xlsxcell.h
+include/QXlsxQt%%QTVER%%/xlsxcellformula.h
+include/QXlsxQt%%QTVER%%/xlsxcelllocation.h
+include/QXlsxQt%%QTVER%%/xlsxcellrange.h
+include/QXlsxQt%%QTVER%%/xlsxcellreference.h
+include/QXlsxQt%%QTVER%%/xlsxchart.h
+include/QXlsxQt%%QTVER%%/xlsxchartsheet.h
+include/QXlsxQt%%QTVER%%/xlsxconditionalformatting.h
+include/QXlsxQt%%QTVER%%/xlsxdatavalidation.h
+include/QXlsxQt%%QTVER%%/xlsxdatetype.h
+include/QXlsxQt%%QTVER%%/xlsxdocument.h
+include/QXlsxQt%%QTVER%%/xlsxformat.h
+include/QXlsxQt%%QTVER%%/xlsxglobal.h
+include/QXlsxQt%%QTVER%%/xlsxrichstring.h
+include/QXlsxQt%%QTVER%%/xlsxworkbook.h
+include/QXlsxQt%%QTVER%%/xlsxworksheet.h
+lib/cmake/QXlsxQt%%QTVER%%/QXlsxQt%%QTVER%%Config.cmake
+lib/cmake/QXlsxQt%%QTVER%%/QXlsxQt%%QTVER%%ConfigVersion.cmake
+lib/cmake/QXlsxQt%%QTVER%%/QXlsxQt%%QTVER%%Targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/QXlsxQt%%QTVER%%/QXlsxQt%%QTVER%%Targets.cmake
+lib/libQXlsxQt%%QTVER%%.so
+lib/libQXlsxQt%%QTVER%%.so.0
+lib/libQXlsxQt%%QTVER%%.so.1.4.4