Upgrade to the latest version in svn. Since the port has never installed a

wiki_namespace table, remove the braindead code that checks for one and
spews two lines of postgres log messages each time the plugin starts (over
two lines per second in my slightly crazy enviornment).

5 files changed, 62 insertions, 10 deletions

diff --git a/www/trac-tags/Makefile b/www/trac-tags/Makefile
index 015e6c46bd0..b8511aedd89 100644
--- a/www/trac-tags/Makefile
+++ b/www/trac-tags/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	tags
-PORTVERSION=	0.6
-PORTREVISION=	2
+DISTVERSION=	0.7.r${SVN_REV}
 CATEGORIES=	www devel python
-MASTER_SITES=	http://www.gerritbeine.de/download/trac/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	brooks
 PKGNAMEPREFIX=	trac-
-DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
+DIST_SUBDIR=	trac
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	A generic tags frontend for trac
@@ -19,15 +19,42 @@ COMMENT=	A generic tags frontend for trac
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
 
+USE_BZIP2=	yes
 USE_PYTHON=	yes
 NO_BUILD=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=	TracTags
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
-WRKSRC=		${WRKDIR}/${PORTNAME}plugin
+EGGVERSION=	${PORTVERSION:C/\.r.*/dev/}
+PLIST_SUB+=	EGGVERSION=${EGGVERSION} PYTHONVERSION=${_PYTHON_VERSION}
 PYDISTUTILS_NOEGGINFO=	yes
 
+.include <bsd.port.pre.mk>
+
+.if !defined(SVN_REV)
+.if defined(BOOTSTRAP)
+LANG=           "C"
+SVN_REV!=       svn info http://trac-hacks.org/svn/tagsplugin/trunk/ | ${GREP} Revision | cut -d' ' -f2
+.else
+.include "Makefile.svn_rev"
+.endif
+.endif
+
+.if defined(BOOTSTRAP) || defined(SVN_FETCH)
+FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
+
+do-fetch:
+	${MKDIR} ${WRKDIR}
+	svn export -r ${SVN_REV} \
+	    http://trac-hacks.org/svn/tagsplugin/trunk/ ${WRKSRC}
+	cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
+	echo "SVN_REV=  ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev
+.if ${USER} == brooks
+	scp ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.tar.bz2 \
+	    freefall.freebsd.org:public_distfiles/
+.endif
+.endif
+
 do-build:
 	@${DO_NADA}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/trac-tags/Makefile.svn_rev b/www/trac-tags/Makefile.svn_rev
new file mode 100644
index 00000000000..c45cee58827
--- /dev/null
+++ b/www/trac-tags/Makefile.svn_rev
@@ -0,0 +1 @@
+SVN_REV=  11504
diff --git a/www/trac-tags/distinfo b/www/trac-tags/distinfo
index 50f286e4e4f..b6385d4dcdf 100644
--- a/www/trac-tags/distinfo
+++ b/www/trac-tags/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tagsplugin-0.6.tar.gz) = c92b86e6f5136f5234f408644b982c075e99786657be831177105ceccb0a4719
-SIZE (tagsplugin-0.6.tar.gz) = 42916
+SHA256 (trac/tags-0.7.r11504.tar.bz2) = d4ca2ad73d8e3ab197b854639daf41747ba3bcacccbedd0e0ecc9c291a588353
+SIZE (trac/tags-0.7.r11504.tar.bz2) = 25799
diff --git a/www/trac-tags/files/patch-tractags_model.py b/www/trac-tags/files/patch-tractags_model.py
new file mode 100644
index 00000000000..6e7e45c83bb
--- /dev/null
+++ b/www/trac-tags/files/patch-tractags_model.py
@@ -0,0 +1,24 @@
+
+$FreeBSD$
+
+--- tractags/model.py.orig
++++ tractags/model.py
+@@ -62,17 +62,7 @@
+         self._upgrade_db(db)
+ 
+     def _need_migration(self, db):
+-        try:
+-            cursor = db.cursor()
+-            cursor.execute("SELECT COUNT(*) FROM wiki_namespace")
+-            cursor.fetchone()
+-            self.env.log.debug("tractags needs to migrate old data")
+-            return True
+-        except Exception, e:
+-            # The expected outcome for any up-to-date installation.
+-            if self.rollback_is_safe:
+-                db.rollback()
+-            return False
++	return False
+ 
+     def _upgrade_db(self, db):
+         try:
diff --git a/www/trac-tags/pkg-plist b/www/trac-tags/pkg-plist
index 3028877f6e4..fea5199d504 100644
--- a/www/trac-tags/pkg-plist
+++ b/www/trac-tags/pkg-plist
@@ -1 +1 @@
-%%PYTHON_SITELIBDIR%%/TracTags-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg
+%%PYTHON_SITELIBDIR%%/TracTags-%%EGGVERSION%%-py%%PYTHONVERSION%%.egg