- Upgrade to 0.10.3-ja-1 [1].

- Integrate my local timezone patch as non-optional, but not activated
  until "[notification] local_timezone = true" set.

PR:		ports/109242 [1]
Submitted by:	TAKATSU Tomonari <tota@rtfm.jp> [1]

8 files changed, 123 insertions, 93 deletions

diff --git a/japanese/trac/Makefile b/japanese/trac/Makefile
index e5eb5186b339..37c84d26483b 100644
--- a/japanese/trac/Makefile
+++ b/japanese/trac/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	trac
-PORTVERSION=	0.9.6
-PORTREVISION=	3
+PORTVERSION=	0.10.3
 CATEGORIES=	japanese www devel python
 MASTER_SITES=	http://dist.bsdlab.org/ \
 		http://www.i-act.co.jp/project/products/downloads/
@@ -23,8 +22,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 OPTIONS=	SILVERCITY "Use Silvercity for syntax highlighting" On \
-		DOCUTILS   "Allow additional text markup" On \
-		LOCALTZ    "Use local TZ in notify mail Date: header" Off
+		DOCUTILS   "Allow additional text markup" On
 CONFLICTS=	trac-0.*
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-ja-1
 
@@ -32,7 +30,7 @@ USE_ZIP=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
-MAN1=		trac-admin.1 tracd.1 tracdb2env.1
+MAN1=		trac-admin.1 tracd.1
 
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
@@ -45,9 +43,6 @@ x-generate-plist:
 		;s,@dirrm (%%PYTHON_SITELIBDIR%%|${PYTHON_LIBDIR:S,${PYTHONBASE}/,,})$$,,g \
 		' | ${TR} -s '\n') > temp-pkg-plist
 
-post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' | ${XARGS} ${RM}
-
 post-install:
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
@@ -63,8 +58,4 @@ RUN_DEPENDS+=	${PREFIX}/bin/source2html.py:${PORTSDIR}/textproc/silvercity
 RUN_DEPENDS+=	${PREFIX}/bin/rst2html:${PORTSDIR}/textproc/py-docutils
 .endif
 
