3 files changed, 14 insertions, 23 deletions

diff --git a/math/py-pymc/Makefile b/math/py-pymc/Makefile
index d6a0571cd8c7..8af5b7f935e6 100644
--- a/math/py-pymc/Makefile
+++ b/math/py-pymc/Makefile
@@ -6,21 +6,19 @@
 #
 
 PORTNAME=	pymc
-PORTVERSION=	2.0r1
+PORTVERSION=	2.0
+PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-2.0rc1
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Markov Chain Monte Carlo Sampling Toolkit
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${BUILD_DEPENDS}
-#LIB_DEPENDS=	lapack.4:${PORTSDIR}/math/lapack
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_EGGINFO=	${DISTNAME}-${PYTHON_VERSION:S/thon//}.egg-info
 
 .include <bsd.port.mk>
diff --git a/math/py-pymc/distinfo b/math/py-pymc/distinfo
index fb3d50705a48..5ec9cbe81c41 100644
--- a/math/py-pymc/distinfo
+++ b/math/py-pymc/distinfo
@@ -1,3 +1,3 @@
-MD5 (pymc-2.0rc1.tar.gz) = b8e8bc8e72b23a0215d10e13839738d8
-SHA256 (pymc-2.0rc1.tar.gz) = fdb7b27c01509e2293d8905697feee3a157478393683eab3deb46a02f486f70a
-SIZE (pymc-2.0rc1.tar.gz) = 978218
+MD5 (pymc-2.0.tar.gz) = ef673f20c89d845520516111c9c0db08
+SHA256 (pymc-2.0.tar.gz) = 15bbf1e0df9e080d367d639462c4b2b9290826ca069a76ac2bc79d795fe6e653
+SIZE (pymc-2.0.tar.gz) = 1200416
diff --git a/math/py-pymc/pkg-plist b/math/py-pymc/pkg-plist
index c301baf0a474..cdb4af11460f 100644
--- a/math/py-pymc/pkg-plist
+++ b/math/py-pymc/pkg-plist
@@ -18,12 +18,6 @@
 %%PYTHON_SITELIBDIR%%/pymc/Model.py
 %%PYTHON_SITELIBDIR%%/pymc/Model.pyc
 %%PYTHON_SITELIBDIR%%/pymc/Model.pyo
-%%PYTHON_SITELIBDIR%%/pymc/MultiModelInference/ModelPosterior.py
-%%PYTHON_SITELIBDIR%%/pymc/MultiModelInference/ModelPosterior.pyc
-%%PYTHON_SITELIBDIR%%/pymc/MultiModelInference/ModelPosterior.pyo
-%%PYTHON_SITELIBDIR%%/pymc/MultiModelInference/__init__.py
-%%PYTHON_SITELIBDIR%%/pymc/MultiModelInference/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pymc/MultiModelInference/__init__.pyo
 %%PYTHON_SITELIBDIR%%/pymc/Node.py
 %%PYTHON_SITELIBDIR%%/pymc/Node.pyc
 %%PYTHON_SITELIBDIR%%/pymc/Node.pyo
@@ -145,6 +139,9 @@
 %%PYTHON_SITELIBDIR%%/pymc/gp/cov_funs/bases.py
 %%PYTHON_SITELIBDIR%%/pymc/gp/cov_funs/bases.pyc
 %%PYTHON_SITELIBDIR%%/pymc/gp/cov_funs/bases.pyo
+%%PYTHON_SITELIBDIR%%/pymc/gp/cov_funs/brownian.py
+%%PYTHON_SITELIBDIR%%/pymc/gp/cov_funs/brownian.pyc
+%%PYTHON_SITELIBDIR%%/pymc/gp/cov_funs/brownian.pyo
 %%PYTHON_SITELIBDIR%%/pymc/gp/cov_funs/cov_utils.py
 %%PYTHON_SITELIBDIR%%/pymc/gp/cov_funs/cov_utils.pyc
 %%PYTHON_SITELIBDIR%%/pymc/gp/cov_funs/cov_utils.pyo
@@ -173,6 +170,9 @@
 %%PYTHON_SITELIBDIR%%/pymc/tests/screen.py
 %%PYTHON_SITELIBDIR%%/pymc/tests/screen.pyc
 %%PYTHON_SITELIBDIR%%/pymc/tests/screen.pyo
+%%PYTHON_SITELIBDIR%%/pymc/tests/test_AM.py
+%%PYTHON_SITELIBDIR%%/pymc/tests/test_AM.pyc
+%%PYTHON_SITELIBDIR%%/pymc/tests/test_AM.pyo
 %%PYTHON_SITELIBDIR%%/pymc/tests/test_GP_MCMC.py
 %%PYTHON_SITELIBDIR%%/pymc/tests/test_GP_MCMC.pyc
 %%PYTHON_SITELIBDIR%%/pymc/tests/test_GP_MCMC.pyo
@@ -215,15 +215,9 @@
 %%PYTHON_SITELIBDIR%%/pymc/tests/test_interactive.py
 %%PYTHON_SITELIBDIR%%/pymc/tests/test_interactive.pyc
 %%PYTHON_SITELIBDIR%%/pymc/tests/test_interactive.pyo
-%%PYTHON_SITELIBDIR%%/pymc/tests/test_joint.py
-%%PYTHON_SITELIBDIR%%/pymc/tests/test_joint.pyc
-%%PYTHON_SITELIBDIR%%/pymc/tests/test_joint.pyo
 %%PYTHON_SITELIBDIR%%/pymc/tests/test_mean.py
 %%PYTHON_SITELIBDIR%%/pymc/tests/test_mean.pyc
 %%PYTHON_SITELIBDIR%%/pymc/tests/test_mean.pyo
-%%PYTHON_SITELIBDIR%%/pymc/tests/test_model_ave.py
-%%PYTHON_SITELIBDIR%%/pymc/tests/test_model_ave.pyc
-%%PYTHON_SITELIBDIR%%/pymc/tests/test_model_ave.pyo
 %%PYTHON_SITELIBDIR%%/pymc/tests/test_norm_approx.py
 %%PYTHON_SITELIBDIR%%/pymc/tests/test_norm_approx.pyc
 %%PYTHON_SITELIBDIR%%/pymc/tests/test_norm_approx.pyo
@@ -236,10 +230,9 @@
 %%PYTHON_SITELIBDIR%%/pymc/utils.py
 %%PYTHON_SITELIBDIR%%/pymc/utils.pyc
 %%PYTHON_SITELIBDIR%%/pymc/utils.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/pymc/MultiModelInference
-@dirrm %%PYTHON_SITELIBDIR%%/pymc/database
-@dirrm %%PYTHON_SITELIBDIR%%/pymc/examples
+@dirrm %%PYTHON_SITELIBDIR%%/pymc/tests
 @dirrm %%PYTHON_SITELIBDIR%%/pymc/gp/cov_funs
 @dirrm %%PYTHON_SITELIBDIR%%/pymc/gp
-@dirrm %%PYTHON_SITELIBDIR%%/pymc/tests
+@dirrm %%PYTHON_SITELIBDIR%%/pymc/examples
+@dirrm %%PYTHON_SITELIBDIR%%/pymc/database
 @dirrm %%PYTHON_SITELIBDIR%%/pymc