On Sat 29/02/2020 15:16, Bjorn Ketelaars wrote:
> I would like to migrate devel/spyder/* to python3-only. This is needed
> to move forward on several other python ports.
>
> There are no consumers.
>
> Addition of a quirk to devel/quirks will follow at commit time.
>
> Comments/OK?
Ping!
Enclosed an updated diff.
diff --git Makefile Makefile
index d416d36d962..9f6e6f81647 100644
--- Makefile
+++ Makefile
@@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2018/08/29 23:17:16 sthen Exp $
SUBDIR =
- SUBDIR += spyder
SUBDIR += spyder,python3
- SUBDIR += py-spyder-kernels
SUBDIR += py-spyder-kernels,python3
diff --git py-spyder-kernels/Makefile py-spyder-kernels/Makefile
index 819dc5434fa..3bbae5acef2 100644
--- py-spyder-kernels/Makefile
+++ py-spyder-kernels/Makefile
@@ -5,14 +5,14 @@ COMMENT= kernels used by spyder on its ipython
console
MODPY_EGG_VERSION= 0.4.2
DISTNAME= spyder-kernels-${MODPY_EGG_VERSION}
PKGNAME= ${MODPY_PY_PREFIX}${DISTNAME}
-REVISION= 1
+REVISION= 2
PORTROACH= limit:^0
HOMEPAGE= https://github.com/spyder-ide/spyder-kernels
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS += devel/py-cloudpickle${MODPY_FLAVOR} \
devel/py-ipykernel${MODPY_FLAVOR}>=4.8.2 \
diff --git py-spyder-kernels/pkg/PLIST py-spyder-kernels/pkg/PLIST
index 9e89ceb1e1e..f29576d074b 100644
--- py-spyder-kernels/pkg/PLIST
+++ py-spyder-kernels/pkg/PLIST
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2019/02/23 17:57:43 mariani Exp $
+@conflict py-spyder-kernels-*
+@pkgpath devel/spyder/py-spyder-kernels
lib/python${MODPY_VERSION}/site-packages/spyder_kernels/
lib/python${MODPY_VERSION}/site-packages/spyder_kernels-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/spyder_kernels-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git spyder/Makefile spyder/Makefile
index 43890c53a23..d38a060fae8 100644
--- spyder/Makefile
+++ spyder/Makefile
@@ -3,25 +3,16 @@
COMMENT = Scientific PYthon Development EnviRonment
MODPY_EGG_VERSION = 3.3.3
+REVISION = 2
DISTNAME = spyder-${MODPY_EGG_VERSION}
-PKGNAME = spyder${MAJOR_VERSION}-${MODPY_EGG_VERSION}
+PKGNAME = spyder3-${MODPY_EGG_VERSION}
PORTROACH= limit:^3
HOMEPAGE = https://github.com/spyder-ide/spyder
FLAVORS = python3
-FLAVOR ?=
-
-.if ${FLAVOR:Mpython3}
-MAJOR_VERSION = 3
-PKGNAME = spyder3-${MODPY_EGG_VERSION}
-.else
-MAJOR_VERSION =
-.endif
-REVISION = 1
-
-SUBST_VARS += MAJOR_VERSION
+FLAVOR = python3
RUN_DEPENDS += databases/py-pickleshare${MODPY_FLAVOR} \
devel/desktop-file-utils \
diff --git spyder/pkg/PLIST spyder/pkg/PLIST
index 20fa0e12af8..9313107be61 100644
--- spyder/pkg/PLIST
+++ spyder/pkg/PLIST
@@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2019/02/23 17:57:43 mariani Exp $
-bin/spyder${MAJOR_VERSION}
+@conflict spyder-*
+@pkgpath devel/spyder/spyder
+bin/spyder3
lib/python${MODPY_VERSION}/site-packages/spyder/
lib/python${MODPY_VERSION}/site-packages/spyder-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/spyder-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -1154,8 +1156,8 @@
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/spyder_pylint/widgets/$
lib/python${MODPY_VERSION}/site-packages/spyder_pylint/widgets/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/spyder_pylint/widgets/${MODPY_PYCACHE}pylintgui.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/spyder_pylint/widgets/pylintgui.py
-share/applications/spyder${MAJOR_VERSION}.desktop
-share/icons/spyder${MAJOR_VERSION}.png
+share/applications/spyder3.desktop
+share/icons/spyder3.png
${MODPY_COMMENT}share/metainfo/
-${MODPY_COMMENT}share/metainfo/spyder${MAJOR_VERSION}.appdata.xml
+${MODPY_COMMENT}share/metainfo/spyder3.appdata.xml
@tag update-desktop-database
