8 files changed, 39 insertions, 44 deletions

diff --git a/www/trac-blog/Makefile b/www/trac-blog/Makefile
index 00e22e641940..91e0c1d996a8 100644
--- a/www/trac-blog/Makefile
+++ b/www/trac-blog/Makefile
@@ -15,15 +15,14 @@ DISTNAME=	trac${PORTNAME}plugin-${PORTVERSION}
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	A blog plugin for Trac
 
-BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac \
 		${PYTHON_SITELIBDIR}/TracTags-0.4-py${_PYTHON_VERSION}.egg:${PORTSDIR}/www/trac-tags \
 		${PYTHON_SITELIBDIR}/TracWebAdmin-0.1.2dev-py${_PYTHON_VERSION}.egg:${PORTSDIR}/www/trac-webadmin
 
 WRKSRC=		${WRKDIR}/trac${PORTNAME}plugin
-NO_BUILD=	yes
 USE_PYTHON=	2.3+
-USE_PYDISTUTILS=yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}dev PYTHONVERSION=${_PYTHON_VERSION}
+USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_PKGNAME=	tBlog
+PYDISTUTILS_PKGVERSION=	${PORTVERSION}dev
 
 .include <bsd.port.mk>
diff --git a/www/trac-blog/pkg-plist b/www/trac-blog/pkg-plist
index 66ede9c7eb4a..ddf68a1c022f 100644
--- a/www/trac-blog/pkg-plist
+++ b/www/trac-blog/pkg-plist
@@ -1 +1 @@
-%%PYTHON_SITELIBDIR%%/tBlog-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/trac-wikinotification/Makefile b/www/trac-wikinotification/Makefile
index e1a8828be8ae..ccfa5a0d17df 100644
--- a/www/trac-wikinotification/Makefile
+++ b/www/trac-wikinotification/Makefile
@@ -15,14 +15,13 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/p/rc/}
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	Allow email notifications on wiki page changes
 
-BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac \
 		${PYTHON_SITELIBDIR}/TracCtxtnavAdd-1.1_r1-py${_PYTHON_VERSION}.egg:${PORTSDIR}/www/trac-ctxtnavadd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-NO_BUILD=	yes
 USE_PYTHON=	2.3+
-USE_PYDISTUTILS=yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION:S/p/rc/} PYTHONVERSION=${_PYTHON_VERSION}
+USE_PYDISTUTILS=easy_install
+PYDISTUTILS_PKGNAME=	TracWikiNotification
+PYDISTUTILS_PKGVERSION=	${PORTVERSION:S/p/rc/}
 
 .include <bsd.port.mk>
diff --git a/www/trac-wikinotification/pkg-plist b/www/trac-wikinotification/pkg-plist
index daca12983886..efe527eba058 100644
--- a/www/trac-wikinotification/pkg-plist
+++ b/www/trac-wikinotification/pkg-plist
@@ -1,25 +1,25 @@
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/templates/notification.cs
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/templates/notification_email.cs
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/__init__.py
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/__init__.pyc
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/__init__.pyo
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/listener.py
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/listener.pyc
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/listener.pyo
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/notification.py
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/notification.pyc
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/notification.pyo
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/web_ui.py
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/web_ui.pyc
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/web_ui.pyo
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/EGG-INFO/top_level.txt
-@dirrm %%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification/templates
-@dirrm %%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/WikiNotification
-@dirrm %%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/TracWikiNotification-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/templates/notification.cs
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/templates/notification_email.cs
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/listener.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/listener.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/listener.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/notification.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/notification.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/notification.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/web_ui.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/web_ui.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification/web_ui.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/entry_points.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%%/WikiNotification/templates
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/WikiNotification
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/trac-wikirename/Makefile b/www/trac-wikirename/Makefile
index ea43ef1b7150..ee92fbf436e6 100644
--- a/www/trac-wikirename/Makefile
+++ b/www/trac-wikirename/Makefile
@@ -15,15 +15,13 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	Renames Wiki pages
 
-BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac \
 		${PYTHON_SITELIBDIR}/TracCtxtnavAdd-1.1_r1-py${_PYTHON_VERSION}.egg:${PORTSDIR}/www/trac-ctxtnavadd \
 		${PYTHON_SITELIBDIR}/TracWebAdmin-0.1.2dev-py${_PYTHON_VERSION}.egg:${PORTSDIR}/www/trac-webadmin
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
-NO_BUILD=	yes
 USE_PYTHON=	2.3+
-USE_PYDISTUTILS=yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_PKGNAME=	TracWikiRename
 
 .include <bsd.port.mk>
diff --git a/www/trac-wikirename/pkg-plist b/www/trac-wikirename/pkg-plist
index 8275c8983c73..9923fd36a331 100644
--- a/www/trac-wikirename/pkg-plist
+++ b/www/trac-wikirename/pkg-plist
@@ -1,2 +1,2 @@
 bin/trac-wikirename
-%%PYTHON_SITELIBDIR%%/TracWikiRename-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/trac-wikitemplates/Makefile b/www/trac-wikitemplates/Makefile
index 04e0ecb097a2..295fcee4963a 100644
--- a/www/trac-wikitemplates/Makefile
+++ b/www/trac-wikitemplates/Makefile
@@ -15,14 +15,13 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSION:S/p/rc/}
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	Templates for the Trac wiki
 
-BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac \
 		${PYTHON_SITELIBDIR}/TracCtxtnavAdd-1.1_r1-py${_PYTHON_VERSION}.egg:${PORTSDIR}/www/trac-ctxtnavadd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
-NO_BUILD=	yes
 USE_PYTHON=	2.3+
-USE_PYDISTUTILS=yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION:S/p/rc/} PYTHONVERSION=${_PYTHON_VERSION}
+USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_PKGNAME=	TracWikiTemplates
+PYDISTUTILS_PKGVERSION=	${PORTVERSION:S/p/rc/}
 
 .include <bsd.port.mk>
diff --git a/www/trac-wikitemplates/pkg-plist b/www/trac-wikitemplates/pkg-plist
index 41ec57b14723..ddf68a1c022f 100644
--- a/www/trac-wikitemplates/pkg-plist
+++ b/www/trac-wikitemplates/pkg-plist
@@ -1 +1 @@
-%%PYTHON_SITELIBDIR%%/TracWikiTemplates-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%