3 files changed, 24 insertions, 9 deletions

diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index edd3d0bc3b96..34784f36263d 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	rpy2
-PORTVERSION=	2.2.6
-PORTREVISION=	6
+PORTVERSION=	2.3.6
 CATEGORIES=	math
-MASTER_SITES=	CHEESESHOP \
-		SF
+MASTER_SITES=	CHEESESHOP
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python interface to the R Programming Language
diff --git a/math/rpy2/distinfo b/math/rpy2/distinfo
index 261907b86cae..2be378a7a14b 100644
--- a/math/rpy2/distinfo
+++ b/math/rpy2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rpy2-2.2.6.tar.gz) = 7e6b3ac86edcc66e59a98d5821581e36d4bfe9552d7f2da95610b730e5f0ef28
-SIZE (rpy2-2.2.6.tar.gz) = 167112
+SHA256 (rpy2-2.3.6.tar.gz) = a834e54ed6b98e71ef674f96628ab68e17f614db5b6246a9560048493a69f81c
+SIZE (rpy2-2.3.6.tar.gz) = 186977
diff --git a/math/rpy2/pkg-plist b/math/rpy2/pkg-plist
index 90fdde952dbe..7a87c1552e63 100644
--- a/math/rpy2/pkg-plist
+++ b/math/rpy2/pkg-plist
@@ -1,10 +1,15 @@
 %%PYTHON_SITELIBDIR%%/rpy2/__init__.py
 %%PYTHON_SITELIBDIR%%/rpy2/__init__.pyc
 %%PYTHON_SITELIBDIR%%/rpy2/__init__.pyo
-%%PYTHON_SITELIBDIR%%/rpy2/images/rpy2_logo.png
 %%PYTHON_SITELIBDIR%%/rpy2/interactive/__init__.py
 %%PYTHON_SITELIBDIR%%/rpy2/interactive/__init__.pyc
 %%PYTHON_SITELIBDIR%%/rpy2/interactive/__init__.pyo
+%%PYTHON_SITELIBDIR%%/rpy2/interactive/ipython.py
+%%PYTHON_SITELIBDIR%%/rpy2/interactive/ipython.pyc
+%%PYTHON_SITELIBDIR%%/rpy2/interactive/ipython.pyo
+%%PYTHON_SITELIBDIR%%/rpy2/interactive/packages.py
+%%PYTHON_SITELIBDIR%%/rpy2/interactive/packages.pyc
+%%PYTHON_SITELIBDIR%%/rpy2/interactive/packages.pyo
 %%PYTHON_SITELIBDIR%%/rpy2/interactive/process_revents.py
 %%PYTHON_SITELIBDIR%%/rpy2/interactive/process_revents.pyc
 %%PYTHON_SITELIBDIR%%/rpy2/interactive/process_revents.pyo
@@ -15,7 +20,7 @@
 %%PYTHON_SITELIBDIR%%/rpy2/rinterface/__init__.pyc
 %%PYTHON_SITELIBDIR%%/rpy2/rinterface/__init__.pyo
 %%PYTHON_SITELIBDIR%%/rpy2/rinterface/_rinterface.so
-%%PYTHON_SITELIBDIR%%/rpy2/rinterface/rpy_device.so
+%%PYTHON_SITELIBDIR%%/rpy2/rinterface/_rpy_device.so
 %%PYTHON_SITELIBDIR%%/rpy2/rinterface/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/rpy2/rinterface/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/rpy2/rinterface/tests/__init__.pyo
@@ -97,6 +102,12 @@
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/lib/grid.py
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/lib/grid.pyc
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/lib/grid.pyo
+%%PYTHON_SITELIBDIR%%/rpy2/robjects/lib/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/rpy2/robjects/lib/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/rpy2/robjects/lib/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/rpy2/robjects/lib/tests/test_ggplot2.py
+%%PYTHON_SITELIBDIR%%/rpy2/robjects/lib/tests/test_ggplot2.pyc
+%%PYTHON_SITELIBDIR%%/rpy2/robjects/lib/tests/test_ggplot2.pyo
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/methods.py
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/methods.pyc
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/methods.pyo
@@ -106,6 +117,9 @@
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/packages.py
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/packages.pyc
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/packages.pyo
+%%PYTHON_SITELIBDIR%%/rpy2/robjects/pandas2ri.py
+%%PYTHON_SITELIBDIR%%/rpy2/robjects/pandas2ri.pyc
+%%PYTHON_SITELIBDIR%%/rpy2/robjects/pandas2ri.pyo
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/robject.py
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/robject.pyc
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/robject.pyo
@@ -142,6 +156,9 @@
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/tests/testPackages.py
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/tests/testPackages.pyc
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/tests/testPackages.pyo
+%%PYTHON_SITELIBDIR%%/rpy2/robjects/tests/testPandasConversions.py
+%%PYTHON_SITELIBDIR%%/rpy2/robjects/tests/testPandasConversions.pyc
+%%PYTHON_SITELIBDIR%%/rpy2/robjects/tests/testPandasConversions.pyo
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/tests/testRObject.py
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/tests/testRObject.pyc
 %%PYTHON_SITELIBDIR%%/rpy2/robjects/tests/testRObject.pyo
@@ -163,13 +180,13 @@
 %%PYTHON_SITELIBDIR%%/rpy2/tests_rpy_classic.py
 %%PYTHON_SITELIBDIR%%/rpy2/tests_rpy_classic.pyc
 %%PYTHON_SITELIBDIR%%/rpy2/tests_rpy_classic.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/rpy2/images
 @dirrm %%PYTHON_SITELIBDIR%%/rpy2/interactive/tests
 @dirrm %%PYTHON_SITELIBDIR%%/rpy2/interactive
 @dirrm %%PYTHON_SITELIBDIR%%/rpy2/rinterface/tests
 @dirrm %%PYTHON_SITELIBDIR%%/rpy2/rinterface
 @dirrm %%PYTHON_SITELIBDIR%%/rpy2/rlike/tests
 @dirrm %%PYTHON_SITELIBDIR%%/rpy2/rlike
+@dirrm %%PYTHON_SITELIBDIR%%/rpy2/robjects/lib/tests
 @dirrm %%PYTHON_SITELIBDIR%%/rpy2/robjects/lib
 @dirrm %%PYTHON_SITELIBDIR%%/rpy2/robjects/tests
 @dirrm %%PYTHON_SITELIBDIR%%/rpy2/robjects