- Upgrade to 0.11.5.ja1.

- Remove my hack about notification.local_timezone flag, and use
  recently added trac.default_timezone setting.
- Rewrite my patch about "prefer iso-2022-jp" encoding in notification
  mail.

Feature safe:	yes

4 files changed, 58 insertions, 32 deletions

diff --git a/japanese/trac/Makefile b/japanese/trac/Makefile
index 4fd0e0fcd033..3f4c74564524 100644
--- a/japanese/trac/Makefile
+++ b/japanese/trac/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	trac
-PORTVERSION=	0.11.4
+PORTVERSION=	0.11.5
 CATEGORIES=	japanese www devel python
 MASTER_SITES=	http://dist.bsdlab.org/ \
 		http://www.i-act.co.jp/project/products/downloads/
diff --git a/japanese/trac/distinfo b/japanese/trac/distinfo
index b4469b32e808..588c256c6e1d 100644
--- a/japanese/trac/distinfo
+++ b/japanese/trac/distinfo
@@ -1,3 +1,3 @@
-MD5 (Trac-0.11.4.ja1.zip) = 5eebfc43bce00c02931dde0969602f57
-SHA256 (Trac-0.11.4.ja1.zip) = a08976c2d02121e3cfceda5f6a7d4224cb1c1f1b8ec7d28855baff5321b8566e
-SIZE (Trac-0.11.4.ja1.zip) = 1007784
+MD5 (Trac-0.11.5.ja1.zip) = 9e7f40b8049864829616c09650f4a10b
+SHA256 (Trac-0.11.5.ja1.zip) = c8363ef1123f699fbd1ef45dac6044128a1f3a2c39a01607bae2692f6e14d458
+SIZE (Trac-0.11.5.ja1.zip) = 1008558
diff --git a/japanese/trac/files/patch-notification.py b/japanese/trac/files/patch-notification.py
index 8fd329255008..05e433369cff 100644
--- a/japanese/trac/files/patch-notification.py
+++ b/japanese/trac/files/patch-notification.py
@@ -1,6 +1,6 @@
---- trac/notification.py.orig	2008-08-17 14:28:38.000000000 +0900
-+++ trac/notification.py	2008-08-24 18:30:45.000000000 +0900
-@@ -248,6 +248,7 @@
+--- trac/notification.py.orig	2009-09-16 14:26:41.787493029 +0900
++++ trac/notification.py	2009-09-16 14:25:56.397348835 +0900
+@@ -243,6 +243,7 @@
      def format_header(self, key, name, email=None):
          from email.Header import Header
          maxlength = MAXHEADERLEN-(len(key)+2)
@@ -8,36 +8,55 @@
          # Do not sent ridiculous short headers
          if maxlength < 10:
              raise TracError(_("Header length is too short"))
-@@ -255,6 +256,13 @@
+@@ -250,7 +251,14 @@
              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)
+-            header = Header(name, self._charset, maxlinelen=maxlength)
++            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
-@@ -386,12 +394,17 @@
-                 headers['To'] = ', '.join(toaddrs)
+         else:
+@@ -383,6 +391,35 @@
          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"))
+         headers['Date'] = formatdate()
++        # Use specified timezone in Date: header.
++        tz = self.config.get('trac', 'default_timezone')
++        if tz:
++            import os
++            preserve_tz = 0
++            old_tz = ''
++            if os.environ.has_key('TZ'):
++                preserve_tz = 1
++                old_tz = os.environ['TZ']
++            os.environ['TZ'] = tz
++            time.tzset()
++            headers['Date'] = formatdate(time.time(), True)
++            if preserve_tz:
++                os.environ['TZ'] = old_tz
++            else:
++                del os.environ['TZ']
++            time.tzset()
++        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 UnicodeEncodeError:
++                    pass
++                except UnicodeDecodeError:
++                    pass
          msg = MIMEText(body, 'plain')
+         # Message class computes the wrong type from MIMEText constructor,
+         # which does not take a Charset object as initializer. Reset the
diff --git a/japanese/trac/pkg-plist b/japanese/trac/pkg-plist
index 56c423d00161..57353a65d79a 100644
--- a/japanese/trac/pkg-plist
+++ b/japanese/trac/pkg-plist
@@ -99,6 +99,7 @@ bin/tracd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/css/wiki.css
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/desc.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/dots.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/download.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/draft.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/edit_toolbar.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/htdocs/editedticket.png
@@ -238,6 +239,9 @@ bin/tracd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/compat.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/compat.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/compat.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/svntestenv.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/svntestenv.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/svntestenv.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/testcases.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/testcases.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/tests/functional/testcases.pyo
@@ -409,6 +413,9 @@ bin/tracd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/svn_fs.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/svn_fs.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/svn_fs.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/svn_prop.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/svn_prop.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/svn_prop.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/templates/browser.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/templates/changeset.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/trac/versioncontrol/templates/diff_form.html