Remove py2-flavor of math/py-numexpr. Consumers are already py3-only. OK?
diff --git devel/quirks/Makefile devel/quirks/Makefile index 3c7f46a4a3e..33f744dfa26 100644 --- devel/quirks/Makefile +++ devel/quirks/Makefile @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.396 +PKGNAME = quirks-3.397 PKG_ARCH = * MAINTAINER = Marc Espie <[email protected]> diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm index 7f620c19826..90300d8e3bd 100644 --- devel/quirks/files/Quirks.pm +++ devel/quirks/files/Quirks.pm @@ -454,6 +454,7 @@ my $stem_extensions = { 'py-cftime' => 'py3-cftime', 'py-astral' => 'py3-astral', 'py-ropper' => 'py3-ropper', + 'py-numexpr' => 'py3-numexpr', }; my $obsolete_reason = { diff --git math/Makefile math/Makefile index 90041544d47..c1dac648268 100644 --- math/Makefile +++ math/Makefile @@ -133,7 +133,6 @@ SUBDIR += py-mpmath,python3 SUBDIR += py-networkx SUBDIR += py-netcdf4 - SUBDIR += py-numexpr SUBDIR += py-numexpr,python3 SUBDIR += py-numpy SUBDIR += py-numpy,python3 diff --git math/py-numexpr/Makefile math/py-numexpr/Makefile index 6e6d53e33b0..f0687eb0b5c 100644 --- math/py-numexpr/Makefile +++ math/py-numexpr/Makefile @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 2.6.4 DISTNAME = numexpr-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} CATEGORIES = math -REVISION = 3 +REVISION = 4 # MIT PERMIT_PACKAGE = Yes @@ -30,6 +30,6 @@ RUN_DEPENDS = math/py-numpy${MODPY_FLAVOR} BUILD_DEPENDS = ${RUN_DEPENDS} FLAVORS = python3 -FLAVOR ?= +FLAVOR ?= python3 .include <bsd.port.mk> diff --git math/py-numexpr/pkg/PLIST math/py-numexpr/pkg/PLIST index 562a4deac37..c9f63abe582 100644 --- math/py-numexpr/pkg/PLIST +++ math/py-numexpr/pkg/PLIST @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2017/04/23 17:45:20 shadchin Exp $ +@conflict py-numexpr-* +@pkgpath math/py-numexpr lib/python${MODPY_VERSION}/site-packages/numexpr/ lib/python${MODPY_VERSION}/site-packages/numexpr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/numexpr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO @@ -19,7 +21,7 @@ lib/python${MODPY_VERSION}/site-packages/numexpr/${MODPY_PYCACHE}utils.${MODPY_P lib/python${MODPY_VERSION}/site-packages/numexpr/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/numexpr/cpuinfo.py lib/python${MODPY_VERSION}/site-packages/numexpr/expressions.py -lib/python${MODPY_VERSION}/site-packages/numexpr/interpreter.so +@so lib/python${MODPY_VERSION}/site-packages/numexpr/interpreter.so lib/python${MODPY_VERSION}/site-packages/numexpr/necompiler.py lib/python${MODPY_VERSION}/site-packages/numexpr/tests/ lib/python${MODPY_VERSION}/site-packages/numexpr/tests/__init__.py
