Index: Makefile
===================================================================
--- Makefile	(revision 306080)
+++ Makefile	(working copy)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	trac-bzr
-# Date created:		2007-03-30
-# Whom:			Radim Kolar <hsn@sanatana.dharma>
-#
+# Created by: Radim Kolar <hsn@sanatana.dharma>
 # $FreeBSD$
-#
 
 PORTNAME=	bzr
 PORTVERSION=	20110228
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://schema.filez.com/distfiles/
 PKGNAMEPREFIX=	trac-
@@ -18,21 +14,16 @@
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac \
+		bzr:${PORTSDIR}/devel/bzr
 
-USE_PYTHON=		-2.7
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_NOEGGINFO=	yes
-
 USE_BZIP2=	yes
+USE_PYTHON=	-2.7
+USE_PYDISTUTILS=easy_install
+PYDISTUTILS_PKGNAME=	TracBzr
+PYDISTUTILS_PKGVERSION=	0.4.2
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
-PLIST_SUB=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
-		PYTRAC_BZR_EGG=${PYTRAC_BZR_EGG}
-
-EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
-PYTRAC_BZR_EGG=	TracBzr-0.4.2-py${PYTHON_VER}.egg
-
 post-patch:
 	${REINPLACE_CMD} -e 's|tag_date = 1||' ${WRKSRC}/setup.cfg
 
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 306080)
+++ pkg-descr	(working copy)
@@ -1,4 +1,4 @@
 Trac-Bzr is a plugin for Trac (>= 0.10) that provides a
 version control backend for Bzr.
 
-WWW:	https://launchpad.net/trac-bzr
+WWW: https://launchpad.net/trac-bzr
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 306080)
+++ pkg-plist	(working copy)
@@ -1,4 +0,0 @@
-@comment $FreeBSD$
-@unexec %%EASY_INSTALL_CMD%% -q -m -N %D/%%PYTHON_SITELIBDIR%%/%%PYTRAC_BZR_EGG%%
-%%PYTHON_SITELIBDIR%%/%%PYTRAC_BZR_EGG%%
-@exec %%EASY_INSTALL_CMD%% -N %D/%%PYTHON_SITELIBDIR%%/%%PYTRAC_BZR_EGG%%