[75270] trunk/dports

takanori at macports.org takanori at macports.org
Wed Jan 19 06:02:34 PST 2011


Revision: 75270
          http://trac.macports.org/changeset/75270
Author:   takanori at macports.org
Date:     2011-01-19 06:02:20 -0800 (Wed, 19 Jan 2011)
Log Message:
-----------
nkf:
 - Don't use non-ASCII in nkf_test.pl. (nkf-bug:23228)
 - Fixed broken 'Q-encoded UTF-8' decode function. (nkf-bug:55125)

Modified Paths:
--------------
    trunk/dports/perl/p5-nkf/Portfile
    trunk/dports/textproc/nkf/Portfile

Added Paths:
-----------
    trunk/dports/perl/p5-nkf/files/
    trunk/dports/perl/p5-nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch
    trunk/dports/perl/p5-nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch
    trunk/dports/perl/p5-nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch
    trunk/dports/textproc/nkf/files/
    trunk/dports/textproc/nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch
    trunk/dports/textproc/nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch
    trunk/dports/textproc/nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch

Modified: trunk/dports/perl/p5-nkf/Portfile
===================================================================
--- trunk/dports/perl/p5-nkf/Portfile	2011-01-19 13:44:11 UTC (rev 75269)
+++ trunk/dports/perl/p5-nkf/Portfile	2011-01-19 14:02:20 UTC (rev 75270)
@@ -5,6 +5,7 @@
 
 set nkf_ver     2.1.1
 perl5.setup     NKF [string range ${nkf_ver} 0 2][string range ${nkf_ver} 4 end]
+revision        1
 categories-append \
                 textproc japanese
 maintainers     nifty.com:pelopor takanori openmaintainer
@@ -17,9 +18,15 @@
 distname        nkf-${nkf_ver}
 dist_subdir     nkf
 distfiles       [suffix ${distname}]:nkf
+patchfiles      nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch \
+                nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch \
+                nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch
 checksums       rmd160  06e0dbda6e90502ab4bafe4d44a9d05beed248c5
 