-.if defined(WITH_LOCALTZ)
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-Notify.py
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/japanese/trac/distinfo b/japanese/trac/distinfo
index cc1b498b64a3..afbfdf7c6aa6 100644
--- a/japanese/trac/distinfo
+++ b/japanese/trac/distinfo
@@ -1,3 +1,3 @@
-MD5 (trac-0.9.6-ja-1.zip) = b8cd00239ca34c0c2c005606a10fcd2a
-SHA256 (trac-0.9.6-ja-1.zip) = 6ef551fdc72ea8446622413618f65dd8175bbde6527894e49890a1f2ff016aca
-SIZE (trac-0.9.6-ja-1.zip) = 503233
+MD5 (trac-0.10.3-ja-1.zip) = 2ed8046e0f59c3751b35b1941789baee
+SHA256 (trac-0.10.3-ja-1.zip) = d4b8a505d003649eb2dde7e85674280e9b84caf3721db74696d8d4d928823247
+SIZE (trac-0.10.3-ja-1.zip) = 644169
diff --git a/japanese/trac/files/extra-patch-Notify.py b/japanese/trac/files/extra-patch-Notify.py
deleted file mode 100644
index 5e7d1e044d10..000000000000
--- a/japanese/trac/files/extra-patch-Notify.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- trac/Notify.py.orig2	Tue Aug 22 19:47:42 2006
-+++ trac/Notify.py	Tue Aug 22 19:48:00 2006
-@@ -139,7 +139,7 @@
-         msg['Sender'] = self.from_email
-         msg['Reply-To'] = self.replyto_email
-         msg['To'] = rcpt
--        msg['Date'] = formatdate()
-+        msg['Date'] = formatdate(time.time(), self.config.getbool('notification', 'local_timezone'))
-         for hdr in mime_headers.keys():
-             msg[hdr] = mime_headers[hdr]
-         self.env.log.debug("Sending SMTP notification to %s on port %d"
diff --git a/japanese/trac/files/patch-Notify.py b/japanese/trac/files/patch-Notify.py
deleted file mode 100644
index 0bd01259038a..000000000000
--- a/japanese/trac/files/patch-Notify.py
+++ /dev/null
@@ -1,32 +0,0 @@
---- trac/Notify.py.orig	Thu Feb 16 10:47:21 2006
-+++ trac/Notify.py	Wed May 24 16:12:07 2006
-@@ -23,6 +23,7 @@
- import md5
- import time
- import smtplib
-+import string
- 
- 
- class Notify:
-@@ -123,15 +124,17 @@
-         from email.Header import Header
-         from email.Utils import formatdate
-         body = self.hdf.render(self.template_name)
--        msg = MIMEMultipart()
--        msg.attach(MIMEText(body, 'plain', 'utf-8'))
--        msg.epilogue = ''
-+        body_esc = string.replace(unicode(body, 'utf-8'), u'\uff5e', u'\u301c').replace(u'\u2225', u'\u2016').replace(u'\uff0d', u'\u2212')
-+        body = body_esc.encode('japanese.c.iso-2022-jp')
-+        msg = MIMEText(body, 'plain', 'iso-2022-jp')
-         msg['X-Mailer'] = 'Trac %s, by Edgewall Software' % __version__
-         msg['X-Trac-Version'] =  __version__
-         projname = self.config.get('project','name')
-         msg['X-Trac-Project'] =  projname
-         msg['X-URL'] =  self.config.get('project','url')
--        msg['Subject'] = Header(self.subject, 'utf-8')
-+        subj = unicode(self.subject, 'utf-8')
-+        subj_esc = string.replace(subj, u'\uff5e', u'\u301c').replace(u'\u2225', u'\u2016').replace(u'\uff0d', u'\u2212')
-+        msg['Subject'] = Header(subj_esc.encode('japanese.c.iso-2022-jp'), 'iso-2022-jp')
-         msg['From'] = '%s <%s>' % (projname, self.from_email)
-         msg['Sender'] = self.from_email
-         msg['Reply-To'] = self.replyto_email
diff --git a/japanese/trac/files/patch-db_default.py b/japanese/trac/files/patch-db_default.py
deleted file mode 100644
index 51b4d26243ac..000000000000
--- a/japanese/trac/files/patch-db_default.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- trac/db_default.py.orig	Sat Jul  8 08:40:03 2006
-+++ trac/db_default.py	Sat Jul  8 08:40:05 2006
-@@ -385,7 +385,7 @@
-  (('trac', 'repository_dir', ''),
-   ('trac', 'templates_dir', default_dir('templates')),
-   ('trac', 'database', 'sqlite:db/trac.db'),
--  ('trac', 'default_charset', 'iso-8859-15'),
-+  ('trac', 'default_charset', 'utf-8'),
-   ('trac', 'default_handler', 'WikiModule'),
-   ('trac', 'check_auth_ip', 'true'),
-   ('trac', 'ignore_auth_case', 'false'),
diff --git a/japanese/trac/files/patch-formatter.py b/japanese/trac/files/patch-formatter.py
deleted file mode 100644
index 1d73a2ad43ac..000000000000
--- a/japanese/trac/files/patch-formatter.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- trac/wiki/formatter.py.orig	Thu Aug 24 12:45:42 2006
-+++ trac/wiki/formatter.py	Thu Aug 24 12:46:01 2006
-@@ -307,7 +307,7 @@
-             return '<img src="%s" alt="%s" />' % (url, title or text)
-         if not url.startswith(self._local):
-             return '<a class="ext-link" href="%s"%s><span class="icon">' \
--                   '</span>%s</a>' % (url, title_attr, text)
-+                   '%s</span></a>' % (url, title_attr, text)
-         else:
-             return '<a href="%s"%s>%s</a>' % (url, title_attr, text)
- 
diff --git a/japanese/trac/files/patch-notification.py b/japanese/trac/files/patch-notification.py
new file mode 100644
index 000000000000..74841dd648da
--- /dev/null
+++ b/japanese/trac/files/patch-notification.py
@@ -0,0 +1,35 @@
+--- ./trac/notification.py.orig	Sun Mar  4 18:14:39 2007
++++ ./trac/notification.py	Sun Mar  4 21:58:03 2007
+@@ -225,6 +225,13 @@
+             tmp = name.encode('ascii')
+             header = Header(tmp, 'ascii', maxlinelen=maxlength)
+         except UnicodeEncodeError:
++	  if self.env.config.get('notification', 'mime_encoding').lower() == 'none':
++	    try:
++		tmp = name.encode('iso-2022-jp')
++		header = Header(tmp, 'iso-2022-jp', maxlinelen=maxlength)
++	    except UnicodeEncodeError:
++		pass
++	  if not header:
+             header = Header(name, self._charset, maxlinelen=maxlength)
+         if not email:
+             return header
+@@ -343,12 +350,17 @@
+                 headers['To'] = ', '.join(toaddrs)
+         if pcc:
+             headers['Cc'] = ', '.join(pcc)
+-        headers['Date'] = formatdate()
++        headers['Date'] = formatdate(time.time(), self.config.getbool('notification', 'local_timezone'))
+         # sanity check
+         if not self._charset.body_encoding:
+             try:
+                 dummy = body.encode('ascii')
+             except UnicodeDecodeError:
++	      try:
++		dummy = unicode(body, 'utf8');
++		body = dummy.encode('iso-2022-jp')
++		self._charset.output_charset = 'iso-2022-jp'
++	      except UnicodeDecodeError:
+                 raise TracError, "Ticket contains non-Ascii chars. " \
+                                  "Please change encoding setting"
+         msg = MIMEText(body, 'plain')
diff --git a/japanese/trac/pkg-plist b/japanese/trac/pkg-plist
index 2a6578bc20c4..15f2c133855d 100644
--- a/japanese/trac/pkg-plist
+++ b/japanese/trac/pkg-plist
@@ -1,12 +1,8 @@
 bin/trac-admin
 bin/tracd
-bin/tracdb2env
 %%PYTHON_SITELIBDIR%%/trac/About.py
 %%PYTHON_SITELIBDIR%%/trac/About.pyc
 %%PYTHON_SITELIBDIR%%/trac/About.pyo
-%%PYTHON_SITELIBDIR%%/trac/Notify.py
-%%PYTHON_SITELIBDIR%%/trac/Notify.pyc
-%%PYTHON_SITELIBDIR%%/trac/Notify.pyo
 %%PYTHON_SITELIBDIR%%/trac/Search.py
 %%PYTHON_SITELIBDIR%%/trac/Search.pyc
 %%PYTHON_SITELIBDIR%%/trac/Search.pyo
@@ -28,12 +24,33 @@ bin/tracdb2env
 %%PYTHON_SITELIBDIR%%/trac/core.py
 %%PYTHON_SITELIBDIR%%/trac/core.pyc
 %%PYTHON_SITELIBDIR%%/trac/core.pyo
-%%PYTHON_SITELIBDIR%%/trac/db.py
-%%PYTHON_SITELIBDIR%%/trac/db.pyc
-%%PYTHON_SITELIBDIR%%/trac/db.pyo
 %%PYTHON_SITELIBDIR%%/trac/db_default.py
 %%PYTHON_SITELIBDIR%%/trac/db_default.pyc
 %%PYTHON_SITELIBDIR%%/trac/db_default.pyo
+%%PYTHON_SITELIBDIR%%/trac/db/__init__.py
+%%PYTHON_SITELIBDIR%%/trac/db/__init__.pyc
+%%PYTHON_SITELIBDIR%%/trac/db/__init__.pyo
+%%PYTHON_SITELIBDIR%%/trac/db/api.py
+%%PYTHON_SITELIBDIR%%/trac/db/api.pyc
+%%PYTHON_SITELIBDIR%%/trac/db/api.pyo
+%%PYTHON_SITELIBDIR%%/trac/db/mysql_backend.py
+%%PYTHON_SITELIBDIR%%/trac/db/mysql_backend.pyc
+%%PYTHON_SITELIBDIR%%/trac/db/mysql_backend.pyo
+%%PYTHON_SITELIBDIR%%/trac/db/pool.py
+%%PYTHON_SITELIBDIR%%/trac/db/pool.pyc
+%%PYTHON_SITELIBDIR%%/trac/db/pool.pyo
+%%PYTHON_SITELIBDIR%%/trac/db/postgres_backend.py
+%%PYTHON_SITELIBDIR%%/trac/db/postgres_backend.pyc
+%%PYTHON_SITELIBDIR%%/trac/db/postgres_backend.pyo
+%%PYTHON_SITELIBDIR%%/trac/db/schema.py
+%%PYTHON_SITELIBDIR%%/trac/db/schema.pyc
+%%PYTHON_SITELIBDIR%%/trac/db/schema.pyo
+%%PYTHON_SITELIBDIR%%/trac/db/sqlite_backend.py
+%%PYTHON_SITELIBDIR%%/trac/db/sqlite_backend.pyc
+%%PYTHON_SITELIBDIR%%/trac/db/sqlite_backend.pyo
+%%PYTHON_SITELIBDIR%%/trac/db/util.py
+%%PYTHON_SITELIBDIR%%/trac/db/util.pyc
+%%PYTHON_SITELIBDIR%%/trac/db/util.pyo
 %%PYTHON_SITELIBDIR%%/trac/env.py
 %%PYTHON_SITELIBDIR%%/trac/env.pyc
 %%PYTHON_SITELIBDIR%%/trac/env.pyo
@@ -67,6 +84,9 @@ bin/tracdb2env
 %%PYTHON_SITELIBDIR%%/trac/mimeview/txtl.py
 %%PYTHON_SITELIBDIR%%/trac/mimeview/txtl.pyc
 %%PYTHON_SITELIBDIR%%/trac/mimeview/txtl.pyo
+%%PYTHON_SITELIBDIR%%/trac/notification.py
+%%PYTHON_SITELIBDIR%%/trac/notification.pyc
+%%PYTHON_SITELIBDIR%%/trac/notification.pyo
 %%PYTHON_SITELIBDIR%%/trac/perm.py
 %%PYTHON_SITELIBDIR%%/trac/perm.pyc
 %%PYTHON_SITELIBDIR%%/trac/perm.pyo
@@ -91,6 +111,9 @@ bin/tracdb2env
 %%PYTHON_SITELIBDIR%%/trac/ticket/model.py
 %%PYTHON_SITELIBDIR%%/trac/ticket/model.pyc
 %%PYTHON_SITELIBDIR%%/trac/ticket/model.pyo
+%%PYTHON_SITELIBDIR%%/trac/ticket/notification.py
+%%PYTHON_SITELIBDIR%%/trac/ticket/notification.pyc
+%%PYTHON_SITELIBDIR%%/trac/ticket/notification.pyo
 %%PYTHON_SITELIBDIR%%/trac/ticket/query.py
 %%PYTHON_SITELIBDIR%%/trac/ticket/query.pyc
 %%PYTHON_SITELIBDIR%%/trac/ticket/query.pyo
@@ -127,6 +150,15 @@ bin/tracdb2env
 %%PYTHON_SITELIBDIR%%/trac/upgrades/db16.py
 %%PYTHON_SITELIBDIR%%/trac/upgrades/db16.pyc
 %%PYTHON_SITELIBDIR%%/trac/upgrades/db16.pyo
+%%PYTHON_SITELIBDIR%%/trac/upgrades/db17.py
+%%PYTHON_SITELIBDIR%%/trac/upgrades/db17.pyc
+%%PYTHON_SITELIBDIR%%/trac/upgrades/db17.pyo
+%%PYTHON_SITELIBDIR%%/trac/upgrades/db18.py
+%%PYTHON_SITELIBDIR%%/trac/upgrades/db18.pyc
+%%PYTHON_SITELIBDIR%%/trac/upgrades/db18.pyo
+%%PYTHON_SITELIBDIR%%/trac/upgrades/db19.py
+%%PYTHON_SITELIBDIR%%/trac/upgrades/db19.pyc
+%%PYTHON_SITELIBDIR%%/trac/upgrades/db19.pyo
 %%PYTHON_SITELIBDIR%%/trac/upgrades/db3.py
 %%PYTHON_SITELIBDIR%%/trac/upgrades/db3.pyc
 %%PYTHON_SITELIBDIR%%/trac/upgrades/db3.pyo
@@ -148,9 +180,24 @@ bin/tracdb2env
 %%PYTHON_SITELIBDIR%%/trac/upgrades/db9.py
 %%PYTHON_SITELIBDIR%%/trac/upgrades/db9.pyc
 %%PYTHON_SITELIBDIR%%/trac/upgrades/db9.pyo
-%%PYTHON_SITELIBDIR%%/trac/util.py
-%%PYTHON_SITELIBDIR%%/trac/util.pyc
-%%PYTHON_SITELIBDIR%%/trac/util.pyo
+%%PYTHON_SITELIBDIR%%/trac/util/__init__.py
+%%PYTHON_SITELIBDIR%%/trac/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/trac/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/trac/util/autoreload.py
+%%PYTHON_SITELIBDIR%%/trac/util/autoreload.pyc
+%%PYTHON_SITELIBDIR%%/trac/util/autoreload.pyo
+%%PYTHON_SITELIBDIR%%/trac/util/daemon.py
+%%PYTHON_SITELIBDIR%%/trac/util/daemon.pyc
+%%PYTHON_SITELIBDIR%%/trac/util/daemon.pyo
+%%PYTHON_SITELIBDIR%%/trac/util/datefmt.py
+%%PYTHON_SITELIBDIR%%/trac/util/datefmt.pyc
+%%PYTHON_SITELIBDIR%%/trac/util/datefmt.pyo
+%%PYTHON_SITELIBDIR%%/trac/util/html.py
+%%PYTHON_SITELIBDIR%%/trac/util/html.pyc
+%%PYTHON_SITELIBDIR%%/trac/util/html.pyo
+%%PYTHON_SITELIBDIR%%/trac/util/text.py
+%%PYTHON_SITELIBDIR%%/trac/util/text.pyc
+%%PYTHON_SITELIBDIR%%/trac/util/text.pyo
 %%PYTHON_SITELIBDIR%%/trac/versioncontrol/__init__.py
 %%PYTHON_SITELIBDIR%%/trac/versioncontrol/__init__.pyc
 %%PYTHON_SITELIBDIR%%/trac/versioncontrol/__init__.pyo
@@ -223,6 +270,15 @@ bin/tracdb2env
 %%PYTHON_SITELIBDIR%%/trac/web/standalone.py
 %%PYTHON_SITELIBDIR%%/trac/web/standalone.pyc
 %%PYTHON_SITELIBDIR%%/trac/web/standalone.pyo
+%%PYTHON_SITELIBDIR%%/trac/web/wsgi.py
+%%PYTHON_SITELIBDIR%%/trac/web/wsgi.pyc
+%%PYTHON_SITELIBDIR%%/trac/web/wsgi.pyo
+%%PYTHON_SITELIBDIR%%/trac/wiki/intertrac.py
+%%PYTHON_SITELIBDIR%%/trac/wiki/intertrac.pyc
+%%PYTHON_SITELIBDIR%%/trac/wiki/intertrac.pyo
+%%PYTHON_SITELIBDIR%%/trac/wiki/interwiki.py
+%%PYTHON_SITELIBDIR%%/trac/wiki/interwiki.pyc
+%%PYTHON_SITELIBDIR%%/trac/wiki/interwiki.pyo
 %%PYTHON_SITELIBDIR%%/trac/wiki/__init__.py
 %%PYTHON_SITELIBDIR%%/trac/wiki/__init__.pyc
 %%PYTHON_SITELIBDIR%%/trac/wiki/__init__.pyo
@@ -245,6 +301,7 @@ bin/tracdb2env
 %%DATADIR%%/cgi-bin/trac.fcgi
 %%DATADIR%%/htdocs/README
 %%DATADIR%%/htdocs/asc.png
+%%DATADIR%%/htdocs/attachment.png
 %%DATADIR%%/htdocs/changeset.png
 %%DATADIR%%/htdocs/closedticket.png
 %%DATADIR%%/htdocs/css/about.css
@@ -262,14 +319,11 @@ bin/tracdb2env
 %%DATADIR%%/htdocs/desc.png
 %%DATADIR%%/htdocs/dots.gif
 %%DATADIR%%/htdocs/draft.png
-%%DATADIR%%/htdocs/edgewall.png
 %%DATADIR%%/htdocs/edit_toolbar.png
 %%DATADIR%%/htdocs/editedticket.png
 %%DATADIR%%/htdocs/extlink.gif
 %%DATADIR%%/htdocs/file.png
-%%DATADIR%%/htdocs/filedeny.png
 %%DATADIR%%/htdocs/folder.png
-%%DATADIR%%/htdocs/folderdeny.png
 %%DATADIR%%/htdocs/ics.png
 %%DATADIR%%/htdocs/imggrid.png
 %%DATADIR%%/htdocs/js/query.js
@@ -278,6 +332,7 @@ bin/tracdb2env
 %%DATADIR%%/htdocs/milestone.png
 %%DATADIR%%/htdocs/newticket.png
 %%DATADIR%%/htdocs/parent.png
+%%DATADIR%%/htdocs/python.png
 %%DATADIR%%/htdocs/topbar_gradient.png
 %%DATADIR%%/htdocs/topbar_gradient2.png
 %%DATADIR%%/htdocs/trac.ico
@@ -286,12 +341,15 @@ bin/tracdb2env
 %%DATADIR%%/htdocs/wiki.png
 %%DATADIR%%/htdocs/xml.png
 %%DATADIR%%/templates/README
+%%DATADIR%%/templates/about.cs
+%%DATADIR%%/templates/anydiff.cs
 %%DATADIR%%/templates/attachment.cs
 %%DATADIR%%/templates/browser.cs
 %%DATADIR%%/templates/changeset.cs
 %%DATADIR%%/templates/error.cs
 %%DATADIR%%/templates/footer.cs
 %%DATADIR%%/templates/header.cs
+%%DATADIR%%/templates/index.cs
 %%DATADIR%%/templates/log.cs
 %%DATADIR%%/templates/log_changelog.cs
 %%DATADIR%%/templates/log_rss.cs
@@ -307,10 +365,14 @@ bin/tracdb2env
 %%DATADIR%%/templates/settings.cs
 %%DATADIR%%/templates/ticket.cs
 %%DATADIR%%/templates/ticket_notify_email.cs
+%%DATADIR%%/templates/ticket_rss.cs
 %%DATADIR%%/templates/timeline.cs
 %%DATADIR%%/templates/timeline_rss.cs
 %%DATADIR%%/templates/wiki.cs
 %%DATADIR%%/wiki-default/CamelCase
+%%DATADIR%%/wiki-default/InterMapTxt
+%%DATADIR%%/wiki-default/InterTrac
+%%DATADIR%%/wiki-default/InterWiki
 %%DATADIR%%/wiki-default/RecentChanges
 %%DATADIR%%/wiki-default/SandBox
 %%DATADIR%%/wiki-default/TitleIndex
@@ -336,6 +398,7 @@ bin/tracdb2env
 %%DATADIR%%/wiki-default/TracPlugins
 %%DATADIR%%/wiki-default/TracQuery
 %%DATADIR%%/wiki-default/TracReports
+%%DATADIR%%/wiki-default/TracRevisionLog
 %%DATADIR%%/wiki-default/TracRoadmap
 %%DATADIR%%/wiki-default/TracRss
 %%DATADIR%%/wiki-default/TracSearch
@@ -365,17 +428,23 @@ bin/tracdb2env
 @dirrm %%DATADIR%%/wiki-macros
 @dirrm %%DATADIR%%/wiki-default
 @dirrm %%DATADIR%%/templates
+@exec mkdir %D/%%DATADIR%%/plugins
+@dirrmtry %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/htdocs/js
 @dirrm %%DATADIR%%/htdocs/css
 @dirrm %%DATADIR%%/htdocs
+@exec mkdir %D/%%DATADIR%%/conf
+@dirrmtry %%DATADIR%%/conf
 @dirrm %%DATADIR%%/cgi-bin
 @dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/trac/wiki
 @dirrm %%PYTHON_SITELIBDIR%%/trac/web
 @dirrm %%PYTHON_SITELIBDIR%%/trac/versioncontrol/web_ui
 @dirrm %%PYTHON_SITELIBDIR%%/trac/versioncontrol
+@dirrm %%PYTHON_SITELIBDIR%%/trac/util
 @dirrm %%PYTHON_SITELIBDIR%%/trac/upgrades
 @dirrm %%PYTHON_SITELIBDIR%%/trac/ticket
 @dirrm %%PYTHON_SITELIBDIR%%/trac/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/trac/mimeview
+@dirrm %%PYTHON_SITELIBDIR%%/trac/db
 @dirrm %%PYTHON_SITELIBDIR%%/trac