[46267] trunk/dports/perl/p5-nkf
takanori at macports.org
takanori at macports.org
Sun Feb 1 14:05:15 PST 2009
Revision: 46267
http://trac.macports.org/changeset/46267
Author: takanori at macports.org
Date: 2009-02-01 14:05:15 -0800 (Sun, 01 Feb 2009)
Log Message:
-----------
p5-nkf: version 2.0.9
Modified Paths:
--------------
trunk/dports/perl/p5-nkf/Portfile
Added Paths:
-----------
trunk/dports/perl/p5-nkf/files/
trunk/dports/perl/p5-nkf/files/nkf.git-b7ee1f1b26ba715116fd8f66e83bf1ad8a95bcce.patch
trunk/dports/perl/p5-nkf/files/nkf.git-d2f5d12b00a610a371ec48f6c841953b792aa721.patch
trunk/dports/perl/p5-nkf/files/nkf.git-f06661980bb179714f60338e09d48ae66ca15f97.patch
Modified: trunk/dports/perl/p5-nkf/Portfile
===================================================================
--- trunk/dports/perl/p5-nkf/Portfile 2009-02-01 22:04:27 UTC (rev 46266)
+++ trunk/dports/perl/p5-nkf/Portfile 2009-02-01 22:05:15 UTC (rev 46267)
@@ -3,9 +3,8 @@
PortSystem 1.0
PortGroup perl5 1.0
-perl5.setup NKF 2.08
-revision 1
-set nkfver 2.0.8b
+perl5.setup NKF 2.09
+set nkfver 2.0.9
categories-append \
textproc japanese
maintainers nifty.com:pelopor takanori openmaintainer
@@ -14,18 +13,20 @@
${description}
platforms darwin
homepage http://sourceforge.jp/projects/nkf/
-#master_sites sourceforge_jp:nkf/26243/
-set sfjpid 26243
-master_sites http://keihanna.dl.sourceforge.jp/nkf/${sfjpid}/ \
- http://osdn.dl.sourceforge.jp/nkf/${sfjpid}/ \
- http://qgpop.dl.sourceforge.jp/nkf/${sfjpid}/
+master_sites sourceforge_jp:nkf/37177/
distfiles nkf-${nkfver}.tar.gz
-checksums md5 1851260a2719629294740783c14ca3d5 \
- sha1 9587e427173b6c0420284afef19b18b3f905fbaa \
- rmd160 952698a09f8e28b6385a7b41301e95dc237aa893
+patchfiles nkf.git-b7ee1f1b26ba715116fd8f66e83bf1ad8a95bcce.patch \
+ nkf.git-d2f5d12b00a610a371ec48f6c841953b792aa721.patch \
+ nkf.git-f06661980bb179714f60338e09d48ae66ca15f97.patch
+checksums md5 0dadcf178785c87874822a2ff8da9f19 \
+ sha1 68e9d5c6224940e6f1fe1d3cf0a54e47c5769a27 \
+ rmd160 c27b176f675428c0cbfb7779700979e60de3a42f
-worksrcdir nkf-2.0.8/NKF.mod
+worksrcdir nkf-${nkfver}/NKF.mod
+patch.dir ${workpath}/nkf-${nkfver}
+patch.pre_args -p1
+
post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/doc
xinstall -m 644 -W ${worksrcpath} Changes README ${destroot}${prefix}/share/doc/${name}
Added: trunk/dports/perl/p5-nkf/files/nkf.git-b7ee1f1b26ba715116fd8f66e83bf1ad8a95bcce.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-b7ee1f1b26ba715116fd8f66e83bf1ad8a95bcce.patch (rev 0)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-b7ee1f1b26ba715116fd8f66e83bf1ad8a95bcce.patch 2009-02-01 22:05:15 UTC (rev 46267)
@@ -0,0 +1,69 @@
+From: NARUSE, Yui <naruse at users.sourceforge.jp>
+Date: Wed, 21 Jan 2009 18:33:41 +0000 (+0900)
+Subject: Fix: can't run test.
+X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=b7ee1f1b26ba715116fd8f66e83bf1ad8a95bcce
+
+Fix: can't run test.
+---
+
+diff --git a/NKF.mod/test.pl b/NKF.mod/test.pl
+index b3cb928..3350aef 100644
+--- a/NKF.mod/test.pl
++++ b/NKF.mod/test.pl
+@@ -114,8 +114,35 @@ END {print "not ok 1\n" unless $loaded;}
+ } else {
+ print "no 5\n";
+ }
++}
+
+-
++sub command_tests {
++ my @tests = @_;
++ my ($in, $out, $ans);
++
++ for (my $i = 0; $i <= $#tests; $i += 3){
++ local (@nkf) = split(/ /,$tests[$i]);
++ shift(@nkf);
++ $in = $tests[$i+1];
++ $ans = $tests[$i+2];
++ $out = NKF::nkf(@nkf,$in);
++ $out =~ s/ //g if $nkf =~ /-\w+m[NS]/o;
++ $ans =~ s/ //g if $nkf =~ /-\w+m[NS]/o;
++ if ($out ne $ans) {
++ last;
++ }
++ }
++ if ($out eq $ans) {
++ print "Ok\n";
++ return;
++ }
++ print "Fail\n";
++ if ($diff) {
++ open(R,"|od -c >tmp.result.bad"); binmode R; print R $out; close(R);
++ open(R,"|od -c >tmp.expect.bad"); binmode R; print R $ans; close(R);
++ system "diff -c tmp.result.bad tmp.expect.bad";
++ }
++ return;
+ }
+
+ do "../nkf_test.pl";
+diff --git a/nkf_test.pl b/nkf_test.pl
+index 0320256..9b0228d 100644
+--- a/nkf_test.pl
++++ b/nkf_test.pl
+@@ -957,6 +957,7 @@ eofeof
+ printf "%-40s", "test_data/bugs10904";
+ &test("$nkf -Mj",$example{'test_data/bugs10904'},$example{'test_data/bugs10904.ans'});
+
++ if (!NKF) {
+ printf "%-40s", "Guess NL";
+ &command_tests(
+ "$nkf --guess","none", "ASCII\n",
+@@ -980,6 +981,7 @@ printf "%-40s", "Guess NL";
+ "$nkf --guess","\r\n.\n", "ASCII (MIXED NL)\n",
+ "$nkf --guess","\r\n.\r", "ASCII (MIXED NL)\n",
+ "$nkf --guess","\r\n.\r\n", "ASCII (CRLF)\n");
++ }
+
+ printf "%-40s", "Convert NL to LF";
+ &command_tests(
Added: trunk/dports/perl/p5-nkf/files/nkf.git-d2f5d12b00a610a371ec48f6c841953b792aa721.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-d2f5d12b00a610a371ec48f6c841953b792aa721.patch (rev 0)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-d2f5d12b00a610a371ec48f6c841953b792aa721.patch 2009-02-01 22:05:15 UTC (rev 46267)
@@ -0,0 +1,23 @@
+From: NARUSE, Yui <naruse at users.sourceforge.jp>
+Date: Wed, 21 Jan 2009 18:32:33 +0000 (+0900)
+Subject: Fix: redefinition of macro SP (workarround).
+X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=d2f5d12b00a610a371ec48f6c841953b792aa721
+
+Fix: redefinition of macro SP (workarround).
+---
+
+diff --git a/NKF.mod/NKF.xs b/NKF.mod/NKF.xs
+index 1de2a7c..5b1c9c7 100644
+--- a/NKF.mod/NKF.xs
++++ b/NKF.mod/NKF.xs
+@@ -95,7 +95,10 @@ nkf_putchar_grow(unsigned int c)
+
+ #define PERL_XS 1
+ #include "../utf8tbl.c"
++#undef SP
+ #include "../nkf.c"
++#undef SP
++#define SP sp /* perl's CORE/pp.h */
+
+ /* package defenition */
+
Added: trunk/dports/perl/p5-nkf/files/nkf.git-f06661980bb179714f60338e09d48ae66ca15f97.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-f06661980bb179714f60338e09d48ae66ca15f97.patch (rev 0)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-f06661980bb179714f60338e09d48ae66ca15f97.patch 2009-02-01 22:05:15 UTC (rev 46267)
@@ -0,0 +1,34 @@
+From: NARUSE, Yui <naruse at users.sourceforge.jp>
+Date: Wed, 21 Jan 2009 15:40:49 +0000 (+0900)
+Subject: NKF.xs must follow nkf.c doesn't have WISH_TRUE AND NO_X0201.
+X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=f06661980bb179714f60338e09d48ae66ca15f97
+
+NKF.xs must follow nkf.c doesn't have WISH_TRUE AND NO_X0201.
+
+fixed by obache [sf.jp#14731]
+---
+
+diff --git a/NKF.mod/NKF.xs b/NKF.mod/NKF.xs
+index 626b634..1de2a7c 100644
+--- a/NKF.mod/NKF.xs
++++ b/NKF.mod/NKF.xs
+@@ -134,9 +134,6 @@ nkf(...)
+ data = SvPV(ST(argc),i_len);
+ input_ctr = 0;
+
+- if(x0201_f == WISH_TRUE)
+- x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
+-
+ /* allocate the result buffer */
+
+ /* During conversion, stirngs length may grow. This is the unit */
+@@ -178,9 +175,6 @@ nkf_continue(...)
+ data = SvPV(ST(0),i_len);
+ input_ctr = 0;
+
+- if(x0201_f == WISH_TRUE)
+- x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
+-
+ /* allocate the result buffer */
+
+ /* During conversion, stirngs length may grow. This is the unit */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090201/2b782230/attachment.html>
More information about the macports-changes
mailing list