2 files changed, 7 insertions, 65 deletions

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%%