Update to 0.9. Bump minimum versions of dependencies. Allow py-PgSQL

or py-psycopg to satisfy the database dependency, in addition to
sqlite.  Install man pages to PKGMANDIR.  Closes PR 31984.

Upstream changelog:

Trac 0.9  (Oct 31, 2005)
http://svn.edgewall.com/repos/trac/tags/trac-0.9

 * Support for a global trac.ini configuration file.
 * Changed logic for enabling plugins/components.
 * Improved support for handling repository subsets.
 * Fixes problems with Trac links when using multiple environments in the
   same Python interpreter.
 * Improvements to email notification layout and encoding.
 * Fixes for database locking with SQLite, in particular in a multi-threaded
   environment.
 * PostgreSQL compatibility fixes.
 * Fixed bugs: #804, #861, #927, #1044, #1051, #1123, #1153, #1169,
   #1239, #1344, #1463, #1562, #1881, #1886, #1895, #1909, #1921, #1930,
   #1983, #1988, #2019, #2051, #2061, #2229, #2106, #2107, #2116, #2120,
   #2124, #2129, #2135, #2136, #2138, #2140, #2144, #2164, #2166, #2170,
   #2172, #2191, #2192, #2196, #2201, #2202, #2203, #2208, #2215, #2218,
   #2223, #2230, #2232, #2239, #2240, #2241, #2243, #2251,


Trac 0.9-beta2  (Sept 25, 2005)
http://svn.edgewall.com/repos/trac/tags/trac-0.9b2

 * Support for setuptools 0.6.
 * Allow insertion of a custom HTML snippet above the new ticket form
   to explain site-specific policies and/or guidelines.
 * Much improved Bugzilla import script.
 * Fixed a bug where deleting a wiki page version would sometimes delete
   the entire page.
 * Fixes for the rendering of diffs and patches.
 * Fixes for the Subversion authz support.
 * Fixed bugs: #2008, #2032, #2034, #1801, #1893, #1040, #2040,
   #1036, #1944, #1081, #1863, #2052, #2066, #2016, #2090, #1985,
   #2012, #2089, #2079, #1999, #2029, #2079, #1960, #2080, #2021,
   #2042, #2088, #1345, #2011, #2100, #2103, #2113, #2116, #2109


Trac 0.9-beta1  (Sept 5, 2005)
http://svn.edgewall.com/repos/trac/tags/trac-0.9b1

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

 * License changed from GPL to modified BSD (See the file COPYING).
 * Improved modularity and extendibility (plugin support).
 * Support for both pysqlite 1.x and pysqlite 2.x.
 * Postgresql database support (with psycopg or pyPgSQL).
 * Repository subsets. Multiple Trac environments can share a single
   repository.
 * Version control abstraction layer making it possible to support
   other version control systems besides subversion in the future.
 * FastCGI frontend support.
 * Python version >= 2.3 is now required.

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

5 files changed, 251 insertions, 138 deletions

diff --git a/www/trac/MESSAGE b/www/trac/MESSAGE
index d0420270426..2ef906bce2a 100644
--- a/www/trac/MESSAGE
+++ b/www/trac/MESSAGE
@@ -1,18 +1,19 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/11/20 00:49:12 epg Exp $
+$NetBSD: MESSAGE,v 1.2 2005/11/03 23:04:29 epg Exp $
 
-The database schema was changed between 0.7.x and 0.8. Existing
-environments must be upgraded before they can be used with Trac
-0.8.  The following command will perform the upgrade:
+You must upgrade existing Trac environments before using a new
+version:
 
   trac-admin /path/to/projectenv upgrade
 
-Trac environments are created with a default set of wiki pages.
-It's recommended to update these pages on existing environments
-whenever Trac is upgraded to get up-to-date documentation and
-additional functionality.  The following command will perform the
-update:
+It is recommended to update the standard wiki pages whenever Trac is
+upgraded to get up-to-date documentation and additional functionality:
 
   trac-admin /path/to/projectenv wiki upgrade
 
+mod_python users will need to change the name of the mod_python handler in
+the Apache HTTPD configuration to:
+
+  PythonHandler trac.web.modpython_frontend
+
 ===========================================================================
diff --git a/www/trac/Makefile b/www/trac/Makefile
index 81330c9cd70..c26ace070c2 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile,v 1.12 2005/06/20 19:20:11 epg Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/03 23:04:29 epg Exp $
 #
 
