aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/py-AccessControl/Makefile10
-rw-r--r--security/py-AccessControl/pkg-plist198
-rw-r--r--security/py-Products.PlonePAS/Makefile14
-rw-r--r--security/py-Products.PlonePAS/pkg-plist218
-rw-r--r--security/py-Products.PluggableAuthService/Makefile12
-rw-r--r--security/py-Products.PluggableAuthService/pkg-plist328
-rw-r--r--security/py-RestrictedPython/Makefile21
-rw-r--r--security/py-RestrictedPython/pkg-plist96
-rw-r--r--security/py-borg.localrole/Makefile14
-rw-r--r--security/py-borg.localrole/pkg-plist58
-rw-r--r--security/py-plone.app.openid/Makefile12
-rw-r--r--security/py-plone.app.openid/pkg-plist65
-rw-r--r--security/py-plone.keyring/Makefile14
-rw-r--r--security/py-plone.keyring/pkg-plist45
-rw-r--r--security/py-plone.openid/Makefile16
-rw-r--r--security/py-plone.openid/pkg-plist70
-rw-r--r--security/py-plone.protect/Makefile16
-rw-r--r--security/py-plone.protect/pkg-plist49
-rw-r--r--security/py-plone.session/Makefile16
-rw-r--r--security/py-plone.session/pkg-plist57
-rw-r--r--security/py-potr/Makefile7
-rw-r--r--security/py-potr/files/patch-setup.py10
-rw-r--r--security/py-potr/pkg-plist34
-rw-r--r--security/py-zope.app.authentication/Makefile10
-rw-r--r--security/py-zope.app.authentication/pkg-plist135
-rw-r--r--security/py-zope.app.localpermission/Makefile10
-rw-r--r--security/py-zope.app.localpermission/pkg-plist29
-rw-r--r--security/py-zope.app.principalannotation/Makefile10
-rw-r--r--security/py-zope.app.principalannotation/pkg-plist33
-rw-r--r--security/py-zope.app.security/Makefile10
-rw-r--r--security/py-zope.app.security/pkg-plist131
-rw-r--r--security/py-zope.app.securitypolicy/Makefile10
-rw-r--r--security/py-zope.app.securitypolicy/pkg-plist49
-rw-r--r--security/py-zope.authentication/Makefile12
-rw-r--r--security/py-zope.authentication/pkg-plist45
-rw-r--r--security/py-zope.login/Makefile12
-rw-r--r--security/py-zope.login/pkg-plist34
-rw-r--r--security/py-zope.password/Makefile8
-rw-r--r--security/py-zope.password/pkg-plist43
-rw-r--r--security/py-zope.pluggableauth/Makefile10
-rw-r--r--security/py-zope.pluggableauth/pkg-plist65
-rw-r--r--security/py-zope.principalannotation/Makefile10
-rw-r--r--security/py-zope.principalannotation/pkg-plist28
-rw-r--r--security/py-zope.principalregistry/Makefile10
-rw-r--r--security/py-zope.principalregistry/pkg-plist40
-rw-r--r--security/py-zope.security/Makefile7
-rw-r--r--security/py-zope.security/pkg-plist179
-rw-r--r--security/py-zope.securitypolicy/Makefile10
-rw-r--r--security/py-zope.securitypolicy/pkg-plist100
-rw-r--r--security/py-zope.session/Makefile10
-rw-r--r--security/py-zope.session/pkg-plist36
51 files changed, 140 insertions, 2326 deletions
diff --git a/security/py-AccessControl/Makefile b/security/py-AccessControl/Makefile
index 81a58f7931fb..f856a23ba7c8 100644
--- a/security/py-AccessControl/Makefile
+++ b/security/py-AccessControl/Makefile
@@ -2,6 +2,7 @@
PORTNAME= AccessControl
PORTVERSION= 3.0.8
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -30,10 +31,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisit
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
-NO_STAGE= yes
-PYEASYINSTALL_ARCHDEP= yes
-USE_PYTHON= 2
-USE_PYDISTUTILS=easy_install
-USE_ZIP= yes
+USE_PYTHON= 2
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
+USE_ZIP= yes
.include <bsd.port.mk>
diff --git a/security/py-AccessControl/pkg-plist b/security/py-AccessControl/pkg-plist
deleted file mode 100644
index 8d6e6f1396ca..000000000000
--- a/security/py-AccessControl/pkg-plist
+++ /dev/null
@@ -1,198 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/AccessControl.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/AuthEncoding.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/AuthEncoding.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/AuthEncoding.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/DTML.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/DTML.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/DTML.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/ImplC.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/ImplC.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/ImplC.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/ImplPython.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/ImplPython.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/ImplPython.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Implementation.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Implementation.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Implementation.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Owned.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Owned.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Owned.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Permission.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Permission.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Permission.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/PermissionMapping.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/PermissionMapping.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/PermissionMapping.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/PermissionRole.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/PermissionRole.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/PermissionRole.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Permissions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Permissions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Permissions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Role.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Role.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/Role.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SecurityInfo.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SecurityInfo.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SecurityInfo.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SecurityManagement.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SecurityManagement.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SecurityManagement.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SecurityManager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SecurityManager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SecurityManager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SimpleObjectPolicies.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SimpleObjectPolicies.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SimpleObjectPolicies.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SpecialUsers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SpecialUsers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/SpecialUsers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/User.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/User.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/User.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/ZopeGuards.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/ZopeGuards.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/ZopeGuards.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/ZopeSecurityPolicy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/ZopeSecurityPolicy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/ZopeSecurityPolicy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/cAccessControl.c
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/cAccessControl.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/cAccessControl.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/cAccessControl.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/cAccessControl.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/class_init.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/class_init.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/class_init.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/logger_wrapper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/logger_wrapper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/logger_wrapper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/meta.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/metaconfigure.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/metaconfigure.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/metaconfigure.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/owner.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/owner.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/owner.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/permissions.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/requestmethod.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/requestmethod.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/requestmethod.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/requestmethod.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/rolemanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/rolemanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/rolemanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/security.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/security.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/security.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tainted.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tainted.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tainted.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/actual_python.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/actual_python.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/actual_python.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/mixed_module/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/mixed_module/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/mixed_module/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/mixed_module/submodule/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/mixed_module/submodule/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/mixed_module/submodule/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/private_module/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/private_module/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/private_module/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/private_module/submodule/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/private_module/submodule/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/private_module/submodule/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/public_module/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/public_module/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/public_module/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/public_module/submodule/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/public_module/submodule/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/public_module/submodule/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testClassSecurityInfo.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testClassSecurityInfo.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testClassSecurityInfo.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testImplementation.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testImplementation.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testImplementation.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testModuleSecurity.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testModuleSecurity.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testModuleSecurity.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testOwned.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testOwned.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testOwned.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testPasswordDigest.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testPasswordDigest.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testPasswordDigest.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testPermissionMapping.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testPermissionMapping.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testPermissionMapping.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testPermissionRole.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testPermissionRole.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testPermissionRole.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testRole.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testRole.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testRole.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testSecurityManager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testSecurityManager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testSecurityManager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testZCML.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testZCML.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testZCML.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testZopeGuards.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testZopeGuards.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testZopeGuards.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testZopeSecurityPolicy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testZopeSecurityPolicy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/testZopeSecurityPolicy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_requestmethod.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_requestmethod.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_requestmethod.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_safeiter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_safeiter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_safeiter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_tainted.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_tainted.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_tainted.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_userfolder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_userfolder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_userfolder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_users.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_users.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/test_users.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/unauthorized.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/unauthorized.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/unauthorized.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/userfolder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/userfolder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/userfolder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/users.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/users.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/users.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/native_libs.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
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/public_module/submodule
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/public_module
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/private_module/submodule
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/private_module
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/mixed_module/submodule
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests/mixed_module
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/AccessControl
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-Products.PlonePAS/Makefile b/security/py-Products.PlonePAS/Makefile
index 17fa2d1f5ad2..fe53249bb88c 100644
--- a/security/py-Products.PlonePAS/Makefile
+++ b/security/py-Products.PlonePAS/Makefile
@@ -2,9 +2,11 @@
PORTNAME= Products.PlonePAS
PORTVERSION= 4.1.1
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Adapts the PluggableAuthService for use by Plone
@@ -18,12 +20,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.me
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService
-DIST_SUBDIR= zope
-USE_PYTHON= 2
-USE_PYDISTUTILS=easy_install
-USE_ZIP= yes
-USES= zope
-
-NO_STAGE= yes
+USE_PYTHON= 2
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
+USE_ZIP= yes
+USES= zope
.include <bsd.port.mk>
diff --git a/security/py-Products.PlonePAS/pkg-plist b/security/py-Products.PlonePAS/pkg-plist
deleted file mode 100644
index 75998ccec7e3..000000000000
--- a/security/py-Products.PlonePAS/pkg-plist
+++ /dev/null
@@ -1,218 +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/namespace_packages.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%%/Products/PlonePAS/Extensions/Install.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/Extensions/Install.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/Extensions/Install.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/Extensions/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/Extensions/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/Extensions/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/info.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/info.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/info.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/member.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/member.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/member.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/search.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/search.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser/search.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/events.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/events.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/events.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/exportimport.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/gruf_support.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/gruf_support.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/gruf_support.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/browser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/browser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/browser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/capabilities.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/capabilities.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/capabilities.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/events.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/events.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/events.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/group.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/group.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/group.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/membership.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/membership.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/membership.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/plugins.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/plugins.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/plugins.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/propertysheets.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/propertysheets.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces/propertysheets.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/ldapmp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/ldapmp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/ldapmp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/odict.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/odict.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/odict.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/pas.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/pas.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/pas.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/patch.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/patch.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/patch.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/permissions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/permissions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/permissions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/autogroup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/autogroup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/autogroup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/cookie_handler.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/cookie_handler.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/cookie_handler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/crumbler.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/crumbler.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/crumbler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/group.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/group.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/group.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/local_role.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/local_role.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/local_role.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/passwordpolicy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/passwordpolicy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/passwordpolicy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/property.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/property.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/property.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/role.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/role.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/role.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/ufactory.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/ufactory.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/ufactory.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/user.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/user.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins/user.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/profiles.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/profiles/default/metadata.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/profiles/default/plone-pas.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/setuphandlers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/setuphandlers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/setuphandlers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/sheet.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/sheet.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/sheet.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/storage.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/storage.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/storage.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/base.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/cookie_auth.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/dummy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/dummy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/dummy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/images/test.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/images/test.jpg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/images/test.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/layer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/layer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/layer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_basic_ops.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_basic_ops.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_basic_ops.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_doctests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_doctests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_doctests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_groupdatatool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_groupdatatool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_groupdatatool.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_groupstool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_groupstool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_groupstool.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_memberdatatool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_memberdatatool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_memberdatatool.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_membershiptool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_membershiptool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_membershiptool.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_properties.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_properties.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_properties.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_role_plugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_role_plugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_role_plugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_views.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_views.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/test_views.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tool.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/groupdata.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/groupdata.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/groupdata.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/groups.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/groups.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/groups.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/memberdata.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/memberdata.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/memberdata.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/membership.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/membership.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/membership.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/plonetool.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/plonetool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools/plonetool.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi/AutoGroupForm.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi/CookieCrumblingPluginForm.dtml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi/ExtendedCookieAuthHelperForm.dtml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi/GroupAwareRoleManagerForm.dtml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi/GroupManagerForm.dtml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi/LocalRolesManagerForm.dtml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi/MutablePropertyProviderForm.dtml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi/PasswordPolicyForm.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi/PloneUserFactoryForm.dtml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi/UserManagerForm.dtml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi/membershipRolemapping.dtml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi/portrait_fix.dtml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/zmi
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tools
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests/images
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/profiles/default
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/profiles
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/interfaces
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/browser
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS/Extensions
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PlonePAS
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-Products.PluggableAuthService/Makefile b/security/py-Products.PluggableAuthService/Makefile
index 437f6f7c939f..f58b01049a25 100644
--- a/security/py-Products.PluggableAuthService/Makefile
+++ b/security/py-Products.PluggableAuthService/Makefile
@@ -2,9 +2,11 @@
PORTNAME= Products.PluggableAuthService
PORTVERSION= 1.10.0
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Pluggable Zope2 authentication / authorization framework
@@ -14,11 +16,9 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:${PORTSDIR}/devel/py-Products.PluginRegistry \
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
-DIST_SUBDIR= zope
-USE_PYTHON= 2
-USE_PYDISTUTILS=easy_install
-USES= zope
-
-NO_STAGE= yes
+USE_PYTHON= 2
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
+USES= zope
.include <bsd.port.mk>
diff --git a/security/py-Products.PluggableAuthService/pkg-plist b/security/py-Products.PluggableAuthService/pkg-plist
deleted file mode 100644
index 52e24de5dc8c..000000000000
--- a/security/py-Products.PluggableAuthService/pkg-plist
+++ /dev/null
@@ -1,328 +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/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.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%%/Products/PluggableAuthService/Extensions/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/Extensions/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/Extensions/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/Extensions/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/Extensions/basic_auth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/Extensions/basic_auth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/Extensions/basic_auth.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/Extensions/upgrade.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/Extensions/upgrade.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/Extensions/upgrade.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/PluggableAuthService.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/PluggableAuthService.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/PluggableAuthService.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/PropertiedUser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/PropertiedUser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/PropertiedUser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/UserPropertySheet.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/UserPropertySheet.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/UserPropertySheet.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/compatibility.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/doc/DEPENDENCIES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/doc/HISTORY.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/doc/TODO.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/doc/caching.stx
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/doc/framework_overview.stx
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/doc/plugin_map.stx
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/events.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/events.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/events.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/events.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/exportimport.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/exportimport.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/exportimport.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/exportimport.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/authservice.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/authservice.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/authservice.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/events.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/events.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/events.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/plugins.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/plugins.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/plugins.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/propertysheets.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/propertysheets.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/propertysheets.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/request.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/request.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces/request.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/meta.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/permissions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/permissions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/permissions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/BasePlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/BasePlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/BasePlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ChallengeProtocolChooser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ChallengeProtocolChooser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ChallengeProtocolChooser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/CookieAuthHelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/CookieAuthHelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/CookieAuthHelper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/DelegatingMultiPlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/DelegatingMultiPlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/DomainAuthHelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/DomainAuthHelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/DomainAuthHelper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/DynamicGroupsPlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/DynamicGroupsPlugin.py.~1~
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/DynamicGroupsPlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/DynamicGroupsPlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/HTTPBasicAuthHelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/HTTPBasicAuthHelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/HTTPBasicAuthHelper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/InlineAuthHelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/InlineAuthHelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/InlineAuthHelper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/LocalRolePlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/LocalRolePlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/LocalRolePlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/NotCompetentHelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/NotCompetentHelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/NotCompetentHelper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/RecursiveGroupsPlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/RecursiveGroupsPlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/RecursiveGroupsPlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/RequestTypeSniffer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/RequestTypeSniffer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/RequestTypeSniffer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ScriptablePlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ScriptablePlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ScriptablePlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/SearchPrincipalsPlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/SearchPrincipalsPlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/SearchPrincipalsPlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/SessionAuthHelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/SessionAuthHelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/SessionAuthHelper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ZODBGroupManager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ZODBGroupManager.py.~1~
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ZODBGroupManager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ZODBGroupManager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ZODBRoleManager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ZODBRoleManager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ZODBRoleManager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ZODBUserManager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ZODBUserManager.py.~1~
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ZODBUserManager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/ZODBUserManager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/exportimport.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/exportimport.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/exportimport.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/ChallengeProtocolChooser.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/helpers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/helpers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/helpers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ChallengeProtocolChooser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ChallengeProtocolChooser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ChallengeProtocolChooser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_CookieAuthHelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_CookieAuthHelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_CookieAuthHelper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_DomainAuthHelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_DomainAuthHelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_DomainAuthHelper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_DynamicGroupsPlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_DynamicGroupsPlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_DynamicGroupsPlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_HTTPBasicAuthHelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_HTTPBasicAuthHelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_HTTPBasicAuthHelper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_InlineAuthHelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_InlineAuthHelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_InlineAuthHelper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_LocalRolePlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_LocalRolePlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_LocalRolePlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_NotCompetentHelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_NotCompetentHelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_NotCompetentHelper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_RecursiveGroupsPlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_RecursiveGroupsPlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_RecursiveGroupsPlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_RequestTypeSniffer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_RequestTypeSniffer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_RequestTypeSniffer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ScriptablePlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ScriptablePlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ScriptablePlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ZODBGroupManager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ZODBGroupManager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ZODBGroupManager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ZODBRoleManager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ZODBRoleManager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ZODBRoleManager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_doctests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_doctests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_doctests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_exportimport.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_exportimport.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests/test_exportimport.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/CookieAuthHelper.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/DelegatingMultiPlugin.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/DomainAuthHelper.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/DynamicGroupsPlugin.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/HTTPBasicAuthHelper.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/InlineAuthHelper.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/RecursiveGroupsPlugin.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/ScriptablePlugin.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/SessionAuthHelper.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/ZODBGroupManager.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/ZODBRoleManager.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/ZODBUserManager.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/bpActivateInterfaces.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/caAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/cpcAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/cpcEdit.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/daAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/daGeneric.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/daMatches.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/dgpAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/dgpGroups.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/dmpAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/hbAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/iaAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/lrpAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/ncbrAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/rgpAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/rtsAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/saAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/spAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/spEditInterfaces.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/sppAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/zgAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/zgGroups.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/zrAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/zrRoles.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/zuAdd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/zuPasswd.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/zuUsers.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www/zuWidgets.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/xml/chooser.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/xml/cookieauth.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/xml/delegatepath.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/xml/domainauth.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/xml/dynamicgroups.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/xml/notcompetent.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/xml/titleonly.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/xml/zodbgroups.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/xml/zodbroles.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/xml/zodbusers.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/empty/PAS/.objects
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/empty/PAS/pluginregistry.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/empty/export_steps.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/empty/import_steps.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/empty/metadata.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple/PAS/.objects
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple/PAS/basic_auth.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple/PAS/dynamic_groups.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple/PAS/groups.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple/PAS/pluginregistry.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple/PAS/recursive_groups.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple/PAS/roles.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple/PAS/users.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple/export_steps.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple/import_steps.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple/metadata.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/conformance.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/conformance.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/conformance.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/image.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/pastc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/pastc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/pastc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_Caching.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_Caching.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_Caching.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_MoreCaching.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_MoreCaching.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_MoreCaching.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_PluggableAuthService.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_PluggableAuthService.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_PluggableAuthService.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_PropertiedUser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_PropertiedUser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_PropertiedUser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_UserFolder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_UserFolder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_UserFolder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_UserPropertySheet.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_UserPropertySheet.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_UserPropertySheet.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_events.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_events.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_events.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_exportimport.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_exportimport.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_exportimport.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/test_utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/version.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/www/PluggableAuthService.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/www/arrow-down.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/www/arrow-left.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/www/arrow-right.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/www/arrow-up.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/www/pasAddForm.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/www/pasSearch.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/www/two_lists.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/zcml.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/zcml.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/zcml.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/www
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple/PAS
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/simple
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/empty/PAS
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles/empty
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/profiles
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/xml
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/www
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/interfaces
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/doc
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService/Extensions
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products/PluggableAuthService
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Products
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
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%%
diff --git a/security/py-borg.localrole/Makefile b/security/py-borg.localrole/Makefile
index 05d3cff063d8..7f1ea3f31bde 100644
--- a/security/py-borg.localrole/Makefile
+++ b/security/py-borg.localrole/Makefile
@@ -2,9 +2,11 @@
PORTNAME= borg.localrole
PORTVERSION= 3.0.2
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= PAS plugin which can manage local roles via an adapter lookup
@@ -22,12 +24,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-USE_ZIP= yes
-#USE_ZOPE= yes
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
+USE_ZIP= yes
+#USE_ZOPE= yes
.include <bsd.port.mk>
diff --git a/security/py-borg.localrole/pkg-plist b/security/py-borg.localrole/pkg-plist
deleted file mode 100644
index 6d73f63afac8..000000000000
--- a/security/py-borg.localrole/pkg-plist
+++ /dev/null
@@ -1,58 +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/namespace_packages.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%%/borg/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/bbb/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/bbb/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/bbb/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/bbb/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/bbb/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/bbb/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/default.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/default_adapter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/default_adapter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/default_adapter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/exportimport.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/factory_adapter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/factory_adapter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/factory_adapter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/profiles/default/borg.localrole_various.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/profiles/default/import_steps.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/setuphandlers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/setuphandlers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/setuphandlers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/workspace.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/workspace.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/workspace.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/zmi/WorkspaceLocalRoleManagerForm.pt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/zmi
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/profiles/default
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/profiles
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole/bbb
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg/localrole
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/borg
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-plone.app.openid/Makefile b/security/py-plone.app.openid/Makefile
index 7ee1decf54d0..b229ddd1cf48 100644
--- a/security/py-plone.app.openid/Makefile
+++ b/security/py-plone.app.openid/Makefile
@@ -2,9 +2,11 @@
PORTNAME= plone.app.openid
PORTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Plone OpenID authentication support
@@ -21,11 +23,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.openid>=0:${PORTSDIR}/security/py-plon
${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=2.0.10:${PORTSDIR}/security/py-Products.PlonePAS \
${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-#USES= zope
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
+#USES= zope
.include <bsd.port.mk>
diff --git a/security/py-plone.app.openid/pkg-plist b/security/py-plone.app.openid/pkg-plist
deleted file mode 100644
index b5b5077f94b9..000000000000
--- a/security/py-plone.app.openid/pkg-plist
+++ /dev/null
@@ -1,65 +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/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.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%%/plone/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/portlets/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/portlets/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/portlets/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/portlets/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/portlets/login.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/portlets/login.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/portlets/login.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/portlets/login.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/profiles/default/metadata.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/profiles/default/openid-pas.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/profiles/default/portlets.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/profiles/default/skins.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/setuphandlers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/setuphandlers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/setuphandlers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/skins/ploneopenid/logged_out.cpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/skins/ploneopenid/logged_out.cpt.metadata
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/skins/ploneopenid/login_failed.cpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/skins/ploneopenid/login_failed.cpt.metadata
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/skins/ploneopenid/login_form.cpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/skins/ploneopenid/login_form.cpt.metadata
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/skins/ploneopenid/openid-icon.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/skins/ploneopenid/openid_login_validate.vpy
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/tests/base.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/tests/base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/tests/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/tests/test_view.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/tests/test_view.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/tests/test_view.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/skins/ploneopenid
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/skins
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/profiles/default
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/profiles
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid/portlets
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app/openid
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/app
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-plone.keyring/Makefile b/security/py-plone.keyring/Makefile
index 9be89dee99b8..be00d413605a 100644
--- a/security/py-plone.keyring/Makefile
+++ b/security/py-plone.keyring/Makefile
@@ -2,25 +2,25 @@
PORTNAME= plone.keyring
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Manage secrets
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-USE_ZIP= yes
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
+USE_ZIP= yes
.include <bsd.port.mk>
diff --git a/security/py-plone.keyring/pkg-plist b/security/py-plone.keyring/pkg-plist
deleted file mode 100644
index 2b3d7bd3d6f0..000000000000
--- a/security/py-plone.keyring/pkg-plist
+++ /dev/null
@@ -1,45 +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/namespace_packages.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%%/plone/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/django_random.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/django_random.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/django_random.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/keymanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/keymanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/keymanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/keyring.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/keyring.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/keyring.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/meta.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/profiles/default/componentregistry.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/profiles/default/metadata.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/tests/testKeymanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/tests/testKeymanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/tests/testKeymanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/tests/testKeyring.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/tests/testKeyring.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/tests/testKeyring.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/profiles/default
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring/profiles
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/keyring
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-plone.openid/Makefile b/security/py-plone.openid/Makefile
index f9819e4f9f19..c4a282b020cd 100644
--- a/security/py-plone.openid/Makefile
+++ b/security/py-plone.openid/Makefile
@@ -2,14 +2,16 @@
PORTNAME= plone.openid
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= OpenID authentication support for PAS
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openid>=0:${PORTSDIR}/security/py-openid \
${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
@@ -17,12 +19,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openid>=0:${PORTSDIR}/security/py-openid \
${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-USE_ZIP= yes
-#USES= zope
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
+USE_ZIP= yes
+#USES= zope
.include <bsd.port.mk>
diff --git a/security/py-plone.openid/pkg-plist b/security/py-plone.openid/pkg-plist
deleted file mode 100644
index f7c0c535136b..000000000000
--- a/security/py-plone.openid/pkg-plist
+++ /dev/null
@@ -1,70 +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/namespace_packages.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%%/plone/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/django_random.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/django_random.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/django_random.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/plugins/oid.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/plugins/oid.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/plugins/oid.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/store.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/store.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/store.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/consumer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/consumer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/consumer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/layer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/layer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/layer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/oitestcase.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/oitestcase.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/oitestcase.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/pas.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/store.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/testAuthentication.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/testAuthentication.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/testAuthentication.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/testDocTests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/testDocTests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/testDocTests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/testExtraction.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/testExtraction.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/testExtraction.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/www/openid.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/www/openidAdd.zpt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/www
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/openid
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-plone.protect/Makefile b/security/py-plone.protect/Makefile
index 4046cbf40f1c..f1ea4d9ab63c 100644
--- a/security/py-plone.protect/Makefile
+++ b/security/py-plone.protect/Makefile
@@ -2,25 +2,25 @@
PORTNAME= plone.protect
PORTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Security for browser forms
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.keyring>1.0:${PORTSDIR}/security/py-plone.keyring \
${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-USE_ZIP= yes
-#USES= zope
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
+USE_ZIP= yes
+#USES= zope
.include <bsd.port.mk>
diff --git a/security/py-plone.protect/pkg-plist b/security/py-plone.protect/pkg-plist
deleted file mode 100644
index 01708098c593..000000000000
--- a/security/py-plone.protect/pkg-plist
+++ /dev/null
@@ -1,49 +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/namespace_packages.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%%/plone/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/authenticator.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/authenticator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/authenticator.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/postonly.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/postonly.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/postonly.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/profiles/default/metadata.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/case.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/case.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/case.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/testAuthenticator.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/testAuthenticator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/testAuthenticator.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/testPostOnly.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/testPostOnly.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/testPostOnly.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/testUtils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/testUtils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests/testUtils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/utils.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/profiles/default
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect/profiles
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/protect
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-plone.session/Makefile b/security/py-plone.session/Makefile
index ded776a50d99..3a8660de8c57 100644
--- a/security/py-plone.session/Makefile
+++ b/security/py-plone.session/Makefile
@@ -2,26 +2,26 @@
PORTNAME= plone.session
PORTVERSION= 3.5.3
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Session based authentication for Zope
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:${PORTSDIR}/security/py-plone.protect \
${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-USE_ZIP= yes
-#USES= zope
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
+USE_ZIP= yes
+#USES= zope
.include <bsd.port.mk>
diff --git a/security/py-plone.session/pkg-plist b/security/py-plone.session/pkg-plist
deleted file mode 100644
index f3d546bcec87..000000000000
--- a/security/py-plone.session/pkg-plist
+++ /dev/null
@@ -1,57 +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/namespace_packages.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%%/plone/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/meta.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/plugins/secret.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/plugins/session.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/plugins/session.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/plugins/session.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/plugins/session.zpt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/profiles.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/profiles/default/cssregistry.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/profiles/default/jsregistry.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/profiles/default/metadata.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/resources.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/resources/refreshsupport.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/sessioncase.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/sessioncase.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/sessioncase.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/testDocTests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/testDocTests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/testDocTests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/testPAS.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/testPAS.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests/testPAS.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tktauth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tktauth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tktauth.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/resources
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/profiles/default
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/profiles
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone/session
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/plone
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-potr/Makefile b/security/py-potr/Makefile
index 93f150dcb6bb..80ae75168f91 100644
--- a/security/py-potr/Makefile
+++ b/security/py-potr/Makefile
@@ -2,6 +2,7 @@
PORTNAME= potr
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -15,9 +16,7 @@ LICENSE= LGPL3
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
USE_PYTHON= yes
-USE_PYDISTUTILS= easy_install
-PYDISTUTILS_PKGNAME= python_${PORTNAME}
-
-NO_STAGE= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-potr/files/patch-setup.py b/security/py-potr/files/patch-setup.py
deleted file mode 100644
index ad117bb5a3de..000000000000
--- a/security/py-potr/files/patch-setup.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./setup.py.orig 2013-10-14 22:33:04.000000000 +0400
-+++ ./setup.py 2013-10-15 09:17:38.000000000 +0400
-@@ -75,5 +75,7 @@
- 'Topic :: Security :: Cryptography',
- ],
-
-+ zip_safe=False,
-+
- **args
- )
diff --git a/security/py-potr/pkg-plist b/security/py-potr/pkg-plist
deleted file mode 100644
index ce924c3533f7..000000000000
--- a/security/py-potr/pkg-plist
+++ /dev/null
@@ -1,34 +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%%/potr/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/compatcrypto/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/compatcrypto/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/compatcrypto/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/compatcrypto/common.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/compatcrypto/common.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/compatcrypto/common.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/compatcrypto/pycrypto.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/compatcrypto/pycrypto.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/compatcrypto/pycrypto.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/context.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/context.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/context.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/crypt.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/crypt.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/crypt.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/proto.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/proto.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/proto.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/utils.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr/compatcrypto
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/potr
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.app.authentication/Makefile b/security/py-zope.app.authentication/Makefile
index 7f6ee9ee863d..e57e6da59fdc 100644
--- a/security/py-zope.app.authentication/Makefile
+++ b/security/py-zope.app.authentication/Makefile
@@ -2,9 +2,11 @@
PORTNAME= zope.app.authentication
PORTVERSION= 3.9
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Principals and groups management for the pluggable authentication
@@ -31,10 +33,8 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:${PORTSDIR}/devel/py-zope.app.container \
${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:${PORTSDIR}/devel/py-zope.app.component
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.app.authentication/pkg-plist b/security/py-zope.app.authentication/pkg-plist
deleted file mode 100644
index cb221c1f6c8e..000000000000
--- a/security/py-zope.app.authentication/pkg-plist
+++ /dev/null
@@ -1,135 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/authentication.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/authentication.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/authentication.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/adding.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/adding.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/adding.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/grant.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/granting.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/granting.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/granting.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/granting.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/granting.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/group_searching_with_empty_string.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/groupfolder.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/groupfolder.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/httpplugins.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/issue663.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/loginform.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/loginform.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/loginform.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/loginform.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/manage_access.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/manage_permissionform.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/manage_roleform.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/pau_prefix_and_searching.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/principalfolder.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/principalfolder.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/register.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/register.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/register.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/rolepermissionview.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/rolepermissionview.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/rolepermissionview.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/schemasearch.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/schemasearch.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/schemasearch.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/schemasearch.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/session.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/special-groups.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/rolepermissionmanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/rolepermissionmanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/rolepermissionmanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/test_doctests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/test_doctests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/test_doctests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/test_granting.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/test_granting.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/test_granting.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/test_rolepermissionview.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/test_rolepermissionview.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests/test_rolepermissionview.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/ftesting.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/ftpplugins.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/ftpplugins.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/ftpplugins.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/ftpplugins.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/generic.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/generic.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/generic.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/groupfolder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/groupfolder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/groupfolder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/groupfolder.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/groupfolder.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/httpplugins.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/httpplugins.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/httpplugins.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/httpplugins.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/i18n.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/i18n.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/i18n.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/idpicker.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/idpicker.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/idpicker.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/password.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/password.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/password.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/password.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/placelesssetup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/placelesssetup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/placelesssetup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/principalfolder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/principalfolder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/principalfolder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/principalfolder.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/principalfolder.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/session.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/session.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/session.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/session.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/testing.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/testing.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/testing.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/vocabulary.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/vocabulary.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/vocabulary.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/vocabulary.txt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication/browser
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/authentication
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.app.localpermission/Makefile b/security/py-zope.app.localpermission/Makefile
index 8e8a6a7698f3..70e3d5fb1c17 100644
--- a/security/py-zope.app.localpermission/Makefile
+++ b/security/py-zope.app.localpermission/Makefile
@@ -2,9 +2,11 @@
PORTNAME= zope.app.localpermission
PORTVERSION= 3.7.2
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Local Persistent Permissions for zope.security
@@ -18,10 +20,8 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.app.localpermission/pkg-plist b/security/py-zope.app.localpermission/pkg-plist
deleted file mode 100644
index bffe97eeeaa9..000000000000
--- a/security/py-zope.app.localpermission/pkg-plist
+++ /dev/null
@@ -1,29 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/localpermission/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/localpermission/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/localpermission/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/localpermission/browser.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/localpermission/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/localpermission/permission.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/localpermission/permission.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/localpermission/permission.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/localpermission/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/localpermission/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/localpermission/tests.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/localpermission
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.app.principalannotation/Makefile b/security/py-zope.app.principalannotation/Makefile
index 60f359fb3269..3c4821c518f8 100644
--- a/security/py-zope.app.principalannotation/Makefile
+++ b/security/py-zope.app.principalannotation/Makefile
@@ -2,9 +2,11 @@
PORTNAME= zope.app.principalannotation
PORTVERSION= 3.7.0
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Bootstrap subscriber and browser menu item for zope.principalannotation
@@ -16,10 +18,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transact
${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime \
${PYTHON_PKGNAMEPREFIX}zope.principalannotation>=0:${PORTSDIR}/security/py-zope.principalannotation
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.app.principalannotation/pkg-plist b/security/py-zope.app.principalannotation/pkg-plist
deleted file mode 100644
index b9d47a76b2bb..000000000000
--- a/security/py-zope.app.principalannotation/pkg-plist
+++ /dev/null
@@ -1,33 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/bootstrap.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/bootstrap.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/bootstrap.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/bootstrap.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/browser.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation/tests.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/principalannotation
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.app.security/Makefile b/security/py-zope.app.security/Makefile
index 94d931d2ca95..7d2abe1a1798 100644
--- a/security/py-zope.app.security/Makefile
+++ b/security/py-zope.app.security/Makefile
@@ -2,9 +2,11 @@
PORTNAME= zope.app.security
PORTVERSION= 3.7.5
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= ZMI Views For Zope3 Security Components
@@ -24,10 +26,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.app.localpermission>=0:${PORTSDIR}/secu
${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:${PORTSDIR}/security/py-zope.securitypolicy \
${PYTHON_PKGNAMEPREFIX}zope.login>=0:${PORTSDIR}/security/py-zope.login
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.app.security/pkg-plist b/security/py-zope.app.security/pkg-plist
deleted file mode 100644
index 36288bbca917..000000000000
--- a/security/py-zope.app.security/pkg-plist
+++ /dev/null
@@ -1,131 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/_protections.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/_protections.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/_protections.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/_protections.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/basicauthadapter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/basicauthadapter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/basicauthadapter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/auth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/auth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/auth.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/authutilitysearchview.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/authutilitysearchview.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/login.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/login_failed.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/loginlogout.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/logout.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/principalterms.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/principalterms.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/principalterms.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/redirect.pt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/ftpauth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/ftpauth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/ftpauth.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/globalmodules.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/i18n.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/i18n.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/i18n.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/loginpassword.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/loginpassword.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/loginpassword.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/meta.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/metaconfigure.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/metaconfigure.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/metaconfigure.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/metadirectives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/metadirectives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/metadirectives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/permission.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/permission.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/permission.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/principal.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/principal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/principal.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/principallogging.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/principallogging.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/principallogging.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/principalregistry.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/principalregistry.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/principalregistry.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/protectclass.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/protectclass.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/protectclass.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/settings.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/settings.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/settings.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/standardpermissions.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/ftesting.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/persistentlist.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_basicauthadapter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_basicauthadapter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_basicauthadapter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_ftpauth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_ftpauth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_ftpauth.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_loginpassword.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_loginpassword.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_loginpassword.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_logout.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_logout.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_logout.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_permission.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_permission.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_permission.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_principal.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_principal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_principal.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_principallogging.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_principallogging.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_principallogging.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_principalregistry.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_principalregistry.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_principalregistry.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_vocabulary.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_vocabulary.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/test_vocabulary.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/vocabulary.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/vocabulary.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/vocabulary.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security/browser
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/security
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.app.securitypolicy/Makefile b/security/py-zope.app.securitypolicy/Makefile
index bdffcf0bc484..ef118c011f5c 100644
--- a/security/py-zope.app.securitypolicy/Makefile
+++ b/security/py-zope.app.securitypolicy/Makefile
@@ -2,9 +2,11 @@
PORTNAME= zope.app.securitypolicy
PORTVERSION= 3.6.1
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= ZMI-based management views for zope.securitypolicy
@@ -27,10 +29,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:${PORTSDIR}/security/py-zope.securitypolicy
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.app.securitypolicy/pkg-plist b/security/py-zope.app.securitypolicy/pkg-plist
deleted file mode 100644
index 7d9b78dac065..000000000000
--- a/security/py-zope.app.securitypolicy/pkg-plist
+++ /dev/null
@@ -1,49 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/granting.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/granting.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/granting.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/granting_ftest.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/rolepermissionview.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/rolepermissionview.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/rolepermissionview.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/tests/functional.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/tests/functional.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/tests/functional.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/tests/functional.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/tests/test_functional.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/tests/test_functional.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/tests/test_functional.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/ftesting.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/testing.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/testing.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/testing.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy/browser
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app/securitypolicy
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/app
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.authentication/Makefile b/security/py-zope.authentication/Makefile
index d2befcde1bc7..99b5f665fe97 100644
--- a/security/py-zope.authentication/Makefile
+++ b/security/py-zope.authentication/Makefile
@@ -2,9 +2,11 @@
PORTNAME= zope.authentication
PORTVERSION= 3.7.1
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Definition of authentication basics for the Zope Framework
@@ -18,11 +20,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.br
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-USE_ZIP= yes
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
+USE_ZIP= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.authentication/pkg-plist b/security/py-zope.authentication/pkg-plist
deleted file mode 100644
index d187b77cc8ed..000000000000
--- a/security/py-zope.authentication/pkg-plist
+++ /dev/null
@@ -1,45 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/loginpassword.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/loginpassword.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/loginpassword.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/logout.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/logout.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/logout.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/logout.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/principal.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/principal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/principal.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/principalterms.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests/test_loginpassword.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests/test_loginpassword.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests/test_loginpassword.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests/test_logout.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests/test_logout.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests/test_logout.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests/test_principal.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests/test_principal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests/test_principal.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/authentication
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.login/Makefile b/security/py-zope.login/Makefile
index 56b4d718a964..655050d63ac7 100644
--- a/security/py-zope.login/Makefile
+++ b/security/py-zope.login/Makefile
@@ -2,9 +2,11 @@
PORTNAME= zope.login
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Login helpers for zope.publisher / authentication
@@ -16,11 +18,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-USE_ZIP= yes
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
+USE_ZIP= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.login/pkg-plist b/security/py-zope.login/pkg-plist
deleted file mode 100644
index 3101387ee792..000000000000
--- a/security/py-zope.login/pkg-plist
+++ /dev/null
@@ -1,34 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/ftp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/ftp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/ftp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/http.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/http.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/http.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/tests/test_basicauth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/tests/test_basicauth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/tests/test_basicauth.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/tests/test_ftpauth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/tests/test_ftpauth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/tests/test_ftpauth.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/login
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.password/Makefile b/security/py-zope.password/Makefile
index 68f679d2919f..9cc9e490dcae 100644
--- a/security/py-zope.password/Makefile
+++ b/security/py-zope.password/Makefile
@@ -2,6 +2,7 @@
PORTNAME= zope.password
PORTVERSION= 3.6.1
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -16,9 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.password/pkg-plist b/security/py-zope.password/pkg-plist
deleted file mode 100644
index 961e6bf6ba94..000000000000
--- a/security/py-zope.password/pkg-plist
+++ /dev/null
@@ -1,43 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/password.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/password.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/password.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/testing.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/testing.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/testing.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/tests/test_password.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/tests/test_password.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/tests/test_password.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/tests/test_zpasswd.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/tests/test_zpasswd.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/tests/test_zpasswd.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/vocabulary.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/vocabulary.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/vocabulary.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/zpasswd.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/zpasswd.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/zpasswd.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/password
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.pluggableauth/Makefile b/security/py-zope.pluggableauth/Makefile
index c0bf04b12cae..6292d22abbc2 100644
--- a/security/py-zope.pluggableauth/Makefile
+++ b/security/py-zope.pluggableauth/Makefile
@@ -2,9 +2,11 @@
PORTNAME= zope.pluggableauth
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Pluggable Authentication Utility
@@ -26,10 +28,8 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.pluggableauth/pkg-plist b/security/py-zope.pluggableauth/pkg-plist
deleted file mode 100644
index 4f41c6c424a0..000000000000
--- a/security/py-zope.pluggableauth/pkg-plist
+++ /dev/null
@@ -1,65 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/authentication.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/authentication.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/authentication.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/factories.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/factories.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/factories.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/ftpplugins.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/ftpplugins.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/ftpplugins.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/ftpplugins.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/generic.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/generic.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/generic.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/generic.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/groupfolder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/groupfolder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/groupfolder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/groupfolder.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/groupfolder.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/httpplugins.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/httpplugins.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/httpplugins.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/httpplugins.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/idpicker.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/idpicker.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/idpicker.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/principalfolder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/principalfolder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/principalfolder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/principalfolder.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/principalfolder.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/session.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/session.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/session.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins/session.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/principalfactories.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/tests.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/pluggableauth
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.principalannotation/Makefile b/security/py-zope.principalannotation/Makefile
index cfd2b1035090..5d1f8422cd89 100644
--- a/security/py-zope.principalannotation/Makefile
+++ b/security/py-zope.principalannotation/Makefile
@@ -2,9 +2,11 @@
PORTNAME= zope.principalannotation
PORTVERSION= 3.6.1
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Annotations for Zope Principals
@@ -19,10 +21,8 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.principalannotation/pkg-plist b/security/py-zope.principalannotation/pkg-plist
deleted file mode 100644
index 27405fa2cbcd..000000000000
--- a/security/py-zope.principalannotation/pkg-plist
+++ /dev/null
@@ -1,28 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/utility.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/utility.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation/utility.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalannotation
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.principalregistry/Makefile b/security/py-zope.principalregistry/Makefile
index 383dbd54665d..479a6120d980 100644
--- a/security/py-zope.principalregistry/Makefile
+++ b/security/py-zope.principalregistry/Makefile
@@ -2,9 +2,11 @@
PORTNAME= zope.principalregistry
PORTVERSION= 3.7.1
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Global principal registry component for Zope3
@@ -17,10 +19,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/
${PYTHON_PKGNAMEPREFIX}zope.password>=0:${PORTSDIR}/security/py-zope.password \
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.principalregistry/pkg-plist b/security/py-zope.principalregistry/pkg-plist
deleted file mode 100644
index 475b6649bc33..000000000000
--- a/security/py-zope.principalregistry/pkg-plist
+++ /dev/null
@@ -1,40 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/meta.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/metaconfigure.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/metaconfigure.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/metaconfigure.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/metadirectives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/metadirectives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/metadirectives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/principalregistry.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/principalregistry.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/principalregistry.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/tests/principal.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/tests/test_doc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/tests/test_doc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/tests/test_doc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/tests/test_principalregistry.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/tests/test_principalregistry.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/tests/test_principalregistry.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/principalregistry
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.security/Makefile b/security/py-zope.security/Makefile
index 59a07c2b10ec..5553b4bf47fd 100644
--- a/security/py-zope.security/Makefile
+++ b/security/py-zope.security/Makefile
@@ -3,6 +3,7 @@
PORTNAME= zope.security
PORTVERSION= 3.9.0
+PORTREVISION= 1
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -23,10 +24,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration
-PYEASYINSTALL_ARCHDEP= yes
USE_PYTHON= yes
-USE_PYDISTUTILS= easy_install
-
-NO_STAGE= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.security/pkg-plist b/security/py-zope.security/pkg-plist
deleted file mode 100644
index 5d3aea80f64c..000000000000
--- a/security/py-zope.security/pkg-plist
+++ /dev/null
@@ -1,179 +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/namespace_packages.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/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_definitions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_definitions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_definitions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_proxy.c
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_proxy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_proxy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_proxy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_proxy.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_zope_security_checker.c
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_zope_security_checker.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_zope_security_checker.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_zope_security_checker.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/_zope_security_checker.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/adapter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/adapter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/adapter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/checker.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/checker.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/checker.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/decorator.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/decorator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/decorator.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/examples/sandbox.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/examples/sandbox.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/examples/sandbox.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/examples/sandbox_security.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/examples/sandbox_security.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/examples/sandbox_security.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/i18n.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/i18n.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/i18n.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/management.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/management.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/management.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/meta.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/metaconfigure.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/metaconfigure.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/metaconfigure.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/metadirectives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/metadirectives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/metadirectives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/permission.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/permission.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/permission.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/permissions.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/protectclass.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/protectclass.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/protectclass.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/proxy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/proxy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/proxy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/setup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/setup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/setup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/simplepolicies.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/simplepolicies.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/simplepolicies.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/testing.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/testing.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/testing.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/adapter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/adapter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/adapter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/components.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/components.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/components.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/configure.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/emptymodule.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/emptymodule.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/emptymodule.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/exampleclass.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/exampleclass.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/exampleclass.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/module.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/module.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/module.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/modulehookup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/modulehookup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/modulehookup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/redefineperms.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_adapter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_adapter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_adapter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_checker.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_checker.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_checker.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_configure.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_configure.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_configure.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_contentdirective.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_contentdirective.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_contentdirective.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_decorator.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_decorator.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_decorator.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_directives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_directives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_directives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_location.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_location.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_location.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_management.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_management.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_management.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_module_directives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_module_directives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_module_directives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_permission.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_permission.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_permission.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_protectclass.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_protectclass.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_protectclass.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_protectsubclass.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_protectsubclass.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_protectsubclass.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_proxy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_proxy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_proxy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_set_checkers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_set_checkers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_set_checkers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_simpleinteraction.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_simpleinteraction.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_simpleinteraction.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_standard_checkers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_standard_checkers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests/test_standard_checkers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedinterpreter.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/builtins.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/builtins.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/builtins.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/builtins.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/interpreter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/interpreter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/interpreter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/interpreter.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/rcompile.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/rcompile.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/rcompile.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/rcompile.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/zcml.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/zcml.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/zcml.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/untrustedpython
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security/examples
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/security
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.securitypolicy/Makefile b/security/py-zope.securitypolicy/Makefile
index 7005fd77e2be..82602e44bed1 100644
--- a/security/py-zope.securitypolicy/Makefile
+++ b/security/py-zope.securitypolicy/Makefile
@@ -2,9 +2,11 @@
PORTNAME= zope.securitypolicy
PORTVERSION= 3.7.0
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Default security policy for Zope3
@@ -23,10 +25,8 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:${PORTSDIR}/devel/py-zope.dublincore
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.securitypolicy/pkg-plist b/security/py-zope.securitypolicy/pkg-plist
deleted file mode 100644
index eb90e970f577..000000000000
--- a/security/py-zope.securitypolicy/pkg-plist
+++ /dev/null
@@ -1,100 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/grantinfo.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/grantinfo.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/grantinfo.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/meta.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/metaconfigure.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/metaconfigure.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/metaconfigure.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/metadirectives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/metadirectives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/metadirectives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/principalpermission.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/principalpermission.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/principalpermission.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/principalrole.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/principalrole.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/principalrole.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/role.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/role.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/role.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/rolepermission.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/rolepermission.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/rolepermission.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/securitymap.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/securitymap.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/securitymap.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/securitypolicy.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/settings.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/settings.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/settings.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/mapping.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/role.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/role_duplicate.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_annotationprincipalrolemanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_annotationprincipalrolemanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_annotationrolepermissionmanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_annotationrolepermissionmanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_principalpermissionmanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_principalpermissionmanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_principalpermissionmanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_principalrolemanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_principalrolemanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_principalrolemanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_role.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_role.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_role.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_rolepermissionmanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_rolepermissionmanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_rolepermissionmanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_securitydirectives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_securitydirectives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_securitydirectives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_securitymap.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_securitymap.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_securitymap.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_settings.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_settings.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_settings.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_vocabulary.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_vocabulary.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_vocabulary.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_zopepolicy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_zopepolicy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests/test_zopepolicy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/vocabulary.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/vocabulary.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/vocabulary.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/zopepolicy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/zopepolicy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/zopepolicy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/zopepolicy.txt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/securitypolicy
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/security/py-zope.session/Makefile b/security/py-zope.session/Makefile
index 3c583ec34548..37ff2a61dff7 100644
--- a/security/py-zope.session/Makefile
+++ b/security/py-zope.session/Makefile
@@ -2,9 +2,11 @@
PORTNAME= zope.session
PORTVERSION= 3.9.5
+PORTREVISION= 1
CATEGORIES= security python zope
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Client identification and sessions for Zope
@@ -19,10 +21,8 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
${PYTHON_PKGNAMEPREFIX}zope.minmax>=0:${PORTSDIR}/devel/py-zope.minmax
-DIST_SUBDIR= zope
-USE_PYTHON= yes
-USE_PYDISTUTILS=easy_install
-
-NO_STAGE= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/security/py-zope.session/pkg-plist b/security/py-zope.session/pkg-plist
deleted file mode 100644
index 8059c44b43f2..000000000000
--- a/security/py-zope.session/pkg-plist
+++ /dev/null
@@ -1,36 +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/namespace_packages.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%%/zope/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/adapters.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/api.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/apidoc.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/classes.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/configure.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/design.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/http.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/http.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/http.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/session.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/session.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/session.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/subscribers.zcml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session/tests.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/session
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%