Upgrade Encode from version 2.60_01 to 2.62

The new version incorporates previous blead CUSTOMIZATIONS.

8 files changed, 24 insertions, 42 deletions

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 741515e8cc..761bc3ffa5 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -376,26 +376,8 @@ use File::Glob qw(:case);
     },
 
     'Encode' => {
-        'DISTRIBUTION' => 'DANKOGAI/Encode-2.60.tar.gz',
+        'DISTRIBUTION' => 'DANKOGAI/Encode-2.62.tar.gz',
         'FILES'        => q[cpan/Encode],
-        'CUSTOMIZED'   => [
-            # Waiting to be merged upstream: see CPAN RT#95130 and
-            # Message-Id: <201405062058.s46KwdCZ013775@m-l.org>
-            qw(
-                Byte/Makefile.PL
-                CN/Makefile.PL
-                EBCDIC/Makefile.PL
-                Encode.pm
-                Encode.xs
-                Encode/Makefile_PL.e2x
-                JP/Makefile.PL
-                KR/Makefile.PL
-                Symbol/Makefile.PL
-                TW/Makefile.PL
-                bin/enc2xs
-            ),
-        ],
-
     },
 
     'encoding::warnings' => {
diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm
index 5d477f6bde..f102a1a8e1 100644
--- a/cpan/Encode/Encode.pm
+++ b/cpan/Encode/Encode.pm
@@ -1,10 +1,10 @@
 #
-# $Id: Encode.pm,v 2.60 2014/04/29 16:26:49 dankogai Exp dankogai $
+# $Id: Encode.pm,v 2.62 2014/05/31 12:12:39 dankogai Exp dankogai $
 #
 package Encode;
 use strict;
 use warnings;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.60_01 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.62 $ =~ /(\d+)/g;
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 use XSLoader ();
 XSLoader::load( __PACKAGE__, $VERSION );
@@ -1029,7 +1029,7 @@ who submitted code to the project.
 
 =head1 COPYRIGHT
 
-Copyright 2002-2013 Dan Kogai I<< <dankogai@cpan.org> >>.
+Copyright 2002-2014 Dan Kogai I<< <dankogai@cpan.org> >>.
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.
diff --git a/cpan/Encode/Encode.xs b/cpan/Encode/Encode.xs
index e08101add5..5ee45399b3 100644
--- a/cpan/Encode/Encode.xs
+++ b/cpan/Encode/Encode.xs
@@ -1,5 +1,5 @@
 /*
- $Id: Encode.xs,v 2.27 2014/04/29 16:25:06 dankogai Exp dankogai $
+ $Id: Encode.xs,v 2.29 2014/05/31 12:12:39 dankogai Exp dankogai $
  */
 
 #define PERL_NO_GET_CONTEXT
@@ -843,7 +843,7 @@ OUTPUT:
     RETVAL
 
 #ifndef SvIsCOW
-# define SvIsCOW (SvREADONLY(sv) && SvFAKE(sv))
+# define SvIsCOW(sv) (SvREADONLY(sv) && SvFAKE(sv))
 #endif
 
 SV *
diff --git a/cpan/Encode/Unicode/Unicode.xs b/cpan/Encode/Unicode/Unicode.xs
index cf42ab8674..846ab3a0ec 100644
--- a/cpan/Encode/Unicode/Unicode.xs
+++ b/cpan/Encode/Unicode/Unicode.xs
@@ -1,5 +1,5 @@
 /*
- $Id: Unicode.xs,v 2.11 2014/04/29 16:25:06 dankogai Exp dankogai $
+ $Id: Unicode.xs,v 2.11 2014/04/29 16:25:06 dankogai Exp $
  */
 
 #define PERL_NO_GET_CONTEXT
diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
index c44487d0c2..f2dda5362b 100644
--- a/cpan/Encode/bin/enc2xs
+++ b/cpan/Encode/bin/enc2xs
@@ -10,7 +10,7 @@ use warnings;
 use Getopt::Std;
 use Config;
 my @orig_ARGV = @ARGV;
-our $VERSION  = do { my @r = (q$Revision: 2.12 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION  = do { my @r = (q$Revision: 2.13 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 # These may get re-ordered.
 # RAW is a do_now as inserted by &enter
diff --git a/cpan/Encode/bin/piconv b/cpan/Encode/bin/piconv
index 669304b68c..c1dad9ee04 100644
--- a/cpan/Encode/bin/piconv
+++ b/cpan/Encode/bin/piconv
@@ -1,5 +1,5 @@
 #!./perl
-# $Id: piconv,v 2.6 2014/03/28 02:37:42 dankogai Exp $
+# $Id: piconv,v 2.7 2014/05/31 09:48:48 dankogai Exp $
 #
 use 5.8.0;
 use strict;
@@ -58,9 +58,13 @@ $Opt{perlqq}   and $Opt{check} = Encode::PERLQQ;
 $Opt{htmlcref} and $Opt{check} = Encode::HTMLCREF;
 $Opt{xmlcref}  and $Opt{check} = Encode::XMLCREF;
 
+my $efrom = Encode->getEncoding($from) || die "Unknown encoding '$from'";
+my $eto   = Encode->getEncoding($to)   || die "Unknown encoding '$to'";
+
+my $cfrom = $efrom->name;
+my $cto   = $eto->name;
+
 if ($Opt{debug}){
-    my $cfrom = Encode->getEncoding($from)->name;
-    my $cto   = Encode->getEncoding($to)->name;
     print <<"EOT";
 Scheme: $scheme
 From:   $from => $cfrom
@@ -76,8 +80,7 @@ my %use_bom =
 
 unless ( $scheme eq 'perlio' ) {
     binmode STDOUT;
-    my $need2slurp = $use_bom{ find_encoding($to)->name }
-      || $use_bom{ find_encoding($from)->name };
+    my $need2slurp = $use_bom{ $eto } || $use_bom{ $efrom };
     for my $argv (@ARGV) {
         my $ifh = ref $argv ? $argv : undef;
 	$ifh or open $ifh, "<", $argv or warn "Can't open $argv: $!" and next;
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 9abfe420b5..09401cbaf2 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -174,6 +174,14 @@ L<[perl #121574]|https://rt.perl.org/Ticket/Display.html?id=121574>
 
 =item *
 
+L<Encode> has been upgraded from version 2.60_01 to 2.62.
+
+B<piconv> now has better error handling when the encoding name is nonexistent,
+and a build breakage when upgrading L<Encode> in perl-5.8.2 and earlier has
+been fixed.
+
+=item *
+
 The libnet collection of modules has been upgraded from version 1.25 to 1.27.
 
 There are only whitespace changes to the installed files.
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index a935691606..f8ff31d128 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -1,15 +1,4 @@
 Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf
-Encode cpan/Encode/bin/enc2xs f60036fd3574ec05c9aab7f4db00a828d5dea92d
-Encode cpan/Encode/Byte/Makefile.PL 0986e25f981a3bf182a13a0060d28d4efedd87e6
-Encode cpan/Encode/CN/Makefile.PL 5507a49d822d0c1d14e967f4595e29e9c873540b
-Encode cpan/Encode/EBCDIC/Makefile.PL 574289638393eb6b1109eb9a6874bfe8c5d2ddea
-Encode cpan/Encode/Encode.pm fc26f74b44148a4f0c9e8ec2b0a9c20eae96249d
-Encode cpan/Encode/Encode.xs 9ee24e3915319bdec044535667a39e3dc531fdcf
-Encode cpan/Encode/Encode/Makefile_PL.e2x 4d0420b19cea75c513842329c1906221130bdb6b
-Encode cpan/Encode/JP/Makefile.PL a9ca9c836424cc2ecbefa4933d9da5db54131b98
-Encode cpan/Encode/KR/Makefile.PL 0e46ded62ec6b128e5562277658132700425a48c
-Encode cpan/Encode/Symbol/Makefile.PL 4beddbbd00f638b7de9c6cd0821d9d38020a8218
-Encode cpan/Encode/TW/Makefile.PL 0cc44f95e59f45c0fb3b66bde41525f13c19a25c
 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691
 Text::Balanced cpan/Text-Balanced/t/01_compile.t 1598cf491a48fa546260a2ec41142abe84da533d
 Text::Balanced cpan/Text-Balanced/t/02_extbrk.t 6ba1b64a4604e822dc2260b8ffcea6b406339ee8