Index: bugzilla/pkg-plist =================================================================== --- bugzilla/pkg-plist (revision 301666) +++ bugzilla/pkg-plist (working copy) @@ -314,5 +314,3 @@ @dirrmtry %%WWWDIR%%/template/ja/default/account @dirrmtry %%WWWDIR%%/template/ja/default @dirrmtry %%WWWDIR%%/template/ja -@dirrmtry %%WWWDIR%%/template -@dirrmtry %%WWWDIR%% Index: bugzilla/Makefile =================================================================== --- bugzilla/Makefile (revision 301666) +++ bugzilla/Makefile (working copy) @@ -7,11 +7,11 @@ PORTNAME= bugzilla PORTVERSION= 4.0.6 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= http://bug-ja.org/releases/4.0/ \ LOCAL MASTER_SITE_SUBDIR= tota/bugzilla-ja -PKGNAMESUFFIX= -ja DISTNAME= Bugzilla-ja-${PORTVERSION}-template-rel01 MAINTAINER= tota@FreeBSD.org @@ -19,12 +19,18 @@ RUN_DEPENDS= bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla +LATEST_LINK= ${PKGNAMEPREFIX}bugzilla + .include "${.CURDIR}/../../devel/bugzilla/Makefile.common" USE_BZIP2= yes +WRKSRC= ${WRKDIR}/default LANGDIR= ${WWWDIR}/template/ja +post-patch: + @${FIND} ${WRKSRC}/ -name \*.orig -delete + do-install: @-${MKDIR} ${LANGDIR}/default @cd ${WRKDIR}/default; ${COPYTREE_SHARE} . ${LANGDIR}/default @@ -34,4 +40,14 @@ @${ECHO_MSG} .endif +# Maintainer +plist: patch + @( cd ${WRKDIR}/ && ${FIND} default -type f | ${AWK} '{print "%%WWWDIR%%/template/ja/"$$1}' | ${SORT} > ${PLIST}.new ) + @( cd ${WRKDIR}/ && ${FIND} default -type d | ${AWK} '{print "@dirrmtry %%WWWDIR%%/template/ja/"$$1}' | ${SORT} -r >> ${PLIST}.new ) + @${ECHO} "@dirrmtry %%WWWDIR%%/template/ja" >> ${PLIST}.new + @if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \ + ${ECHO_MSG} no pkg-plist changes; \ + ${RM} ${PLIST}.new ; \ + fi + .include Index: bugzilla/files/patch_406-407 =================================================================== --- bugzilla/files/patch_406-407 (revision 0) +++ bugzilla/files/patch_406-407 (working copy) @@ -0,0 +1,24 @@ +--- ./global/confirm-user-match.html.tmpl.orig 2012-05-13 16:58:15.000000000 +0200 ++++ ./global/confirm-user-match.html.tmpl 2012-07-27 21:31:26.000000000 +0200 +@@ -147,8 +147,6 @@ + [% ELSE %] + 合致しました + [% query.value.users.0.identity FILTER html %] +- + [% END %] + [% ELSE %] + [% IF (query.key.length < 3) && !Param('emailsuffix') %] +@@ -173,8 +171,10 @@ + + [% IF matchsuccess == 1 %] + +- [% SET exclude_these = +- matches.keys.merge(['Bugzilla_login', 'Bugzilla_password']) %] ++ [% SET exclude_these = ['Bugzilla_login', 'Bugzilla_password'] %] ++ [% FOREACH key IN matches.keys %] ++ [% exclude_these.push(key) IF cgi.param(key) == '' %] ++ [% END %] + [% SET exclude = '^' _ exclude_these.join('|') _ '$' %] + [% PROCESS "global/hidden-fields.html.tmpl" exclude = exclude %] + Index: bugzilla3/pkg-plist =================================================================== --- bugzilla3/pkg-plist (revision 301666) +++ bugzilla3/pkg-plist (working copy) @@ -61,9 +61,9 @@ %%WWWDIR%%/template/ja/default/admin/milestones/list.html.tmpl %%WWWDIR%%/template/ja/default/admin/milestones/select-product.html.tmpl %%WWWDIR%%/template/ja/default/admin/params/admin.html.tmpl +%%WWWDIR%%/template/ja/default/admin/params/advanced.html.tmpl %%WWWDIR%%/template/ja/default/admin/params/attachment.html.tmpl %%WWWDIR%%/template/ja/default/admin/params/auth.html.tmpl -%%WWWDIR%%/template/ja/default/admin/params/advanced.html.tmpl %%WWWDIR%%/template/ja/default/admin/params/bugchange.html.tmpl %%WWWDIR%%/template/ja/default/admin/params/bugfields.html.tmpl %%WWWDIR%%/template/ja/default/admin/params/bugmove.html.tmpl @@ -274,7 +274,6 @@ %%WWWDIR%%/template/ja/default/whine/mail.txt.tmpl %%WWWDIR%%/template/ja/default/whine/multipart-mime.txt.tmpl %%WWWDIR%%/template/ja/default/whine/schedule.html.tmpl -@dirrmtry %%WWWDIR%%/template/ja/extension @dirrmtry %%WWWDIR%%/template/ja/default/whine @dirrmtry %%WWWDIR%%/template/ja/default/setup @dirrmtry %%WWWDIR%%/template/ja/default/search @@ -316,5 +315,3 @@ @dirrmtry %%WWWDIR%%/template/ja/default/account @dirrmtry %%WWWDIR%%/template/ja/default @dirrmtry %%WWWDIR%%/template/ja -@dirrmtry %%WWWDIR%%/template -@dirrmtry %%WWWDIR%% Index: bugzilla3/Makefile =================================================================== --- bugzilla3/Makefile (revision 301666) +++ bugzilla3/Makefile (working copy) @@ -7,11 +7,11 @@ PORTNAME= bugzilla PORTVERSION= 3.6.9 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= http://bug-ja.org/releases/3.6/ \ LOCAL MASTER_SITE_SUBDIR= tota/bugzilla-ja -PKGNAMESUFFIX= -ja DISTNAME= Bugzilla-ja-${PORTVERSION}-template-rel01 MAINTAINER= tota@FreeBSD.org @@ -19,7 +19,7 @@ RUN_DEPENDS= bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla3 -LATEST_LINK= ${PKGNAMEPREFIX}bugzilla3${PKGNAMESUFFIX} +LATEST_LINK= ${PKGNAMEPREFIX}bugzilla3 .include "${.CURDIR}/../../devel/bugzilla3/Makefile.common" @@ -36,4 +36,14 @@ @${ECHO_MSG} .endif +# Maintainer +plist: patch + @( cd ${WRKDIR}/ && ${FIND} default -type f | ${AWK} '{print "%%WWWDIR%%/template/ja/"$$1}' | ${SORT} > ${PLIST}.new ) + @( cd ${WRKDIR}/ && ${FIND} default -type d | ${AWK} '{print "@dirrmtry %%WWWDIR%%/template/ja/"$$1}' | ${SORT} -r >> ${PLIST}.new ) + @${ECHO} "@dirrmtry %%WWWDIR%%/template/ja" >> ${PLIST}.new + @if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \ + ${ECHO_MSG} no pkg-plist changes; \ + ${RM} ${PLIST}.new ; \ + fi + .include Index: bugzilla42/pkg-plist =================================================================== --- bugzilla42/pkg-plist (revision 301666) +++ bugzilla42/pkg-plist (working copy) @@ -317,5 +317,3 @@ @dirrmtry %%WWWDIR%%/template/ja/default/account @dirrmtry %%WWWDIR%%/template/ja/default @dirrmtry %%WWWDIR%%/template/ja -@dirrmtry %%WWWDIR%%/template -@dirrmtry %%WWWDIR%% Index: bugzilla42/Makefile =================================================================== --- bugzilla42/Makefile (revision 301666) +++ bugzilla42/Makefile (working copy) @@ -7,11 +7,11 @@ PORTNAME= bugzilla PORTVERSION= 4.2.1 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= http://bug-ja.org/releases/4.2/ \ LOCAL MASTER_SITE_SUBDIR= tota/bugzilla-ja -PKGNAMESUFFIX= -ja DISTNAME= Bugzilla-ja-${PORTVERSION}-template-rel01 MAINTAINER= tota@FreeBSD.org @@ -19,7 +19,7 @@ RUN_DEPENDS= bugzilla>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla42 -LATEST_LINK= ${PKGNAMEPREFIX}bugzilla42${PKGNAMESUFFIX} +LATEST_LINK= ${PKGNAMEPREFIX}bugzilla42 .include "${.CURDIR}/../../devel/bugzilla42/Makefile.common" @@ -36,10 +36,14 @@ @${ECHO_MSG} .endif -x-generate-plist: - ${FIND} ${LANGDIR} -type f | ${SORT} | ${SED} -e 's,${WWWDIR},%%WWWDIR%%,' > pkg-plist.new - ${FIND} ${LANGDIR} -type d -depth | ${SORT} -r | ${SED} -e 's,${WWWDIR},@dirrmtry %%WWWDIR%%,' >> pkg-plist.new - ${ECHO} "@dirrmtry %%WWWDIR%%/template" >> pkg-plist.new - ${ECHO} "@dirrmtry %%WWWDIR%%" >> pkg-plist.new +# Maintainer +plist: patch + @( cd ${WRKDIR}/ && ${FIND} default -type f | ${AWK} '{print "%%WWWDIR%%/template/ja/"$$1}' | ${SORT} > ${PLIST}.new ) + @( cd ${WRKDIR}/ && ${FIND} default -type d | ${AWK} '{print "@dirrmtry %%WWWDIR%%/template/ja/"$$1}' | ${SORT} -r >> ${PLIST}.new ) + @${ECHO} "@dirrmtry %%WWWDIR%%/template/ja" >> ${PLIST}.new + @if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \ + ${ECHO_MSG} no pkg-plist changes; \ + ${RM} ${PLIST}.new ; \ + fi .include Index: bugzilla42/files/patch_421-422 =================================================================== --- bugzilla42/files/patch_421-422 (revision 0) +++ bugzilla42/files/patch_421-422 (working copy) @@ -0,0 +1,199 @@ +--- ./admin/params/editparams.html.tmpl.orig 2012-07-28 21:38:23.000000000 +0200 ++++ ./admin/params/editparams.html.tmpl 2012-07-28 21:40:58.000000000 +0200 +@@ -93,7 +93,7 @@ + [% ELSE %] + +
注: +- [%+ terms.Bugzilla %] はボランティアによって開発されています。 ++ B[% %]ugzilla はボランティアによって開発されています。 + [% terms.Bugzilla %] プロジェクトに協力する最善の手は、あなた自身が + 貢献する ことです ! + 貢献するにはプログラマである必要はなく、必要なことはたくさんあります。 +--- ./bug/dependency-tree.html.tmpl.orig 2012-07-28 21:40:55.000000000 +0200 ++++ ./bug/dependency-tree.html.tmpl 2012-07-28 21:45:13.000000000 +0200 +@@ -80,11 +80,27 @@ + [% END %] + + [% IF ids.size %] +- ([% IF maxdepth -%]最大 [% maxdepth %] 階層 | [% END -%] ++ [%# 27 chars is the length of buglist.cgi?tweak=&bug_id=" %] ++ [% use_post = (ids.join(",").length > constants.CGI_URI_LIMIT - 27 ) ? 1 : 0 %] ++ [% IF use_post %] ++
++ ++ [% END %] ++ ++ [% IF maxdepth -%]Up to [% maxdepth %] level[% "s" IF maxdepth > 1 %] deep | [% END -%] ++ [% IF use_post %] ++ ++ [% IF user.in_group('editbugs') && ids.size > 1 %] ++ | ++ [% END %] ++
++ [% ELSE %] + [% terms.bug %] リストとしてみる + [% IF user.in_group('editbugs') && ids.size > 1 %] + | 一度に変更する +- [% END %]) ++ [% END %] ++ [% END %] ++ +
    + [% INCLUDE display_tree tree=$tree_name %] +
+--- ./email/bugmail.html.tmpl.orig 2012-07-28 21:45:33.000000000 +0200 ++++ ./email/bugmail.html.tmpl 2012-07-28 21:59:10.000000000 +0200 +@@ -33,9 +33,10 @@ + [% IF comment.count %] + [% INCLUDE global/user.html.tmpl who = comment.author %] からの + [% "コメント # ${comment.count}" FILTER bug_link( bug, +- {comment_num => comment.count, full_url => 1}) FILTER none %] ++ {comment_num => comment.count, full_url => 1, user => to_user}) FILTER none %] ++ on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none %] + [% END %] +- 
[% comment.body_full({ wrap => 1 }) FILTER quoteUrls(bug, comment) %]
++ 
[% comment.body_full({ wrap => 1 }) FILTER quoteUrls(bug, comment, to_user) %]
+
+ [% END %] +

+@@ -68,12 +69,17 @@ + [% SET in_table = 0 %] + [% END %] + [% IF change.blocker %] +- [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, full_url => 1) FILTER none %] +- は、ステータスに変更があった [% "${terms.bug} ${change.blocker.id}" +- FILTER bug_link(change.blocker, full_url => 1) FILTER none %] に依存しています。 ++ [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %] ++ は、ステータスに変更があった ++ [%+ "${terms.bug} ${change.blocker.id}" ++ FILTER bug_link(change.blocker, {full_url => 1, user => to_user}) FILTER none %], ++ に依存しています。 + [% ELSE %] + [% INCLUDE global/user.html.tmpl who = change.who %] +- による [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, full_url => 1) FILTER none %] の変更 ++ による ++ ++ [%+ "${terms.bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %] ++ の変更 + [% END %] +
+ [% IF in_table == 0 %] +@@ -97,7 +103,7 @@ + [% field_label FILTER html %] + + [% IF change.field_name == "bug_id" %] +- [% new_value FILTER bug_link(bug, full_url => 1) FILTER none %] ++ [% new_value FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %] + [% ELSE %] + [% new_value FILTER html %] + [% END %] +@@ -124,4 +130,4 @@ + [% END %] + [% END %] + [% '' IF in_table %] +-[% END %] +\ No newline at end of file ++[% END %] +--- ./global/code-error.html.tmpl.orig 2012-07-28 21:59:01.000000000 +0200 ++++ ./global/code-error.html.tmpl 2012-07-28 22:00:32.000000000 +0200 +@@ -453,6 +453,10 @@ + [% ELSIF error == "invalid_post_bug_submit_action" %] + post_bug_submit_action の無効な設定です。 + ++ [% ELSIF error == "search_field_operator_unsupported" %] ++ [% terms.Bugzilla %] does not support the search type ++ "[% operator FILTER html %]". ++ + [% ELSE %] + [%# Try to find hooked error messages %] + [% error_message = Hook.process("errors") %] +--- ./global/confirm-user-match.html.tmpl.orig 2012-07-28 22:00:52.000000000 +0200 ++++ ./global/confirm-user-match.html.tmpl 2012-07-28 22:02:46.000000000 +0200 +@@ -147,8 +147,6 @@ + [% ELSE %] + 合致しました + [% query.value.users.0.identity FILTER html %] +- + [% END %] + [% ELSE %] + [% IF (query.key.length < 3) && !Param('emailsuffix') %] +@@ -173,8 +171,10 @@ + + [% IF matchsuccess == 1 %] + +- [% SET exclude_these = +- matches.keys.merge(['Bugzilla_login', 'Bugzilla_password']) %] ++ [% SET exclude_these = ['Bugzilla_login', 'Bugzilla_password'] %] ++ [% FOREACH key IN matches.keys %] ++ [% exclude_these.push(key) IF cgi.param(key) == '' %] ++ [% END %] + [% SET exclude = '^' _ exclude_these.join('|') _ '$' %] + [% PROCESS "global/hidden-fields.html.tmpl" exclude = exclude %] + +--- ./list/server-push.html.tmpl.orig 2012-07-28 22:02:43.000000000 +0200 ++++ ./list/server-push.html.tmpl 2012-07-28 22:04:40.000000000 +0200 +@@ -33,14 +33,10 @@ +

お待ちください ...

+ + [% IF debug %] +-

+- [% FOREACH debugline = debugdata %] +- [% debugline FILTER html %]
++

[% query FILTER html %]

++ [% IF query_explain.defined %] ++ 
[% query_explain FILTER html %]
+ [% END %] +-

+-

+- [% query FILTER html %] +-

+ [% END %] + + +--- ./search/knob.html.tmpl.orig 2012-07-28 22:04:47.000000000 +0200 ++++ ./search/knob.html.tmpl 2012-07-28 22:08:27.000000000 +0200 +@@ -40,6 +40,9 @@ + "Last Changed" => "最終更新" } %] + + ++[% IF user.id %] ++ ++[% END %] + +

+ : +@@ -56,7 +59,7 @@ + + [% IF known_name %] +- [%# We store known_name in case the user add a boolean chart. %] ++ [%# We store known_name in case the user adds a boolean chart. %] + + + [%# The name of the existing query will be passed to buglist.cgi. %] +@@ -68,18 +71,21 @@ + [% END %] +

+ +-

++[% IF user.id %] ++

+     + + +-

++

++[% END %] + + [% IF userdefaultquery %] +

+- ++ + 既定の検索条件をシステム既定のものに戻す +

+ [% END %]