ports/127964: [UPDATE] www/trac-accountmanager to 0.2.1.3857

[Martin Matuska]

>Number:         127964
>Category:       ports
>Synopsis:       [UPDATE] www/trac-accountmanager to 0.2.1.3857
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 09 09:20:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 7.1-PRERELEASE i386/amd64
>Organization:
>Environment:
FreeBSD 7.1-PRERELEASE i386/amd64
>Description:
- Update trac-accountmanager from to 0.1.3.2063 0.2.1.3857
- Match with trac 0.11
- Simplify port (use more of bsd.python.mk)
- Fix package build (register with easy-install)
- Request maintainership
>How-To-Repeat:
>Fix:
Index: ports/www/trac-accountmanager/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/trac-accountmanager/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ports/www/trac-accountmanager/Makefile	7 Jul 2008 11:34:50 -0000	1.7
+++ ports/www/trac-accountmanager/Makefile	9 Oct 2008 08:52:42 -0000
@@ -6,51 +6,26 @@
 #
 
 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://dist.bsdlab.org/
+MASTER_SITES=	http://people.freebsd.org/~mm/trac/
 PKGNAMEPREFIX=	trac-
-DISTNAME=	TracAccountManager-${PORTVERSION}
+DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
 
-MAINTAINER=	kuriyama at FreeBSD.org
+MAINTAINER=	mm at FreeBSD.org
 COMMENT=	Account Manager Plugin for trac
 
-BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \
-		tracd:${PORTSDIR}/www/trac \
+RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac \
 		${PYTHON_SITELIBDIR}/webadmin/webadmin/__init__.py:${PORTSDIR}/www/trac-webadmin
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}plugin/trunk
+USE_PYTHON=	2.3+
+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=	${PORTVERSION:R}dev
 
-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"
-
-# --- trac.ini
-# [components]
-# acct_mgr.* = enabled
-#
-# [account-manager]
-# password_format = htpasswd
-# password_file = /var/trac/trac.htpasswd
-#
-# --- httpd.conf
-# SetEnv PYTHON_EGG_CACHE "/tmp/cache"
+PLIST_SUB+=	PORTVERSION=${PORTVERSION:R}dev PYTHONVERSION=${_PYTHON_VERSION}
+PYDISTUTILS_NOEGGINFO=	yes
 
 .include <bsd.port.mk>
Index: ports/www/trac-accountmanager/distinfo
===================================================================
RCS file: /home/pcvs/ports/www/trac-accountmanager/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- ports/www/trac-accountmanager/distinfo	6 Mar 2007 03:10:34 -0000	1.2
+++ ports/www/trac-accountmanager/distinfo	9 Oct 2008 08:52:42 -0000
@@ -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 (accountmanagerplugin-0.2.1.3857.tar.gz) = f963513a7e22a5c8e49681c6652f1956
+SHA256 (accountmanagerplugin-0.2.1.3857.tar.gz) = 65073a164e89bcc57855bf39f25e1cbdd77b301a2e3aace4300d31cc95ddd6e6
+SIZE (accountmanagerplugin-0.2.1.3857.tar.gz) = 25342
Index: ports/www/trac-accountmanager/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/trac-accountmanager/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- ports/www/trac-accountmanager/pkg-plist	6 Mar 2007 03:10:34 -0000	1.3
+++ ports/www/trac-accountmanager/pkg-plist	9 Oct 2008 08:52:42 -0000
@@ -1,3 +1 @@
- at unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%TRACACCOUNTMANAGER_EGG_VER%%
-%%PYTHON_SITELIBDIR%%/%%TRACACCOUNTMANAGER_EGG%%
- at exec %%EASY_INSTALL_CMD%% -q -N -S %D/%%PYTHON_SITELIBDIR%% %%TRACACCOUNTMANAGER_EGG_VER%%
+%%PYTHON_SITELIBDIR%%/TracAccountManager-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg
>Release-Note:
>Audit-Trail:
>Unformatted: