git: b75599479b82 - main - devel/qscintilla2*: Flavorize ports

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Sat, 19 Oct 2024 07:38:50 UTC
The branch main has been updated by jhale:

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

commit b75599479b82e6e7b29f4284416bc57680ec706e
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-10-17 23:28:25 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-10-19 04:32:17 +0000

    devel/qscintilla2*: Flavorize ports
---
 MOVED                                              |  3 +
 cad/openscad-devel/Makefile                        |  2 +-
 cad/openscad/Makefile                              |  2 +-
 databases/sqlitebrowser/Makefile                   |  2 +-
 devel/Makefile                                     |  5 +-
 devel/py-qt5-pyqt/Makefile                         |  2 +-
 devel/py-qt5-qscintilla2/Makefile                  |  4 +-
 devel/py-qt6-pyqt/Makefile                         |  2 +-
 devel/py-qt6-qscintilla2/Makefile                  |  4 +-
 devel/qscintilla2-designerplugin-qt5/Makefile      | 24 ------
 devel/qscintilla2-designerplugin/Makefile          | 35 +++++++++
 .../pkg-descr                                      |  0
 devel/qscintilla2-qt5/pkg-descr                    |  1 -
 devel/qscintilla2-qt5/pkg-plist                    | 85 ----------------------
 devel/qscintilla2-qt6/Makefile                     | 43 -----------
 devel/qscintilla2-qt6/distinfo                     |  3 -
 devel/qscintilla2-qt6/pkg-descr                    |  1 -
 devel/{qscintilla2-qt5 => qscintilla2}/Makefile    | 30 ++++++--
 devel/{qscintilla2-qt5 => qscintilla2}/distinfo    |  0
 devel/qscintilla2/pkg-descr                        |  1 +
 devel/{qscintilla2-qt6 => qscintilla2}/pkg-plist   |  8 +-
 graphics/qgis-ltr/Makefile                         |  2 +-
 graphics/qgis/Makefile                             |  2 +-
 math/octave/Makefile                               |  2 +-
 net/py-qt5-networkauth/Makefile                    |  2 +-
 x11-toolkits/py-qt5-chart/Makefile                 |  2 +-
 26 files changed, 82 insertions(+), 185 deletions(-)

diff --git a/MOVED b/MOVED
index 25833ad348c4..a801d67d3dc8 100644
--- a/MOVED
+++ b/MOVED
@@ -3534,3 +3534,6 @@ devel/wasi-libcxx13||2024-10-18|Version no longer supported as a WASI component
 devel/wasi-libcxx14||2024-10-18|Version no longer supported as a WASI component
 devel/wasi-libcxx15||2024-10-18|Version no longer supported as a WASI component
 devel/wasi-libcxx16||2024-10-18|Version no longer supported as a WASI component
+devel/qscintilla2-qt5|devel/qscintilla2@qt5|2024-10-19|Converted to a flavorized port. Use devel/qscintilla2@qt5 instead
+devel/qscintilla2-qt6|devel/qscintilla2@qt6|2024-10-19|Converted to a flavorized port. Use devel/qscintilla2@qt6 instead
+devel/qscintilla2-designerplugin-qt5|devel/qscintilla2-designerplugin@qt5|2024-10-19|Converted to a flavorized port. Use devel/qscintilla2-designerplugin@qt5 instead
diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 912291def189..9ebb0a9535ea 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	cgal>0:math/cgal \
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
-		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
+		libqscintilla2_qt5.so:devel/qscintilla2@qt5 \
 		libopencsg.so:graphics/opencsg \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 2fae0a0de03e..a539212fe385 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	cgal>0:math/cgal \
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
-		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
+		libqscintilla2_qt5.so:devel/qscintilla2@qt5 \
 		libopencsg.so:graphics/opencsg \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile
index 8b3863d4f98b..3542b67e12ab 100644
--- a/databases/sqlitebrowser/Makefile
+++ b/databases/sqlitebrowser/Makefile
@@ -12,7 +12,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libantlr.a:devel/antlr
-LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
+LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2@qt5
 
 USES=		cmake desktop-file-utils gnome qt:5 sqlite
 USE_QT=		core concurrent gui network printsupport testlib widgets \
diff --git a/devel/Makefile b/devel/Makefile
index c35059403787..2d89167d975f 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -6226,9 +6226,8 @@
     SUBDIR += qjson
     SUBDIR += qmake
     SUBDIR += qschematic
-    SUBDIR += qscintilla2-designerplugin-qt5
-    SUBDIR += qscintilla2-qt5
-    SUBDIR += qscintilla2-qt6
+    SUBDIR += qscintilla2
+    SUBDIR += qscintilla2-designerplugin
     SUBDIR += qt-maybe
     SUBDIR += qt5
     SUBDIR += qt5-assistant
diff --git a/devel/py-qt5-pyqt/Makefile b/devel/py-qt5-pyqt/Makefile
index c4736308455e..cf8693809781 100644
--- a/devel/py-qt5-pyqt/Makefile
+++ b/devel/py-qt5-pyqt/Makefile
@@ -12,7 +12,7 @@ WWW=		https://riverbankcomputing.com/software/pyqt
 
 PYQT_DIST=	yes
 
-LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
+LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2@qt5 \
 		libdbus-1.so:devel/dbus
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} \
diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile
index 495b9395ae11..a4ba7328c07f 100644
--- a/devel/py-qt5-qscintilla2/Makefile
+++ b/devel/py-qt5-qscintilla2/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Python bindings for QScintilla2 (PyQt5), QSci module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS}
-LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
+LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2@qt5
 
-DISTINFO_FILE=	${.CURDIR:H}/qscintilla2-qt5/distinfo
+DISTINFO_FILE=	${.CURDIR:H}/qscintilla2/distinfo
 DESTDIRNAME=	INSTALL_ROOT
 
 USES=		python pyqt:5 gl qt:5
diff --git a/devel/py-qt6-pyqt/Makefile b/devel/py-qt6-pyqt/Makefile
index 08657ba77fcd..e4a5c40ec028 100644
--- a/devel/py-qt6-pyqt/Makefile
+++ b/devel/py-qt6-pyqt/Makefile
@@ -12,7 +12,7 @@ WWW=		https://riverbankcomputing.com/software/pyqt
 PYQT_DIST=	yes
 
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
-		libqscintilla2_qt6.so:devel/qscintilla2-qt6
+		libqscintilla2_qt6.so:devel/qscintilla2@qt6
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
diff --git a/devel/py-qt6-qscintilla2/Makefile b/devel/py-qt6-qscintilla2/Makefile
index 83db0bac229e..0bdf9f263f31 100644
--- a/devel/py-qt6-qscintilla2/Makefile
+++ b/devel/py-qt6-qscintilla2/Makefile
@@ -13,7 +13,7 @@ WWW=		https://riverbankcomputing.com/software/pyqt \
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS}
-LIB_DEPENDS=	libqscintilla2_qt6.so:devel/qscintilla2-qt6
+LIB_DEPENDS=	libqscintilla2_qt6.so:devel/qscintilla2@qt6
 
 USES=		python pyqt:6 gl qt:6
 USE_GL=		gl
@@ -26,7 +26,7 @@ SIP_ARGS=	--qmake ${QMAKE} --verbose --build-dir build
 
 ALL_TARGET=	#empty
 DESTDIRNAME=	INSTALL_ROOT
-DISTINFO_FILE=	${.CURDIR:H}/qscintilla2-qt6/distinfo
+DISTINFO_FILE=	${.CURDIR:H}/qscintilla2/distinfo
 WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 
 OPTIONS_DEFINE=	DEBUG
