On 2020/10/02 21:25, Klemens Nanni wrote:
> Updated diff after quirks churn.
-common should get merged back in too, I think this is the way:
Index: editors/Makefile
===================================================================
RCS file: /cvs/ports/editors/Makefile,v
retrieving revision 1.141
diff -u -p -r1.141 Makefile
--- editors/Makefile 28 Jun 2020 21:25:18 -0000 1.141
+++ editors/Makefile 2 Oct 2020 19:44:45 -0000
@@ -51,7 +51,6 @@
SUBDIR += nvi,iconv
SUBDIR += py-neovim
SUBDIR += py-neovim,python3
- SUBDIR += py-qscintilla
SUBDIR += py-qscintilla,python3
SUBDIR += qscintilla
SUBDIR += scintilla
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1047
diff -u -p -r1.1047 Makefile
--- devel/quirks/Makefile 25 Sep 2020 21:40:55 -0000 1.1047
+++ devel/quirks/Makefile 2 Oct 2020 19:44:45 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.439
+PKGNAME = quirks-3.440
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1065
diff -u -p -r1.1065 Quirks.pm
--- devel/quirks/files/Quirks.pm 25 Sep 2020 21:40:55 -0000 1.1065
+++ devel/quirks/files/Quirks.pm 2 Oct 2020 19:44:45 -0000
@@ -479,6 +479,8 @@ my $stem_extensions = {
'py-urwid' => 'py3-urwid',
'py-ply' => 'py3-ply',
'py-dtfabric' => 'py3-dtfabric',
+# 6.9
+ 'py-qscintilla' => 'py3-qscintilla',
};
my $obsolete_reason = {
Index: geo/qgis/Makefile
===================================================================
RCS file: /cvs/ports/geo/qgis/Makefile,v
retrieving revision 1.134
diff -u -p -r1.134 Makefile
--- geo/qgis/Makefile 14 Sep 2020 07:25:27 -0000 1.134
+++ geo/qgis/Makefile 2 Oct 2020 19:44:45 -0000
@@ -8,6 +8,7 @@ COMMENT = desktop geographical informati
DPB_PROPERTIES = parallel
DISTNAME = qgis-3.14.16
+REVISION = 0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
DEBUG_PACKAGES =${BUILD_PACKAGES}
Index: editors/py-qscintilla/Makefile
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- editors/py-qscintilla/Makefile 3 Jul 2020 21:12:53 -0000 1.25
+++ editors/py-qscintilla/Makefile 2 Oct 2020 19:44:45 -0000
@@ -1,16 +1,12 @@
# $OpenBSD: Makefile,v 1.25 2020/07/03 21:12:53 sthen Exp $
-COMMENT-main = Python binding for the Scintilla source code editor
-COMMENT-common = common files for py-qscintilla
+COMMENT = Python binding for the Scintilla source code editor
VERSION = 2.11.4
-REVISION = 2
+REVISION = 3
MODPY_EGG_VERSION = ${VERSION}
DISTNAME = QScintilla-${VERSION}
-
-PKGNAME-main = py-qscintilla-${VERSION}
-FULLPKGNAME-common = py-qscintilla-common-${VERSION}
-FULLPKGPATH-common = editors/py-qscintilla,-common
+PKGNAME = py-qscintilla-${VERSION}
CATEGORIES = editors x11 devel
@@ -21,12 +17,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
-WANTLIB-main += ${COMPILER_LIBCXX} GL m Qt5Core Qt5Gui Qt5PrintSupport
-WANTLIB-main += Qt5Widgets qscintilla2_qt5
-
-WANTLIB-common +=
-
-MULTI_PACKAGES = -main -common
+WANTLIB += ${COMPILER_LIBCXX} GL m Qt5Core Qt5Gui Qt5PrintSupport
+WANTLIB += Qt5Widgets qscintilla2_qt5
MODULES = lang/python \
x11/qt5
@@ -35,23 +27,13 @@ PYQTVER = PyQt5
SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
FLAVORS = python3
-FLAVOR ?=
-
-.if ${FLAVOR:Mpython3}
-FULLPKGNAME-main = ${PKGNAME-main:S/^py-/py3-/}
-FULLPKGPATH-main = editors/py-qscintilla,-main${MODPY_FLAVOR}
-.endif
+FLAVOR = python3
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
x11/dbus-python${MODPY_FLAVOR} \
x11/py-qt5${MODPY_FLAVOR}
-RUN_DEPENDS-main = ${RUN_DEPENDS} \
- editors/py-qscintilla,-common
-LIB_DEPENDS-main = editors/qscintilla=${VERSION}
-
-RUN_DEPENDS-common =
-LIB_DEPENDS-common =
+LIB_DEPENDS = editors/qscintilla=${VERSION}
COMPILER = base-clang ports-gcc base-gcc
Index: editors/py-qscintilla/pkg/DESCR
===================================================================
RCS file: editors/py-qscintilla/pkg/DESCR
diff -N editors/py-qscintilla/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ editors/py-qscintilla/pkg/DESCR 2 Oct 2020 19:44:45 -0000
@@ -0,0 +1 @@
+Python binding for QScintilla.
Index: editors/py-qscintilla/pkg/DESCR-common
===================================================================
RCS file: editors/py-qscintilla/pkg/DESCR-common
diff -N editors/py-qscintilla/pkg/DESCR-common
--- editors/py-qscintilla/pkg/DESCR-common 19 Feb 2020 17:35:36 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-Common files for py-qscintilla.
Index: editors/py-qscintilla/pkg/DESCR-main
===================================================================
RCS file: editors/py-qscintilla/pkg/DESCR-main
diff -N editors/py-qscintilla/pkg/DESCR-main
--- editors/py-qscintilla/pkg/DESCR-main 19 Feb 2020 17:35:36 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-Python binding for QScintilla.
Index: editors/py-qscintilla/pkg/PLIST
===================================================================
RCS file: editors/py-qscintilla/pkg/PLIST
diff -N editors/py-qscintilla/pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ editors/py-qscintilla/pkg/PLIST 2 Oct 2020 19:44:45 -0000
@@ -0,0 +1,70 @@
+@comment $OpenBSD: PLIST-main,v 1.1 2020/02/19 17:35:36 juanfra Exp $
+@conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-*
+@conflict py-qscintilla-common-*
+@pkgpath editors/py-qscintilla,-common
+@pkgpath editors/py-qscintilla,-main${MODPY_FLAVOR}
+@pkgpath editors/py-qscintilla,${QTVER}
+@pkgpath editors/py-qscintilla
+lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.pyi
+@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.so
+lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/INSTALLER
+lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/${QTVER}/qsci/api/python/QScintilla2.api
+${SIPDIR}/Qsci/
+${SIPDIR}/Qsci/qsciabstractapis.sip
+${SIPDIR}/Qsci/qsciapis.sip
+${SIPDIR}/Qsci/qscicommand.sip
+${SIPDIR}/Qsci/qscicommandset.sip
+${SIPDIR}/Qsci/qscidocument.sip
+${SIPDIR}/Qsci/qscilexer.sip
+${SIPDIR}/Qsci/qscilexeravs.sip
+${SIPDIR}/Qsci/qscilexerbash.sip
+${SIPDIR}/Qsci/qscilexerbatch.sip
+${SIPDIR}/Qsci/qscilexercmake.sip
+${SIPDIR}/Qsci/qscilexercoffeescript.sip
+${SIPDIR}/Qsci/qscilexercpp.sip
+${SIPDIR}/Qsci/qscilexercsharp.sip
+${SIPDIR}/Qsci/qscilexercss.sip
+${SIPDIR}/Qsci/qscilexercustom.sip
+${SIPDIR}/Qsci/qscilexerd.sip
+${SIPDIR}/Qsci/qscilexerdiff.sip
+${SIPDIR}/Qsci/qscilexeredifact.sip
+${SIPDIR}/Qsci/qscilexerfortran.sip
+${SIPDIR}/Qsci/qscilexerfortran77.sip
+${SIPDIR}/Qsci/qscilexerhtml.sip
+${SIPDIR}/Qsci/qscilexeridl.sip
+${SIPDIR}/Qsci/qscilexerjava.sip
+${SIPDIR}/Qsci/qscilexerjavascript.sip
+${SIPDIR}/Qsci/qscilexerjson.sip
+${SIPDIR}/Qsci/qscilexerlua.sip
+${SIPDIR}/Qsci/qscilexermakefile.sip
+${SIPDIR}/Qsci/qscilexermarkdown.sip
+${SIPDIR}/Qsci/qscilexermatlab.sip
+${SIPDIR}/Qsci/qscilexeroctave.sip
+${SIPDIR}/Qsci/qscilexerpascal.sip
+${SIPDIR}/Qsci/qscilexerperl.sip
+${SIPDIR}/Qsci/qscilexerpo.sip
+${SIPDIR}/Qsci/qscilexerpostscript.sip
+${SIPDIR}/Qsci/qscilexerpov.sip
+${SIPDIR}/Qsci/qscilexerproperties.sip
+${SIPDIR}/Qsci/qscilexerpython.sip
+${SIPDIR}/Qsci/qscilexerruby.sip
+${SIPDIR}/Qsci/qscilexerspice.sip
+${SIPDIR}/Qsci/qscilexersql.sip
+${SIPDIR}/Qsci/qscilexertcl.sip
+${SIPDIR}/Qsci/qscilexertex.sip
+${SIPDIR}/Qsci/qscilexerverilog.sip
+${SIPDIR}/Qsci/qscilexervhdl.sip
+${SIPDIR}/Qsci/qscilexerxml.sip
+${SIPDIR}/Qsci/qscilexeryaml.sip
+${SIPDIR}/Qsci/qscimacro.sip
+${SIPDIR}/Qsci/qscimod4.sip
+${SIPDIR}/Qsci/qscimod5.sip
+${SIPDIR}/Qsci/qscimodcommon.sip
+${SIPDIR}/Qsci/qsciprinter.sip
+${SIPDIR}/Qsci/qsciscintilla.sip
+${SIPDIR}/Qsci/qsciscintillabase.sip
+${SIPDIR}/Qsci/qscistyle.sip
+${SIPDIR}/Qsci/qscistyledtext.sip
Index: editors/py-qscintilla/pkg/PLIST-common
===================================================================
RCS file: editors/py-qscintilla/pkg/PLIST-common
diff -N editors/py-qscintilla/pkg/PLIST-common
--- editors/py-qscintilla/pkg/PLIST-common 19 Feb 2020 17:35:36 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PLIST-common,v 1.1 2020/02/19 17:35:36 juanfra Exp $
-@conflict py3-qscintilla-${QTVER}-*
-@pkgpath editors/py-qscintilla,${QTVER}
-lib/${QTVER}/qsci/
-lib/${QTVER}/qsci/api/
-lib/${QTVER}/qsci/api/python/
-lib/${QTVER}/qsci/api/python/QScintilla2.api
Index: editors/py-qscintilla/pkg/PLIST-main
===================================================================
RCS file: editors/py-qscintilla/pkg/PLIST-main
diff -N editors/py-qscintilla/pkg/PLIST-main
--- editors/py-qscintilla/pkg/PLIST-main 19 Feb 2020 17:35:36 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2020/02/19 17:35:36 juanfra Exp $
-@conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-*
-@pkgpath editors/py-qscintilla,${QTVER}
-@pkgpath editors/py-qscintilla
-lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.pyi
-@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.so
-lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/INSTALLER
-lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/RECORD
-${SIPDIR}/Qsci/
-${SIPDIR}/Qsci/qsciabstractapis.sip
-${SIPDIR}/Qsci/qsciapis.sip
-${SIPDIR}/Qsci/qscicommand.sip
-${SIPDIR}/Qsci/qscicommandset.sip
-${SIPDIR}/Qsci/qscidocument.sip
-${SIPDIR}/Qsci/qscilexer.sip
-${SIPDIR}/Qsci/qscilexeravs.sip
-${SIPDIR}/Qsci/qscilexerbash.sip
-${SIPDIR}/Qsci/qscilexerbatch.sip
-${SIPDIR}/Qsci/qscilexercmake.sip
-${SIPDIR}/Qsci/qscilexercoffeescript.sip
-${SIPDIR}/Qsci/qscilexercpp.sip
-${SIPDIR}/Qsci/qscilexercsharp.sip
-${SIPDIR}/Qsci/qscilexercss.sip
-${SIPDIR}/Qsci/qscilexercustom.sip
-${SIPDIR}/Qsci/qscilexerd.sip
-${SIPDIR}/Qsci/qscilexerdiff.sip
-${SIPDIR}/Qsci/qscilexeredifact.sip
-${SIPDIR}/Qsci/qscilexerfortran.sip
-${SIPDIR}/Qsci/qscilexerfortran77.sip
-${SIPDIR}/Qsci/qscilexerhtml.sip
-${SIPDIR}/Qsci/qscilexeridl.sip
-${SIPDIR}/Qsci/qscilexerjava.sip
-${SIPDIR}/Qsci/qscilexerjavascript.sip
-${SIPDIR}/Qsci/qscilexerjson.sip
-${SIPDIR}/Qsci/qscilexerlua.sip
-${SIPDIR}/Qsci/qscilexermakefile.sip
-${SIPDIR}/Qsci/qscilexermarkdown.sip
-${SIPDIR}/Qsci/qscilexermatlab.sip
-${SIPDIR}/Qsci/qscilexeroctave.sip
-${SIPDIR}/Qsci/qscilexerpascal.sip
-${SIPDIR}/Qsci/qscilexerperl.sip
-${SIPDIR}/Qsci/qscilexerpo.sip
-${SIPDIR}/Qsci/qscilexerpostscript.sip
-${SIPDIR}/Qsci/qscilexerpov.sip
-${SIPDIR}/Qsci/qscilexerproperties.sip
-${SIPDIR}/Qsci/qscilexerpython.sip
-${SIPDIR}/Qsci/qscilexerruby.sip
-${SIPDIR}/Qsci/qscilexerspice.sip
-${SIPDIR}/Qsci/qscilexersql.sip
-${SIPDIR}/Qsci/qscilexertcl.sip
-${SIPDIR}/Qsci/qscilexertex.sip
-${SIPDIR}/Qsci/qscilexerverilog.sip
-${SIPDIR}/Qsci/qscilexervhdl.sip
-${SIPDIR}/Qsci/qscilexerxml.sip
-${SIPDIR}/Qsci/qscilexeryaml.sip
-${SIPDIR}/Qsci/qscimacro.sip
-${SIPDIR}/Qsci/qscimod4.sip
-${SIPDIR}/Qsci/qscimod5.sip
-${SIPDIR}/Qsci/qscimodcommon.sip
-${SIPDIR}/Qsci/qsciprinter.sip
-${SIPDIR}/Qsci/qsciscintilla.sip
-${SIPDIR}/Qsci/qsciscintillabase.sip
-${SIPDIR}/Qsci/qscistyle.sip
-${SIPDIR}/Qsci/qscistyledtext.sip
