Index: head/japanese/trac/Makefile =================================================================== --- head/japanese/trac/Makefile (revision 186672) +++ head/japanese/trac/Makefile (revision 186673) @@ -1,61 +1,62 @@ # New ports collection makefile for: trac # Date created: 17 April 2004 # Whom: Kuei-Feng Li # # $FreeBSD$ # 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/ DISTFILES= ${PORTNAME}-${PORTVERSION}-ja-1.zip MAINTAINER= kuriyama@FreeBSD.org COMMENT= An enhanced wiki and issue tracking system for software projects BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite20 \ ${PYTHON_SITELIBDIR}/neo_cgi.so:${PORTSDIR}/www/clearsilver-python \ ${PYTHON_SITELIBDIR}/svn/__init__.py:${PORTSDIR}/devel/subversion-python \ ${PYTHON_SITELIBDIR}/japanese.pth:${PORTSDIR}/japanese/pycodec RUN_DEPENDS= ${BUILD_DEPENDS} OPTIONS= SILVERCITY "Use Silvercity for syntax highlighting" On \ DOCUTILS "Allow additional text markup" On CONFLICTS= trac-0.* WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-ja-1 USE_ZIP= yes USE_PYTHON= yes USE_PYDISTUTILS= yes MAN1= trac-admin.1 tracd.1 # This target is only meant to be used by the port maintainer. x-generate-plist: (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \ | ${SED} -E \ 's,.*share/nls/.+$$,,g \ ;s,@dirrm share/man(/.*)?$$,,g \ ;s,${PYTHON_SITELIBDIR:S,^${PYTHONBASE}/,,},%%PYTHON_SITELIBDIR%%,g \ ;s,share/trac,%%DATADIR%%,g \ ;s,@dirrm (%%PYTHON_SITELIBDIR%%|${PYTHON_LIBDIR:S,${PYTHONBASE}/,,})$$,,g \ ' | ${TR} -s '\n') > temp-pkg-plist post-install: @${ECHO_CMD} @${CAT} ${PKGMESSAGE} @${ECHO_CMD} .include .if defined(WITH_SILVERCITY) RUN_DEPENDS+= ${PREFIX}/bin/source2html.py:${PORTSDIR}/textproc/silvercity .endif .if defined(WITH_DOCUTILS) RUN_DEPENDS+= ${PREFIX}/bin/rst2html:${PORTSDIR}/textproc/py-docutils .endif .include Property changes on: head/japanese/trac/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.27 \ No newline at end of property +1.28 \ No newline at end of property Index: head/japanese/trac/files/patch-api.py =================================================================== --- head/japanese/trac/files/patch-api.py (nonexistent) +++ head/japanese/trac/files/patch-api.py (revision 186673) @@ -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, Property changes on: head/japanese/trac/files/patch-api.py ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/japanese/trac/files/patch-notification.py =================================================================== --- head/japanese/trac/files/patch-notification.py (revision 186672) +++ head/japanese/trac/files/patch-notification.py (revision 186673) @@ -1,35 +1,43 @@ ---- ./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: + 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 @@ +@@ -343,12 +351,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') Property changes on: head/japanese/trac/files/patch-notification.py ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property