5 files changed, 36 insertions, 15 deletions

diff --git a/www/trac-mastertickets/Makefile b/www/trac-mastertickets/Makefile
index 978de70f5f73..bfb0bd580f27 100644
--- a/www/trac-mastertickets/Makefile
+++ b/www/trac-mastertickets/Makefile
@@ -6,24 +6,27 @@
 #
 
 PORTNAME=	mastertickets
-PORTVERSION=	2.1.3
-PORTREVISION=	2
+PORTVERSION=	3.0.1
 CATEGORIES=	www devel python
-MASTER_SITES=	http://www.gerritbeine.de/download/trac/
+MASTER_SITES=	http://dist.codelabs.ru/fbsd/ \
+		LOCAL/glarkin
 PKGNAMEPREFIX=	trac-
 DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
 
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Support for ticket dependencies
 
-BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+RUN_DEPENDS+=	trac>=0.12:${PORTSDIR}/www/trac
 
-WRKSRC=		${WRKDIR}/${PORTNAME}plugin
-NO_BUILD=	yes
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
+WRKSRC=			${WRKDIR}/coderanger-trac-mastertickets-a72a4e2
+
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_PKGNAME=	TracMasterTickets
 PYDISTUTILS_NOEGGINFO=	yes
 
+PLIST_SUB+=		PORTVERSION=${PORTVERSION} \
+			PYTHONVERSION=${_PYTHON_VERSION}
+PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/TracMasterTickets-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg
+
 .include <bsd.port.mk>
diff --git a/www/trac-mastertickets/distinfo b/www/trac-mastertickets/distinfo
index 688b7b641013..eb1f9b2a8836 100644
--- a/www/trac-mastertickets/distinfo
+++ b/www/trac-mastertickets/distinfo
@@ -1,3 +1,3 @@
-MD5 (masterticketsplugin-2.1.3.tar.gz) = f7b0d0672cace300634832e0adabca2e
-SHA256 (masterticketsplugin-2.1.3.tar.gz) = 1d8fd2cb742dbdcfb07efaf8156109753d96d2a60d981dfba79417ac1fe92cd8
-SIZE (masterticketsplugin-2.1.3.tar.gz) = 28009
+MD5 (masterticketsplugin-3.0.1.tar.gz) = d93e26760eb4fab9fd948eb70d3c20c0
+SHA256 (masterticketsplugin-3.0.1.tar.gz) = 7f3ecba42443b142dc7d29d6d91b8d33d02b356dd391009d8c64085f0b81fae2
+SIZE (masterticketsplugin-3.0.1.tar.gz) = 30096
diff --git a/www/trac-mastertickets/files/patch-mastertickets__model.py b/www/trac-mastertickets/files/patch-mastertickets__model.py
new file mode 100644
index 000000000000..a923a98802d8
--- /dev/null
+++ b/www/trac-mastertickets/files/patch-mastertickets__model.py
@@ -0,0 +1,11 @@
+--- ./mastertickets/model.py.orig	2010-07-11 23:51:58.000000000 -0400
++++ ./mastertickets/model.py	2010-09-08 18:41:35.000000000 -0400
+@@ -107,7 +107,7 @@
+             for tkt in arr:
+                 if isinstance(tkt, Ticket):
+                     tkt = tkt.id
+-                arr2.append(tkt)
++                arr2.append(str(tkt))
+             return '[%s]'%','.join(arr2)
+             
+         return '<mastertickets.model.TicketLinks #%s blocking=%s blocked_by=%s>'% \
diff --git a/www/trac-mastertickets/pkg-descr b/www/trac-mastertickets/pkg-descr
index 285aa614efcf..067a44da23b7 100644
--- a/www/trac-mastertickets/pkg-descr
+++ b/www/trac-mastertickets/pkg-descr
@@ -1,3 +1,11 @@
-Add support for ticket dependencies to Trac
+This plugin adds "blocks" and "blocked by" fields to each ticket,
+enabling you to express dependencies between tickets. It also
+provides a graphviz-based dependency-graph feature for those tickets
+having dependencies specified, allowing you to visually understand
+the dependency tree.
+
+The dependency graph is viewable by clicking 'depgraph' in the
+context (in the upper right corner) menu when viewing a ticket that
+blocks or is blocked by another ticket.
 
 WWW: http://trac-hacks.org/wiki/MasterTicketsPlugin
diff --git a/www/trac-mastertickets/pkg-plist b/www/trac-mastertickets/pkg-plist
deleted file mode 100644
index ea6972fd1268..000000000000
--- a/www/trac-mastertickets/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/TracMasterTickets-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg