[100638] trunk/dports/perl/p5-nkf
takanori at macports.org
takanori at macports.org
Tue Dec 18 06:20:08 PST 2012
Revision: 100638
https://trac.macports.org/changeset/100638
Author: takanori at macports.org
Date: 2012-12-18 06:20:08 -0800 (Tue, 18 Dec 2012)
Log Message:
-----------
nkf: version 2.1.3 (2012-11-22)
Modified Paths:
--------------
trunk/dports/perl/p5-nkf/Portfile
Removed Paths:
-------------
trunk/dports/perl/p5-nkf/files/nkf.git-4e632c30b502e56032a1781e4edf44ec462fe6ad.patch
trunk/dports/perl/p5-nkf/files/nkf.git-50a383c848f1c8c4e107ed68c3e839ff95f275a6.patch
trunk/dports/perl/p5-nkf/files/nkf.git-6bbe38e718c98825229bce7ef9f8d236e63c095f.patch
trunk/dports/perl/p5-nkf/files/nkf.git-832e032be763ec6acf1cf13225b0d72f1b867a18.patch
trunk/dports/perl/p5-nkf/files/nkf.git-ecf2a983ff0945462d731afa9b4d7327cfeb9b5a.patch
trunk/dports/perl/p5-nkf/files/nkf.git-fcc185d621977d87cc50c1561be0aff3924af2ac.patch
Modified: trunk/dports/perl/p5-nkf/Portfile
===================================================================
--- trunk/dports/perl/p5-nkf/Portfile 2012-12-18 14:19:39 UTC (rev 100637)
+++ trunk/dports/perl/p5-nkf/Portfile 2012-12-18 14:20:08 UTC (rev 100638)
@@ -6,7 +6,7 @@
set nkf_ver 2.1.2
perl5.branches 5.8 5.10 5.12 5.14 5.16
perl5.setup NKF [string range ${nkf_ver} 0 2][string range ${nkf_ver} 4 end]
-revision 3
+revision 4
categories-append \
textproc japanese
maintainers nifty.com:pelopor takanori openmaintainer
@@ -16,7 +16,8 @@
platforms darwin
license zlib
homepage http://sourceforge.jp/projects/nkf/
-master_sites sourceforge_jp:nkf/53171/
+master_sites http://svn.sourceforge.jp/svnroot/macports-jp/distfiles/nkf/
+# sourceforge_jp:nkf/53171/
distname nkf-${nkf_ver}
dist_subdir nkf
if {${perl5.major} != ""} {
@@ -26,8 +27,44 @@
nkf.git-832e032be763ec6acf1cf13225b0d72f1b867a18.patch \
nkf.git-6bbe38e718c98825229bce7ef9f8d236e63c095f.patch \
nkf.git-fcc185d621977d87cc50c1561be0aff3924af2ac.patch \
- nkf.git-50a383c848f1c8c4e107ed68c3e839ff95f275a6.patch
-checksums rmd160 91c0d413a70299246591d314d33f45e71eba51a7
+ nkf.git-50a383c848f1c8c4e107ed68c3e839ff95f275a6.patch \
+ nkf.git-d844277c5702758dcd8ef9603a2db5fd4996885c.patch \
+ nkf.git-cdb2fdaa5e74f844a06461ec9c151af186382a40.patch \
+ nkf.git-b0a6577a521d1bba5e19853f95d5c4b9be1072b5.patch \
+ nkf.git-e8581233c53fc45f39de6cba6fe8c5afbaa267da.patch
+checksums nkf.git-ecf2a983ff0945462d731afa9b4d7327cfeb9b5a.patch \
+ rmd160 95c5531fa639038bdece8320006a726b33d7ac24 \
+ sha256 a391cb644d78831eb74321c8cc2edcae225271896d5531df13f26f47cbcf6231 \
+ nkf.git-4e632c30b502e56032a1781e4edf44ec462fe6ad.patch \
+ rmd160 f93ae9a52b23ce80cdf518e38c5783b992c8fe92 \
+ sha256 3334ca7db5b8770e88137e23f53eb0c1d69b8cede496f1583fd157758b751c9b \
+ nkf.git-832e032be763ec6acf1cf13225b0d72f1b867a18.patch \
+ rmd160 fe1f8432e2ca02137fee4c52a6def7315d9a90dd \
+ sha256 6fe252a180ba2cc9ae733b9cfde09fe129b467bb0aba6992036e15ea193e1e6e \
+ nkf.git-6bbe38e718c98825229bce7ef9f8d236e63c095f.patch \
+ rmd160 43bb17bf5ce6d4d418563210980789d99b9021c6 \
+ sha256 0df567fc3e6eb2209bd651287910b3df1f0db6db0e7d8e850b93abce7de9e0b1 \
+ nkf.git-fcc185d621977d87cc50c1561be0aff3924af2ac.patch \
+ rmd160 1ed2a43fc872e31c8976319e6c1f56bc98b30596 \
+ sha256 9e746810657ea7a0b7d390837f9afeeada990568078e52770011e7006af5001c \
+ nkf.git-50a383c848f1c8c4e107ed68c3e839ff95f275a6.patch \
+ rmd160 bf37611f8f4626f508100f7bbbe6e9a1a3162590 \
+ sha256 94ca41839c906e7114b77de3e52b4bb31b6667378fbf2be9450af7e929cc4d2c \
+ nkf.git-d844277c5702758dcd8ef9603a2db5fd4996885c.patch \
+ rmd160 06071dc64115f2fb925f23fab5a1bbb8d95c68d3 \
+ sha256 b1ed47f4bc877a95b978a157c3cee3879a956a9b0ab801ad2e3f49483f416555 \
+ nkf.git-cdb2fdaa5e74f844a06461ec9c151af186382a40.patch \
+ rmd160 708c139df8b66416e973b5e8061cd5e0d3ee7b0c \
+ sha256 e9668c98cbc99b02a05a9a596d77ec75a17f86c5409c146d0b954347e01f5dca \
+ nkf.git-b0a6577a521d1bba5e19853f95d5c4b9be1072b5.patch \
+ rmd160 0a4169f473500a689faa29866f55abf6ec801503 \
+ sha256 63e6706ae72400077b2f72507bb3a87d5ca317e300cc92c6a1949f33c06a273e \
+ nkf.git-e8581233c53fc45f39de6cba6fe8c5afbaa267da.patch \
+ rmd160 963dab3c10246908cf1c796c52f800f731b11a82 \
+ sha256 c386da77ea01340b9734bde8f08801021cb598617417590dc05d1668b84ab832 \
+ nkf-2.1.2.tar.gz \
+ rmd160 91c0d413a70299246591d314d33f45e71eba51a7 \
+ sha256 034e8b676160fa7cfaf023ad130ce2d7a7309e917c8f41b308e9dc2f6218a0a6
worksrcdir ${distname}/NKF.mod
Deleted: trunk/dports/perl/p5-nkf/files/nkf.git-4e632c30b502e56032a1781e4edf44ec462fe6ad.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-4e632c30b502e56032a1781e4edf44ec462fe6ad.patch 2012-12-18 14:19:39 UTC (rev 100637)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-4e632c30b502e56032a1781e4edf44ec462fe6ad.patch 2012-12-18 14:20:08 UTC (rev 100638)
@@ -1,28 +0,0 @@
-From: NARUSE, Yui <naruse at users.sourceforge.jp>
-Date: Sat, 17 Mar 2012 11:40:54 +0000 (+0900)
-Subject: Show endian on --guess.
-X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=4e632c30b502e56032a1781e4edf44ec462fe6ad
-
-Show endian on --guess.
-
-http://sourceforge.jp/ticket/browse.php?group_id=248&tid=26325
----
-
-diff --git a/nkf.c b/nkf.c
-index 0382f30..b9df10e 100644
---- a/nkf.c
-+++ b/nkf.c
-@@ -4190,8 +4190,12 @@ print_guessed_code(char *filename)
- if (guess_f == 1) {
- printf("%s\n", input_codename);
- } else {
-- printf("%s%s\n",
-+ printf("%s%s%s\n",
- input_codename,
-+ iconv != w_iconv16 && iconv != w_iconv32 ? "" :
-+ input_endian == ENDIAN_LITTLE ? " LE" :
-+ input_endian == ENDIAN_BIG ? " BE" :
-+ "[BUG]",
- input_eol == CR ? " (CR)" :
- input_eol == LF ? " (LF)" :
- input_eol == CRLF ? " (CRLF)" :
Deleted: trunk/dports/perl/p5-nkf/files/nkf.git-50a383c848f1c8c4e107ed68c3e839ff95f275a6.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-50a383c848f1c8c4e107ed68c3e839ff95f275a6.patch 2012-12-18 14:19:39 UTC (rev 100637)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-50a383c848f1c8c4e107ed68c3e839ff95f275a6.patch 2012-12-18 14:20:08 UTC (rev 100638)
@@ -1,48 +0,0 @@
-From: NARUSE, Yui <naruse at users.sourceforge.jp>
-Date: Thu, 13 Sep 2012 10:39:24 +0000 (+0900)
-Subject: Fix: can't convert CP50221's UDC to CP932
-X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=50a383c848f1c8c4e107ed68c3e839ff95f275a6
-
-Fix: can't convert CP50221's UDC to CP932
-
-patched by TOMITA Masahiro. [nkf-forum:65482]
----
-
-diff --git a/nkf.c b/nkf.c
-index 5209864..a16b142 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.3"
--#define NKF_RELEASE_DATE "2012-08-29"
-+#define NKF_RELEASE_DATE "2012-09-13"
- #define COPY_RIGHT \
- "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
- "Copyright (C) 1996-2012, The nkf Project."
-@@ -5491,7 +5491,7 @@ kanji_convert(FILE *f)
- code_status(c1);
- if (c2) {
- /* second byte */
-- if (c2 > DEL) {
-+ if (c2 > ((input_encoding && nkf_enc_cp5022x_p(input_encoding)) ? 0x92 : DEL)) {
- /* in case of 8th bit is on */
- if (!estab_f&&!mime_decode_mode) {
- /* in case of not established yet */
-diff --git a/nkf_test.pl b/nkf_test.pl
-index af607be..79cfea6 100644
---- a/nkf_test.pl
-+++ b/nkf_test.pl
-@@ -1071,6 +1071,11 @@ printf "%-40s", "[nkf-forum:65316] ";
- "\xEF\xBD\xB1\xEF\xBD\xB2\xEF\xBD\xB3\xEF\xBD\xB4\xEF\xBD\xB5\xEF\xBD\xB6\xEF\xBD\xB7\xEF\xBD\xB8\xEF\xBD\xB9\xEF\xBD\xBA\xEF\xBD\xBB\xEF\xBD\xBC\xEF\xBD\xBD\xEF\xBD\xBE\xEF\xBD\xBF\xEF\xBE\x80\xEF\xBE\x81\xEF\xBE\x82\xEF\xBE\x83\xEF\xBE\x84",
- "\xEF\xBD\xB1\xEF\xBD\xB2\xEF\xBD\xB3\xEF\xBD\xB4\xEF\xBD\xB5\xEF\xBD\xB6\xEF\xBD\xB7\xEF\xBD\xB8\xEF\xBD\xB9\xEF\xBD\xBA\n\xEF\xBD\xBB\xEF\xBD\xBC\xEF\xBD\xBD\xEF\xBD\xBE\xEF\xBD\xBF\xEF\xBE\x80\xEF\xBE\x81\xEF\xBE\x82\xEF\xBE\x83\xEF\xBE\x84\n");
-
-+printf "%-40s", "[nkf-forum:65482] ";
-+ &test("$nkf --ic=CP50221 --oc=CP932",
-+ "\x1b\x24\x42\x7f\x21\x80\x21\x1b\x28\x42\n",
-+ "\xf0\x40\xf0\x9f\x0a");
-+
- if (!NKF) {
- printf "%-40s", "Guess NL";
- &command_tests(
Deleted: trunk/dports/perl/p5-nkf/files/nkf.git-6bbe38e718c98825229bce7ef9f8d236e63c095f.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-6bbe38e718c98825229bce7ef9f8d236e63c095f.patch 2012-12-18 14:19:39 UTC (rev 100637)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-6bbe38e718c98825229bce7ef9f8d236e63c095f.patch 2012-12-18 14:20:08 UTC (rev 100638)
@@ -1,37 +0,0 @@
-From: NARUSE, Yui <naruse at users.sourceforge.jp>
-Date: Wed, 29 Aug 2012 05:45:10 +0000 (+0900)
-Subject: Fix: Halfwidh treated as fullwidth on folding. [nkf-forum:65316]
-X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=6bbe38e718c98825229bce7ef9f8d236e63c095f
-
-Fix: Halfwidh treated as fullwidth on folding. [nkf-forum:65316]
----
-
-diff --git a/nkf.c b/nkf.c
-index ee855d8..4a6d758 100644
---- a/nkf.c
-+++ b/nkf.c
-@@ -3500,7 +3500,7 @@ fold_conv(nkf_char c2, nkf_char c1)
- f_prev = c1;
- if (c2 || c2 == JIS_X_0201_1976_K)
- f_prev |= 0x80; /* this is Japanese */
-- f_line += char_size(c2,c1);
-+ f_line += c2 == JIS_X_0201_1976_K ? 1: char_size(c2,c1);
- if (f_line<=fold_len) { /* normal case */
- fold_state = 1;
- } else {
-diff --git a/nkf_test.pl b/nkf_test.pl
-index 9f85675..af607be 100644
---- a/nkf_test.pl
-+++ b/nkf_test.pl
-@@ -1066,6 +1066,11 @@ printf "%-40s", "[nkf-bug:21393]-X ";
- "\xEF\xBD\xBC\xEF\xBE\x9E\xEF\xBD\xAC\xEF\xBD\xB0\xEF\xBE\x8F\xEF\xBE\x9D\xEF\xBD\xA5\xEF\xBE\x8E\xEF\xBE\x9F\xEF\xBE\x83\xEF\xBE\x84\xEF\xBD\xA1",
- "\x83W\x83\x83\x81[\x83}\x83\x93\x81E\x83|\x83e\x83g\x81B");
-
-+printf "%-40s", "[nkf-forum:65316] ";
-+ &test("$nkf -xwW -f10",
-+ "\xEF\xBD\xB1\xEF\xBD\xB2\xEF\xBD\xB3\xEF\xBD\xB4\xEF\xBD\xB5\xEF\xBD\xB6\xEF\xBD\xB7\xEF\xBD\xB8\xEF\xBD\xB9\xEF\xBD\xBA\xEF\xBD\xBB\xEF\xBD\xBC\xEF\xBD\xBD\xEF\xBD\xBE\xEF\xBD\xBF\xEF\xBE\x80\xEF\xBE\x81\xEF\xBE\x82\xEF\xBE\x83\xEF\xBE\x84",
-+ "\xEF\xBD\xB1\xEF\xBD\xB2\xEF\xBD\xB3\xEF\xBD\xB4\xEF\xBD\xB5\xEF\xBD\xB6\xEF\xBD\xB7\xEF\xBD\xB8\xEF\xBD\xB9\xEF\xBD\xBA\n\xEF\xBD\xBB\xEF\xBD\xBC\xEF\xBD\xBD\xEF\xBD\xBE\xEF\xBD\xBF\xEF\xBE\x80\xEF\xBE\x81\xEF\xBE\x82\xEF\xBE\x83\xEF\xBE\x84\n");
-+
- if (!NKF) {
- printf "%-40s", "Guess NL";
- &command_tests(
Deleted: trunk/dports/perl/p5-nkf/files/nkf.git-832e032be763ec6acf1cf13225b0d72f1b867a18.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-832e032be763ec6acf1cf13225b0d72f1b867a18.patch 2012-12-18 14:19:39 UTC (rev 100637)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-832e032be763ec6acf1cf13225b0d72f1b867a18.patch 2012-12-18 14:20:08 UTC (rev 100638)
@@ -1,92 +0,0 @@
-From: NARUSE, Yui <naruse at users.sourceforge.jp>
-Date: Sat, 17 Mar 2012 11:50:17 +0000 (+0900)
-Subject: Show "(BOM)" if the byte sequence has BOM.
-X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=832e032be763ec6acf1cf13225b0d72f1b867a18
-
-Show "(BOM)" if the byte sequence has BOM.
-
-http://sourceforge.jp/ticket/browse.php?group_id=248&tid=26325
----
-
-diff --git a/nkf.c b/nkf.c
-index b9df10e..ee855d8 100644
---- a/nkf.c
-+++ b/nkf.c
-@@ -20,11 +20,11 @@
- *
- * 3. This notice may not be removed or altered from any source distribution.
- */
--#define NKF_VERSION "2.1.2"
--#define NKF_RELEASE_DATE "2011-09-08"
-+#define NKF_VERSION "2.1.3"
-+#define NKF_RELEASE_DATE "2012-03-17"
- #define COPY_RIGHT \
- "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
-- "Copyright (C) 1996-2011, The nkf Project."
-+ "Copyright (C) 1996-2012, The nkf Project."
-
- #include "config.h"
- #include "nkf.h"
-@@ -356,6 +356,7 @@ static int no_cp932ext_f = FALSE;
- /* ignore ZERO WIDTH NO-BREAK SPACE */
- static int no_best_fit_chars_f = FALSE;
- static int input_endian = ENDIAN_BIG;
-+static int input_bom_f = FALSE;
- static nkf_char unicode_subchar = '?'; /* the regular substitution character */
- static void (*encode_fallback)(nkf_char c) = NULL;
- static void w_status(struct input_code *, nkf_char);
-@@ -3202,6 +3203,7 @@ check_bom(FILE *f)
- set_iconv(TRUE, w_iconv32);
- }
- if (iconv == w_iconv32) {
-+ input_bom_f = TRUE;
- input_endian = ENDIAN_BIG;
- return;
- }
-@@ -3232,6 +3234,7 @@ check_bom(FILE *f)
- set_iconv(TRUE, w_iconv);
- }
- if (iconv == w_iconv) {
-+ input_bom_f = TRUE;
- return;
- }
- (*i_ungetc)(0xBF,f);
-@@ -3260,6 +3263,7 @@ check_bom(FILE *f)
- }
- if (iconv == w_iconv16) {
- input_endian = ENDIAN_BIG;
-+ input_bom_f = TRUE;
- return;
- }
- (*i_ungetc)(0xFF,f);
-@@ -3275,6 +3279,7 @@ check_bom(FILE *f)
- }
- if (iconv == w_iconv32) {
- input_endian = ENDIAN_LITTLE;
-+ input_bom_f = TRUE;
- return;
- }
- (*i_ungetc)(0x00,f);
-@@ -3286,6 +3291,7 @@ check_bom(FILE *f)
- }
- if (iconv == w_iconv16) {
- input_endian = ENDIAN_LITTLE;
-+ input_bom_f = TRUE;
- return;
- }
- (*i_ungetc)(0xFE,f);
-@@ -4190,12 +4196,13 @@ print_guessed_code(char *filename)
- if (guess_f == 1) {
- printf("%s\n", input_codename);
- } else {
-- printf("%s%s%s\n",
-+ printf("%s%s%s%s\n",
- input_codename,
- iconv != w_iconv16 && iconv != w_iconv32 ? "" :
- input_endian == ENDIAN_LITTLE ? " LE" :
- input_endian == ENDIAN_BIG ? " BE" :
- "[BUG]",
-+ input_bom_f ? " (BOM)" : "",
- input_eol == CR ? " (CR)" :
- input_eol == LF ? " (LF)" :
- input_eol == CRLF ? " (CRLF)" :
Deleted: trunk/dports/perl/p5-nkf/files/nkf.git-ecf2a983ff0945462d731afa9b4d7327cfeb9b5a.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-ecf2a983ff0945462d731afa9b4d7327cfeb9b5a.patch 2012-12-18 14:19:39 UTC (rev 100637)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-ecf2a983ff0945462d731afa9b4d7327cfeb9b5a.patch 2012-12-18 14:20:08 UTC (rev 100638)
@@ -1,21 +0,0 @@
-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-fcc185d621977d87cc50c1561be0aff3924af2ac.patch
===================================================================
--- trunk/dports/perl/p5-nkf/files/nkf.git-fcc185d621977d87cc50c1561be0aff3924af2ac.patch 2012-12-18 14:19:39 UTC (rev 100637)
+++ trunk/dports/perl/p5-nkf/files/nkf.git-fcc185d621977d87cc50c1561be0aff3924af2ac.patch 2012-12-18 14:20:08 UTC (rev 100638)
@@ -1,21 +0,0 @@
-From: NARUSE, Yui <naruse at users.sourceforge.jp>
-Date: Wed, 29 Aug 2012 11:47:57 +0000 (+0900)
-Subject: update release date.
-X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=fcc185d621977d87cc50c1561be0aff3924af2ac
-
-update release date.
----
-
-diff --git a/nkf.c b/nkf.c
-index 4a6d758..5209864 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.3"
--#define NKF_RELEASE_DATE "2012-03-17"
-+#define NKF_RELEASE_DATE "2012-08-29"
- #define COPY_RIGHT \
- "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
- "Copyright (C) 1996-2012, The nkf Project."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121218/928fd773/attachment.html>
More information about the macports-changes
mailing list