I believe py-six can go python3-only now.

ok?

Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
diff -u -p -u -r1.1582 Makefile
--- devel/quirks/Makefile       20 Nov 2023 11:53:55 -0000      1.1582
+++ devel/quirks/Makefile       25 Nov 2023 16:25:07 -0000
@@ -3,7 +3,7 @@ CATEGORIES =    devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =      quirks-6.198
+PKGNAME =      quirks-6.199
 PKG_ARCH =     *
 MAINTAINER =   Marc Espie <es...@openbsd.org>
 
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
diff -u -p -u -r1.1594 Quirks.pm
--- devel/quirks/files/Quirks.pm        20 Nov 2023 11:53:55 -0000      1.1594
+++ devel/quirks/files/Quirks.pm        25 Nov 2023 16:25:07 -0000
@@ -803,6 +803,7 @@ my $stem_extensions = {
        'py-future' => 'py3-future',
        'py-capstone' => 'py3-capstone',
         'iosevka-fixed-slab' => 'iosevka-slab',
+       'py-six' => 'py3-six',
 };
 
 my $obsolete_reason = {};
Index: devel/py-six/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-six/Makefile,v
diff -u -p -u -r1.32 Makefile
--- devel/py-six/Makefile       26 Nov 2022 23:28:13 -0000      1.32
+++ devel/py-six/Makefile       25 Nov 2023 16:25:07 -0000
@@ -3,7 +3,7 @@ COMMENT =       Python 2 and 3 compatibility l
 MODPY_EGG_VERSION =    1.16.0
 DISTNAME =     six-${MODPY_EGG_VERSION}
 PKGNAME =      py-six-${MODPY_EGG_VERSION}
-REVISION =     2
+REVISION =     3
 
 CATEGORIES =   devel
 
@@ -17,14 +17,12 @@ MODPY_PI =  Yes
 MODULES =      lang/python
 
 FLAVORS =      python3
-FLAVOR ?=
+FLAVOR =       python3
 
 MODPY_SETUPTOOLS =     Yes
 MODPY_PYTEST =         Yes
 MODPY_PYTEST_ARGS =    -v
 
-.if ${FLAVOR:Mpython3}
 TEST_DEPENDS = devel/py-py${MODPY_FLAVOR}
-.endif
 
 .include <bsd.port.mk>
Index: devel/py-six/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-six/pkg/PLIST,v
diff -u -p -u -r1.5 PLIST
--- devel/py-six/pkg/PLIST      11 Mar 2022 18:52:57 -0000      1.5
+++ devel/py-six/pkg/PLIST      25 Nov 2023 16:25:07 -0000
@@ -1,3 +1,5 @@
+@conflict six-*
+@pkgpath devel/py-six
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/six-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/

Reply via email to