2 files changed, 6 insertions, 111 deletions

diff --git a/security/py-RestrictedPython/Makefile b/security/py-RestrictedPython/Makefile
index 082ae4aab19f..a7a49062594e 100644
--- a/security/py-RestrictedPython/Makefile
+++ b/security/py-RestrictedPython/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	RestrictedPython
 PORTVERSION=	3.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,18 +13,9 @@ COMMENT=	Restricted execution environment for Python
 
 LICENSE=	ZPL21
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=easy_install
-USE_ZIP=	yes
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+USE_ZIP=		yes
 
-NO_STAGE=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} >= 270
-PLIST_SUB+=	PYTHON27=""
-.else
-PLIST_SUB+=	PYTHON27="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/py-RestrictedPython/pkg-plist b/security/py-RestrictedPython/pkg-plist
deleted file mode 100644
index 91077e01ed7f..000000000000
--- a/security/py-RestrictedPython/pkg-plist
+++ /dev/null
@@ -1,96 +0,0 @@
-%%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/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/Eval.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/Eval.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/Eval.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/Guards.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/Guards.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/Guards.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/Limits.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/Limits.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/Limits.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/MutatingWalker.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/MutatingWalker.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/MutatingWalker.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/PrintCollector.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/PrintCollector.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/PrintCollector.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/RCompile.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/RCompile.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/RCompile.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/RestrictionMutator.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/RestrictionMutator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/RestrictionMutator.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/SelectCompiler.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/SelectCompiler.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/SelectCompiler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/Utilities.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/Utilities.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/Utilities.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/notes.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after24.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after24.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after24.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after25.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after25.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after25.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after26.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after26.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after26.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after27.py
-%%PYTHON27%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after27.pyc
-%%PYTHON27%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/before_and_after27.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/class.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/class.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/class.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/lambda.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/lambda.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/lambda.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/restricted_module.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/restricted_module.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/restricted_module.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/security_in_syntax.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/security_in_syntax.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/security_in_syntax.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/security_in_syntax26.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/security_in_syntax26.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/security_in_syntax26.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/security_in_syntax27.py
-%%PYTHON27%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/security_in_syntax27.pyc
-%%PYTHON27%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/security_in_syntax27.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/testCompile.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/testCompile.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/testCompile.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/testREADME.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/testREADME.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/testREADME.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/testRestrictions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/testRestrictions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/testRestrictions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/testUtiliities.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/testUtiliities.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/testUtiliities.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/unpack.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/unpack.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/unpack.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/verify.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/verify.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests/verify.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RestrictedPython
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%