5 files changed, 97 insertions, 95 deletions

diff --git a/devel/py-RPyC/Makefile b/devel/py-RPyC/Makefile
index cd079b8e18b5..4e07f480b7c8 100644
--- a/devel/py-RPyC/Makefile
+++ b/devel/py-RPyC/Makefile
@@ -6,17 +6,21 @@
 #
 
 PORTNAME=	rpyc
-PORTVERSION=	3.0.7
+PORTVERSION=	3.1.0
 CATEGORIES=	devel python
-MASTER_SITES=	SF/${PORTNAME}/main/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/files/main/${PORTVERSION} \
+		CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	RPyC-${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Remote Python Call
 
 LICENSE=	MIT
 
+USE_DOS2UNIX=	yes
 USE_PYTHON=		2.7
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	RPyC
 
 .include <bsd.port.mk>
diff --git a/devel/py-RPyC/distinfo b/devel/py-RPyC/distinfo
index b5d9dd97c8d5..baecbd665a5e 100644
--- a/devel/py-RPyC/distinfo
+++ b/devel/py-RPyC/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rpyc-3.0.7.tar.gz) = 3249218dc5486aec79fd7239756b87a110371b410197be58ddab84dd3ea10dc4
-SIZE (rpyc-3.0.7.tar.gz) = 31601
+SHA256 (RPyC-3.1.0.tar.gz) = ea6b54b100df8433927f1d654b242170885fd0060a58ba145f9f703c8758cbbf
+SIZE (RPyC-3.1.0.tar.gz) = 32573
diff --git a/devel/py-RPyC/files/patch-python.py b/devel/py-RPyC/files/patch-python.py
new file mode 100644
index 000000000000..2a6b4bc02971
--- /dev/null
+++ b/devel/py-RPyC/files/patch-python.py
@@ -0,0 +1,14 @@
+--- setup.py.orig	2011-07-22 11:50:16.000000000 +0400
++++ setup.py	2011-07-22 11:52:05.000000000 +0400
+@@ -2,10 +2,7 @@
+ import sys
+ import os
+ 
+-try:
+-    from setuptools import setup
+-except ImportError:
+-    from distutils.core import setup
++from distutils.core import setup
+ 
+ if sys.version_info < (2, 4):
+     sys.exit("requires python 2.4 and up")
diff --git a/devel/py-RPyC/pkg-descr b/devel/py-RPyC/pkg-descr
index 7a39f62fa988..b406c4799ad8 100644
--- a/devel/py-RPyC/pkg-descr
+++ b/devel/py-RPyC/pkg-descr
@@ -5,4 +5,4 @@ object-proxying, a technique that employs python's dynamic nature,
 to overcome the physical boundaries between processes and computers,
 so that remote objects can be manipulated as if they were local.
 
-WWW:	http://pypi.python.org/pypi/RPyC/
+WWW:	http://rpyc.wikidot.com/
diff --git a/devel/py-RPyC/pkg-plist b/devel/py-RPyC/pkg-plist
index 3755e6bba8fc..2897121eb2b6 100644
--- a/devel/py-RPyC/pkg-plist
+++ b/devel/py-RPyC/pkg-plist
@@ -1,89 +1,73 @@
-%%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%%/rpyc/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/async.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/async.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/async.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/brine.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/brine.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/brine.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/channel.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/channel.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/channel.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/consts.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/consts.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/consts.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/netref.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/netref.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/netref.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/protocol.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/protocol.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/protocol.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/service.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/service.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/service.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/stream.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/stream.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/stream.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/vinegar.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/vinegar.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core/vinegar.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/license.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/license.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/license.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers/classic_server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers/classic_server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers/classic_server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers/registry_server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers/registry_server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers/registry_server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers/vdbconf.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers/vdbconf.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers/vdbconf.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/authenticators.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/authenticators.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/authenticators.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/classic.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/classic.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/classic.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/factory.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/factory.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/factory.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/helpers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/helpers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/helpers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/lib.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/lib.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/lib.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/logger.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/logger.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/logger.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/registry.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/registry.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/registry.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/twisted_integration.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/twisted_integration.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils/twisted_integration.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/core
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/servers
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc/utils
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rpyc
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+bin/rpyc_classic.py
+bin/rpyc_registry.py
+bin/rpyc_vdbconf.py
+%%PYTHON_SITELIBDIR%%/rpyc/__init__.py
+%%PYTHON_SITELIBDIR%%/rpyc/__init__.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/__init__.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/core/__init__.py
+%%PYTHON_SITELIBDIR%%/rpyc/core/__init__.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/core/__init__.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/core/async.py
+%%PYTHON_SITELIBDIR%%/rpyc/core/async.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/core/async.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/core/brine.py
+%%PYTHON_SITELIBDIR%%/rpyc/core/brine.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/core/brine.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/core/channel.py
+%%PYTHON_SITELIBDIR%%/rpyc/core/channel.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/core/channel.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/core/consts.py
+%%PYTHON_SITELIBDIR%%/rpyc/core/consts.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/core/consts.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/core/netref.py
+%%PYTHON_SITELIBDIR%%/rpyc/core/netref.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/core/netref.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/core/protocol.py
+%%PYTHON_SITELIBDIR%%/rpyc/core/protocol.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/core/protocol.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/core/service.py
+%%PYTHON_SITELIBDIR%%/rpyc/core/service.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/core/service.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/core/stream.py
+%%PYTHON_SITELIBDIR%%/rpyc/core/stream.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/core/stream.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/core/vinegar.py
+%%PYTHON_SITELIBDIR%%/rpyc/core/vinegar.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/core/vinegar.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/lib/__init__.py
+%%PYTHON_SITELIBDIR%%/rpyc/lib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/lib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/lib/colls.py
+%%PYTHON_SITELIBDIR%%/rpyc/lib/colls.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/lib/colls.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/lib/compat.py
+%%PYTHON_SITELIBDIR%%/rpyc/lib/compat.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/lib/compat.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/utils/__init__.py
+%%PYTHON_SITELIBDIR%%/rpyc/utils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/utils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/utils/authenticators.py
+%%PYTHON_SITELIBDIR%%/rpyc/utils/authenticators.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/utils/authenticators.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/utils/classic.py
+%%PYTHON_SITELIBDIR%%/rpyc/utils/classic.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/utils/classic.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/utils/factory.py
+%%PYTHON_SITELIBDIR%%/rpyc/utils/factory.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/utils/factory.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/utils/helpers.py
+%%PYTHON_SITELIBDIR%%/rpyc/utils/helpers.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/utils/helpers.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/utils/registry.py
+%%PYTHON_SITELIBDIR%%/rpyc/utils/registry.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/utils/registry.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/utils/server.py
+%%PYTHON_SITELIBDIR%%/rpyc/utils/server.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/utils/server.pyo
+%%PYTHON_SITELIBDIR%%/rpyc/version.py
+%%PYTHON_SITELIBDIR%%/rpyc/version.pyc
+%%PYTHON_SITELIBDIR%%/rpyc/version.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/rpyc/utils
+@dirrm %%PYTHON_SITELIBDIR%%/rpyc/lib
+@dirrm %%PYTHON_SITELIBDIR%%/rpyc/core
+@dirrm %%PYTHON_SITELIBDIR%%/rpyc