[83943] trunk/dports/perl/p5-nkf

takanori at macports.org takanori at macports.org
Tue Sep 13 06:25:03 PDT 2011


Revision: 83943
          http://trac.macports.org/changeset/83943
Author:   takanori at macports.org
Date:     2011-09-13 06:25:03 -0700 (Tue, 13 Sep 2011)
Log Message:
-----------
p5-nkf: version 2.1.2

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

Added Paths:
-----------
    trunk/dports/perl/p5-nkf/files/nkf.git-ecf2a983ff0945462d731afa9b4d7327cfeb9b5a.patch

Removed Paths:
-------------
    trunk/dports/perl/p5-nkf/files/nkf.git-7f18e3086e219cc8a3639ebc7b0e4192001d3174.patch
    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

Modified: trunk/dports/perl/p5-nkf/Portfile
===================================================================
--- trunk/dports/perl/p5-nkf/Portfile	2011-09-13 13:24:32 UTC (rev 83942)
+++ trunk/dports/perl/p5-nkf/Portfile	2011-09-13 13:25:03 UTC (rev 83943)
@@ -3,9 +3,8 @@
 PortSystem      1.0
 PortGroup       perl5 1.0
 
-set nkf_ver     2.1.1
+set nkf_ver     2.1.2
 perl5.setup     NKF [string range ${nkf_ver} 0 2][string range ${nkf_ver} 4 end]
-revision        4
 categories-append \
                 textproc japanese
 maintainers     nifty.com:pelopor takanori openmaintainer
@@ -20,11 +19,8 @@
 dist_subdir     nkf
 if {${perl5.major} != ""} {
 distfiles       [suffix ${distname}]:nkf
-patchfiles      nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch \
-                nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch \
-                nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch \
-                nkf.git-7f18e3086e219cc8a3639ebc7b0e4192001d3174.patch
-checksums       rmd160  06e0dbda6e90502ab4bafe4d44a9d05beed248c5
+patchfiles      nkf.git-ecf2a983ff0945462d731afa9b4d7327cfeb9b5a.patch
+checksums       rmd160  91c0d413a70299246591d314d33f45e71eba51a7
 
 worksrcdir  ${distname}/NKF.mod
 

Deleted: trunk/dports/perl/p5-nkf/files/nkf.git-7f18e3086e219cc8a3639ebc7b0e4192001d3174.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-7f18e3086e219cc8a3639ebc7b0e4192001d3174.patch	2011-09-13 13:24:32 UTC (rev 83942)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-7f18e3086e219cc8a3639ebc7b0e4192001d3174.patch	2011-09-13 13:25:03 UTC (rev 83943)
@@ -1,30 +0,0 @@
-From: NARUSE, Yui <naruse at users.sourceforge.jp>
-Date: Fri, 25 Mar 2011 03:09:59 +0000 (+0900)
-Subject: Fix type for character value.
-X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=7f18e3086e219cc8a3639ebc7b0e4192001d3174
-
-Fix type for character value.
----
-
-diff --git a/nkf.c b/nkf.c
-index 6b944e1..28e164a 100644
---- a/nkf.c
-+++ b/nkf.c
-@@ -21,7 +21,7 @@
-  * 3. This notice may not be removed or altered from any source distribution.
-  */
- #define NKF_VERSION "2.1.1"
--#define NKF_RELEASE_DATE "2010-08-08"
-+#define NKF_RELEASE_DATE "2011-03-25"
- #define COPY_RIGHT \
-     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
-     "Copyright (C) 1996-2010, The nkf Project."
-@@ -4259,7 +4259,7 @@ numchar_getc(FILE *f)
-     nkf_char (*u)(nkf_char c ,FILE *f) = i_nungetc;
-     int i = 0, j;
-     nkf_char buf[12];
--    long c = -1;
-+    nkf_char c = -1;
- 
-     buf[i] = (*g)(f);
-     if (buf[i] == '&'){

Deleted: trunk/dports/perl/p5-nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch	2011-09-13 13:24:32 UTC (rev 83942)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch	2011-09-13 13:25:03 UTC (rev 83943)
@@ -1,26 +0,0 @@
-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=?=

Deleted: trunk/dports/perl/p5-nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch	2011-09-13 13:24:32 UTC (rev 83942)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch	2011-09-13 13:25:03 UTC (rev 83943)
@@ -1,23 +0,0 @@
-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-ecf2a983ff0945462d731afa9b4d7327cfeb9b5a.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-ecf2a983ff0945462d731afa9b4d7327cfeb9b5a.patch	                        (rev 0)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-ecf2a983ff0945462d731afa9b4d7327cfeb9b5a.patch	2011-09-13 13:25:03 UTC (rev 83943)
@@ -0,0 +1,21 @@
+From: NARUSE, Yui <naruse at users.sourceforge.jp>
+Date: Fri, 9 Sep 2011 10:31:45 +0000 (+0900)
+Subject: Add missing -w. [nkf-bug#26274]
+X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=ecf2a983ff0945462d731afa9b4d7327cfeb9b5a
+
+Add missing -w. [nkf-bug#26274]
+---
+
+diff --git a/nkf_test.pl b/nkf_test.pl
+index 15b29b3..9f85675 100644
+--- a/nkf_test.pl
++++ b/nkf_test.pl
+@@ -899,7 +899,7 @@ $example{'test_data/q-encode-utf-8.ans'} = <<"eofeof";
+ eofeof
+ 
+ printf "%-40s", "test_data/q-encode-utf-8";
+-    &test("$nkf",$example{'test_data/q-encode-utf-8'},$example{'test_data/q-encode-utf-8.ans'});
++    &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');

Deleted: trunk/dports/perl/p5-nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch	2011-09-13 13:24:32 UTC (rev 83942)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch	2011-09-13 13:25:03 UTC (rev 83943)
@@ -1,33 +0,0 @@
-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/20110913/3855588d/attachment.html>


More information about the macports-changes mailing list