Index: head/www/trac-OhlohWidgetsMacro/Makefile =================================================================== --- head/www/trac-OhlohWidgetsMacro/Makefile (revision 416080) +++ head/www/trac-OhlohWidgetsMacro/Makefile (revision 416081) @@ -1,22 +1,23 @@ # Created by: Douglas Thrift # $FreeBSD$ PORTNAME= OhlohWidgetsMacro PORTVERSION= 0.2 PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= trac- MAINTAINER= douglas@douglasthrift.net COMMENT= Trac macro to embed Ohloh widgets LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycerberus>=0.3:devel/py-pycerberus \ tracd:www/trac USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: head/www/trac-OhlohWidgetsMacro/files/patch-ohloh_widgets__macro.py =================================================================== --- head/www/trac-OhlohWidgetsMacro/files/patch-ohloh_widgets__macro.py (revision 416080) +++ head/www/trac-OhlohWidgetsMacro/files/patch-ohloh_widgets__macro.py (revision 416081) @@ -1,20 +1,20 @@ ---- ./ohloh_widgets/macro.py.orig 2013-06-17 12:52:47.000000000 -0700 -+++ ./ohloh_widgets/macro.py 2013-06-17 12:53:17.000000000 -0700 -@@ -46,7 +46,7 @@ +--- ohloh_widgets/macro.py.orig 2010-07-04 06:54:44 UTC ++++ ohloh_widgets/macro.py +@@ -46,7 +46,7 @@ class OhlohWidgetMacro(MacroWithValidati ![[OhlohWidget(project_id, widget_name)]] The macro gets two parameters which you can get from Ohloh's widget page - for your project (!http://www.ohloh.net/p//widgets) when you + for your project (!https://www.ohloh.net/p//widgets) when you look at the embeddable HTML snippet: * project_id -- a 6 digit number which identifies your project -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ class OhlohWidgetMacro(MacroWithValidati def url(self, parameters): query_string = '' - url_template = 'http://www.ohloh.net/p/%(project_id)d/widgets/%(widget_name)s.js' + url_template = 'https://www.ohloh.net/p/%(project_id)d/widgets/%(widget_name)s.js' widget_name = parameters.widget_name if '?' in widget_name: parameters['widget_name'], query_parameters = widget_name.split('?', 1) Index: head/www/trac-TracGoogleAnalytics/Makefile =================================================================== --- head/www/trac-TracGoogleAnalytics/Makefile (revision 416080) +++ head/www/trac-TracGoogleAnalytics/Makefile (revision 416081) @@ -1,24 +1,25 @@ # Created by: Douglas Thrift # $FreeBSD$ PORTNAME= TracGoogleAnalytics PORTVERSION= 0.2.4 PORTREVISION= 3 CATEGORIES= www devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= trac- MAINTAINER= douglas@douglasthrift.net COMMENT= Trac plugin to enable logging by Google Analytics LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= tracd:www/trac \ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-accountmanager/Makefile =================================================================== --- head/www/trac-accountmanager/Makefile (revision 416080) +++ head/www/trac-accountmanager/Makefile (revision 416081) @@ -1,36 +1,39 @@ # $FreeBSD$ PORTNAME= accountmanager PORTVERSION= 0.5.${REV} -PORTEPOCH= 1 PORTREVISION= 1 +PORTEPOCH= 1 CATEGORIES= www devel python MASTER_SITES= LOCAL/kuriyama \ http://trac-hacks.org/changeset/${REV}/accountmanagerplugin/trunk?old_path=/&format=zip&filename= PKGNAMEPREFIX= trac- DIST_SUBDIR= trac MAINTAINER= kuriyama@FreeBSD.org COMMENT= Account Manager Plugin for trac +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + RUN_DEPENDS= tracd:www/trac FETCH_BEFORE_ARGS= -o ${DISTFILES} REV= 12583 USES= python:2 zip USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/accountmanagerplugin/trunk +NO_ARCH= yes # --- 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" -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-advancedticketworkflow/Makefile =================================================================== --- head/www/trac-advancedticketworkflow/Makefile (revision 416080) +++ head/www/trac-advancedticketworkflow/Makefile (revision 416081) @@ -1,22 +1,22 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= advancedticketworkflow PORTVERSION= 0.10.3940 PORTREVISION= 3 CATEGORIES= www devel python MASTER_SITES= http://people.freebsd.org/~mm/trac/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Advanced Ticket Workflow Plugin for Trac -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11 USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-attachmentpolicy/Makefile =================================================================== --- head/www/trac-attachmentpolicy/Makefile (revision 416080) +++ head/www/trac-attachmentpolicy/Makefile (revision 416081) @@ -1,29 +1,29 @@ # Created by: Hung-Yi Chen # $FreeBSD$ PORTNAME= attachmentpolicy PORTVERSION= 0.1.0.${SVN_REV} PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= http://distfiles.cse.tw/ \ http://trac-hacks.org/changeset/${SVN_REV}/attachmentpolicyplugin?old_path=/&format=zip&filename=/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-r${SVN_REV} MAINTAINER= gaod@hychen.org COMMENT= Provides delete permission to Trac normal user LICENSE= BSD3CLAUSE SVN_REV= 12775 RUN_DEPENDS+= tracd:www/trac WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.12 USES= python:2 zip USE_PYTHON= distutils autoplist +NO_ARCH= yes FETCH_BEFORE_ARGS= -o ${DISTFILES} -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-autocomplete/Makefile =================================================================== --- head/www/trac-autocomplete/Makefile (revision 416080) +++ head/www/trac-autocomplete/Makefile (revision 416081) @@ -1,23 +1,23 @@ # Created by: Eygene Ryabinkin # $FreeBSD$ PORTNAME= autocomplete PORTVERSION= 0.4.1 PORTREVISION= 6 CATEGORIES= www python MASTER_SITES= http://dist.codelabs.ru/fbsd/ PKGNAMEPREFIX= trac- DISTNAME= autocompleteusersplugin-r${REL} MAINTAINER= rea@FreeBSD.org COMMENT= Plugin for autocompletion of user names in ticket fields -RUN_DEPENDS+= trac>=0.11:www/trac +RUN_DEPENDS= trac>=0.11:www/trac USES= python:2 zip USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/autocompleteusersplugin/0.11 +NO_ARCH= yes REL= 8451 -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-bzr/Makefile =================================================================== --- head/www/trac-bzr/Makefile (revision 416080) +++ head/www/trac-bzr/Makefile (revision 416081) @@ -1,27 +1,28 @@ # Created by: Radim Kolar # $FreeBSD$ PORTNAME= bzr PORTVERSION= 20110228 PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://schema.filez.com/distfiles/ PKGNAMEPREFIX= trac- DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= hsn@sendmail.cz COMMENT= Bazaar-NG plugin for Trac -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= tracd:www/trac \ bzr:devel/bzr USES= python:2 tar:bzip2 USE_PYTHON= distutils autoplist +NO_ARCH= yes post-patch: - ${REINPLACE_CMD} -e 's|tag_date = 1||' ${WRKSRC}/setup.cfg + @${REINPLACE_CMD} -e 's|tag_date = 1||' ${WRKSRC}/setup.cfg -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-childtickets/Makefile =================================================================== --- head/www/trac-childtickets/Makefile (revision 416080) +++ head/www/trac-childtickets/Makefile (revision 416081) @@ -1,27 +1,28 @@ # Created by: Radim Kolar # $FreeBSD$ PORTNAME= childtickets PORTVERSION= 2.5.2 PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= http://schema.filez.com/distfiles/ PKGNAMEPREFIX= trac- MAINTAINER= hsn@sendmail.cz COMMENT= Support for having child-tickets in Trac LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS+= trac>=0.12:www/trac +RUN_DEPENDS= trac>=0.12:www/trac USES= python:2 zip WRKSRC= ${WRKDIR}/childticketsplugin/0.12 USE_PYTHON= distutils autoplist +NO_ARCH= yes SUB_FILES= pkg-message -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-customfieldadmin/Makefile =================================================================== --- head/www/trac-customfieldadmin/Makefile (revision 416080) +++ head/www/trac-customfieldadmin/Makefile (revision 416081) @@ -1,24 +1,28 @@ # Created by: Greg Larkin # $FreeBSD$ PORTNAME= customfieldadmin PORTVERSION= 0.2.2.6485 PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www devel python MASTER_SITES= http://www.sourcehosting.net/freebsd/distfiles/ \ LOCAL/glarkin PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Web interface to administer Trac ticket custom fields -RUN_DEPENDS+= tracd:www/trac +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt +RUN_DEPENDS= tracd:www/trac + USES= python:2 zip WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11 USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: head/www/trac-datefield/Makefile =================================================================== --- head/www/trac-datefield/Makefile (revision 416080) +++ head/www/trac-datefield/Makefile (revision 416081) @@ -1,23 +1,23 @@ # Created by: Eygene Ryabinkin # $FreeBSD$ PORTNAME= datefield PORTVERSION= 1.0.1 PORTREVISION= 4 CATEGORIES= www python MASTER_SITES= http://dist.codelabs.ru/fbsd/ PKGNAMEPREFIX= trac- DISTNAME= datefieldplugin-r${REL} MAINTAINER= rea@FreeBSD.org COMMENT= Plugin for creating date fields -RUN_DEPENDS+= trac>=0.11:www/trac +RUN_DEPENDS= trac>=0.11:www/trac USES= python:2 zip USE_PYTHON= distutils autoplist +NO_ARCH= yes WRKSRC= ${WRKDIR}/datefieldplugin/0.11 REL= 7267 -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-defaultcc/Makefile =================================================================== --- head/www/trac-defaultcc/Makefile (revision 416080) +++ head/www/trac-defaultcc/Makefile (revision 416081) @@ -1,25 +1,27 @@ # Created by: Eygene Ryabinkin # $FreeBSD$ PORTNAME= defaultcc PORTVERSION= 0.1 PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= http://dist.codelabs.ru/fbsd/trac-${PORTNAME}/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-r${REL} MAINTAINER= rea@FreeBSD.org COMMENT= Plugin that adds default CC value for tickets -RUN_DEPENDS+= trac>=0.11:www/trac +LICENSE= GPLv2 +RUN_DEPENDS= trac>=0.11:www/trac + USES= python:2 zip USE_PYTHON= distutils autoplist +NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME}plugin/trunk REL= 10605 -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-discussion/Makefile =================================================================== --- head/www/trac-discussion/Makefile (revision 416080) +++ head/www/trac-discussion/Makefile (revision 416081) @@ -1,33 +1,33 @@ # $FreeBSD$ PORTNAME= discussion PORTVERSION= 0.7 PORTREVISION= 2 CATEGORIES= www devel python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org COMMENT= Discussion forum plugin for Trac -RUN_DEPENDS+= tracd:www/trac \ +RUN_DEPENDS= tracd:www/trac \ trac-TracSpamFilter>=0.2.1:www/trac-spam-filter USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes # Maintainter targets below this point # Retrieve the latest version from SVN and package in a tarball. .if defined(BOOTSTRAP) FETCH_DEPENDS+= svn:devel/subversion do-fetch: ${MKDIR} ${WRKDIR} cd ${WRKDIR} && \ svn export http://trac-hacks.org/svn/discussionplugin/0.11/ \ ${DISTNAME} - cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME} .endif -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-down/Makefile =================================================================== --- head/www/trac-down/Makefile (revision 416080) +++ head/www/trac-down/Makefile (revision 416081) @@ -1,21 +1,21 @@ # Created by: Li-Wen Hsu # $FreeBSD$ PORTNAME= down PORTVERSION= 0.0.1.r11 PORTREVISION= 4 CATEGORIES= www devel python MASTER_SITES= http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/ PKGNAMEPREFIX= trac- DISTNAME= TracDown-${PORTVERSION:E} MAINTAINER= lwhsu@FreeBSD.org COMMENT= Trac plugin for listing released downloads RUN_DEPENDS= tracd:www/trac USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-estimator/Makefile =================================================================== --- head/www/trac-estimator/Makefile (revision 416080) +++ head/www/trac-estimator/Makefile (revision 416081) @@ -1,21 +1,22 @@ # $FreeBSD$ PORTNAME= estimator PORTVERSION= 0.1.1 PORTREVISION= 4 CATEGORIES= www devel python MASTER_SITES= http://www.sourcehosting.net/freebsd/distfiles/ \ LOCAL/glarkin PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Produce detailed range-based estimations for Trac tickets -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11 USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: head/www/trac-fivestarvote/Makefile =================================================================== --- head/www/trac-fivestarvote/Makefile (revision 416080) +++ head/www/trac-fivestarvote/Makefile (revision 416081) @@ -1,32 +1,32 @@ # $FreeBSD$ PORTNAME= fivestarvote PORTVERSION= 0.1 PORTREVISION= 4 CATEGORIES= www devel python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org COMMENT= Five star plugin for voting on Trac resources -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes # Maintainter targets below this point # Retrieve the latest version from SVN and package in a tarball. .if defined(BOOTSTRAP) FETCH_DEPENDS+= svn:devel/subversion do-fetch: ${MKDIR} ${WRKDIR} cd ${WRKDIR} && \ svn export http://trac-hacks.org/svn/fivestarvoteplugin/0.11/ \ ${DISTNAME} cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME} .endif -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-fullblog/Makefile =================================================================== --- head/www/trac-fullblog/Makefile (revision 416080) +++ head/www/trac-fullblog/Makefile (revision 416081) @@ -1,31 +1,31 @@ # $FreeBSD$ PORTNAME= fullblog PORTVERSION= 0.1.1 PORTREVISION= 2 CATEGORIES= www devel python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} DIST_SUBDIR= trac MAINTAINER= ports@FreeBSD.org COMMENT= Plugin that provides a project Blog -RUN_DEPENDS+= htmldoc:textproc/htmldoc \ +RUN_DEPENDS= htmldoc:textproc/htmldoc \ tracd:www/trac USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes .if defined(BOOTSTRAP) do-fetch: ${MKDIR} ${WRKDIR} svn export http://trac-hacks.org/svn/fullblogplugin/0.11/ ${WRKSRC} ${MKDIR} ${_DISTDIR} cd ${WRKDIR} && \ - tar cfvz ${_DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME} + ${TAR} cfvz ${_DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME} .endif -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-fullblognotification/Makefile =================================================================== --- head/www/trac-fullblognotification/Makefile (revision 416080) +++ head/www/trac-fullblognotification/Makefile (revision 416081) @@ -1,31 +1,31 @@ # $FreeBSD$ PORTNAME= fullblognotification PORTVERSION= 0.2.1 PORTREVISION= 2 CATEGORIES= www devel python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} DIST_SUBDIR= trac MAINTAINER= ports@FreeBSD.org COMMENT= Plugin that provides a project Blog -RUN_DEPENDS+= trac-fullblog>=0.1.1:www/trac-fullblog +RUN_DEPENDS= trac-fullblog>=0.1.1:www/trac-fullblog USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes .if defined(BOOTSTRAP) do-fetch: ${MKDIR} ${WRKDIR} svn export http://trac-hacks.org/svn/fullblognotificationplugin/0.12/ \ ${WRKSRC} ${MKDIR} ${_DISTDIR} cd ${WRKDIR} && \ tar cfvz ${_DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME} .endif -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-graphviz/Makefile =================================================================== --- head/www/trac-graphviz/Makefile (revision 416080) +++ head/www/trac-graphviz/Makefile (revision 416081) @@ -1,32 +1,33 @@ # $FreeBSD$ PORTNAME= ${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl} PORTVERSION= 0.7.4 PORTREVISION= 8 CATEGORIES= www devel graphics python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Graphviz plugin for Trac's wiki LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS+= urwfonts>0:x11-fonts/urwfonts \ +RUN_DEPENDS= urwfonts>0:x11-fonts/urwfonts \ dot:graphics/graphviz \ tracd:www/trac USES= python:2 USE_PYTHON= autoplist distutils PYDISTUTILS_PKGNAME= graphviz NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME}plugin post-patch: - ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|%%PREFIX%%|${PREFIX}|' \ -e 's|%%OSMAJOR%%|${OSREL:C/\..*$//}|' \ - ${WRKSRC}/graphviz/graphviz.py + ${WRKSRC}/graphviz/graphviz.py .include Index: head/www/trac-graphviz/files/patch-graphviz_graphviz.py =================================================================== --- head/www/trac-graphviz/files/patch-graphviz_graphviz.py (revision 416080) +++ head/www/trac-graphviz/files/patch-graphviz_graphviz.py (revision 416081) @@ -1,36 +1,36 @@ ---- graphviz/graphviz.py.orig +--- graphviz/graphviz.py.orig 2008-10-13 16:24:45 UTC +++ graphviz/graphviz.py -@@ -16,11 +16,11 @@ +@@ -16,11 +16,11 @@ __docformat__ = 'restructuredtext' __version__ = '0.7.2' +import hashlib import inspect import locale import os import re -import sha import subprocess import sys -@@ -59,10 +59,7 @@ +@@ -59,10 +59,7 @@ class Graphviz(Component): 'c:\\Program Files\\ATT\\Graphviz\\bin', ], - 'freebsd6': ['/usr/local/bin', - ], - - 'freebsd5': ['/usr/local/bin', + 'freebsd%%OSMAJOR%%': ['%%LOCALBASE%%/bin', ], 'darwin': ['/opt/local/bin', -@@ -312,7 +309,7 @@ +@@ -312,7 +309,7 @@ class Graphviz(Component): encoded_cmd = (processor + unicode(self.processor_options)) \ .encode(self.encoding) encoded_content = content.encode(self.encoding) - sha_key = sha.new(encoded_cmd + encoded_content).hexdigest() + sha_key = hashlib.sha1(encoded_cmd + encoded_content).hexdigest() img_name = '%s.%s.%s' % (sha_key, processor, out_format) # cache: hash.. img_path = os.path.join(self.cache_dir, img_name) Index: head/www/trac-iniadmin/Makefile =================================================================== --- head/www/trac-iniadmin/Makefile (revision 416080) +++ head/www/trac-iniadmin/Makefile (revision 416081) @@ -1,22 +1,22 @@ # Created by: Gerrit Beine # $FreeBSD$ PORTNAME= iniadmin PORTVERSION= 0.2.3915 PORTREVISION= 3 CATEGORIES= www devel python MASTER_SITES= http://people.freebsd.org/~mm/trac/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Edit all trac.ini option via the WebAdminPlugin -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11 USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes` -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-keywords/Makefile =================================================================== --- head/www/trac-keywords/Makefile (revision 416080) +++ head/www/trac-keywords/Makefile (revision 416081) @@ -1,29 +1,31 @@ # Created by: Eygene Ryabinkin # $FreeBSD$ PORTNAME= keywords PORTVERSION= 0.2 PORTREVISION= 3 CATEGORIES= www python MASTER_SITES= http://dist.codelabs.ru/fbsd/ PKGNAMEPREFIX= trac- DISTNAME= trackeywordsplugin-r${REL} MAINTAINER= rea@FreeBSD.org COMMENT= Plugin for using pre-configured keywords -RUN_DEPENDS+= trac>=0.11:www/trac +LICENSE= BSD3CLAUSE +RUN_DEPENDS= trac>=0.11:www/trac + USES= python:2 zip USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/trackeywordsplugin/0.11 +NO_ARCH= yes REL= 7273 post-extract: # Fix misplaced Genshi template: https://trac-hacks.org/ticket/6104 @${MV} ${WRKDIR}/trackeywordsplugin/0.10/trackeywords/templates/keywords.html ${WRKSRC}/trackeywords/templates/ # Seems like web_ui.py was misplaced too. @${MV} ${WRKDIR}/trackeywordsplugin/0.10/trackeywords/web_ui.py ${WRKSRC}/trackeywords/ -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-keywords/files/patch-web_ui.py =================================================================== --- head/www/trac-keywords/files/patch-web_ui.py (revision 416080) +++ head/www/trac-keywords/files/patch-web_ui.py (nonexistent) @@ -1,12 +0,0 @@ ---- trackeywords/web_ui.py.orig 2009-09-09 17:18:34.000000000 +0400 -+++ trackeywords/web_ui.py 2010-04-05 11:32:50.000000000 +0400 -@@ -80,7 +80,8 @@ - - # changed to Genshi signature - def post_process_request(self, req, template, data, content_type): -- data['keywords'] = self._get_keywords() -+ if data is not None: -+ data['keywords'] = self._get_keywords() - return (template, data, content_type) - - ### ITemplateProvider methods Property changes on: head/www/trac-keywords/files/patch-web_ui.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/trac-keywords/files/patch-fix-javascript =================================================================== --- head/www/trac-keywords/files/patch-fix-javascript (revision 416080) +++ head/www/trac-keywords/files/patch-fix-javascript (revision 416081) @@ -1,22 +1,22 @@ ---- trackeywords/templates/keywords.cs.orig 2010-09-12 23:33:05.000000000 +0400 -+++ trackeywords/templates/keywords.cs 2010-09-12 23:33:25.000000000 +0400 -@@ -9,7 +9,7 @@ +--- trackeywords/templates/keywords.cs.orig 2007-09-11 15:09:40 UTC ++++ trackeywords/templates/keywords.cs +@@ -9,7 +9,7 @@ function initTags() { var el = document.getElementById('keywords'); var currentTags = el.value.split(/\s+/); for(i in currentTags) { - link = document.getElementById('add_' + currentTags[i]); + var link = document.getElementById('add_' + currentTags[i]); if(link) link.className = "sel"; } ---- trackeywords/templates/keywords.html.orig 2010-09-12 23:33:05.000000000 +0400 -+++ trackeywords/templates/keywords.html 2010-09-12 23:33:46.000000000 +0400 -@@ -14,7 +14,7 @@ +--- trackeywords/templates/keywords.html.orig 2009-09-09 13:18:34 UTC ++++ trackeywords/templates/keywords.html +@@ -14,7 +14,7 @@ function initTags() { var currentTags = el.value.split(/\s+/); for(i in currentTags) { - link = document.getElementById('add_' + currentTags[i]); + var link = document.getElementById('add_' + currentTags[i]); if(link) link.className = "sel"; } Index: head/www/trac-keywords/files/patch-trackeywords_web__ui.py =================================================================== --- head/www/trac-keywords/files/patch-trackeywords_web__ui.py (nonexistent) +++ head/www/trac-keywords/files/patch-trackeywords_web__ui.py (revision 416081) @@ -0,0 +1,12 @@ +--- trackeywords/web_ui.py.orig 2009-09-09 13:18:34 UTC ++++ trackeywords/web_ui.py +@@ -80,7 +80,8 @@ class TracKeywordsComponent(core.Compone + + # changed to Genshi signature + def post_process_request(self, req, template, data, content_type): +- data['keywords'] = self._get_keywords() ++ if data is not None: ++ data['keywords'] = self._get_keywords() + return (template, data, content_type) + + ### ITemplateProvider methods Property changes on: head/www/trac-keywords/files/patch-trackeywords_web__ui.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/trac-keywordsecretticket/Makefile =================================================================== --- head/www/trac-keywordsecretticket/Makefile (revision 416080) +++ head/www/trac-keywordsecretticket/Makefile (revision 416081) @@ -1,25 +1,27 @@ # Created by: Hung-Yi Chen # $FreeBSD$ PORTNAME= keywordsecretticket PORTVERSION= 1.0.1.${GITDATE} CATEGORIES= www devel python PKGNAMEPREFIX= trac- MAINTAINER= gaod@hychen.org COMMENT= Ticket security policy based on keyword for Trac LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING +RUN_DEPENDS= tracd:www/trac + USE_GITHUB= yes GH_ACCOUNT= KKBOX GH_PROJECT= trac-keyword-secret-ticket-plugin GH_TAGNAME= 98edea2 GITDATE= 20130401 -RUN_DEPENDS+= tracd:www/trac - USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: head/www/trac-ldap/Makefile =================================================================== --- head/www/trac-ldap/Makefile (revision 416080) +++ head/www/trac-ldap/Makefile (revision 416081) @@ -1,43 +1,42 @@ # $FreeBSD$ PORTNAME= ldap PORTVERSION= 0.7.0.${SVN_REVISION} CATEGORIES= www devel python MASTER_SITES= LOCAL/matthew PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} MAINTAINER= matthew@FreeBSD.org COMMENT= Trac plugin to use LDAP to store permissions LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS+= tracd:www/trac \ +RUN_DEPENDS= tracd:www/trac \ trac-accountmanager>0:www/trac-accountmanager NO_ARCH= yes PORTSCOUT= ignore:1 SVN_REVISION= 15146 USES= python:-2.7 USE_PYTHON= distutils autoplist # Maintainter targets below this point # Retrieve the latest version from SVN and package in a tarball. .if defined(BOOTSTRAP) FETCH_DEPENDS+= svn:devel/subversion do-fetch: ${MKDIR} ${WRKDIR} cd ${WRKDIR} && \ svn export --non-interactive \ --trust-server-cert-failures=unknown-ca \ --revision ${SVN_REVISION} \ https://trac-hacks.org/svn/${PORTNAME}plugin/0.12/ \ ${DISTNAME} cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME} .endif -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-ldapauthstore/Makefile =================================================================== --- head/www/trac-ldapauthstore/Makefile (revision 416080) +++ head/www/trac-ldapauthstore/Makefile (revision 416081) @@ -1,45 +1,44 @@ # $FreeBSD$ PORTNAME= ldapauthstore PORTVERSION= 0.3.2.${SVN_REVISION} CATEGORIES= www devel python MASTER_SITES= LOCAL/matthew PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} MAINTAINER= matthew@FreeBSD.org COMMENT= Trac AccountManager plugin using LDAP authentication store LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS+= tracd:www/trac \ +RUN_DEPENDS= tracd:www/trac \ trac-accountmanager>0:www/trac-accountmanager \ trac-ldap>0:www/trac-ldap \ ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap NO_ARCH= yes PORTSCOUT= ignore:1 SVN_REVISION= 15146 USES= python:-2.7 USE_PYTHON= distutils autoplist # Maintainter targets below this point # Retrieve the latest version from SVN and package in a tarball. .if defined(BOOTSTRAP) FETCH_DEPENDS+= svn:devel/subversion do-fetch: ${MKDIR} ${WRKDIR} cd ${WRKDIR} && \ svn export --non-interactive \ --trust-server-cert-failures=unknown-ca \ --revision ${SVN_REVISION} \ https://trac-hacks.org/svn/${PORTNAME}plugin/trunk/ \ ${DISTNAME} cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME} .endif -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-mastertickets/Makefile =================================================================== --- head/www/trac-mastertickets/Makefile (revision 416080) +++ head/www/trac-mastertickets/Makefile (revision 416081) @@ -1,25 +1,24 @@ # Created by: Gerrit Beine # $FreeBSD$ PORTNAME= mastertickets PORTVERSION= 3.0.2 PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= http://mirrors.redv.com/pub/trac/ \ LOCAL/glarkin PKGNAMEPREFIX= trac- DISTNAME= coderanger-trac-${PORTNAME}-43a7537 MAINTAINER= ports@FreeBSD.org COMMENT= Support for ticket dependencies +RUN_DEPENDS= trac>=0.12:www/trac + BROKEN= unfetchable -RUN_DEPENDS+= trac>=0.12:www/trac - -WRKSRC= ${WRKDIR}/${DISTNAME} - USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: head/www/trac-math/Makefile =================================================================== --- head/www/trac-math/Makefile (revision 416080) +++ head/www/trac-math/Makefile (revision 416081) @@ -1,36 +1,36 @@ # $FreeBSD$ PORTNAME= math PORTVERSION= 0.1 PORTREVISION= 7 CATEGORIES= www math python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org COMMENT= Support for LaTeX math formulas in wiki pages -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac USE_TEX= latex SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes # Maintainter targets below this point # Retrieve the latest version from SVN and package in a tarball. .if defined(BOOTSTRAP) FETCH_DEPENDS+= svn:devel/subversion do-fetch: ${MKDIR} ${WRKDIR} cd ${WRKDIR} && \ svn export http://trac-hacks.org/svn/tracmathplugin/ \ ${DISTNAME} cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME} .endif -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-math/files/patch-tracmath_tracmath.py =================================================================== --- head/www/trac-math/files/patch-tracmath_tracmath.py (revision 416080) +++ head/www/trac-math/files/patch-tracmath_tracmath.py (revision 416081) @@ -1,21 +1,21 @@ ---- tracmath/tracmath.py.orig +--- tracmath/tracmath.py.orig 2008-04-04 08:58:46 UTC +++ tracmath/tracmath.py -@@ -4,8 +4,8 @@ +@@ -4,8 +4,8 @@ This has currently been tested only on t """ import codecs +import hashlib import re -import sha from cStringIO import StringIO import os import sys -@@ -142,7 +142,7 @@ +@@ -142,7 +142,7 @@ class TracMathPlugin(Component): if m: label = m.group(1) - key = sha.new(content.encode('utf-8')).hexdigest() + key = hashlib.sha1(content.encode('utf-8')).hexdigest() imgname = key + '.png' imgpath = os.path.join(self.cacheDirectory, imgname) Index: head/www/trac-mercurial/Makefile =================================================================== --- head/www/trac-mercurial/Makefile (revision 416080) +++ head/www/trac-mercurial/Makefile (revision 416081) @@ -1,22 +1,24 @@ # $FreeBSD$ PORTNAME= mercurial PORTVERSION= 1.0.0.3 CATEGORIES= www devel python MASTER_SITES= LOCAL/rm PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} DIST_SUBDIR= trac MAINTAINER= ports@FreeBSD.org COMMENT= Plugin to use Mercurial instead of Subversion in Trac LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= hg:devel/mercurial \ tracd:www/trac USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: head/www/trac-navadd/Makefile =================================================================== --- head/www/trac-navadd/Makefile (revision 416080) +++ head/www/trac-navadd/Makefile (revision 416081) @@ -1,21 +1,21 @@ # $FreeBSD$ PORTNAME= navadd PORTVERSION= 0.1 PORTREVISION= 4 CATEGORIES= www devel python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Plugin for adding navigation items into Trac navigation bars -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME}plugin -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-permredirect/Makefile =================================================================== --- head/www/trac-permredirect/Makefile (revision 416080) +++ head/www/trac-permredirect/Makefile (revision 416081) @@ -1,25 +1,25 @@ # Created by: Grzegorz Blach # $FreeBSD$ PORTNAME= permredirect PORTVERSION= 3.0 PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= http://trac-hacks.org/changeset/${REV}/${PORTNAME}plugin/tags/${PORTVERSION}?old_path=${PORTNAME}plugin&format=zip&filename= \ LOCAL/gblach/ PKGNAMEPREFIX= trac- DIST_SUBDIR= trac MAINTAINER= ports@FreeBSD.org COMMENT= Redirect users to the login screen on PermissionError RUN_DEPENDS= tracd:www/trac FETCH_BEFORE_ARGS= -o ${DISTFILES} REV= 13353 USES= python zip:infozip USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/${PORTNAME}plugin/tags/${PORTVERSION} +NO_ARCH= yes -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-privatetickets/Makefile =================================================================== --- head/www/trac-privatetickets/Makefile (revision 416080) +++ head/www/trac-privatetickets/Makefile (revision 416081) @@ -1,21 +1,21 @@ # Created by: Li-Wen Hsu # $FreeBSD$ PORTNAME= privatetickets PORTVERSION= 2.0.2 PORTREVISION= 3 CATEGORIES= www devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= trac- DISTNAME= TracPrivateTickets-${PORTVERSION} MAINTAINER= lwhsu@FreeBSD.org COMMENT= Modified ticket security for Trac RUN_DEPENDS= tracd:www/trac USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-pydotorgtheme/Makefile =================================================================== --- head/www/trac-pydotorgtheme/Makefile (revision 416080) +++ head/www/trac-pydotorgtheme/Makefile (revision 416081) @@ -1,21 +1,21 @@ # $FreeBSD$ PORTNAME= pydotorgtheme PORTVERSION= 2.0 PORTREVISION= 4 CATEGORIES= www devel python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org COMMENT= Theme that emulates the look of python.org -RUN_DEPENDS+= tracd:www/trac \ +RUN_DEPENDS= tracd:www/trac \ trac-themeengine>=2.0:www/trac-themeengine USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME} -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-robotstxt/Makefile =================================================================== --- head/www/trac-robotstxt/Makefile (revision 416080) +++ head/www/trac-robotstxt/Makefile (revision 416081) @@ -1,23 +1,23 @@ # Created by: Martin Wilke # $FreeBSD$ PORTNAME= robotxt PORTVERSION= 1.0.1 PORTREVISION= 5 CATEGORIES= www devel python MASTER_SITES= http://freebsd.unixfreunde.de/sources/trac/ PKGNAMEPREFIX= trac- DISTNAME= TracRobotsTxt-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Allows simple management of a robots.txt -BROKEN= unfetchable - RUN_DEPENDS= tracd:www/trac +BROKEN= unfetchable + USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-scrumburndown/Makefile =================================================================== --- head/www/trac-scrumburndown/Makefile (revision 416080) +++ head/www/trac-scrumburndown/Makefile (revision 416081) @@ -1,22 +1,25 @@ # Created by: Greg Larkin # $FreeBSD$ PORTNAME= scrumburndown PORTVERSION= 1.9.2 PORTREVISION= 4 CATEGORIES= www devel python MASTER_SITES= http://www.sourcehosting.net/freebsd/distfiles/ \ LOCAL/glarkin PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org COMMENT= Plugin to enable Scrum burndown chart capabilities -RUN_DEPENDS+= tracd:www/trac \ +LICENSE= APACHE20 + +RUN_DEPENDS= tracd:www/trac \ trac-timingandestimation>=0:www/trac-timingandestimation WRKSRC= ${WRKDIR}/${PORTNAME}plugin USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: head/www/trac-spam-filter/Makefile =================================================================== --- head/www/trac-spam-filter/Makefile (revision 416080) +++ head/www/trac-spam-filter/Makefile (revision 416081) @@ -1,23 +1,23 @@ # Created by: sutra # $FreeBSD$ PORTNAME= TracSpamFilter PORTVERSION= 0.2.1 PORTREVISION= 6 CATEGORIES= www devel python MASTER_SITES= http://zhoushuqun.com/files/ \ http://freebsd.unixfreunde.de/sources/ PKGNAMEPREFIX= trac- MAINTAINER= zhoushuqun@gmail.com COMMENT= Allow different ways to reject contributions that contain spam RUN_DEPENDS= tracd:www/trac WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}dev USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-subtickets/Makefile =================================================================== --- head/www/trac-subtickets/Makefile (revision 416080) +++ head/www/trac-subtickets/Makefile (revision 416081) @@ -1,30 +1,30 @@ # Created by: Hung-Yi Chen # $FreeBSD$ PORTNAME= subtickets PORTVERSION= 0.2.0.${GITDATE} PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= http://distfiles.cse.tw/ PKGNAMEPREFIX= trac- # Should not be setting DISTNAME, USE_GITHUB already sets a very nice and unique distname. DISTNAME= itota-trac-subtickets-plugin-a0fc153 MAINTAINER= gaod@hychen.org COMMENT= Offers sub-ticket feature for managing tickets LICENSE= BSD3CLAUSE RUN_DEPENDS= tracd:www/trac USE_GITHUB= yes GH_ACCOUNT= itota GH_PROJECT= trac-subtickets-plugin GH_TAGNAME= a0fc153 GITDATE= 20130328 USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-subtickets/files/patch-setup.cfg =================================================================== --- head/www/trac-subtickets/files/patch-setup.cfg (revision 416080) +++ head/www/trac-subtickets/files/patch-setup.cfg (revision 416081) @@ -1,10 +1,10 @@ ---- setup.cfg.orig 2013-03-28 05:06:54.072148000 +0800 -+++ setup.cfg 2013-03-28 05:06:59.650566000 +0800 +--- setup.cfg.orig 2012-10-27 18:40:31 UTC ++++ setup.cfg @@ -1,6 +1,6 @@ [egg_info] tag_build = .dev -tag_date = True +tag_date = False [extract_messages] add_comments = TRANSLATOR: Index: head/www/trac-subtickets/files/patch-tracsubtickets_api.py =================================================================== --- head/www/trac-subtickets/files/patch-tracsubtickets_api.py (revision 416080) +++ head/www/trac-subtickets/files/patch-tracsubtickets_api.py (revision 416081) @@ -1,20 +1,20 @@ ---- tracsubtickets/api.py.orig 2013-03-28 05:19:20.898573000 +0800 -+++ tracsubtickets/api.py 2013-03-28 05:19:46.107341000 +0800 -@@ -153,7 +153,7 @@ +--- tracsubtickets/api.py.orig 2012-10-27 18:40:31 UTC ++++ tracsubtickets/api.py +@@ -153,7 +153,7 @@ class SubTicketsSystem(Component): (parent, ticket.id)) # add a comment to old parent xticket = Ticket(self.env, parent) - xticket.save_changes(author, _('Remove a subticket #%s.') % ticket.id) + xticket.save_changes(author, _('Remove a subticket #%s. (%s)') % (ticket.id, ticket['summary'])) tn = TicketNotifyEmail(self.env) tn.notify(xticket, newticket=False, modtime=xticket['changetime']) -@@ -164,7 +164,7 @@ +@@ -164,7 +164,7 @@ class SubTicketsSystem(Component): (parent, ticket.id)) # add a comment to new parent xticket = Ticket(self.env, parent) - xticket.save_changes(author, _('Add a subticket #%s.') % ticket.id) + xticket.save_changes(author, _('Add a subticket #%s. (%s)') % (ticket.id, ticket['summary'])) tn = TicketNotifyEmail(self.env) tn.notify(xticket, newticket=False, modtime=xticket['changetime']) Index: head/www/trac-tags/Makefile =================================================================== --- head/www/trac-tags/Makefile (revision 416080) +++ head/www/trac-tags/Makefile (revision 416081) @@ -1,47 +1,47 @@ # Created by: Gerrit Beine # $FreeBSD$ PORTNAME= tags DISTVERSION= 0.7.r${SVN_REV} PORTREVISION= 2 CATEGORIES= www devel python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DIST_SUBDIR= trac MAINTAINER= ports@FreeBSD.org COMMENT= Generic tags frontend for trac -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac USES= python:2 tar:bzip2 USE_PYTHON= distutils autoplist +NO_ARCH= yes -.include "${.CURDIR}/../../www/trac/plugin.mk" .include .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: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 .include Index: head/www/trac-tags/files/patch-tractags_model.py =================================================================== --- head/www/trac-tags/files/patch-tractags_model.py (revision 416080) +++ head/www/trac-tags/files/patch-tractags_model.py (revision 416081) @@ -1,21 +1,21 @@ ---- tractags/model.py.orig +--- tractags/model.py.orig 2011-12-14 21:19:06 UTC +++ tractags/model.py -@@ -62,17 +62,7 @@ +@@ -62,17 +62,7 @@ class TagModelProvider(Component): 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: Index: head/www/trac-themeengine/Makefile =================================================================== --- head/www/trac-themeengine/Makefile (revision 416080) +++ head/www/trac-themeengine/Makefile (revision 416081) @@ -1,22 +1,23 @@ # $FreeBSD$ PORTNAME= themeengine PORTVERSION= 2.1.3 PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= trac- DISTNAME= TracThemeEngine-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Plugin to simplify distributing and deploying themes and styles LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac USES= python:2 tar:bzip2 USE_PYTHON= distutils autoplist +NO_ARCH= yes -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-ticketimport/Makefile =================================================================== --- head/www/trac-ticketimport/Makefile (revision 416080) +++ head/www/trac-ticketimport/Makefile (revision 416081) @@ -1,33 +1,35 @@ # $FreeBSD$ PORTNAME= ticketimport PORTVERSION= 0.7c PORTREVISION= 3 CATEGORIES= www devel python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org COMMENT= Import or update tickets from a CSV file or Excel file -RUN_DEPENDS+= tracd:www/trac \ +LICENSE= BSD3CLAUSE # "same license as trac" + +RUN_DEPENDS= tracd:www/trac \ ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.1:textproc/py-xlrd USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes # Maintainter targets below this point # Retrieve the latest version from SVN and package in a tarball. .if defined(BOOTSTRAP) FETCH_DEPENDS+= svn:devel/subversion do-fetch: ${MKDIR} ${WRKDIR} cd ${WRKDIR} && \ svn export http://trac-hacks.org/svn/ticketimportplugin/0.11/ \ ${DISTNAME} cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME} .endif -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-tickettemplate/Makefile =================================================================== --- head/www/trac-tickettemplate/Makefile (revision 416080) +++ head/www/trac-tickettemplate/Makefile (revision 416081) @@ -1,24 +1,24 @@ # Created by: Eygene Ryabinkin # $FreeBSD$ PORTNAME= tickettemplate PORTVERSION= 0.7 PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= http://dist.codelabs.ru/fbsd/trac-${PORTNAME}/ PKGNAMEPREFIX= trac- DISTNAME= trac${PORTNAME}plugin-r${REL} MAINTAINER= rea@FreeBSD.org COMMENT= Plugin for making ticket templates -RUN_DEPENDS+= trac>=0.11:www/trac +RUN_DEPENDS= trac>=0.11:www/trac USES= python:2 zip USE_PYTHON= distutils autoplist +NO_ARCH= yes WRKSRC= ${WRKDIR}/trac${PORTNAME}plugin/0.11 REL= 10605 -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-timingandestimation/Makefile =================================================================== --- head/www/trac-timingandestimation/Makefile (revision 416080) +++ head/www/trac-timingandestimation/Makefile (revision 416081) @@ -1,22 +1,23 @@ # Created by: Greg Larkin # $FreeBSD$ PORTNAME= timingandestimation PORTVERSION= 1.0.8b PORTREVISION= 2 CATEGORIES= www devel python MASTER_SITES= http://www.sourcehosting.net/freebsd/distfiles/ \ LOCAL/glarkin PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Add estimation and time tracking functionality to Trac -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac WRKSRC= ${WRKDIR}/${PORTNAME}plugin/branches/trac0.12-Permissions USES= python:2 zip USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: head/www/trac-tocmacro/Makefile =================================================================== --- head/www/trac-tocmacro/Makefile (revision 416080) +++ head/www/trac-tocmacro/Makefile (revision 416081) @@ -1,20 +1,21 @@ # Created by: Gerrit Beine # $FreeBSD$ PORTNAME= tocmacro PORTVERSION= 11.0.0.3 PORTREVISION= 3 CATEGORIES= www devel python MASTER_SITES= http://people.freebsd.org/~mm/trac/ PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org COMMENT= Table of contents macro -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac WRKSRC= ${WRKDIR}/${PORTNAME} USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: head/www/trac-tracdragdrop/Makefile =================================================================== --- head/www/trac-tracdragdrop/Makefile (revision 416080) +++ head/www/trac-tracdragdrop/Makefile (revision 416081) @@ -1,29 +1,29 @@ # Created by: Hung-Yi Chen # $FreeBSD$ PORTNAME= tracdragdrop PORTVERSION= 0.12.0.10.${SVN_REV} PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= http://distfiles.cse.tw/ \ http://trac-hacks.org/changeset/${SVN_REV}/tracdragdropplugin?old_path=/&format=zip&filename=/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-r${SVN_REV} MAINTAINER= gaod@hychen.org COMMENT= Provides extends attachments list of Trac LICENSE= BSD3CLAUSE +RUN_DEPENDS= tracd:www/trac + SVN_REV= 12822 -RUN_DEPENDS+= tracd:www/trac - WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.12 USES= python:2 zip USE_PYTHON= distutils autoplist +NO_ARCH= yes FETCH_BEFORE_ARGS= -o ${DISTFILES} -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-tweakui/Makefile =================================================================== --- head/www/trac-tweakui/Makefile (revision 416080) +++ head/www/trac-tweakui/Makefile (revision 416081) @@ -1,32 +1,33 @@ # Created by: glarkin # $FreeBSD$ PORTNAME= tweakui PORTVERSION= 0.1.7413 PORTREVISION= 3 CATEGORIES= www devel python MASTER_SITES= http://www.sourcehosting.net/freebsd/distfiles/ \ LOCAL/glarkin PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Easily tweak Trac pages with JavaScript expressions -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac USES= dos2unix python zip DOS2UNIX_REGEX= .*\.(css|html|js|py|txt)$ +USE_PYTHON= distutils autoplist +NO_ARCH= yes EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} PORTEXAMPLES= * SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/trac${PORTNAME}plugin/0.11 -USE_PYTHON= distutils autoplist post-install: cd ${WRKSRC}/tractweakui/htdocs && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Index: head/www/trac-tweakui/pkg-descr =================================================================== --- head/www/trac-tweakui/pkg-descr (revision 416080) +++ head/www/trac-tweakui/pkg-descr (revision 416081) @@ -1,9 +1,9 @@ This plugin implements a Javascript deployment platform, enabling Trac administrators to easily tweak Trac pages with Javascript expressions. The plugin supports the Trac web admin system, and it can apply Javascript tweaks to multiple pages by matching their names with regular expressions. -WWW: http://trac-hacks.org/wiki/TracTweakUiPlugin +WWW: http://trac-hacks.org/wiki/TracTweakUiPlugin Index: head/www/trac-vote/Makefile =================================================================== --- head/www/trac-vote/Makefile (revision 416080) +++ head/www/trac-vote/Makefile (revision 416081) @@ -1,32 +1,32 @@ # $FreeBSD$ PORTNAME= vote PORTVERSION= 0.1.2 PORTREVISION= 3 CATEGORIES= www devel python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org COMMENT= Plugin for voting on Trac resources -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes # Maintainter targets below this point # Retrieve the latest version from SVN and package in a tarball. .if defined(BOOTSTRAP) FETCH_DEPENDS+= svn:devel/subversion do-fetch: ${MKDIR} ${WRKDIR} cd ${WRKDIR} && \ svn export http://trac-hacks.org/svn/voteplugin/0.11/ \ ${DISTNAME} cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME} .endif -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-watchlist/Makefile =================================================================== --- head/www/trac-watchlist/Makefile (revision 416080) +++ head/www/trac-watchlist/Makefile (revision 416081) @@ -1,33 +1,33 @@ # Created by: Hung-Yi Chen # $FreeBSD$ PORTNAME= watchlist PORTVERSION= 1.0.${SVN_REV} PORTREVISION= 3 CATEGORIES= www devel python MASTER_SITES= http://distfiles.cse.tw/ \ http://trac-hacks.org/changeset/${SVN_REV}/watchlistplugin?old_path=/&format=zip&filename=/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-r${SVN_REV} MAINTAINER= gaod@hychen.org COMMENT= Watchlist feature for wikis and tickets of Trac -LICENSE= GPLv3 +LICENSE= GPLv3+ +RUN_DEPENDS= tracd:www/trac + SVN_REV= 11526 -RUN_DEPENDS+= tracd:www/trac - WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.12 USES= python:2 zip USE_PYTHON= distutils autoplist +NO_ARCH= yes FETCH_BEFORE_ARGS= -o ${DISTFILES} post-extract: @${FIND} ${WRKSRC} -type f | ${XARGS} ${CHMOD} 644 @${FIND} ${WRKSRC} -type d | ${XARGS} ${CHMOD} 755 -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-watchlist/files/patch-trachwatchlist_plugin.py =================================================================== --- head/www/trac-watchlist/files/patch-trachwatchlist_plugin.py (revision 416080) +++ head/www/trac-watchlist/files/patch-trachwatchlist_plugin.py (nonexistent) @@ -1,11 +0,0 @@ ---- tracwatchlist/plugin.py.orig 2013-08-30 19:07:32.000000000 +0800 -+++ tracwatchlist/plugin.py 2013-08-30 19:08:43.000000000 +0800 -@@ -527,7 +527,7 @@ - self.set_notify(req, realm, res) - db.commit() - if redirectback and len(new_res) == 1: -- req.redirect(req.href(realm,new_res[0])) -+ req.redirect(req.href(realm,list(new_res)[0])) - action = 'view' - - elif action == "unwatch": Property changes on: head/www/trac-watchlist/files/patch-trachwatchlist_plugin.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/trac-watchlist/files/patch-tracwatchlist_plugin.py =================================================================== --- head/www/trac-watchlist/files/patch-tracwatchlist_plugin.py (nonexistent) +++ head/www/trac-watchlist/files/patch-tracwatchlist_plugin.py (revision 416081) @@ -0,0 +1,11 @@ +--- tracwatchlist/plugin.py.orig 2012-04-05 10:15:12 UTC ++++ tracwatchlist/plugin.py +@@ -527,7 +527,7 @@ class WatchlistPlugin(Component): + self.set_notify(req, realm, res) + db.commit() + if redirectback and len(new_res) == 1: +- req.redirect(req.href(realm,new_res[0])) ++ req.redirect(req.href(realm,list(new_res)[0])) + action = 'view' + + elif action == "unwatch": Property changes on: head/www/trac-watchlist/files/patch-tracwatchlist_plugin.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/trac-watchlist/files/patch-tracwatchlist_util.py =================================================================== --- head/www/trac-watchlist/files/patch-tracwatchlist_util.py (revision 416080) +++ head/www/trac-watchlist/files/patch-tracwatchlist_util.py (revision 416081) @@ -1,13 +1,13 @@ ---- tracwatchlist/util.py.orig 2013-08-15 04:15:56.000000000 +0800 -+++ tracwatchlist/util.py 2013-08-15 04:16:05.000000000 +0800 -@@ -198,8 +198,8 @@ +--- tracwatchlist/util.py.orig 2010-09-25 16:12:54 UTC ++++ tracwatchlist/util.py +@@ -198,8 +198,8 @@ def convert_LDML_to_MySQL( ldml_pattern try: from babel.dates import get_datetime_format, get_date_format, get_time_format def datetime_format(format='medium', locale=LC_TIME): - time_format = unicode(get_time_format(format, locale)) - date_format = unicode(get_date_format(format, locale)) + time_format = unicode(get_time_format(format, locale=locale)) + date_format = unicode(get_date_format(format, locale=locale)) return convert_LDML_to_MySQL( get_datetime_format(format, locale)\ .replace('{0}', time_format)\ .replace('{1}', date_format) ) Index: head/www/trac-wikigoodies/Makefile =================================================================== --- head/www/trac-wikigoodies/Makefile (revision 416080) +++ head/www/trac-wikigoodies/Makefile (revision 416081) @@ -1,23 +1,26 @@ # Created by: Alexey V. Degtyarev # $FreeBSD$ PORTNAME= wikigoodies PORTVERSION= 0.3.3522 PORTREVISION= 3 CATEGORIES= www devel python MASTER_SITES= ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin.${PORTVERSION} MAINTAINER= alexey@renatasystems.org COMMENT= Plugin for Trac which extends the Wiki with some goodies +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + RUN_DEPENDS= tracd:www/trac WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11 USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-wikinotification/Makefile =================================================================== --- head/www/trac-wikinotification/Makefile (revision 416080) +++ head/www/trac-wikinotification/Makefile (revision 416081) @@ -1,20 +1,24 @@ # Created by: Gerrit Beine # $FreeBSD$ PORTNAME= wikinotificationplugin PORTVERSION= 0.2.1 PORTREVISION= 5 CATEGORIES= www devel python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org COMMENT= Allow email notifications on wiki page changes -RUN_DEPENDS+= tracd:www/trac +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE +RUN_DEPENDS= tracd:www/trac + WRKSRC= ${WRKDIR}/${PORTNAME} USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: head/www/trac-wikinotification/files/patch-WikiNotification__notification.py =================================================================== --- head/www/trac-wikinotification/files/patch-WikiNotification__notification.py (revision 416080) +++ head/www/trac-wikinotification/files/patch-WikiNotification__notification.py (revision 416081) @@ -1,79 +1,79 @@ ---- ./WikiNotification/notification.py.orig -+++ ./WikiNotification/notification.py +--- WikiNotification/notification.py.orig 2008-03-14 09:02:03 UTC ++++ WikiNotification/notification.py @@ -14,14 +14,13 @@ # ============================================================================= import re -import md5 from trac import __version__ from trac.core import * from trac.util.text import CRLF from trac.wiki.model import WikiPage from trac.versioncontrol.diff import unified_diff -from trac.notification import NotifyEmail +from trac.notification import NotifyEmail, NotificationSystem from trac.config import Option, BoolOption, ListOption, IntOption from genshi.template.text import TextTemplate -@@ -33,6 +32,7 @@ +@@ -33,6 +32,7 @@ diff_header = """Index: %(name)s +++ %(name)s (version: %(version)s) """ + class WikiNotificationSystem(Component): smtp_from = Option( 'wiki-notification', 'smtp_from', 'trac+wiki@localhost', -@@ -131,7 +131,7 @@ +@@ -131,7 +131,7 @@ class WikiNotifyEmail(NotifyEmail): if page.version > 0 and action == 'modified': diff = diff_header % {'name': self.page.name, 'version': self.page.version, - 'oldversion': self.page.version -1 + 'oldversion': self.page.version -1, } oldpage = WikiPage(self.env, page.name, page.version - 1) self.data["oldversion"]= oldpage.version -@@ -183,8 +183,8 @@ +@@ -183,8 +183,8 @@ class WikiNotifyEmail(NotifyEmail): public_cc = self.config.getbool('wiki-notification', 'use_public_cc') headers = {} headers['X-Mailer'] = 'Trac %s, by Edgewall Software' % __version__ - headers['X-Trac-Version'] = __version__ - headers['X-Trac-Project'] = projname + headers['X-Trac-Version'] = __version__ + headers['X-Trac-Project'] = projname headers['X-URL'] = self.config.get('project', 'url') headers['Precedence'] = 'bulk' headers['Auto-Submitted'] = 'auto-generated' -@@ -284,18 +284,16 @@ +@@ -284,18 +284,16 @@ class WikiNotifyEmail(NotifyEmail): del msg['Content-Transfer-Encoding'] msg.set_charset(self._charset) - self.add_headers(msg, headers); - self.add_headers(msg, mime_headers); - self.env.log.info("Sending SMTP notification to %s:%d to %s" - % (self.smtp_server, self.smtp_port, recipients)) + self.add_headers(msg, headers) + self.add_headers(msg, mime_headers) + self.env.log.info("Sending SMTP notification to %s" + % str(recipients)) msgtext = msg.as_string() # Ensure the message complies with RFC2822: use CRLF line endings recrlf = re.compile("\r?\n") msgtext = CRLF.join(recrlf.split(msgtext)) - try: - self.server.sendmail(msg['From'], recipients, msgtext) - except Exception, err: - self.env.log.debug('Notification could not be sent: %r', err) + NotificationSystem(self.env).send_email(self.from_email, recipients, + msgtext) def format_subject(self, action): template = self.config.get('wiki-notification', 'subject_template') -@@ -308,6 +306,6 @@ +@@ -308,6 +306,6 @@ class WikiNotifyEmail(NotifyEmail): data = { 'page': self.page, 'prefix': prefix, - 'action': action + 'action': action, } return template.generate(**data).render('text', encoding=None).strip() Index: head/www/trac-wikinotification/files/patch-WikiNotification__templates__wiki_notification_email_template.txt =================================================================== --- head/www/trac-wikinotification/files/patch-WikiNotification__templates__wiki_notification_email_template.txt (revision 416080) +++ head/www/trac-wikinotification/files/patch-WikiNotification__templates__wiki_notification_email_template.txt (revision 416081) @@ -1,59 +1,59 @@ ---- ./WikiNotification/templates/wiki_notification_email_template.txt.orig 2008-03-14 05:02:03.000000000 -0400 -+++ ./WikiNotification/templates/wiki_notification_email_template.txt 2010-10-08 11:41:19.000000000 -0400 +--- WikiNotification/templates/wiki_notification_email_template.txt.orig 2008-03-14 09:02:03 UTC ++++ WikiNotification/templates/wiki_notification_email_template.txt @@ -1,40 +1,40 @@ -#if action == 'added' +{% if action == 'added' %} Added page "${name}" by ${author} from ${ip}* Page URL: <${link}> - #if comment + {% if comment %} Comment: ${comment} - #end + {% end %} Content: -------8<------8<------8<------8<------8<------8<------8<------8<-------- ${text} -------8<------8<------8<------8<------8<------8<------8<------8<-------- -#end -#if action == 'modified' +{% end %} +{% if action == 'modified' %} Changed page "${name}" by ${author} from ${ip}* Page URL: <${link}> Diff URL: <${linkdiff}> Revision ${version} - #if comment + {% if comment %} Comment: ${comment} - #end + {% end %} - #if wikidiff!=None + {% if wikidiff!=None %} -------8<------8<------8<------8<------8<------8<------8<------8<-------- ${wikidiff} -------8<------8<------8<------8<------8<------8<------8<------8<-------- - #end - #if wikidiff==None + {% end %} + {% if wikidiff==None %} Changes on attached ${name}.diff file. - #end -#end -#if action == 'deleted' + {% end %} +{% end %} +{% if action == 'deleted' %} Deleted page "${name}" by ${author} from ${ip}* -#end -#if action == 'deleted_version' +{% end %} +{% if action == 'deleted_version' %} Page URL: <${link}> Deleted version "${version}" of page "${name}" by ${author} from ${ip}* -#end +{% end %} * The IP shown here might not mean anything if the user or the server is behind a proxy. Index: head/www/trac-wikitemplates/Makefile =================================================================== --- head/www/trac-wikitemplates/Makefile (revision 416080) +++ head/www/trac-wikitemplates/Makefile (revision 416081) @@ -1,23 +1,27 @@ # Created by: Gerrit Beine # $FreeBSD$ PORTNAME= wikitemplates PORTVERSION= 0.3.0p3 PORTREVISION= 6 CATEGORIES= www devel python MASTER_SITES= http://www.sourcehosting.net/freebsd/distfiles/ \ LOCAL/glarkin PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION:S/p/rc/} MAINTAINER= ports@FreeBSD.org COMMENT= Templates for the Trac wiki -RUN_DEPENDS+= tracd:www/trac +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + +RUN_DEPENDS= tracd:www/trac # ${PYTHON_SITELIBDIR}/TracCtxtnavAdd-2.0-py${PYTHON_VER}.egg:www/trac-ctxtnavadd WRKSRC= ${WRKDIR}/${PORTNAME}plugin USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: head/www/trac-wikitopdf/Makefile =================================================================== --- head/www/trac-wikitopdf/Makefile (revision 416080) +++ head/www/trac-wikitopdf/Makefile (revision 416081) @@ -1,22 +1,22 @@ # $FreeBSD$ PORTNAME= wikitopdf PORTVERSION= 2.2.2 PORTREVISION= 6 CATEGORIES= www devel python MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Plugin to generate PDF documents from the Wiki -RUN_DEPENDS+= htmldoc:textproc/htmldoc \ +RUN_DEPENDS= htmldoc:textproc/htmldoc \ tracd:www/trac USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME}plugin -.include "${.CURDIR}/../../www/trac/plugin.mk" .include Index: head/www/trac-wysiwyg/Makefile =================================================================== --- head/www/trac-wysiwyg/Makefile (revision 416080) +++ head/www/trac-wysiwyg/Makefile (revision 416081) @@ -1,43 +1,44 @@ # Created by: Greg Larkin # $FreeBSD$ PORTNAME= wysiwyg DISTVERSION= 0.4.${SVN_REV} PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= http://www.sourcehosting.net/freebsd/distfiles/ \ LOCAL/brooks PKGNAMEPREFIX= trac- DIST_SUBDIR= trac MAINTAINER= ports@FreeBSD.org COMMENT= WYSIWYG editor for Trac wiki -RUN_DEPENDS+= tracd:www/trac +RUN_DEPENDS= tracd:www/trac USES= python:2 tar:bzip2 USE_PYTHON= distutils autoplist +NO_ARCH= yes .include .if !defined(SVN_REV) .if defined(BOOTSTRAP) SVN_URL= http://trac-hacks.org/svn/tracwysiwygplugin/0.12/ LANG= "C" SVN_REV!= svn info ${SVN_URL} | ${GREP} Revision | cut -d' ' -f2 .else .include "Makefile.svn_rev" .endif .endif .if defined(BOOTSTRAP) || defined(SVN_FETCH) FETCH_DEPENDS+= svn:devel/subversion do-fetch: ${MKDIR} ${WRKDIR} svn export -r ${SVN_REV} ${SVN_URL} ${WRKSRC} cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.tar.bz2 ${DISTNAME} echo "SVN_REV= ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev .endif .include Index: head/www/trac-xmlrpc/Makefile =================================================================== --- head/www/trac-xmlrpc/Makefile (revision 416080) +++ head/www/trac-xmlrpc/Makefile (revision 416081) @@ -1,27 +1,28 @@ # Created by: Gerrit Beine # $FreeBSD$ PORTNAME= xmlrpc PORTVERSION= 1.1.2.r${SVN_REV} PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= http://www.sourcehosting.net/freebsd/distfiles/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-r${SVN_REV} MAINTAINER= ports@FreeBSD.org COMMENT= Provides an XML-RPC interface to Trac LICENSE= BSD3CLAUSE +RUN_DEPENDS= tracd:www/trac + SVN_REV= 13203 -RUN_DEPENDS+= tracd:www/trac - WRKSRC= ${WRKDIR}/${PORTNAME}plugin/trunk FETCH_BEFORE_ARGS= -o ${DISTFILES} USES= python:2 zip USE_PYTHON= distutils autoplist +NO_ARCH= yes .include