2 files changed, 71 insertions, 80 deletions

diff --git a/textproc/py-mako/Makefile b/textproc/py-mako/Makefile
index 6f8669dcbc62..f1012b10e0e2 100644
--- a/textproc/py-mako/Makefile
+++ b/textproc/py-mako/Makefile
@@ -18,19 +18,12 @@ DISTNAME=	Mako-${PORTVERSION}
 MAINTAINER=	dryice@FreeBSD.org
 COMMENT=	Super-fast templating language in Python
 
-BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \
-		${PYTHON_PKGNAMEPREFIX}beaker>=0.7.3:${PORTSDIR}/www/py-beaker \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beaker>=0.7.3:${PORTSDIR}/www/py-beaker \
 		${PYTHON_PKGNAMEPREFIX}Babel>=0.8.1:${PORTSDIR}/devel/py-babel
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-PYMAKO_EGG=	Mako-${PORTVERSION}-py${PYTHON_VER}.egg
-
-PLIST_SUB=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
-		PYMAKO_EGG=${PYMAKO_EGG}
-
-EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
+USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_PKGNAME=	Mako
 
 .include <bsd.port.mk>
diff --git a/textproc/py-mako/pkg-plist b/textproc/py-mako/pkg-plist
index 31a643ca7976..71653df5e0a2 100644
--- a/textproc/py-mako/pkg-plist
+++ b/textproc/py-mako/pkg-plist
@@ -1,70 +1,68 @@
-@unexec %%EASY_INSTALL_CMD%% -N -m %D/%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ast.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ast.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ast.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/cache.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/cache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/cache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/codegen.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/codegen.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/codegen.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/exceptions.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/filters.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/filters.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/filters.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/lexer.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/lexer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/lexer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/lookup.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/lookup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/lookup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/parsetree.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/parsetree.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/parsetree.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/pygen.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/pygen.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/pygen.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/runtime.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/runtime.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/runtime.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/template.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/template.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/template.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/util.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/autohandler.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/autohandler.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/autohandler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/babelplugin.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/babelplugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/babelplugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/preprocessors.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/preprocessors.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/preprocessors.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/pygmentplugin.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/pygmentplugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/pygmentplugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/turbogears.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/turbogears.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/turbogears.pyo
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako/ext
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/mako
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYMAKO_EGG%%
-@exec %%EASY_INSTALL_CMD%% -N %D/%%PYTHON_SITELIBDIR%%/PYMAKO_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ast.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ast.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ast.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/cache.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/cache.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/cache.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/codegen.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/codegen.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/codegen.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/exceptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/filters.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/filters.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/filters.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/lexer.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/lexer.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/lexer.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/lookup.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/lookup.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/lookup.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/parsetree.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/parsetree.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/parsetree.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/pygen.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/pygen.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/pygen.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/runtime.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/runtime.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/runtime.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/template.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/template.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/template.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/autohandler.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/autohandler.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/autohandler.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/babelplugin.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/babelplugin.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/babelplugin.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/preprocessors.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/preprocessors.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/preprocessors.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/pygmentplugin.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/pygmentplugin.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/pygmentplugin.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/turbogears.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/turbogears.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/turbogears.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext/__init__.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako/ext
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mako
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%