diff options
| author |   afresh1 <afresh1@openbsd.org> | 2019-02-13 21:10:38 +0000 |
|---|---|---|
| committer | afresh1 <afresh1@openbsd.org> | 2019-02-13 21:10:38 +0000 |
| commit | 5759b3d249badf144a6240f7eec4dcf9df003e6b (patch) | |
| tree | 88ca2f73bac6772bb3b7819e5ca28614859b0f2c /gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils | |
| parent | strsep the -e argument for execve; ok benno (diff) | |
| download | wireguard-openbsd-5759b3d249badf144a6240f7eec4dcf9df003e6b.tar.xz wireguard-openbsd-5759b3d249badf144a6240f7eec4dcf9df003e6b.zip | |
Import perl-5.28.1
looking good sthen@, Great! bluhm@
Diffstat (limited to 'gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils')
4 files changed, 15 insertions, 15 deletions
diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm index 34e85decfbe..4924c81fbea 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm @@ -7,7 +7,7 @@ use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION); @ISA = qw(Exporter); @EXPORT = qw(cp rm_f rm_rf mv cat eqtime mkpath touch test_f test_d chmod dos2unix); -$VERSION = '7.10_02'; +$VERSION = '7.34'; $VERSION = eval $VERSION; my $Is_VMS = $^O eq 'VMS'; @@ -350,6 +350,7 @@ sub dos2unix { open ORIG, $_ or do { warn "dos2unix can't open $_: $!"; return }; open TEMP, ">$temp" or do { warn "dos2unix can't create .dos2unix_tmp: $!"; return }; + binmode ORIG; binmode TEMP; while (my $line = <ORIG>) { $line =~ s/\015\012/\012/g; print TEMP $line; diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm index 68fcd4c5b84..6d97df06f61 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm @@ -1,7 +1,8 @@ package ExtUtils::MakeMaker::Locale; use strict; -our $VERSION = "7.10"; +our $VERSION = "7.34"; +$VERSION = eval $VERSION; use base 'Exporter'; our @EXPORT_OK = qw( @@ -27,11 +28,8 @@ sub _init { eval { unless (defined &GetConsoleCP) { require Win32; - # no point falling back to Win32::GetConsoleCP from this - # as added same time, 0.45 - eval { Win32::GetConsoleCP() }; # manually "import" it since Win32->import refuses - *GetConsoleCP = sub { &Win32::GetConsoleCP } unless $@; + *GetConsoleCP = sub { &Win32::GetConsoleCP } if defined &Win32::GetConsoleCP; } unless (defined &GetConsoleCP) { require Win32::API; @@ -51,18 +49,17 @@ sub _init { require Win32; eval { Win32::GetConsoleCP() }; # manually "import" it since Win32->import refuses - *GetInputCP = sub { &Win32::GetConsoleCP } unless $@; - *GetOutputCP = sub { &Win32::GetConsoleOutputCP } unless $@; + *GetInputCP = sub { &Win32::GetConsoleCP } if defined &Win32::GetConsoleCP; + *GetOutputCP = sub { &Win32::GetConsoleOutputCP } if defined &Win32::GetConsoleOutputCP; }; unless (defined &GetInputCP) { eval { # try Win32::Console module for codepage to use require Win32::Console; - eval { Win32::Console::InputCP() }; *GetInputCP = sub { &Win32::Console::InputCP } - unless $@; + if defined &Win32::Console::InputCP; *GetOutputCP = sub { &Win32::Console::OutputCP } - unless $@; + if defined &Win32::Console::OutputCP; }; } unless (defined &GetInputCP) { @@ -137,7 +134,7 @@ Encode::Alias::define_alias(sub { sub _flush_aliases { no strict 'refs'; - for my $a (keys %Encode::Alias::Alias) { + for my $a (sort keys %Encode::Alias::Alias) { if (defined ${"ENCODING_" . uc($a)}) { delete $Encode::Alias::Alias{$a}; warn "Flushed alias cache for $a" if DEBUG; diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm index 35cd2ab9b30..c59be1eeee7 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm @@ -10,12 +10,13 @@ package ExtUtils::MakeMaker::version; -use 5.006002; +use 5.006001; use strict; use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv); -$VERSION = '7.10_01'; +$VERSION = '7.34'; +$VERSION = eval $VERSION; $CLASS = 'version'; { diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm index a0213b14ff2..f0eb14eacb4 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm @@ -10,7 +10,8 @@ use strict; use vars qw($VERSION $CLASS $STRICT $LAX); -$VERSION = '7.10_01'; +$VERSION = '7.34'; +$VERSION = eval $VERSION; #--------------------------------------------------------------------------# # Version regexp components |