Updated www/trac to 0.11.1

Trac 0.11.1 (August 6, 2008)
http://svn.edgewall.org/repos/trac/tags/trac-0.11.1

 Trac 0.11.1 contains a number of bug fixes and minor enhancements.
 The following list contains only a few highlights:

 * Improved DB connection handling (new connection pool)
 * Better MySQL backend unicode support. "utf8" and "utf8_bin" is the
   recommended database charset and collation settings.
 * Fixes intermittent "constraint violation" and "invalid form token"
   error messages.
 * Fixes roadmap layout glitch in Firefox 3.
 * Safer default umask value for tracd (can be set using --umask option)
 * Better default PYTHON_EGG_CACHE value.

 The complete list of closed tickets can be found here:
   http://trac.edgewall.org/query?status=closed&milestone=0.11.1

Trac 0.11 'Genshi' (June 22, 2008)
http://svn.edgewall.org/repos/trac/tags/trac-0.11

 Trac 0.11 contains a great number of new features, improvements and
 bug fixes. The following list contains only a few highlights:

 * New template engine for generating content (Genshi)
 * New configurable workflow in the ticket subsystem
 * Finer-grained control of permissions
 * Support for Pygments as the default syntax highlighter
 * Improved repository browser ("blame" support, dynamic in-place
   expansion of folders)
 * Improved user preferences subsystem, among which the possibility for
 * any user to select their time zone and disable access keys
 * The WebAdmin plugin is now an integral part of Trac
 * Paging of timeline and query results.

 A more complete list of new features can be found in the RELEASE file.
 The complete list of closed tickets can be found here:
   http://trac.edgewall.org/query?status=closed&milestone=0.11

5 files changed, 310 insertions, 192 deletions

diff --git a/www/trac/MESSAGE b/www/trac/MESSAGE
index 2ef906bce2a..8c9d2d11451 100644
--- a/www/trac/MESSAGE
+++ b/www/trac/MESSAGE
@@ -1,5 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/11/03 23:04:29 epg Exp $
+$NetBSD: MESSAGE,v 1.3 2008/09/12 10:18:11 abs Exp $
+
+The default database has changed from sqlite2 in 0.10.x to sqlite3
+in 0.11.x. Set PKG_OPTIONS.trac=sqlite2 for the old behaviour.
 
 You must upgrade existing Trac environments before using a new
 version:
diff --git a/www/trac/Makefile b/www/trac/Makefile
index 45d10bfbcdd..462a576ea00 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2008/08/18 00:55:48 epg Exp $
+# $NetBSD: Makefile,v 1.34 2008/09/12 10:18:11 abs Exp $
 #
 
-DISTNAME=	trac-0.10.5
+DISTNAME=	Trac-0.11.1
+PKGNAME=	${DISTNAME:tl}
+EGG_NAME=	${DISTNAME}
 CATEGORIES=	devel www
 MASTER_SITES=	http://ftp.edgewall.org/pub/trac/ \
 		ftp://ftp.edgewall.org/pub/trac/
@@ -10,19 +12,22 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://trac.edgewall.org/
 COMMENT=	Subversion repository browser, wiki, and issue tracking system
 
-DEPENDS+=	${PYPKGPREFIX}-clearsilver>=0.9.14:../../www/py-clearsilver
+DEPENDS+=	${PYPKGPREFIX}-genshi>=0:../../www/py-genshi
 DEPENDS+=	${PYPKGPREFIX}-subversion>=1.1.0:../../devel/py-subversion
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.trac
 PKG_OPTIONS_REQUIRED_GROUPS=	db
-PKG_OPTIONS_GROUP.db=	sqlite pgsql psycopg2
-PKG_SUGGESTED_OPTIONS=	sqlite
+PKG_OPTIONS_GROUP.db=	sqlite2 sqlite3 pgsql psycopg2
+PKG_SUGGESTED_OPTIONS=	sqlite3
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Msqlite)
+.if !empty(PKG_OPTIONS:Msqlite2)
 DEPENDS+=	${PYPKGPREFIX}-sqlite2>=2:../../databases/py-sqlite2
 .endif
