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?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/spyder/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 29 Aug 2018 23:17:16 -0000 1.1.1.1
+++ Makefile 29 Feb 2020 14:10:57 -0000
@@ -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
Index: py-spyder-kernels/Makefile
===================================================================
RCS file: /cvs/ports/devel/spyder/py-spyder-kernels/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- py-spyder-kernels/Makefile 5 May 2019 15:44:12 -0000 1.4
+++ py-spyder-kernels/Makefile 29 Feb 2020 14:10:57 -0000
@@ -5,14 +5,14 @@ COMMENT= kernels used by spyder on its
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 \
Index: py-spyder-kernels/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/spyder/py-spyder-kernels/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- py-spyder-kernels/pkg/PLIST 23 Feb 2019 17:57:43 -0000 1.2
+++ py-spyder-kernels/pkg/PLIST 29 Feb 2020 14:10:57 -0000
@@ -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
Index: spyder/Makefile
===================================================================
RCS file: /cvs/ports/devel/spyder/spyder/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- spyder/Makefile 5 May 2019 15:44:12 -0000 1.4
+++ spyder/Makefile 29 Feb 2020 14:10:57 -0000
@@ -3,6 +3,7 @@
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}
@@ -11,7 +12,7 @@ PORTROACH= limit:^3
HOMEPAGE = https://github.com/spyder-ide/spyder
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
.if ${FLAVOR:Mpython3}
MAJOR_VERSION = 3
@@ -19,7 +20,6 @@ PKGNAME = spyder3-${MODPY_EGG_VERSION}
.else
MAJOR_VERSION =
.endif
-REVISION = 1
SUBST_VARS += MAJOR_VERSION
Index: spyder/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/spyder/spyder/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- spyder/pkg/PLIST 23 Feb 2019 17:57:43 -0000 1.2
+++ spyder/pkg/PLIST 29 Feb 2020 14:10:57 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2019/02/23 17:57:43 mariani Exp $
+@conflict spyder-*
+@pkgpath devel/spyder/spyder
bin/spyder${MAJOR_VERSION}
lib/python${MODPY_VERSION}/site-packages/spyder/
lib/python${MODPY_VERSION}/site-packages/spyder-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
