3 files changed, 30 insertions, 34 deletions

diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile
index 360a184c8222..e2b219af31c3 100644
--- a/math/py-numexpr/Makefile
+++ b/math/py-numexpr/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	numexpr
-# Date created:				05 July 2010
-# Whom:					Ju Pengfei <ju.pengfei@gmail.com>
-#
+# Created by: Ju Pengfei <ju.pengfei@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	numexpr
-PORTVERSION=	1.4.2
+PORTVERSION=	2.0.1
 CATEGORIES=	math python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +14,7 @@ BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=easy_install
 PYEASYINSTALL_ARCHDEP=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-numexpr/distinfo b/math/py-numexpr/distinfo
index 634f0b8677d3..6be56508905e 100644
--- a/math/py-numexpr/distinfo
+++ b/math/py-numexpr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (numexpr-1.4.2.tar.gz) = 38f73f0402bca52566186dbeca586989617c02f8f23a31085cf27eb5fd654967
-SIZE (numexpr-1.4.2.tar.gz) = 64172
+SHA256 (numexpr-2.0.1.tar.gz) = 29492a08d5137c9a3a369527a899680ef7c1908cd4851ad2827b6c1d3767b092
+SIZE (numexpr-2.0.1.tar.gz) = 68549
diff --git a/math/py-numexpr/pkg-plist b/math/py-numexpr/pkg-plist
index cac3b66ec98a..e5c9525d50b2 100644
--- a/math/py-numexpr/pkg-plist
+++ b/math/py-numexpr/pkg-plist
@@ -1,40 +1,40 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/cpuinfo.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/necompiler.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/version.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/expressions.py
+%%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/interpreter.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/cpuinfo.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/necompiler.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/version.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/expressions.pyc
 %%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/necompiler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/version.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/__config__.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/test_numexpr.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/numexpr/tests/test_numexpr.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%%/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/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
+%%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