+.if !empty(PKG_OPTIONS:Msqlite3)
+DEPENDS+=	${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
+.endif
 .if !empty(PKG_OPTIONS:Mpgsql)
 DEPENDS+=	${PYPKGPREFIX}-PgSQL>=2.4:../../databases/py-PgSQL
 .endif
@@ -34,14 +39,17 @@ DEPENDS+=	${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2
 
 PYDISTUTILSPKG=	YES
 PY_PATCHPLIST=	YES
-PYTHON_PATCH_SCRIPTS=	contrib/*.py contrib/*-hook
+PYTHON_PATCH_SCRIPTS=	cgi-bin/trac.* contrib/*.py contrib/*-hook
 
 EGDIR=		${PREFIX}/share/examples/trac
+CGIBINDIR=	${PREFIX}/libexec/trac
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/contrib/* ${EGDIR}
+	${INSTALL_PROGRAM_DIR} ${CGIBINDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/[A-qs-v]* ${EGDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/trac.* ${CGIBINDIR}
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/trac/PLIST b/www/trac/PLIST
index 77d3e94d997..1fdfc2aceb6 100644
--- a/www/trac/PLIST
+++ b/www/trac/PLIST
@@ -1,21 +1,39 @@
-@comment $NetBSD: PLIST,v 1.13 2007/10/12 12:40:59 gdt Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/09/12 10:18:11 abs Exp $
 bin/trac-admin
 bin/tracd
-${PYSITELIB}/trac/About.py
-${PYSITELIB}/trac/About.pyc
-${PYSITELIB}/trac/About.pyo
-${PYSITELIB}/trac/Search.py
-${PYSITELIB}/trac/Search.pyc
-${PYSITELIB}/trac/Search.pyo
-${PYSITELIB}/trac/Settings.py
-${PYSITELIB}/trac/Settings.pyc
-${PYSITELIB}/trac/Settings.pyo
-${PYSITELIB}/trac/Timeline.py
-${PYSITELIB}/trac/Timeline.pyc
-${PYSITELIB}/trac/Timeline.pyo
+libexec/trac/trac.cgi
+libexec/trac/trac.fcgi
 ${PYSITELIB}/trac/__init__.py
 ${PYSITELIB}/trac/__init__.pyc
 ${PYSITELIB}/trac/__init__.pyo
+${PYSITELIB}/trac/about.py
+${PYSITELIB}/trac/about.pyc
+${PYSITELIB}/trac/about.pyo
+${PYSITELIB}/trac/admin/__init__.py
+${PYSITELIB}/trac/admin/__init__.pyc
+${PYSITELIB}/trac/admin/__init__.pyo
+${PYSITELIB}/trac/admin/api.py
+${PYSITELIB}/trac/admin/api.pyc
+${PYSITELIB}/trac/admin/api.pyo
+${PYSITELIB}/trac/admin/console.py
+${PYSITELIB}/trac/admin/console.pyc
+${PYSITELIB}/trac/admin/console.pyo
+${PYSITELIB}/trac/admin/templates/admin.html
+${PYSITELIB}/trac/admin/templates/admin_basics.html
+${PYSITELIB}/trac/admin/templates/admin_components.html
+${PYSITELIB}/trac/admin/templates/admin_enums.html
+${PYSITELIB}/trac/admin/templates/admin_legacy.html
+${PYSITELIB}/trac/admin/templates/admin_logging.html
+${PYSITELIB}/trac/admin/templates/admin_milestones.html
+${PYSITELIB}/trac/admin/templates/admin_perms.html
+${PYSITELIB}/trac/admin/templates/admin_plugins.html
+${PYSITELIB}/trac/admin/templates/admin_versions.html
+${PYSITELIB}/trac/admin/templates/deploy_trac.cgi
+${PYSITELIB}/trac/admin/templates/deploy_trac.fcgi
+${PYSITELIB}/trac/admin/templates/deploy_trac.wsgi
+${PYSITELIB}/trac/admin/web_ui.py
+${PYSITELIB}/trac/admin/web_ui.pyc
+${PYSITELIB}/trac/admin/web_ui.pyo
 ${PYSITELIB}/trac/attachment.py
 ${PYSITELIB}/trac/attachment.pyc
 ${PYSITELIB}/trac/attachment.pyo
@@ -25,9 +43,6 @@ ${PYSITELIB}/trac/config.pyo
 ${PYSITELIB}/trac/core.py
 ${PYSITELIB}/trac/core.pyc
 ${PYSITELIB}/trac/core.pyo
-${PYSITELIB}/trac/db_default.py
-${PYSITELIB}/trac/db_default.pyc
-${PYSITELIB}/trac/db_default.pyo
 ${PYSITELIB}/trac/db/__init__.py
 ${PYSITELIB}/trac/db/__init__.pyc
 ${PYSITELIB}/trac/db/__init__.pyo
@@ -52,9 +67,77 @@ ${PYSITELIB}/trac/db/sqlite_backend.pyo
 ${PYSITELIB}/trac/db/util.py
 ${PYSITELIB}/trac/db/util.pyc
 ${PYSITELIB}/trac/db/util.pyo
+${PYSITELIB}/trac/db_default.py
+${PYSITELIB}/trac/db_default.pyc
+${PYSITELIB}/trac/db_default.pyo
 ${PYSITELIB}/trac/env.py
 ${PYSITELIB}/trac/env.pyc
 ${PYSITELIB}/trac/env.pyo
+${PYSITELIB}/trac/htdocs/README
+${PYSITELIB}/trac/htdocs/asc.png
+${PYSITELIB}/trac/htdocs/attachment.png
+${PYSITELIB}/trac/htdocs/changeset.png
+${PYSITELIB}/trac/htdocs/closedticket.png
+${PYSITELIB}/trac/htdocs/collapsed.png
+${PYSITELIB}/trac/htdocs/css/about.css
+${PYSITELIB}/trac/htdocs/css/admin.css
+${PYSITELIB}/trac/htdocs/css/browser.css
+${PYSITELIB}/trac/htdocs/css/changeset.css
+${PYSITELIB}/trac/htdocs/css/code.css
+${PYSITELIB}/trac/htdocs/css/diff.css
+${PYSITELIB}/trac/htdocs/css/prefs.css
+${PYSITELIB}/trac/htdocs/css/report.css
+${PYSITELIB}/trac/htdocs/css/roadmap.css
+${PYSITELIB}/trac/htdocs/css/search.css
+${PYSITELIB}/trac/htdocs/css/ticket.css
+${PYSITELIB}/trac/htdocs/css/timeline.css
+${PYSITELIB}/trac/htdocs/css/trac.css
+${PYSITELIB}/trac/htdocs/css/wiki.css
+${PYSITELIB}/trac/htdocs/desc.png
+${PYSITELIB}/trac/htdocs/dots.gif
+${PYSITELIB}/trac/htdocs/draft.png
+${PYSITELIB}/trac/htdocs/edit_toolbar.png
+${PYSITELIB}/trac/htdocs/editedticket.png
+${PYSITELIB}/trac/htdocs/envelope.png
+${PYSITELIB}/trac/htdocs/expanded.png
+${PYSITELIB}/trac/htdocs/expander_normal.png
+${PYSITELIB}/trac/htdocs/expander_normal_hover.png
+${PYSITELIB}/trac/htdocs/expander_open.png
+${PYSITELIB}/trac/htdocs/expander_open_hover.png
+${PYSITELIB}/trac/htdocs/extlink.gif
+${PYSITELIB}/trac/htdocs/feed.png
+${PYSITELIB}/trac/htdocs/file.png
+${PYSITELIB}/trac/htdocs/folder.png
+${PYSITELIB}/trac/htdocs/guide/basic-workflow.png
+${PYSITELIB}/trac/htdocs/guide/original-workflow.png
+${PYSITELIB}/trac/htdocs/ics.png
+${PYSITELIB}/trac/htdocs/imggrid.png
+${PYSITELIB}/trac/htdocs/js/blame.js
+${PYSITELIB}/trac/htdocs/js/diff.js
+${PYSITELIB}/trac/htdocs/js/expand_dir.js
+${PYSITELIB}/trac/htdocs/js/folding.js
+${PYSITELIB}/trac/htdocs/js/ie_pre7_hacks.js
+${PYSITELIB}/trac/htdocs/js/jquery.js
+${PYSITELIB}/trac/htdocs/js/keyboard_nav.js
+${PYSITELIB}/trac/htdocs/js/noconflict.js
+${PYSITELIB}/trac/htdocs/js/query.js
+${PYSITELIB}/trac/htdocs/js/search.js
+${PYSITELIB}/trac/htdocs/js/suggest.js
+${PYSITELIB}/trac/htdocs/js/trac.js
+${PYSITELIB}/trac/htdocs/js/wikitoolbar.js
+${PYSITELIB}/trac/htdocs/loading.gif
+${PYSITELIB}/trac/htdocs/lock-locked.png
+${PYSITELIB}/trac/htdocs/milestone.png
+${PYSITELIB}/trac/htdocs/newticket.png
+${PYSITELIB}/trac/htdocs/parent.png
+${PYSITELIB}/trac/htdocs/python.png
+${PYSITELIB}/trac/htdocs/topbar_gradient.png
+${PYSITELIB}/trac/htdocs/topbar_gradient2.png
+${PYSITELIB}/trac/htdocs/trac.ico
+${PYSITELIB}/trac/htdocs/trac_banner.png
+${PYSITELIB}/trac/htdocs/trac_logo_mini.png
+${PYSITELIB}/trac/htdocs/vgradient.png
+${PYSITELIB}/trac/htdocs/wiki.png
 ${PYSITELIB}/trac/loader.py
 ${PYSITELIB}/trac/loader.pyc
 ${PYSITELIB}/trac/loader.pyo
@@ -76,6 +159,9 @@ ${PYSITELIB}/trac/mimeview/patch.pyo
 ${PYSITELIB}/trac/mimeview/php.py
 ${PYSITELIB}/trac/mimeview/php.pyc
 ${PYSITELIB}/trac/mimeview/php.pyo
+${PYSITELIB}/trac/mimeview/pygments.py
+${PYSITELIB}/trac/mimeview/pygments.pyc
+${PYSITELIB}/trac/mimeview/pygments.pyo
 ${PYSITELIB}/trac/mimeview/rst.py
 ${PYSITELIB}/trac/mimeview/rst.pyc
 ${PYSITELIB}/trac/mimeview/rst.pyo
@@ -91,24 +177,84 @@ ${PYSITELIB}/trac/notification.pyo
 ${PYSITELIB}/trac/perm.py
 ${PYSITELIB}/trac/perm.pyc
 ${PYSITELIB}/trac/perm.pyo
-${PYSITELIB}/trac/scripts/__init__.py
-${PYSITELIB}/trac/scripts/__init__.pyc
-${PYSITELIB}/trac/scripts/__init__.pyo
-${PYSITELIB}/trac/scripts/admin.py
-${PYSITELIB}/trac/scripts/admin.pyc
-${PYSITELIB}/trac/scripts/admin.pyo
-${PYSITELIB}/trac/siteconfig.py
-${PYSITELIB}/trac/siteconfig.pyc
-${PYSITELIB}/trac/siteconfig.pyo
+${PYSITELIB}/trac/prefs/__init__.py
+${PYSITELIB}/trac/prefs/__init__.pyc
+${PYSITELIB}/trac/prefs/__init__.pyo
+${PYSITELIB}/trac/prefs/api.py
+${PYSITELIB}/trac/prefs/api.pyc
+${PYSITELIB}/trac/prefs/api.pyo
+${PYSITELIB}/trac/prefs/templates/prefs.html
+${PYSITELIB}/trac/prefs/templates/prefs_advanced.html
+${PYSITELIB}/trac/prefs/templates/prefs_datetime.html
+${PYSITELIB}/trac/prefs/templates/prefs_general.html
+${PYSITELIB}/trac/prefs/templates/prefs_keybindings.html
+${PYSITELIB}/trac/prefs/templates/prefs_pygments.html
+${PYSITELIB}/trac/prefs/web_ui.py
+${PYSITELIB}/trac/prefs/web_ui.pyc
+${PYSITELIB}/trac/prefs/web_ui.pyo
+${PYSITELIB}/trac/resource.py
+${PYSITELIB}/trac/resource.pyc
+${PYSITELIB}/trac/resource.pyo
+${PYSITELIB}/trac/search/__init__.py
+${PYSITELIB}/trac/search/__init__.pyc
+${PYSITELIB}/trac/search/__init__.pyo
+${PYSITELIB}/trac/search/api.py
+${PYSITELIB}/trac/search/api.pyc
+${PYSITELIB}/trac/search/api.pyo
+${PYSITELIB}/trac/search/templates/opensearch.xml
+${PYSITELIB}/trac/search/templates/search.html
+${PYSITELIB}/trac/search/web_ui.py
+${PYSITELIB}/trac/search/web_ui.pyc
+${PYSITELIB}/trac/search/web_ui.pyo
+${PYSITELIB}/trac/templates/README
+${PYSITELIB}/trac/templates/about.html
+${PYSITELIB}/trac/templates/attachment.html
+${PYSITELIB}/trac/templates/diff_div.html
+${PYSITELIB}/trac/templates/diff_view.html
+${PYSITELIB}/trac/templates/error.html
+${PYSITELIB}/trac/templates/footer.cs
+${PYSITELIB}/trac/templates/header.cs
+${PYSITELIB}/trac/templates/history_view.html
+${PYSITELIB}/trac/templates/index.html
+${PYSITELIB}/trac/templates/layout.html
+${PYSITELIB}/trac/templates/macros.cs
+${PYSITELIB}/trac/templates/macros.html
+${PYSITELIB}/trac/templates/macros.rss
+${PYSITELIB}/trac/templates/page_index.html
+${PYSITELIB}/trac/templates/theme.html
 ${PYSITELIB}/trac/test.py
 ${PYSITELIB}/trac/test.pyc
 ${PYSITELIB}/trac/test.pyo
+${PYSITELIB}/trac/tests/functional/__init__.py
+${PYSITELIB}/trac/tests/functional/__init__.pyc
+${PYSITELIB}/trac/tests/functional/__init__.pyo
+${PYSITELIB}/trac/tests/functional/better_twill.py
+${PYSITELIB}/trac/tests/functional/better_twill.pyc
+${PYSITELIB}/trac/tests/functional/better_twill.pyo
+${PYSITELIB}/trac/tests/functional/compat.py
+${PYSITELIB}/trac/tests/functional/compat.pyc
+${PYSITELIB}/trac/tests/functional/compat.pyo
+${PYSITELIB}/trac/tests/functional/testcases.py
+${PYSITELIB}/trac/tests/functional/testcases.pyc
+${PYSITELIB}/trac/tests/functional/testcases.pyo
+${PYSITELIB}/trac/tests/functional/testenv.py
+${PYSITELIB}/trac/tests/functional/testenv.pyc
+${PYSITELIB}/trac/tests/functional/testenv.pyo
+${PYSITELIB}/trac/tests/functional/tester.py
+${PYSITELIB}/trac/tests/functional/tester.pyc
+${PYSITELIB}/trac/tests/functional/tester.pyo
 ${PYSITELIB}/trac/ticket/__init__.py
 ${PYSITELIB}/trac/ticket/__init__.pyc
 ${PYSITELIB}/trac/ticket/__init__.pyo
+${PYSITELIB}/trac/ticket/admin.py
+${PYSITELIB}/trac/ticket/admin.pyc
+${PYSITELIB}/trac/ticket/admin.pyo
 ${PYSITELIB}/trac/ticket/api.py
 ${PYSITELIB}/trac/ticket/api.pyc
 ${PYSITELIB}/trac/ticket/api.pyo
+${PYSITELIB}/trac/ticket/default_workflow.py
+${PYSITELIB}/trac/ticket/default_workflow.pyc
+${PYSITELIB}/trac/ticket/default_workflow.pyo
 ${PYSITELIB}/trac/ticket/model.py
 ${PYSITELIB}/trac/ticket/model.pyc
 ${PYSITELIB}/trac/ticket/model.pyo
@@ -124,9 +270,36 @@ ${PYSITELIB}/trac/ticket/report.pyo
 ${PYSITELIB}/trac/ticket/roadmap.py
 ${PYSITELIB}/trac/ticket/roadmap.pyc
 ${PYSITELIB}/trac/ticket/roadmap.pyo
+${PYSITELIB}/trac/ticket/templates/milestone_delete.html
+${PYSITELIB}/trac/ticket/templates/milestone_edit.html
+${PYSITELIB}/trac/ticket/templates/milestone_view.html
+${PYSITELIB}/trac/ticket/templates/query.html
+${PYSITELIB}/trac/ticket/templates/query.rss
+${PYSITELIB}/trac/ticket/templates/query_results.html
+${PYSITELIB}/trac/ticket/templates/report.rss
+${PYSITELIB}/trac/ticket/templates/report_delete.html
+${PYSITELIB}/trac/ticket/templates/report_edit.html
+${PYSITELIB}/trac/ticket/templates/report_view.html
+${PYSITELIB}/trac/ticket/templates/roadmap.html
+${PYSITELIB}/trac/ticket/templates/ticket.html
+${PYSITELIB}/trac/ticket/templates/ticket.rss
+${PYSITELIB}/trac/ticket/templates/ticket_notify_email.txt
 ${PYSITELIB}/trac/ticket/web_ui.py
 ${PYSITELIB}/trac/ticket/web_ui.pyc
 ${PYSITELIB}/trac/ticket/web_ui.pyo
+${PYSITELIB}/trac/ticket/workflows/basic-workflow.ini
+${PYSITELIB}/trac/ticket/workflows/original-workflow.ini
+${PYSITELIB}/trac/timeline/__init__.py
+${PYSITELIB}/trac/timeline/__init__.pyc
+${PYSITELIB}/trac/timeline/__init__.pyo
+${PYSITELIB}/trac/timeline/api.py
+${PYSITELIB}/trac/timeline/api.pyc
+${PYSITELIB}/trac/timeline/api.pyo
+${PYSITELIB}/trac/timeline/templates/timeline.html
+${PYSITELIB}/trac/timeline/templates/timeline.rss
+${PYSITELIB}/trac/timeline/web_ui.py
+${PYSITELIB}/trac/timeline/web_ui.pyc
+${PYSITELIB}/trac/timeline/web_ui.pyo
 ${PYSITELIB}/trac/upgrades/__init__.py
 ${PYSITELIB}/trac/upgrades/__init__.pyc
 ${PYSITELIB}/trac/upgrades/__init__.pyo
@@ -163,6 +336,9 @@ ${PYSITELIB}/trac/upgrades/db19.pyo
 ${PYSITELIB}/trac/upgrades/db20.py
 ${PYSITELIB}/trac/upgrades/db20.pyc
 ${PYSITELIB}/trac/upgrades/db20.pyo
+${PYSITELIB}/trac/upgrades/db21.py
+${PYSITELIB}/trac/upgrades/db21.pyc
+${PYSITELIB}/trac/upgrades/db21.pyo
 ${PYSITELIB}/trac/upgrades/db3.py
 ${PYSITELIB}/trac/upgrades/db3.pyc
 ${PYSITELIB}/trac/upgrades/db3.pyo
@@ -190,6 +366,9 @@ ${PYSITELIB}/trac/util/__init__.pyo
 ${PYSITELIB}/trac/util/autoreload.py
 ${PYSITELIB}/trac/util/autoreload.pyc
 ${PYSITELIB}/trac/util/autoreload.pyo
+${PYSITELIB}/trac/util/compat.py
+${PYSITELIB}/trac/util/compat.pyc
+${PYSITELIB}/trac/util/compat.pyo
 ${PYSITELIB}/trac/util/daemon.py
 ${PYSITELIB}/trac/util/daemon.pyc
 ${PYSITELIB}/trac/util/daemon.pyo
@@ -199,10 +378,15 @@ ${PYSITELIB}/trac/util/datefmt.pyo
 ${PYSITELIB}/trac/util/html.py
 ${PYSITELIB}/trac/util/html.pyc
 ${PYSITELIB}/trac/util/html.pyo
+${PYSITELIB}/trac/util/presentation.py
+${PYSITELIB}/trac/util/presentation.pyc
+${PYSITELIB}/trac/util/presentation.pyo
 ${PYSITELIB}/trac/util/text.py
 ${PYSITELIB}/trac/util/text.pyc
 ${PYSITELIB}/trac/util/text.pyo
-man/man1/trac-admin.1
+${PYSITELIB}/trac/util/translation.py
+${PYSITELIB}/trac/util/translation.pyc
+${PYSITELIB}/trac/util/translation.pyo
 ${PYSITELIB}/trac/versioncontrol/__init__.py
 ${PYSITELIB}/trac/versioncontrol/__init__.pyc
 ${PYSITELIB}/trac/versioncontrol/__init__.pyo
@@ -221,6 +405,13 @@ ${PYSITELIB}/trac/versioncontrol/svn_authz.pyo
 ${PYSITELIB}/trac/versioncontrol/svn_fs.py
 ${PYSITELIB}/trac/versioncontrol/svn_fs.pyc
 ${PYSITELIB}/trac/versioncontrol/svn_fs.pyo
+${PYSITELIB}/trac/versioncontrol/templates/browser.html
+${PYSITELIB}/trac/versioncontrol/templates/changeset.html
+${PYSITELIB}/trac/versioncontrol/templates/diff_form.html
+${PYSITELIB}/trac/versioncontrol/templates/dir_entries.html
+${PYSITELIB}/trac/versioncontrol/templates/revisionlog.html
+${PYSITELIB}/trac/versioncontrol/templates/revisionlog.rss
+${PYSITELIB}/trac/versioncontrol/templates/revisionlog.txt
 ${PYSITELIB}/trac/versioncontrol/web_ui/__init__.py
 ${PYSITELIB}/trac/versioncontrol/web_ui/__init__.pyc
 ${PYSITELIB}/trac/versioncontrol/web_ui/__init__.pyo
@@ -233,6 +424,9 @@ ${PYSITELIB}/trac/versioncontrol/web_ui/changeset.pyo
 ${PYSITELIB}/trac/versioncontrol/web_ui/log.py
 ${PYSITELIB}/trac/versioncontrol/web_ui/log.pyc
 ${PYSITELIB}/trac/versioncontrol/web_ui/log.pyo
+${PYSITELIB}/trac/versioncontrol/web_ui/main.py
+${PYSITELIB}/trac/versioncontrol/web_ui/main.pyc
+${PYSITELIB}/trac/versioncontrol/web_ui/main.pyo
 ${PYSITELIB}/trac/versioncontrol/web_ui/util.py
 ${PYSITELIB}/trac/versioncontrol/web_ui/util.pyc
 ${PYSITELIB}/trac/versioncontrol/web_ui/util.pyo
@@ -284,6 +478,61 @@ ${PYSITELIB}/trac/wiki/__init__.pyo
 ${PYSITELIB}/trac/wiki/api.py
 ${PYSITELIB}/trac/wiki/api.pyc
 ${PYSITELIB}/trac/wiki/api.pyo
+${PYSITELIB}/trac/wiki/default-pages/CamelCase
+${PYSITELIB}/trac/wiki/default-pages/InterMapTxt
+${PYSITELIB}/trac/wiki/default-pages/InterTrac
+${PYSITELIB}/trac/wiki/default-pages/InterWiki
+${PYSITELIB}/trac/wiki/default-pages/PageTemplates
+${PYSITELIB}/trac/wiki/default-pages/RecentChanges
+${PYSITELIB}/trac/wiki/default-pages/SandBox
+${PYSITELIB}/trac/wiki/default-pages/TitleIndex
+${PYSITELIB}/trac/wiki/default-pages/TracAccessibility
+${PYSITELIB}/trac/wiki/default-pages/TracAdmin
+${PYSITELIB}/trac/wiki/default-pages/TracBackup
+${PYSITELIB}/trac/wiki/default-pages/TracBrowser
+${PYSITELIB}/trac/wiki/default-pages/TracCgi
+${PYSITELIB}/trac/wiki/default-pages/TracChangeset
+${PYSITELIB}/trac/wiki/default-pages/TracEnvironment
+${PYSITELIB}/trac/wiki/default-pages/TracFastCgi
+${PYSITELIB}/trac/wiki/default-pages/TracFineGrainedPermissions
+${PYSITELIB}/trac/wiki/default-pages/TracGuide
+${PYSITELIB}/trac/wiki/default-pages/TracImport
+${PYSITELIB}/trac/wiki/default-pages/TracIni
+${PYSITELIB}/trac/wiki/default-pages/TracInstall
+${PYSITELIB}/trac/wiki/default-pages/TracInterfaceCustomization
+${PYSITELIB}/trac/wiki/default-pages/TracLinks
+${PYSITELIB}/trac/wiki/default-pages/TracLogging
+${PYSITELIB}/trac/wiki/default-pages/TracModPython
+${PYSITELIB}/trac/wiki/default-pages/TracNavigation
+${PYSITELIB}/trac/wiki/default-pages/TracNotification
+${PYSITELIB}/trac/wiki/default-pages/TracPermissions
+${PYSITELIB}/trac/wiki/default-pages/TracPlugins
+${PYSITELIB}/trac/wiki/default-pages/TracQuery
+${PYSITELIB}/trac/wiki/default-pages/TracReports
+${PYSITELIB}/trac/wiki/default-pages/TracRevisionLog
+${PYSITELIB}/trac/wiki/default-pages/TracRoadmap
+${PYSITELIB}/trac/wiki/default-pages/TracRss
+${PYSITELIB}/trac/wiki/default-pages/TracSearch
+${PYSITELIB}/trac/wiki/default-pages/TracStandalone
+${PYSITELIB}/trac/wiki/default-pages/TracSupport
+${PYSITELIB}/trac/wiki/default-pages/TracSyntaxColoring
+${PYSITELIB}/trac/wiki/default-pages/TracTickets
+${PYSITELIB}/trac/wiki/default-pages/TracTicketsCustomFields
+${PYSITELIB}/trac/wiki/default-pages/TracTimeline
+${PYSITELIB}/trac/wiki/default-pages/TracUnicode
+${PYSITELIB}/trac/wiki/default-pages/TracUpgrade
+${PYSITELIB}/trac/wiki/default-pages/TracWiki
+${PYSITELIB}/trac/wiki/default-pages/TracWorkflow
+${PYSITELIB}/trac/wiki/default-pages/WikiDeletePage
+${PYSITELIB}/trac/wiki/default-pages/WikiFormatting
+${PYSITELIB}/trac/wiki/default-pages/WikiHtml
+${PYSITELIB}/trac/wiki/default-pages/WikiMacros
+${PYSITELIB}/trac/wiki/default-pages/WikiNewPage
+${PYSITELIB}/trac/wiki/default-pages/WikiPageNames
+${PYSITELIB}/trac/wiki/default-pages/WikiProcessors
+${PYSITELIB}/trac/wiki/default-pages/WikiRestructuredText
+${PYSITELIB}/trac/wiki/default-pages/WikiRestructuredTextLinks
+${PYSITELIB}/trac/wiki/default-pages/WikiStart
 ${PYSITELIB}/trac/wiki/formatter.py
 ${PYSITELIB}/trac/wiki/formatter.pyc
 ${PYSITELIB}/trac/wiki/formatter.pyo
@@ -299,155 +548,28 @@ ${PYSITELIB}/trac/wiki/macros.pyo
 ${PYSITELIB}/trac/wiki/model.py
 ${PYSITELIB}/trac/wiki/model.pyc
 ${PYSITELIB}/trac/wiki/model.pyo
+${PYSITELIB}/trac/wiki/parser.py
+${PYSITELIB}/trac/wiki/parser.pyc
+${PYSITELIB}/trac/wiki/parser.pyo
+${PYSITELIB}/trac/wiki/templates/wiki_delete.html
+${PYSITELIB}/trac/wiki/templates/wiki_diff.html
+${PYSITELIB}/trac/wiki/templates/wiki_edit.html
+${PYSITELIB}/trac/wiki/templates/wiki_view.html
 ${PYSITELIB}/trac/wiki/web_ui.py
 ${PYSITELIB}/trac/wiki/web_ui.pyc
 ${PYSITELIB}/trac/wiki/web_ui.pyo
-man/man1/tracd.1
 share/examples/trac/README
 share/examples/trac/bugzilla2trac.py
+share/examples/trac/checkwiki.py
 share/examples/trac/emailfilter.py
 share/examples/trac/htdigest.py
+share/examples/trac/htpasswd.py
 share/examples/trac/migrateticketmodel.py
 share/examples/trac/sourceforge2trac.py
 share/examples/trac/trac-post-commit-hook
 share/examples/trac/trac-post-commit-hook.cmd
 share/examples/trac/trac-pre-commit-hook
-share/trac/cgi-bin/trac.cgi
-share/trac/cgi-bin/trac.fcgi
-share/trac/htdocs/README
-share/trac/htdocs/asc.png
-share/trac/htdocs/attachment.png
-share/trac/htdocs/changeset.png
-share/trac/htdocs/closedticket.png
-share/trac/htdocs/css/about.css
-share/trac/htdocs/css/browser.css
-share/trac/htdocs/css/changeset.css
-share/trac/htdocs/css/code.css
-share/trac/htdocs/css/diff.css
-share/trac/htdocs/css/report.css
-share/trac/htdocs/css/roadmap.css
-share/trac/htdocs/css/search.css
-share/trac/htdocs/css/ticket.css
-share/trac/htdocs/css/timeline.css
-share/trac/htdocs/css/trac.css
-share/trac/htdocs/css/wiki.css
-share/trac/htdocs/desc.png
-share/trac/htdocs/dots.gif
-share/trac/htdocs/draft.png
-share/trac/htdocs/edit_toolbar.png
-share/trac/htdocs/editedticket.png
-share/trac/htdocs/extlink.gif
-share/trac/htdocs/file.png
-share/trac/htdocs/folder.png
-share/trac/htdocs/ics.png
-share/trac/htdocs/imggrid.png
-share/trac/htdocs/js/query.js
-share/trac/htdocs/js/trac.js
-share/trac/htdocs/js/wikitoolbar.js
-share/trac/htdocs/milestone.png
-share/trac/htdocs/newticket.png
-share/trac/htdocs/parent.png
-share/trac/htdocs/python.png
-share/trac/htdocs/topbar_gradient.png
-share/trac/htdocs/topbar_gradient2.png
-share/trac/htdocs/trac.ico
-share/trac/htdocs/trac_banner.png
-share/trac/htdocs/trac_logo_mini.png
-share/trac/htdocs/wiki.png
-share/trac/htdocs/xml.png
-share/trac/templates/README
-share/trac/templates/about.cs
-share/trac/templates/anydiff.cs
-share/trac/templates/attachment.cs
-share/trac/templates/browser.cs
-share/trac/templates/changeset.cs
-share/trac/templates/error.cs
-share/trac/templates/footer.cs
-share/trac/templates/header.cs
-share/trac/templates/index.cs
-share/trac/templates/log.cs
-share/trac/templates/log_changelog.cs
-share/trac/templates/log_rss.cs
-share/trac/templates/macros.cs
-share/trac/templates/milestone.cs
-share/trac/templates/newticket.cs
-share/trac/templates/query.cs
-share/trac/templates/query_rss.cs
-share/trac/templates/report.cs
-share/trac/templates/report_rss.cs
-share/trac/templates/roadmap.cs
-share/trac/templates/search.cs
-share/trac/templates/settings.cs
-share/trac/templates/ticket.cs
-share/trac/templates/ticket_notify_email.cs
-share/trac/templates/ticket_rss.cs
-share/trac/templates/timeline.cs
-share/trac/templates/timeline_rss.cs
-share/trac/templates/wiki.cs
-share/trac/wiki-default/CamelCase
-share/trac/wiki-default/InterMapTxt
-share/trac/wiki-default/InterTrac
-share/trac/wiki-default/InterWiki
-share/trac/wiki-default/RecentChanges
-share/trac/wiki-default/SandBox
-share/trac/wiki-default/TitleIndex
-share/trac/wiki-default/TracAccessibility
-share/trac/wiki-default/TracAdmin
-share/trac/wiki-default/TracBackup
-share/trac/wiki-default/TracBrowser
-share/trac/wiki-default/TracCgi
-share/trac/wiki-default/TracChangeset
-share/trac/wiki-default/TracEnvironment
-share/trac/wiki-default/TracFastCgi
-share/trac/wiki-default/TracGuide
-share/trac/wiki-default/TracImport
-share/trac/wiki-default/TracIni
-share/trac/wiki-default/TracInstall
-share/trac/wiki-default/TracInterfaceCustomization
-share/trac/wiki-default/TracLinks
-share/trac/wiki-default/TracLogging
-share/trac/wiki-default/TracModPython
-share/trac/wiki-default/TracNotification
-share/trac/wiki-default/TracPermissions
-share/trac/wiki-default/TracPlugins
-share/trac/wiki-default/TracQuery
-share/trac/wiki-default/TracReports
-share/trac/wiki-default/TracRevisionLog
-share/trac/wiki-default/TracRoadmap
-share/trac/wiki-default/TracRss
-share/trac/wiki-default/TracSearch
-share/trac/wiki-default/TracStandalone
-share/trac/wiki-default/TracSupport
-share/trac/wiki-default/TracSyntaxColoring
-share/trac/wiki-default/TracTickets
-share/trac/wiki-default/TracTicketsCustomFields
-share/trac/wiki-default/TracTimeline
-share/trac/wiki-default/TracUnicode
-share/trac/wiki-default/TracUpgrade
-share/trac/wiki-default/TracWiki
-share/trac/wiki-default/WikiDeletePage
-share/trac/wiki-default/WikiFormatting
-share/trac/wiki-default/WikiHtml
-share/trac/wiki-default/WikiMacros
-share/trac/wiki-default/WikiNewPage
-share/trac/wiki-default/WikiPageNames
-share/trac/wiki-default/WikiProcessors
-share/trac/wiki-default/WikiRestructuredText
-share/trac/wiki-default/WikiRestructuredTextLinks
-share/trac/wiki-default/WikiStart
-share/trac/wiki-macros/HelloWorld.py
-share/trac/wiki-macros/Timestamp.py
-share/trac/wiki-macros/TracGuideToc.py
-@dirrm share/trac/wiki-macros
-@dirrm share/trac/wiki-default
-@dirrm share/trac/templates
-@dirrm share/trac/plugins
-@dirrm share/trac/htdocs/js
-@dirrm share/trac/htdocs/css
-@dirrm share/trac/htdocs
-@dirrm share/trac/conf
-@dirrm share/trac/cgi-bin
-@dirrm share/trac
+@dirrm libexec/trac
 @dirrm share/examples/trac
 @dirrm ${PYSITELIB}/trac/wiki
 @dirrm ${PYSITELIB}/trac/web
@@ -456,7 +578,6 @@ share/trac/wiki-macros/TracGuideToc.py
 @dirrm ${PYSITELIB}/trac/util
 @dirrm ${PYSITELIB}/trac/upgrades
 @dirrm ${PYSITELIB}/trac/ticket
-@dirrm ${PYSITELIB}/trac/scripts
 @dirrm ${PYSITELIB}/trac/mimeview
 @dirrm ${PYSITELIB}/trac/db
 @dirrm ${PYSITELIB}/trac
diff --git a/www/trac/distinfo b/www/trac/distinfo
index c376dd733f4..66e5a562e50 100644
--- a/www/trac/distinfo
+++ b/www/trac/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.20 2008/07/04 16:30:53 gdt Exp $
+$NetBSD: distinfo,v 1.21 2008/09/12 10:18:11 abs Exp $
 
-SHA1 (trac-0.10.5.tar.gz) = 3e1e3ea3edd76be7761359ffc7f080cc3fd5c4dc
-RMD160 (trac-0.10.5.tar.gz) = c9632030624471f6c456cdc34f2a23cfe2ccdde9
-Size (trac-0.10.5.tar.gz) = 452253 bytes
-SHA1 (patch-aa) = 5d8c1c3e5416e73d6cc24a5a45d4ec7afdc4a095
+SHA1 (Trac-0.11.1.tar.gz) = 92be092d45bb03bc01d39983966d7a89a1b47e29
+RMD160 (Trac-0.11.1.tar.gz) = 9d6e595df064e3dfe08299da44ae18c8a51b961f
+Size (Trac-0.11.1.tar.gz) = 687225 bytes
diff --git a/www/trac/patches/patch-aa b/www/trac/patches/patch-aa
deleted file mode 100644
index a702a02700c..00000000000
--- a/www/trac/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/11/03 23:04:29 epg Exp $
-
---- setup.py.orig	2005-10-31 10:37:52.000000000 -0800
-+++ setup.py
-@@ -225,7 +225,7 @@ facilities.
-                   (_p('share/trac/htdocs'), glob(_p('htdocs/*.*')) + [_p('htdocs/README')]),
-                   (_p('share/trac/htdocs/css'), glob(_p('htdocs/css/*'))),
-                   (_p('share/trac/htdocs/js'), glob(_p('htdocs/js/*'))),
--                  (_p('share/man/man1'), glob(_p('scripts/*.1'))),
-+                  (_p('/'.join([os.getenv('PKGMANDIR', 'share/man'), 'man1'])), glob(_p('scripts/*.1'))),
-                   (_p('share/trac/wiki-default'), glob(_p('wiki-default/[A-Z]*'))),
-                   (_p('share/trac/wiki-macros'), glob(_p('wiki-macros/*.py')))],
-       scripts=[_p('scripts/trac-admin'),