- Use utf-8 as default charset again.

- Fix silly error for touching unused variable in my patch.

3 files changed, 24 insertions, 4 deletions

diff --git a/japanese/trac/Makefile b/japanese/trac/Makefile
index 37c84d26483b..8883283b5a06 100644
--- a/japanese/trac/Makefile
+++ b/japanese/trac/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	trac
 PORTVERSION=	0.10.3
+PORTREVISION=	1
 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/files/patch-api.py b/japanese/trac/files/patch-api.py
new file mode 100644
index 000000000000..5cc78594c624
--- /dev/null
+++ b/japanese/trac/files/patch-api.py
@@ -0,0 +1,11 @@
+--- trac/mimeview/api.py.orig	Tue Mar  6 16:30:30 2007
++++ trac/mimeview/api.py	Tue Mar  6 16:30:40 2007
+@@ -319,7 +319,7 @@
+     annotators = ExtensionPoint(IHTMLPreviewAnnotator)
+     converters = ExtensionPoint(IContentConverter)
+ 
+-    default_charset = Option('trac', 'default_charset', 'iso-8859-15',
++    default_charset = Option('trac', 'default_charset', 'utf-8',
+         u"""文字コードが設定されていないときのデフォルト値を設定します。""")
+ 
+     tab_width = IntOption('mimeviewer', 'tab_width', 8,
diff --git a/japanese/trac/files/patch-notification.py b/japanese/trac/files/patch-notification.py
index 74841dd648da..99bf28c46bcb 100644
--- a/japanese/trac/files/patch-notification.py
+++ b/japanese/trac/files/patch-notification.py
@@ -1,6 +1,14 @@
---- ./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 @@
+--- trac/notification.py.orig	Sat Dec  9 19:06:15 2006
++++ trac/notification.py	Tue Mar  6 16:31:37 2007
+@@ -218,6 +218,7 @@
+     def format_header(self, key, name, email=None):
+         from email.Header import Header
+         maxlength = MAXHEADERLEN-(len(key)+2)
++	header = None
+         # Do not sent ridiculous short headers
+         if maxlength < 10:
+             raise TracError, "Header length is too short"
+@@ -225,6 +226,13 @@
              tmp = name.encode('ascii')
              header = Header(tmp, 'ascii', maxlinelen=maxlength)
          except UnicodeEncodeError:
@@ -14,7 +22,7 @@
              header = Header(name, self._charset, maxlinelen=maxlength)
          if not email:
              return header
-@@ -343,12 +350,17 @@
+@@ -343,12 +351,17 @@
                  headers['To'] = ', '.join(toaddrs)
          if pcc:
              headers['Cc'] = ', '.join(pcc)