-DISTNAME=	trac-0.8.4
+DISTNAME=	trac-0.9
 CATEGORIES=	devel www
 MASTER_SITES=	http://ftp.edgewall.com/pub/trac/
 
 MAINTAINER=	epg@NetBSD.org
 HOMEPAGE=	http://www.edgewall.com/products/trac/
-COMMENT=	Enhanced wiki and issue tracking system
+COMMENT=	Subversion repository browser, wiki, and issue tracking system
 
-DEPENDS+=	${PYPKGPREFIX}-clearsilver>=0.9.7:../../www/py-clearsilver
-DEPENDS+=	${PYPKGPREFIX}-sqlite>=0.4.3:../../databases/py-sqlite
-DEPENDS+=	${PYPKGPREFIX}-subversion>=0.37:../../devel/py-subversion
+DEPENDS+=	${PYPKGPREFIX}-clearsilver>=0.9.14:../../www/py-clearsilver
+DEPENDS+=	${PYPKGPREFIX}-subversion>=1.1.0:../../devel/py-subversion
+DEPENDS+=	${PYPKGPREFIX}-{PgSQL>=2.4,psycopg>=1.1.14,sqlite>=0.5}:../../databases/py-sqlite
 
 PYDISTUTILSPKG=	YES
 PY_PATCHPLIST=	YES