-worksrcdir      ${distname}/NKF.mod
+patch.pre_args  -p1
+post-patch {
+    worksrcdir  ${distname}/NKF.mod
+}
 
 post-destroot {
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/doc

Added: trunk/dports/perl/p5-nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch	                        (rev 0)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch	2011-01-19 14:02:20 UTC (rev 75270)
@@ -0,0 +1,26 @@
+From: NARUSE, Yui <naruse at users.sourceforge.jp>
+Date: Wed, 15 Sep 2010 00:04:17 +0000 (+0900)
+Subject: Fix test: test_data/ruby-dev:39722.
+X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=bbb280a04623e073e447add83c6c9a5309c30fd2
+
+Fix test: test_data/ruby-dev:39722.
+
+Don't use non ASCII in nkf_test.pl.
+[nkf-bug#23228]
+---
+
+diff --git a/nkf_test.pl b/nkf_test.pl
+index 30b754b..6296f32 100644
+--- a/nkf_test.pl
++++ b/nkf_test.pl
+@@ -1003,8 +1003,8 @@ printf "%-40s", "test_data/bugs10904";
+     &test("$nkf -Mj",$example{'test_data/bugs10904'},$example{'test_data/bugs10904.ans'});
+ 
+ printf "%-40s", "test_data/ruby-dev:39722";
+-    &test("$nkf -Mj",<<eom,<<eom);
+-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$B$"(B
++    &test("$nkf -MjW",<<eom,<<eom);
++aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\xE3\x81\x82
+ eom
+ =?US-ASCII?Q?aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa?=
+  =?US-ASCII?Q?aaaaaaaaaaaaaaaaa?= =?ISO-2022-JP?B?GyRCJCIbKEI=?=

Added: trunk/dports/perl/p5-nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch	                        (rev 0)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch	2011-01-19 14:02:20 UTC (rev 75270)
@@ -0,0 +1,23 @@
+From: NARUSE, Yui <naruse at users.sourceforge.jp>
+Date: Sat, 8 Jan 2011 11:47:09 +0000 (+0900)
+Subject: Fix: wrong decode function setting [nkf-bug:55125]
+X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=d2f185cc2134b370b49b7a52a5e81b9671ecc43e
+
+Fix: wrong decode function setting [nkf-bug:55125]
+
+Q-encoded UTF-8 was broken.
+---
+
+diff --git a/nkf.c b/nkf.c
+index 6877afe..6b944e1 100644
+--- a/nkf.c
++++ b/nkf.c
+@@ -3878,7 +3878,7 @@ static const unsigned char *mime_pattern[] = {
+ 
+ /* $B3:Ev$9$k%3!<%I$NM%@hEY$r>e$2$k$?$a$NL\0u(B */
+ nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
+-    e_iconv, s_iconv, 0, 0, 0, 0,
++    e_iconv, s_iconv, 0, 0, 0, 0, 0,
+ #if defined(UTF8_INPUT_ENABLE)
+     w_iconv, w_iconv,
+ #endif

Added: trunk/dports/perl/p5-nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch	                        (rev 0)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch	2011-01-19 14:02:20 UTC (rev 75270)
@@ -0,0 +1,33 @@
+From: NARUSE, Yui <naruse at users.sourceforge.jp>
+Date: Sat, 8 Jan 2011 11:47:09 +0000 (+0900)
+Subject: Add test for Q-encoded UTF-8.
+X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=fbbf52db285384e4938bbe7862cae1df80482960
+
+Add test for Q-encoded UTF-8.
+---
+
+diff --git a/nkf_test.pl b/nkf_test.pl
+index 6296f32..15b29b3 100644
+--- a/nkf_test.pl
++++ b/nkf_test.pl
+@@ -886,6 +886,20 @@ eofeof
+ 
+ printf "%-40s", "test_data/q-encode-softrap";
+     &test("$nkf -jmQ",$example{'test_data/q-encode-softrap'},$example{'test_data/q-encode-softrap.ans'});
++# test_data/q-encode-utf-8
++
++$example{'test_data/q-encode-utf-8'} = <<'eofeof';
++=?utf-8?Q?=E3=81=82=E3=81=84=E3=81=86=E3=81=88=E3=81=8A?=
++=?utf-8?Q?=E3=81=8B=E3=81=8D=E3=81=8F=E3=81=91=E3=81=93?=
++eofeof
++
++$example{'test_data/q-encode-utf-8.ans'} = <<"eofeof";
++\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A
++\xE3\x81\x8B\xE3\x81\x8D\xE3\x81\x8F\xE3\x81\x91\xE3\x81\x93
++eofeof
++
++printf "%-40s", "test_data/q-encode-utf-8";
++    &test("$nkf -w",$example{'test_data/q-encode-utf-8'},$example{'test_data/q-encode-utf-8.ans'});
+ # test_data/rot13
+ 
+ $example{'test_data/rot13'} = unpack('u',<<'eofeof');

Modified: trunk/dports/textproc/nkf/Portfile
===================================================================
--- trunk/dports/textproc/nkf/Portfile	2011-01-19 13:44:11 UTC (rev 75269)
+++ trunk/dports/textproc/nkf/Portfile	2011-01-19 14:02:20 UTC (rev 75270)
@@ -4,6 +4,7 @@
 
 name            nkf
 version         2.1.1
+revision        1
 categories      textproc japanese
 maintainers     takanori openmaintainer
 description     Network Kanji code conversion Filter
@@ -14,8 +15,13 @@
 platforms       darwin
 homepage        http://sourceforge.jp/projects/nkf/
 master_sites    sourceforge_jp:${name}/48945/
+patchfiles      nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch \
+                nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch \
+                nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch
 checksums       rmd160  06e0dbda6e90502ab4bafe4d44a9d05beed248c5
 
+patch.pre_args  -p1
+
 use_configure   no
 
 build.target

Added: trunk/dports/textproc/nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch
===================================================================
--- trunk/dports/textproc/nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch	                        (rev 0)
+++ trunk/dports/textproc/nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch	2011-01-19 14:02:20 UTC (rev 75270)
@@ -0,0 +1,26 @@
+From: NARUSE, Yui <naruse at users.sourceforge.jp>
+Date: Wed, 15 Sep 2010 00:04:17 +0000 (+0900)
+Subject: Fix test: test_data/ruby-dev:39722.
+X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=bbb280a04623e073e447add83c6c9a5309c30fd2
+
+Fix test: test_data/ruby-dev:39722.
+
+Don't use non ASCII in nkf_test.pl.
+[nkf-bug#23228]
+---
+
+diff --git a/nkf_test.pl b/nkf_test.pl
+index 30b754b..6296f32 100644
+--- a/nkf_test.pl
++++ b/nkf_test.pl
+@@ -1003,8 +1003,8 @@ printf "%-40s", "test_data/bugs10904";
+     &test("$nkf -Mj",$example{'test_data/bugs10904'},$example{'test_data/bugs10904.ans'});
+ 
+ printf "%-40s", "test_data/ruby-dev:39722";
+-    &test("$nkf -Mj",<<eom,<<eom);
+-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$B$"(B
++    &test("$nkf -MjW",<<eom,<<eom);
++aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\xE3\x81\x82
+ eom
+ =?US-ASCII?Q?aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa?=
+  =?US-ASCII?Q?aaaaaaaaaaaaaaaaa?= =?ISO-2022-JP?B?GyRCJCIbKEI=?=

Added: trunk/dports/textproc/nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch
===================================================================
--- trunk/dports/textproc/nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch	                        (rev 0)
+++ trunk/dports/textproc/nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch	2011-01-19 14:02:20 UTC (rev 75270)
@@ -0,0 +1,23 @@
+From: NARUSE, Yui <naruse at users.sourceforge.jp>
+Date: Sat, 8 Jan 2011 11:47:09 +0000 (+0900)
+Subject: Fix: wrong decode function setting [nkf-bug:55125]
+X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=d2f185cc2134b370b49b7a52a5e81b9671ecc43e
+
+Fix: wrong decode function setting [nkf-bug:55125]
+
+Q-encoded UTF-8 was broken.
+---
+
+diff --git a/nkf.c b/nkf.c
+index 6877afe..6b944e1 100644
+--- a/nkf.c
++++ b/nkf.c
+@@ -3878,7 +3878,7 @@ static const unsigned char *mime_pattern[] = {
+ 
+ /* $B3:Ev$9$k%3!<%I$NM%@hEY$r>e$2$k$?$a$NL\0u(B */
+ nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
+-    e_iconv, s_iconv, 0, 0, 0, 0,
++    e_iconv, s_iconv, 0, 0, 0, 0, 0,
+ #if defined(UTF8_INPUT_ENABLE)
+     w_iconv, w_iconv,
+ #endif

Added: trunk/dports/textproc/nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch
===================================================================
--- trunk/dports/textproc/nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch	                        (rev 0)
+++ trunk/dports/textproc/nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch	2011-01-19 14:02:20 UTC (rev 75270)
@@ -0,0 +1,33 @@
+From: NARUSE, Yui <naruse at users.sourceforge.jp>
+Date: Sat, 8 Jan 2011 11:47:09 +0000 (+0900)
+Subject: Add test for Q-encoded UTF-8.
+X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=fbbf52db285384e4938bbe7862cae1df80482960
+
+Add test for Q-encoded UTF-8.
+---
+
+diff --git a/nkf_test.pl b/nkf_test.pl
+index 6296f32..15b29b3 100644
+--- a/nkf_test.pl
++++ b/nkf_test.pl
+@@ -886,6 +886,20 @@ eofeof
+ 
+ printf "%-40s", "test_data/q-encode-softrap";
+     &test("$nkf -jmQ",$example{'test_data/q-encode-softrap'},$example{'test_data/q-encode-softrap.ans'});
++# test_data/q-encode-utf-8
++
++$example{'test_data/q-encode-utf-8'} = <<'eofeof';
++=?utf-8?Q?=E3=81=82=E3=81=84=E3=81=86=E3=81=88=E3=81=8A?=
++=?utf-8?Q?=E3=81=8B=E3=81=8D=E3=81=8F=E3=81=91=E3=81=93?=
++eofeof
++
++$example{'test_data/q-encode-utf-8.ans'} = <<"eofeof";
++\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A
++\xE3\x81\x8B\xE3\x81\x8D\xE3\x81\x8F\xE3\x81\x91\xE3\x81\x93
++eofeof
++
++printf "%-40s", "test_data/q-encode-utf-8";
++    &test("$nkf -w",$example{'test_data/q-encode-utf-8'},$example{'test_data/q-encode-utf-8.ans'});
+ # test_data/rot13
+ 
+ $example{'test_data/rot13'} = unpack('u',<<'eofeof');
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110119/5dc70b3d/attachment.html>


More information about the macports-changes mailing list