Note that kiwisolver 1.2.0 is now python3-only so diff below includes
a quirks diff as well.
kiwisolver is only used by py-matplotlib which still seems to work with
the update below.
ok?
Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.2023
diff -u -p -u -r1.2023 Makefile
--- devel/Makefile 10 Oct 2020 18:45:00 -0000 1.2023
+++ devel/Makefile 10 Oct 2020 21:48:42 -0000
@@ -1529,7 +1529,6 @@
SUBDIR += py-jupyter_client,python3
SUBDIR += py-jupyter_core,python3
SUBDIR += py-kitchen,python3
- SUBDIR += py-kiwisolver
SUBDIR += py-kiwisolver,python3
SUBDIR += py-lazy-object-proxy
SUBDIR += py-lazy-object-proxy,python3
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1060
diff -u -p -u -r1.1060 Makefile
--- devel/quirks/Makefile 10 Oct 2020 18:45:00 -0000 1.1060
+++ devel/quirks/Makefile 10 Oct 2020 21:48:42 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.452
+PKGNAME = quirks-3.453
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.1078
diff -u -p -u -r1.1078 Quirks.pm
--- devel/quirks/files/Quirks.pm 10 Oct 2020 18:45:00 -0000 1.1078
+++ devel/quirks/files/Quirks.pm 10 Oct 2020 21:48:42 -0000
@@ -491,6 +491,7 @@ my $stem_extensions = {
'py-construct' => 'py3-construct',
'py-sane' => 'py3-sane',
'py-zmq' => 'py3-zmq',
+ 'py-kiwisolver' => 'py3-kiwisolver',
};
my $obsolete_reason = {
Index: devel/py-kiwisolver/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-kiwisolver/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- devel/py-kiwisolver/Makefile 3 Jul 2020 21:12:46 -0000 1.4
+++ devel/py-kiwisolver/Makefile 10 Oct 2020 21:48:43 -0000
@@ -2,10 +2,9 @@
COMMENT = fast implementation of the Cassowary constraint solver
-MODPY_EGG_VERSION = 1.0.1
+MODPY_EGG_VERSION = 1.2.0
DISTNAME = kiwisolver-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = devel
@@ -19,6 +18,6 @@ MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
.include <bsd.port.mk>
Index: devel/py-kiwisolver/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-kiwisolver/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- devel/py-kiwisolver/distinfo 18 Oct 2018 13:56:12 -0000 1.1.1.1
+++ devel/py-kiwisolver/distinfo 10 Oct 2020 21:48:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (kiwisolver-1.0.1.tar.gz) = zjvl1SC00sPl7rTNLvYrm5q4rGtv7bqg45zbb1BkQng=
-SIZE (kiwisolver-1.0.1.tar.gz) = 31618
+SHA256 (kiwisolver-1.2.0.tar.gz) = JHgAJgzTgWDDYtIR3K9O0PeBavte/lZUR0iyHWrW0X8=
+SIZE (kiwisolver-1.2.0.tar.gz) = 52090
Index: devel/py-kiwisolver/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-kiwisolver/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- devel/py-kiwisolver/pkg/PLIST 18 Oct 2018 13:56:12 -0000 1.1.1.1
+++ devel/py-kiwisolver/pkg/PLIST 10 Oct 2020 21:48:43 -0000
@@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/10/18 13:56:12 bket Exp $
+@conflict py-kiwisolver-*
+@pkgpath devel/py-kiwisolver
lib/python${MODPY_VERSION}/site-packages/kiwisolver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kiwisolver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kiwisolver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kiwisolver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/kiwisolver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/kiwisolver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/kiwisolver.so
+@so lib/python${MODPY_VERSION}/site-packages/kiwisolver.so
