- Upgrade to 0.2.1 (svn r3857) version.

- Support Trac 0.11.
- Remove dependency on trac-webadmin (which is included in Trac now).

PR:		ports/127574
Reported by:	Christop <christop@physik.tu-berlin.de>

www/trac-accountmanager/Makefile

@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	accountmanager
-PORTVERSION=	0.1.3.2063
-PORTREVISION=	2
+PORTVERSION=	0.2.1.3857
 PORTEPOCH=	1
 CATEGORIES=	www devel python
-#MASTER_SITES=	http://trac-hacks.org/svn/accountmanagerplugin/0.10/
+#MASTER_SITES=	http://trac-hacks.org/svn/accountmanagerplugin/trunk/
 MASTER_SITES=	http://dist.bsdlab.org/
 PKGNAMEPREFIX=	trac-
 DISTNAME=	TracAccountManager-${PORTVERSION}
@@ -18,29 +17,18 @@ DISTNAME=	TracAccountManager-${PORTVERSION}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Account Manager Plugin for trac
 
-BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \
-		tracd:${PORTSDIR}/www/trac \
-		${PYTHON_SITELIBDIR}/webadmin/webadmin/__init__.py:${PORTSDIR}/www/trac-webadmin
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
+RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
 
+USE_ZIP=		yes
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	TracAccountManager
-PYDISTUTILS_PKGVERSION=	0.1.3
-PYDISTUTILS_NOEGGINFO=	yes # XXX convert easy_install support to bsd.python.mk's
-WRKSRC=			${WRKDIR}/accountmanagerplugin
+PYDISTUTILS_PKGVERSION=	0.2.1dev
+WRKSRC=			${WRKDIR}/accountmanagerplugin/trunk
 
-EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
-
-PYDISTUTILS_BUILD_TARGET=	bdist_egg
-PYDISTUTILS_INSTALL_TARGET=	easy_install
-PYDISTUTILS_INSTALLARGS=	-O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${TRACACCOUNTMANAGER_EGG}
-
-TRACACCOUNTMANAGER_EGG=	TracAccountManager-0.1.3dev-py${PYTHON_VER}.egg
-
-PLIST_SUB+=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
-		TRACACCOUNTMANAGER_EGG=${TRACACCOUNTMANAGER_EGG} \
-		TRACACCOUNTMANAGER_EGG_VER="TracAccountManager==0.1.3dev"
+pre-build:
+	cd ${WRKSRC} && ${PYTHON_CMD} setup.py bdist_egg
 
 # --- trac.ini
 # [components]

www/trac-accountmanager/distinfo

@@ -1,3 +1,3 @@
-MD5 (TracAccountManager-0.1.3.2063.tar.gz) = 92c626ba7334488192ac25d25552daee
-SHA256 (TracAccountManager-0.1.3.2063.tar.gz) = 15f973c1360ac2101ef6f89a90ce3cb553348222007829c727688fae4a92ab06
-SIZE (TracAccountManager-0.1.3.2063.tar.gz) = 12705
+MD5 (TracAccountManager-0.2.1.3857.zip) = fd19d132b44c59331461cf6b2842847d
+SHA256 (TracAccountManager-0.2.1.3857.zip) = da8ee4850b9e54695e1afbabed85f9898485168b57733a7eb0130065feda8119
+SIZE (TracAccountManager-0.2.1.3857.zip) = 41988

www/trac-accountmanager/pkg-plist

@@ -1,3 +1 @@
-@unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%TRACACCOUNTMANAGER_EGG_VER%%
-%%PYTHON_SITELIBDIR%%/%%TRACACCOUNTMANAGER_EGG%%
-@exec %%EASY_INSTALL_CMD%% -q -N -S %D/%%PYTHON_SITELIBDIR%% %%TRACACCOUNTMANAGER_EGG_VER%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%