-PYTHON_PATCH_SCRIPTS=	contrib/*.py
+PYTHON_PATCH_SCRIPTS=	contrib/*.py contrib/*-hook
+PYTHON_VERSIONS_ACCEPTED=	24 23
 
 EGDIR=		${PREFIX}/share/examples/trac
 
diff --git a/www/trac/PLIST b/www/trac/PLIST
index 3c5cb063b58..95cec1ddc99 100644
--- a/www/trac/PLIST
+++ b/www/trac/PLIST
@@ -1,127 +1,133 @@
-@comment $NetBSD: PLIST,v 1.8 2005/06/16 15:18:07 epg Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/11/03 23:04:29 epg Exp $
 bin/trac-admin
 bin/tracd
 bin/tracdb2env
 ${PYSITELIB}/trac/About.py
 ${PYSITELIB}/trac/About.pyc
 ${PYSITELIB}/trac/About.pyo
-${PYSITELIB}/trac/Browser.py
-${PYSITELIB}/trac/Browser.pyc
-${PYSITELIB}/trac/Browser.pyo
-${PYSITELIB}/trac/Changeset.py
-${PYSITELIB}/trac/Changeset.pyc
-${PYSITELIB}/trac/Changeset.pyo
-${PYSITELIB}/trac/Diff.py
-${PYSITELIB}/trac/Diff.pyc
-${PYSITELIB}/trac/Diff.pyo
-${PYSITELIB}/trac/Environment.py
-${PYSITELIB}/trac/Environment.pyc
-${PYSITELIB}/trac/Environment.pyo
-${PYSITELIB}/trac/File.py
-${PYSITELIB}/trac/File.pyc
-${PYSITELIB}/trac/File.pyo
-${PYSITELIB}/trac/Href.py
-${PYSITELIB}/trac/Href.pyc
-${PYSITELIB}/trac/Href.pyo
-${PYSITELIB}/trac/Log.py
-${PYSITELIB}/trac/Log.pyc
-${PYSITELIB}/trac/Log.pyo
-${PYSITELIB}/trac/Logging.py
-${PYSITELIB}/trac/Logging.pyc
-${PYSITELIB}/trac/Logging.pyo
-${PYSITELIB}/trac/Milestone.py
-${PYSITELIB}/trac/Milestone.pyc
-${PYSITELIB}/trac/Milestone.pyo
-${PYSITELIB}/trac/Mimeview.py
-${PYSITELIB}/trac/Mimeview.pyc
-${PYSITELIB}/trac/Mimeview.pyo
-${PYSITELIB}/trac/ModPythonHandler.py
-${PYSITELIB}/trac/ModPythonHandler.pyc
-${PYSITELIB}/trac/ModPythonHandler.pyo
-${PYSITELIB}/trac/Module.py
-${PYSITELIB}/trac/Module.pyc
-${PYSITELIB}/trac/Module.pyo
 ${PYSITELIB}/trac/Notify.py
 ${PYSITELIB}/trac/Notify.pyc
 ${PYSITELIB}/trac/Notify.pyo
-${PYSITELIB}/trac/Query.py
-${PYSITELIB}/trac/Query.pyc
-${PYSITELIB}/trac/Query.pyo
-${PYSITELIB}/trac/Report.py
-${PYSITELIB}/trac/Report.pyc
-${PYSITELIB}/trac/Report.pyo
-${PYSITELIB}/trac/Roadmap.py
-${PYSITELIB}/trac/Roadmap.pyc
-${PYSITELIB}/trac/Roadmap.pyo
 ${PYSITELIB}/trac/Search.py
 ${PYSITELIB}/trac/Search.pyc
 ${PYSITELIB}/trac/Search.pyo
-${PYSITELIB}/trac/Session.py
-${PYSITELIB}/trac/Session.pyc
-${PYSITELIB}/trac/Session.pyo
 ${PYSITELIB}/trac/Settings.py
 ${PYSITELIB}/trac/Settings.pyc
 ${PYSITELIB}/trac/Settings.pyo
-${PYSITELIB}/trac/Ticket.py
-${PYSITELIB}/trac/Ticket.pyc
-${PYSITELIB}/trac/Ticket.pyo
 ${PYSITELIB}/trac/Timeline.py
 ${PYSITELIB}/trac/Timeline.pyc
 ${PYSITELIB}/trac/Timeline.pyo
-${PYSITELIB}/trac/Wiki.py
-${PYSITELIB}/trac/Wiki.pyc
-${PYSITELIB}/trac/Wiki.pyo
-${PYSITELIB}/trac/WikiFormatter.py
-${PYSITELIB}/trac/WikiFormatter.pyc
-${PYSITELIB}/trac/WikiFormatter.pyo
 ${PYSITELIB}/trac/__init__.py
 ${PYSITELIB}/trac/__init__.pyc
 ${PYSITELIB}/trac/__init__.pyo
-${PYSITELIB}/trac/auth.py
-${PYSITELIB}/trac/auth.pyc
-${PYSITELIB}/trac/auth.pyo
-${PYSITELIB}/trac/authzperm.py
-${PYSITELIB}/trac/authzperm.pyc
-${PYSITELIB}/trac/authzperm.pyo
+${PYSITELIB}/trac/attachment.py
+${PYSITELIB}/trac/attachment.pyc
+${PYSITELIB}/trac/attachment.pyo
+${PYSITELIB}/trac/config.py
+${PYSITELIB}/trac/config.pyc
+${PYSITELIB}/trac/config.pyo
 ${PYSITELIB}/trac/core.py
 ${PYSITELIB}/trac/core.pyc
 ${PYSITELIB}/trac/core.pyo
+${PYSITELIB}/trac/db.py
+${PYSITELIB}/trac/db.pyc
+${PYSITELIB}/trac/db.pyo
 ${PYSITELIB}/trac/db_default.py
 ${PYSITELIB}/trac/db_default.pyc
 ${PYSITELIB}/trac/db_default.pyo
-${PYSITELIB}/trac/mimeviewers/__init__.py
-${PYSITELIB}/trac/mimeviewers/__init__.pyc
-${PYSITELIB}/trac/mimeviewers/__init__.pyo
-${PYSITELIB}/trac/mimeviewers/default.py
-${PYSITELIB}/trac/mimeviewers/default.pyc
-${PYSITELIB}/trac/mimeviewers/default.pyo
-${PYSITELIB}/trac/mimeviewers/enscript.py
-${PYSITELIB}/trac/mimeviewers/enscript.pyc
-${PYSITELIB}/trac/mimeviewers/enscript.pyo
-${PYSITELIB}/trac/mimeviewers/image.py
-${PYSITELIB}/trac/mimeviewers/image.pyc
-${PYSITELIB}/trac/mimeviewers/image.pyo
-${PYSITELIB}/trac/mimeviewers/silvercity.py
-${PYSITELIB}/trac/mimeviewers/silvercity.pyc
-${PYSITELIB}/trac/mimeviewers/silvercity.pyo
-${PYSITELIB}/trac/mimeviewers/test.py
-${PYSITELIB}/trac/mimeviewers/test.pyc
-${PYSITELIB}/trac/mimeviewers/test.pyo
+${PYSITELIB}/trac/env.py
+${PYSITELIB}/trac/env.pyc
+${PYSITELIB}/trac/env.pyo
+${PYSITELIB}/trac/loader.py
+${PYSITELIB}/trac/loader.pyc
+${PYSITELIB}/trac/loader.pyo
+${PYSITELIB}/trac/log.py
+${PYSITELIB}/trac/log.pyc
+${PYSITELIB}/trac/log.pyo
+${PYSITELIB}/trac/mimeview/__init__.py
+${PYSITELIB}/trac/mimeview/__init__.pyc
+${PYSITELIB}/trac/mimeview/__init__.pyo
+${PYSITELIB}/trac/mimeview/api.py
+${PYSITELIB}/trac/mimeview/api.pyc
+${PYSITELIB}/trac/mimeview/api.pyo
+${PYSITELIB}/trac/mimeview/enscript.py
+${PYSITELIB}/trac/mimeview/enscript.pyc
+${PYSITELIB}/trac/mimeview/enscript.pyo
+${PYSITELIB}/trac/mimeview/patch.py
+${PYSITELIB}/trac/mimeview/patch.pyc
+${PYSITELIB}/trac/mimeview/patch.pyo
+${PYSITELIB}/trac/mimeview/php.py
+${PYSITELIB}/trac/mimeview/php.pyc
+${PYSITELIB}/trac/mimeview/php.pyo
+${PYSITELIB}/trac/mimeview/rst.py
+${PYSITELIB}/trac/mimeview/rst.pyc
+${PYSITELIB}/trac/mimeview/rst.pyo
+${PYSITELIB}/trac/mimeview/silvercity.py
+${PYSITELIB}/trac/mimeview/silvercity.pyc
+${PYSITELIB}/trac/mimeview/silvercity.pyo
+${PYSITELIB}/trac/mimeview/txtl.py
+${PYSITELIB}/trac/mimeview/txtl.pyc
+${PYSITELIB}/trac/mimeview/txtl.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/sync.py
-${PYSITELIB}/trac/sync.pyc
-${PYSITELIB}/trac/sync.pyo
 ${PYSITELIB}/trac/test.py
 ${PYSITELIB}/trac/test.pyc
 ${PYSITELIB}/trac/test.pyo
+${PYSITELIB}/trac/ticket/__init__.py
+${PYSITELIB}/trac/ticket/__init__.pyc
+${PYSITELIB}/trac/ticket/__init__.pyo
+${PYSITELIB}/trac/ticket/api.py
+${PYSITELIB}/trac/ticket/api.pyc
+${PYSITELIB}/trac/ticket/api.pyo
+${PYSITELIB}/trac/ticket/model.py
+${PYSITELIB}/trac/ticket/model.pyc
+${PYSITELIB}/trac/ticket/model.pyo
+${PYSITELIB}/trac/ticket/query.py
+${PYSITELIB}/trac/ticket/query.pyc
+${PYSITELIB}/trac/ticket/query.pyo
+${PYSITELIB}/trac/ticket/report.py
+${PYSITELIB}/trac/ticket/report.pyc
+${PYSITELIB}/trac/ticket/report.pyo
+${PYSITELIB}/trac/ticket/roadmap.py
+${PYSITELIB}/trac/ticket/roadmap.pyc
+${PYSITELIB}/trac/ticket/roadmap.pyo
+${PYSITELIB}/trac/ticket/web_ui.py
+${PYSITELIB}/trac/ticket/web_ui.pyc
+${PYSITELIB}/trac/ticket/web_ui.pyo
 ${PYSITELIB}/trac/upgrades/__init__.py
 ${PYSITELIB}/trac/upgrades/__init__.pyc
 ${PYSITELIB}/trac/upgrades/__init__.pyo
+${PYSITELIB}/trac/upgrades/db10.py
+${PYSITELIB}/trac/upgrades/db10.pyc
+${PYSITELIB}/trac/upgrades/db10.pyo
+${PYSITELIB}/trac/upgrades/db11.py
+${PYSITELIB}/trac/upgrades/db11.pyc
+${PYSITELIB}/trac/upgrades/db11.pyo
+${PYSITELIB}/trac/upgrades/db12.py
+${PYSITELIB}/trac/upgrades/db12.pyc
+${PYSITELIB}/trac/upgrades/db12.pyo
+${PYSITELIB}/trac/upgrades/db13.py
+${PYSITELIB}/trac/upgrades/db13.pyc
+${PYSITELIB}/trac/upgrades/db13.pyo
+${PYSITELIB}/trac/upgrades/db14.py
+${PYSITELIB}/trac/upgrades/db14.pyc
+${PYSITELIB}/trac/upgrades/db14.pyo
+${PYSITELIB}/trac/upgrades/db15.py
+${PYSITELIB}/trac/upgrades/db15.pyc
+${PYSITELIB}/trac/upgrades/db15.pyo
+${PYSITELIB}/trac/upgrades/db16.py
+${PYSITELIB}/trac/upgrades/db16.pyc
+${PYSITELIB}/trac/upgrades/db16.pyo
 ${PYSITELIB}/trac/upgrades/db3.py
 ${PYSITELIB}/trac/upgrades/db3.pyc
 ${PYSITELIB}/trac/upgrades/db3.pyo
@@ -137,47 +143,121 @@ ${PYSITELIB}/trac/upgrades/db6.pyo
 ${PYSITELIB}/trac/upgrades/db7.py
 ${PYSITELIB}/trac/upgrades/db7.pyc
 ${PYSITELIB}/trac/upgrades/db7.pyo
+${PYSITELIB}/trac/upgrades/db8.py
+${PYSITELIB}/trac/upgrades/db8.pyc
+${PYSITELIB}/trac/upgrades/db8.pyo
+${PYSITELIB}/trac/upgrades/db9.py
+${PYSITELIB}/trac/upgrades/db9.pyc
+${PYSITELIB}/trac/upgrades/db9.pyo
 ${PYSITELIB}/trac/util.py
 ${PYSITELIB}/trac/util.pyc
 ${PYSITELIB}/trac/util.pyo
-${PYSITELIB}/trac/wikimacros/HelloWorld.py
-${PYSITELIB}/trac/wikimacros/HelloWorld.pyc
-${PYSITELIB}/trac/wikimacros/HelloWorld.pyo
-${PYSITELIB}/trac/wikimacros/RecentChanges.py
-${PYSITELIB}/trac/wikimacros/RecentChanges.pyc
-${PYSITELIB}/trac/wikimacros/RecentChanges.pyo
-${PYSITELIB}/trac/wikimacros/Timestamp.py
-${PYSITELIB}/trac/wikimacros/Timestamp.pyc
-${PYSITELIB}/trac/wikimacros/Timestamp.pyo
-${PYSITELIB}/trac/wikimacros/TitleIndex.py
-${PYSITELIB}/trac/wikimacros/TitleIndex.pyc
-${PYSITELIB}/trac/wikimacros/TitleIndex.pyo
-${PYSITELIB}/trac/wikimacros/TracGuideToc.py
-${PYSITELIB}/trac/wikimacros/TracGuideToc.pyc
-${PYSITELIB}/trac/wikimacros/TracGuideToc.pyo
-${PYSITELIB}/trac/wikimacros/__init__.py
-${PYSITELIB}/trac/wikimacros/__init__.pyc
-${PYSITELIB}/trac/wikimacros/__init__.pyo
-${PYSITELIB}/trac/wikimacros/rst.py
-${PYSITELIB}/trac/wikimacros/rst.pyc
-${PYSITELIB}/trac/wikimacros/rst.pyo
-${PYSITELIB}/trac/wikimacros/txtl.py
-${PYSITELIB}/trac/wikimacros/txtl.pyc
-${PYSITELIB}/trac/wikimacros/txtl.pyo
+${PYSITELIB}/trac/versioncontrol/__init__.py
+${PYSITELIB}/trac/versioncontrol/__init__.pyc
+${PYSITELIB}/trac/versioncontrol/__init__.pyo
+${PYSITELIB}/trac/versioncontrol/api.py
+${PYSITELIB}/trac/versioncontrol/api.pyc
+${PYSITELIB}/trac/versioncontrol/api.pyo
+${PYSITELIB}/trac/versioncontrol/cache.py
+${PYSITELIB}/trac/versioncontrol/cache.pyc
+${PYSITELIB}/trac/versioncontrol/cache.pyo
+${PYSITELIB}/trac/versioncontrol/diff.py
+${PYSITELIB}/trac/versioncontrol/diff.pyc
+${PYSITELIB}/trac/versioncontrol/diff.pyo
+${PYSITELIB}/trac/versioncontrol/svn_authz.py
+${PYSITELIB}/trac/versioncontrol/svn_authz.pyc
+${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/web_ui/__init__.py
+${PYSITELIB}/trac/versioncontrol/web_ui/__init__.pyc
+${PYSITELIB}/trac/versioncontrol/web_ui/__init__.pyo
+${PYSITELIB}/trac/versioncontrol/web_ui/browser.py
+${PYSITELIB}/trac/versioncontrol/web_ui/browser.pyc
+${PYSITELIB}/trac/versioncontrol/web_ui/browser.pyo
+${PYSITELIB}/trac/versioncontrol/web_ui/changeset.py
+${PYSITELIB}/trac/versioncontrol/web_ui/changeset.pyc
+${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/util.py
+${PYSITELIB}/trac/versioncontrol/web_ui/util.pyc
+${PYSITELIB}/trac/versioncontrol/web_ui/util.pyo
+${PYSITELIB}/trac/web/__init__.py
+${PYSITELIB}/trac/web/__init__.pyc
+${PYSITELIB}/trac/web/__init__.pyo
+${PYSITELIB}/trac/web/_fcgi.py
+${PYSITELIB}/trac/web/_fcgi.pyc
+${PYSITELIB}/trac/web/_fcgi.pyo
+${PYSITELIB}/trac/web/api.py
+${PYSITELIB}/trac/web/api.pyc
+${PYSITELIB}/trac/web/api.pyo
+${PYSITELIB}/trac/web/auth.py
+${PYSITELIB}/trac/web/auth.pyc
+${PYSITELIB}/trac/web/auth.pyo
+${PYSITELIB}/trac/web/cgi_frontend.py
+${PYSITELIB}/trac/web/cgi_frontend.pyc
+${PYSITELIB}/trac/web/cgi_frontend.pyo
+${PYSITELIB}/trac/web/chrome.py
+${PYSITELIB}/trac/web/chrome.pyc
+${PYSITELIB}/trac/web/chrome.pyo
+${PYSITELIB}/trac/web/clearsilver.py
+${PYSITELIB}/trac/web/clearsilver.pyc
+${PYSITELIB}/trac/web/clearsilver.pyo
+${PYSITELIB}/trac/web/fcgi_frontend.py
+${PYSITELIB}/trac/web/fcgi_frontend.pyc
+${PYSITELIB}/trac/web/fcgi_frontend.pyo
+${PYSITELIB}/trac/web/href.py
+${PYSITELIB}/trac/web/href.pyc
+${PYSITELIB}/trac/web/href.pyo
+${PYSITELIB}/trac/web/main.py
+${PYSITELIB}/trac/web/main.pyc
+${PYSITELIB}/trac/web/main.pyo
+${PYSITELIB}/trac/web/modpython_frontend.py
+${PYSITELIB}/trac/web/modpython_frontend.pyc
+${PYSITELIB}/trac/web/modpython_frontend.pyo
+${PYSITELIB}/trac/web/session.py
+${PYSITELIB}/trac/web/session.pyc
+${PYSITELIB}/trac/web/session.pyo
+${PYSITELIB}/trac/web/standalone.py
+${PYSITELIB}/trac/web/standalone.pyc
+${PYSITELIB}/trac/web/standalone.pyo
+${PYSITELIB}/trac/wiki/__init__.py
+${PYSITELIB}/trac/wiki/__init__.pyc
+${PYSITELIB}/trac/wiki/__init__.pyo
+${PYSITELIB}/trac/wiki/api.py
+${PYSITELIB}/trac/wiki/api.pyc
+${PYSITELIB}/trac/wiki/api.pyo
+${PYSITELIB}/trac/wiki/formatter.py
+${PYSITELIB}/trac/wiki/formatter.pyc
+${PYSITELIB}/trac/wiki/formatter.pyo
+${PYSITELIB}/trac/wiki/macros.py
+${PYSITELIB}/trac/wiki/macros.pyc
+${PYSITELIB}/trac/wiki/macros.pyo
+${PYSITELIB}/trac/wiki/model.py
+${PYSITELIB}/trac/wiki/model.pyc
+${PYSITELIB}/trac/wiki/model.pyo
+${PYSITELIB}/trac/wiki/web_ui.py
+${PYSITELIB}/trac/wiki/web_ui.pyc
+${PYSITELIB}/trac/wiki/web_ui.pyo
 share/examples/trac/README
 share/examples/trac/bugzilla2trac.py
 share/examples/trac/emailfilter.py
 share/examples/trac/sourceforge2trac.py
 share/examples/trac/trac-post-commit-hook
 share/examples/trac/trac-pre-commit-hook
-share/man/man1/trac-admin.1
-share/man/man1/tracd.1
-share/man/man1/tracdb2env.1
+${PKGMANDIR}/man1/trac-admin.1
+${PKGMANDIR}/man1/tracd.1
+${PKGMANDIR}/man1/tracdb2env.1
 share/trac/cgi-bin/trac.cgi
+share/trac/cgi-bin/trac.fcgi
 share/trac/htdocs/README
 share/trac/htdocs/asc.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
@@ -194,6 +274,7 @@ share/trac/htdocs/dots.gif
 share/trac/htdocs/draft.png
 share/trac/htdocs/edgewall.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/filedeny.png
@@ -201,13 +282,15 @@ share/trac/htdocs/folder.png
 share/trac/htdocs/folderdeny.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/topbar_gradient.png
 share/trac/htdocs/topbar_gradient2.png
 share/trac/htdocs/trac.ico
-share/trac/htdocs/trac.js
 share/trac/htdocs/trac_banner.png
 share/trac/htdocs/trac_logo_mini.png
 share/trac/htdocs/wiki.png
@@ -217,15 +300,16 @@ share/trac/templates/attachment.cs
 share/trac/templates/browser.cs
 share/trac/templates/changeset.cs
 share/trac/templates/error.cs
-share/trac/templates/file.cs
 share/trac/templates/footer.cs
 share/trac/templates/header.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
@@ -244,19 +328,21 @@ 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/TracInstallPlatforms
+share/trac/wiki-default/TracInterfaceCustomization
 share/trac/wiki-default/TracLinks
 share/trac/wiki-default/TracLogging
 share/trac/wiki-default/TracModPython
-share/trac/wiki-default/TracMultipleProjects
 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/TracRoadmap
@@ -271,6 +357,7 @@ 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
@@ -280,14 +367,24 @@ 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/htdocs/js
 @dirrm share/trac/htdocs/css
 @dirrm share/trac/htdocs
 @dirrm share/trac/cgi-bin
 @dirrm share/trac
 @dirrm share/examples/trac
-@dirrm ${PYSITELIB}/trac/wikimacros
+@dirrm ${PYSITELIB}/trac/wiki
+@dirrm ${PYSITELIB}/trac/web
+@dirrm ${PYSITELIB}/trac/versioncontrol/web_ui
+@dirrm ${PYSITELIB}/trac/versioncontrol
 @dirrm ${PYSITELIB}/trac/upgrades
-@dirrm ${PYSITELIB}/trac/mimeviewers
+@dirrm ${PYSITELIB}/trac/ticket
+@dirrm ${PYSITELIB}/trac/scripts
+@dirrm ${PYSITELIB}/trac/mimeview
 @dirrm ${PYSITELIB}/trac
diff --git a/www/trac/distinfo b/www/trac/distinfo
index 6dd6e502244..2ff6e72eaeb 100644
--- a/www/trac/distinfo
+++ b/www/trac/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2005/06/20 19:20:11 epg Exp $
+$NetBSD: distinfo,v 1.11 2005/11/03 23:04:29 epg Exp $
 
-SHA1 (trac-0.8.4.tar.gz) = 4497b4b8b3c717fcb22860a320c4162abdffac9b
-RMD160 (trac-0.8.4.tar.gz) = 02abbb8bd3ac9e7b37a0ca39a5373c91c393b644
-Size (trac-0.8.4.tar.gz) = 216950 bytes
+SHA1 (trac-0.9.tar.gz) = 61ee8db9d3aba7dd1e63ac4c4c852cf62d013323
+RMD160 (trac-0.9.tar.gz) = 44932caa9d68738b768b2b1de58364fb572eb270
+Size (trac-0.9.tar.gz) = 333250 bytes
+SHA1 (patch-aa) = 5d8c1c3e5416e73d6cc24a5a45d4ec7afdc4a095
diff --git a/www/trac/patches/patch-aa b/www/trac/patches/patch-aa
new file mode 100644
index 00000000000..a702a02700c
--- /dev/null
+++ b/www/trac/patches/patch-aa
@@ -0,0 +1,13 @@
+$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'),