3 files changed, 38 insertions, 47 deletions

diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile
index d693e96e62e5..b66e9fd5a17f 100644
--- a/math/py-numexpr/Makefile
+++ b/math/py-numexpr/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	numexpr
-PORTVERSION=	2.1
+PORTVERSION=	2.2
 CATEGORIES=	math python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,10 +11,12 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast numerical array expression evaluator for Python and NumPy
 
 BUILD_DEPENDS=	${PYNUMPY}
-RUN_DEPENDS=	${PYNUMPY}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
-PYEASYINSTALL_ARCHDEP=	yes
+USE_PYDISTUTILS=yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|\(import\) \(setuptools\)|\1 do_not_use_\2|' ${WRKSRC}/${PYSETUP}
 
 .include <bsd.port.mk>
diff --git a/math/py-numexpr/distinfo b/math/py-numexpr/distinfo
index 26c2b06309c8..0cb795257a61 100644
--- a/math/py-numexpr/distinfo
+++ b/math/py-numexpr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (numexpr-2.1.tar.gz) = 39f2fed7f1b8125c0f2df3af454c97e5dfa636ce487ad7921025815e24c17df8
-SIZE (numexpr-2.1.tar.gz) = 73944
+SHA256 (numexpr-2.2.tar.gz) = 78089f6ee49096ce8f16cca6649b302d658f32fba730e8bd84e0fc92b8c1d610
+SIZE (numexpr-2.2.tar.gz) = 75333
diff --git a/math/py-numexpr/pkg-plist b/math/py-numexpr/pkg-plist
index e5c9525d50b2..ba6dbbf6857d 100644
--- a/math/py-numexpr/pkg-plist
+++ b/math/py-numexpr/pkg-plist
@@ -1,41 +1,30 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/__config__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/__config__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/__config__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/cpuinfo.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/cpuinfo.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/cpuinfo.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/expressions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/expressions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/expressions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/interpreter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/interpreter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/interpreter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/interpreter.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/necompiler.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/necompiler.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/necompiler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/tests/test_numexpr.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/tests/test_numexpr.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/tests/test_numexpr.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/version.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/version.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/version.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+%%PYTHON_SITELIBDIR%%/numexpr/__config__.py
+%%PYTHON_SITELIBDIR%%/numexpr/__config__.pyc
+%%PYTHON_SITELIBDIR%%/numexpr/__config__.pyo
+%%PYTHON_SITELIBDIR%%/numexpr/__init__.py
+%%PYTHON_SITELIBDIR%%/numexpr/__init__.pyc
+%%PYTHON_SITELIBDIR%%/numexpr/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numexpr/cpuinfo.py
+%%PYTHON_SITELIBDIR%%/numexpr/cpuinfo.pyc
+%%PYTHON_SITELIBDIR%%/numexpr/cpuinfo.pyo
+%%PYTHON_SITELIBDIR%%/numexpr/expressions.py
+%%PYTHON_SITELIBDIR%%/numexpr/expressions.pyc
+%%PYTHON_SITELIBDIR%%/numexpr/expressions.pyo
+%%PYTHON_SITELIBDIR%%/numexpr/interpreter.so
+%%PYTHON_SITELIBDIR%%/numexpr/necompiler.py
+%%PYTHON_SITELIBDIR%%/numexpr/necompiler.pyc
+%%PYTHON_SITELIBDIR%%/numexpr/necompiler.pyo
+%%PYTHON_SITELIBDIR%%/numexpr/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/numexpr/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/numexpr/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numexpr/tests/test_numexpr.py
+%%PYTHON_SITELIBDIR%%/numexpr/tests/test_numexpr.pyc
+%%PYTHON_SITELIBDIR%%/numexpr/tests/test_numexpr.pyo
+%%PYTHON_SITELIBDIR%%/numexpr/utils.py
+%%PYTHON_SITELIBDIR%%/numexpr/utils.pyc
+%%PYTHON_SITELIBDIR%%/numexpr/utils.pyo
+%%PYTHON_SITELIBDIR%%/numexpr/version.py
+%%PYTHON_SITELIBDIR%%/numexpr/version.pyc
+%%PYTHON_SITELIBDIR%%/numexpr/version.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/numexpr/tests
+@dirrm %%PYTHON_SITELIBDIR%%/numexpr