diff --git a/devel/qscintilla2-designerplugin-qt5/Makefile b/devel/qscintilla2-designerplugin-qt5/Makefile
deleted file mode 100644
index 6ed93fbe81f4..000000000000
--- a/devel/qscintilla2-designerplugin-qt5/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME=	designerplugin-qt5
-PORTVERSION=	${QSCI2_VERSION}
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITES_QSCI2}
-PKGNAMEPREFIX=	qscintilla2-
-DISTNAME=	${QSCI2_DISTNAME}
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt5 Designer plugin for QScintilla2
-WWW=		http://www.riverbankcomputing.co.uk/software/qscintilla/
-
-LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
-
-DISTINFO_FILE=	${.CURDIR:H}/qscintilla2-qt5/distinfo
-USES=		compiler:c++11-lang qmake pyqt:5 qt:5 gl
-USE_GL=		gl
-USE_QT=		core designer printsupport gui widgets xml \
-		buildtools:build qmake:build
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/designer
-
-PLIST_FILES=	%%QT_PLUGINDIR%%/designer/libqscintillaplugin.so
-
-.include <bsd.port.mk>
diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile
new file mode 100644
index 000000000000..532b29f8e3bc
--- /dev/null
+++ b/devel/qscintilla2-designerplugin/Makefile
@@ -0,0 +1,35 @@
+PORTNAME=	designerplugin
+PORTVERSION=	${QSCI2_VERSION}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITES_QSCI2}
+PKGNAMEPREFIX=	qscintilla2-
+PKGNAMESUFFIX=	-${FLAVOR}
+DISTNAME=	${QSCI2_DISTNAME}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Qt${FLAVOR:S/qt//} Designer plugin for QScintilla2
+WWW=		https://riverbankcomputing.com/software/qscintilla/
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC:H}/LICENSE
+
+LIB_DEPENDS=	libqscintilla2_${FLAVOR}.so:devel/qscintilla2@${FLAVOR}
+
+FLAVORS=	qt5 qt6
+FLAVOR?=	qt5
+
+USES=		compiler:c++11-lang gl pyqt:5 qmake qt:${FLAVOR:S/qt//}
+_USE_GL_qt5=	gl
+_USE_GL_qt6=	gl opengl
+USE_GL=		${_USE_GL_${FLAVOR}}
+_USE_QT_qt5=	core designer printsupport gui widgets xml \
+		buildtools:build qmake:build
+_USE_QT_qt6=	base tools
+USE_QT=		${_USE_QT_${FLAVOR}}
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/designer
+
+DISTINFO_FILE=	${.CURDIR:H}/qscintilla2/distinfo
+PLIST_FILES=	%%QT_PLUGINDIR%%/designer/libqscintillaplugin.so
+
+.include <bsd.port.mk>
diff --git a/devel/qscintilla2-designerplugin-qt5/pkg-descr b/devel/qscintilla2-designerplugin/pkg-descr
similarity index 100%
rename from devel/qscintilla2-designerplugin-qt5/pkg-descr
rename to devel/qscintilla2-designerplugin/pkg-descr
diff --git a/devel/qscintilla2-qt5/pkg-descr b/devel/qscintilla2-qt5/pkg-descr
deleted file mode 100644
index 61e4bb114dbe..000000000000
--- a/devel/qscintilla2-qt5/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-QScintilla2 is a port to Qt5 of Neil Hodgson's Scintilla C++ editor class.
diff --git a/devel/qscintilla2-qt5/pkg-plist b/devel/qscintilla2-qt5/pkg-plist
deleted file mode 100644
index 20920cef64fe..000000000000
--- a/devel/qscintilla2-qt5/pkg-plist
+++ /dev/null
@@ -1,85 +0,0 @@
-%%QT_INCDIR%%/Qsci/qsciabstractapis.h
-%%QT_INCDIR%%/Qsci/qsciapis.h
-%%QT_INCDIR%%/Qsci/qscicommand.h
-%%QT_INCDIR%%/Qsci/qscicommandset.h
-%%QT_INCDIR%%/Qsci/qscidocument.h
-%%QT_INCDIR%%/Qsci/qsciglobal.h
-%%QT_INCDIR%%/Qsci/qscilexer.h
-%%QT_INCDIR%%/Qsci/qscilexerasm.h
-%%QT_INCDIR%%/Qsci/qscilexeravs.h
-%%QT_INCDIR%%/Qsci/qscilexerbash.h
-%%QT_INCDIR%%/Qsci/qscilexerbatch.h
-%%QT_INCDIR%%/Qsci/qscilexercmake.h
-%%QT_INCDIR%%/Qsci/qscilexercoffeescript.h
-%%QT_INCDIR%%/Qsci/qscilexercpp.h
-%%QT_INCDIR%%/Qsci/qscilexercsharp.h
-%%QT_INCDIR%%/Qsci/qscilexercss.h
-%%QT_INCDIR%%/Qsci/qscilexercustom.h
-%%QT_INCDIR%%/Qsci/qscilexerd.h
-%%QT_INCDIR%%/Qsci/qscilexerdiff.h
-%%QT_INCDIR%%/Qsci/qscilexeredifact.h
-%%QT_INCDIR%%/Qsci/qscilexerfortran.h
-%%QT_INCDIR%%/Qsci/qscilexerfortran77.h
-%%QT_INCDIR%%/Qsci/qscilexerhex.h
-%%QT_INCDIR%%/Qsci/qscilexerhtml.h
-%%QT_INCDIR%%/Qsci/qscilexeridl.h
-%%QT_INCDIR%%/Qsci/qscilexerintelhex.h
-%%QT_INCDIR%%/Qsci/qscilexerjava.h
-%%QT_INCDIR%%/Qsci/qscilexerjavascript.h
-%%QT_INCDIR%%/Qsci/qscilexerjson.h
-%%QT_INCDIR%%/Qsci/qscilexerlua.h
-%%QT_INCDIR%%/Qsci/qscilexermakefile.h
-%%QT_INCDIR%%/Qsci/qscilexermarkdown.h
-%%QT_INCDIR%%/Qsci/qscilexermasm.h
-%%QT_INCDIR%%/Qsci/qscilexermatlab.h
-%%QT_INCDIR%%/Qsci/qscilexernasm.h
-%%QT_INCDIR%%/Qsci/qscilexeroctave.h
-%%QT_INCDIR%%/Qsci/qscilexerpascal.h
-%%QT_INCDIR%%/Qsci/qscilexerperl.h
-%%QT_INCDIR%%/Qsci/qscilexerpo.h
-%%QT_INCDIR%%/Qsci/qscilexerpostscript.h
-%%QT_INCDIR%%/Qsci/qscilexerpov.h
-%%QT_INCDIR%%/Qsci/qscilexerproperties.h
-%%QT_INCDIR%%/Qsci/qscilexerpython.h
-%%QT_INCDIR%%/Qsci/qscilexerruby.h
-%%QT_INCDIR%%/Qsci/qscilexerspice.h
-%%QT_INCDIR%%/Qsci/qscilexersql.h
-%%QT_INCDIR%%/Qsci/qscilexersrec.h
-%%QT_INCDIR%%/Qsci/qscilexertcl.h
-%%QT_INCDIR%%/Qsci/qscilexertekhex.h
-%%QT_INCDIR%%/Qsci/qscilexertex.h
-%%QT_INCDIR%%/Qsci/qscilexerverilog.h
-%%QT_INCDIR%%/Qsci/qscilexervhdl.h
-%%QT_INCDIR%%/Qsci/qscilexerxml.h
-%%QT_INCDIR%%/Qsci/qscilexeryaml.h
-%%QT_INCDIR%%/Qsci/qscimacro.h
-%%QT_INCDIR%%/Qsci/qsciprinter.h
-%%QT_INCDIR%%/Qsci/qsciscintilla.h
-%%QT_INCDIR%%/Qsci/qsciscintillabase.h
-%%QT_INCDIR%%/Qsci/qscistyle.h
-%%QT_INCDIR%%/Qsci/qscistyledtext.h
-%%QT_LIBDIR%%/libqscintilla2_qt5.so
-%%QT_LIBDIR%%/libqscintilla2_qt5.so.15
-%%QT_LIBDIR%%/libqscintilla2_qt5.so.15.2
-%%QT_LIBDIR%%/libqscintilla2_qt5.so.15.2.1
-%%QT_MKSPECDIR%%/features/qscintilla2.prf
-%%QT_DATADIR%%/qsci/api/python/Python-2.4.api
-%%QT_DATADIR%%/qsci/api/python/Python-2.5.api
-%%QT_DATADIR%%/qsci/api/python/Python-2.6.api
-%%QT_DATADIR%%/qsci/api/python/Python-2.7.api
-%%QT_DATADIR%%/qsci/api/python/Python-3.1.api
-%%QT_DATADIR%%/qsci/api/python/Python-3.10.api
-%%QT_DATADIR%%/qsci/api/python/Python-3.11.api
-%%QT_DATADIR%%/qsci/api/python/Python-3.2.api
-%%QT_DATADIR%%/qsci/api/python/Python-3.3.api
-%%QT_DATADIR%%/qsci/api/python/Python-3.4.api
-%%QT_DATADIR%%/qsci/api/python/Python-3.5.api
-%%QT_DATADIR%%/qsci/api/python/Python-3.6.api
-%%QT_DATADIR%%/qsci/api/python/Python-3.7.api
-%%QT_DATADIR%%/qsci/api/python/Python-3.8.api
-%%QT_DATADIR%%/qsci/api/python/Python-3.9.api
-%%NLS%%%%QT_L10NDIR%%/qscintilla_cs.qm
-%%NLS%%%%QT_L10NDIR%%/qscintilla_de.qm
-%%NLS%%%%QT_L10NDIR%%/qscintilla_es.qm
-%%NLS%%%%QT_L10NDIR%%/qscintilla_fr.qm
-%%NLS%%%%QT_L10NDIR%%/qscintilla_pt_br.qm
diff --git a/devel/qscintilla2-qt6/Makefile b/devel/qscintilla2-qt6/Makefile
deleted file mode 100644
index 266577b890b3..000000000000
--- a/devel/qscintilla2-qt6/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-PORTNAME=	qscintilla2-qt6
-PORTVERSION=	${QSCI2_VERSION}
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITES_QSCI2}
-DISTNAME=	${QSCI2_DISTNAME}
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt 6 port of the Scintilla C++ editor class
-WWW=		http://www.riverbankcomputing.co.uk/software/qscintilla/
-
-USES=		compiler:c++11-lang gl qmake pyqt:6 qt:6
-USE_GL=		gl
-USE_LOCALE=	C.UTF-8
-USE_PYQT=	#
-USE_QT=		base
-USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
-
-BUILD_WRKSRC=		${WRKSRC}/src
-CONFIGURE_WRKSRC=	${BUILD_WRKSRC}
-INSTALL_WRKSRC=		${BUILD_WRKSRC}
-
-PORTDOCS=	*
-PORTEXAMPLES=	*
-
-OPTIONS_DEFINE=	DOCS EXAMPLES NLS
-OPTIONS_SUB=	yes
-
-post-patch-NLS-off:
-	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e \
-		's|trans qsci|qsci|' qscintilla.pro
-
-post-install:
-	cd ${WRKSRC} &&\
-		${MKDIR} ${STAGEDIR}${DOCSDIR}/html ${STAGEDIR}${DOCSDIR}/Scintilla &&\
-		${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR} &&\
-		${INSTALL_DATA} doc/html/* ${STAGEDIR}${DOCSDIR}/html &&\
-		${INSTALL_DATA} doc/Scintilla/* ${STAGEDIR}${DOCSDIR}/Scintilla
-	cd ${WRKSRC}/example &&\
-		${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/images &&\
-		${INSTALL_DATA} *.* ${STAGEDIR}${EXAMPLESDIR} &&\
-		${INSTALL_DATA} images/* ${STAGEDIR}${EXAMPLESDIR}/images
-
-.include <bsd.port.mk>
diff --git a/devel/qscintilla2-qt6/distinfo b/devel/qscintilla2-qt6/distinfo
deleted file mode 100644
index 1d0aa4754198..000000000000
--- a/devel/qscintilla2-qt6/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1690218121
-SHA256 (QScintilla_src-2.14.1.tar.gz) = dfe13c6acc9d85dfcba76ccc8061e71a223957a6c02f3c343b30a9d43a4cdd4d
-SIZE (QScintilla_src-2.14.1.tar.gz) = 3233610
diff --git a/devel/qscintilla2-qt6/pkg-descr b/devel/qscintilla2-qt6/pkg-descr
deleted file mode 100644
index 61e4bb114dbe..000000000000
--- a/devel/qscintilla2-qt6/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-QScintilla2 is a port to Qt5 of Neil Hodgson's Scintilla C++ editor class.
diff --git a/devel/qscintilla2-qt5/Makefile b/devel/qscintilla2/Makefile
similarity index 58%
rename from devel/qscintilla2-qt5/Makefile
rename to devel/qscintilla2/Makefile
index 7d136662efb4..60ede7bd4554 100644
--- a/devel/qscintilla2-qt5/Makefile
+++ b/devel/qscintilla2/Makefile
@@ -1,23 +1,39 @@
-PORTNAME=	qscintilla2-qt5
+PORTNAME=	qscintilla2
 PORTVERSION=	${QSCI2_VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITES_QSCI2}
+PKGNAMESUFFIX=	-${FLAVOR}
 DISTNAME=	${QSCI2_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt 5 port of the Scintilla C++ editor class
-WWW=		http://www.riverbankcomputing.co.uk/software/qscintilla/
+COMMENT=	Qt${FLAVOR:S/qt//} port of the Scintilla C++ editor class
+WWW=		https://riverbankcomputing.com/software/qscintilla/
 
-USES=		compiler:c++11-lang gl qmake pyqt:5 qt:5
-USE_GL=		gl
-USE_PYQT=	#
-USE_QT=		buildtools:build core gui printsupport widgets
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+FLAVORS=	qt5 qt6
+FLAVOR?=	qt5
+
+USES=		compiler:c++11-lang gl qmake pyqt:5 qt:${FLAVOR:S/qt//}
+_USE_GL_qt5=	gl
+_USE_GL_qt6=	gl opengl
+USE_GL=		${_USE_GL_${FLAVOR}}
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
+USE_PYQT=	#
+_USE_QT_qt5=	buildtools:build core gui printsupport widgets
+_USE_QT_qt6=	base
+USE_QT=		${_USE_QT_${FLAVOR}}
+
+DATADIR=	${PREFIX}/share/${PORTNAME}-${FLAVOR}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${FLAVOR}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}-${FLAVOR}
 
 BUILD_WRKSRC=		${WRKSRC}/src
 CONFIGURE_WRKSRC=	${BUILD_WRKSRC}
 INSTALL_WRKSRC=		${BUILD_WRKSRC}
 
+PLIST_SUB=	QT_MAJOR_VERSION=${FLAVOR:S/qt//}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
diff --git a/devel/qscintilla2-qt5/distinfo b/devel/qscintilla2/distinfo
similarity index 100%
rename from devel/qscintilla2-qt5/distinfo
rename to devel/qscintilla2/distinfo
diff --git a/devel/qscintilla2/pkg-descr b/devel/qscintilla2/pkg-descr
new file mode 100644
index 000000000000..2273edcb855d
--- /dev/null
+++ b/devel/qscintilla2/pkg-descr
@@ -0,0 +1 @@
+QScintilla2 is a port to Qt of Neil Hodgson's Scintilla C++ editor class.
diff --git a/devel/qscintilla2-qt6/pkg-plist b/devel/qscintilla2/pkg-plist
similarity index 92%
rename from devel/qscintilla2-qt6/pkg-plist
rename to devel/qscintilla2/pkg-plist
index 23f615697598..3b6a570d05d4 100644
--- a/devel/qscintilla2-qt6/pkg-plist
+++ b/devel/qscintilla2/pkg-plist
@@ -58,10 +58,10 @@
 %%QT_INCDIR%%/Qsci/qsciscintillabase.h
 %%QT_INCDIR%%/Qsci/qscistyle.h
 %%QT_INCDIR%%/Qsci/qscistyledtext.h
-%%QT_LIBDIR%%/libqscintilla2_qt6.so
-%%QT_LIBDIR%%/libqscintilla2_qt6.so.15
-%%QT_LIBDIR%%/libqscintilla2_qt6.so.15.2
-%%QT_LIBDIR%%/libqscintilla2_qt6.so.15.2.1
+%%QT_LIBDIR%%/libqscintilla2_qt%%QT_MAJOR_VERSION%%.so
+%%QT_LIBDIR%%/libqscintilla2_qt%%QT_MAJOR_VERSION%%.so.15
+%%QT_LIBDIR%%/libqscintilla2_qt%%QT_MAJOR_VERSION%%.so.15.2
+%%QT_LIBDIR%%/libqscintilla2_qt%%QT_MAJOR_VERSION%%.so.15.2.1
 %%QT_MKSPECDIR%%/features/qscintilla2.prf
 %%QT_DATADIR%%/qsci/api/python/Python-2.4.api
 %%QT_DATADIR%%/qsci/api/python/Python-2.5.api
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 1920d222852f..39b5dd471d28 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -52,7 +52,7 @@ LIB_DEPENDS=	libabsl_log_internal_check_op.so:devel/abseil \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
-		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
+		libqscintilla2_qt5.so:devel/qscintilla2@qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt.so:x11-toolkits/qwt6@qt5 \
 		librttopo.so:devel/librttopo \
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 87de94449afe..39e120aee3a1 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -51,7 +51,7 @@ LIB_DEPENDS=	libabsl_log_internal_check_op.so:devel/abseil \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
-		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
+		libqscintilla2_qt5.so:devel/qscintilla2@qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt.so:x11-toolkits/qwt6@qt5 \
 		librttopo.so:devel/librttopo \
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 6654cbcebf66..12b7013b1937 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -100,7 +100,7 @@ DOCS_CONFIGURE_ENABLE=	docs
 JAVA_CONFIGURE_ENABLE=	java
 QT6_CONFIGURE_WITH=	qscintilla qt=6
 
-QT6_LIB_DEPENDS=	libqscintilla2_qt6.so:devel/qscintilla2-qt6
+QT6_LIB_DEPENDS=	libqscintilla2_qt6.so:devel/qscintilla2@qt6
 
 DOCS_USES=	tex
 DOCS_USE=	TEX=dvipsk:build,formats:build
diff --git a/net/py-qt5-networkauth/Makefile b/net/py-qt5-networkauth/Makefile
index ad3af79ce242..7dcbf7db8165 100644
--- a/net/py-qt5-networkauth/Makefile
+++ b/net/py-qt5-networkauth/Makefile
@@ -14,7 +14,7 @@ WWW=		https://riverbankcomputing.com/software/pyqt
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		qmake-qt5:devel/qt5-qmake
-LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
+LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2@qt5
 
 USES=		gl pyqt:5 python qt:5
 USE_GL=		gl
diff --git a/x11-toolkits/py-qt5-chart/Makefile b/x11-toolkits/py-qt5-chart/Makefile
index c265fe48167a..5d3dddc82c8c 100644
--- a/x11-toolkits/py-qt5-chart/Makefile
+++ b/x11-toolkits/py-qt5-chart/Makefile
@@ -15,7 +15,7 @@ WWW=		https://riverbankcomputing.com/software/pyqtchart
 LICENSE=	${PYQT5_LICENSE}
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS}
-LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
+LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2@qt5
 
 USES=		gl python pyqt:5 qt:5
 USE_GL=		gl