diff options
| author |   afresh1 <afresh1@openbsd.org> | 2019-02-13 21:15:00 +0000 |
|---|---|---|
| committer | afresh1 <afresh1@openbsd.org> | 2019-02-13 21:15:00 +0000 |
| commit | 9f11ffb7133c203312a01e4b986886bc88c7d74b (patch) | |
| tree | 6618511204c614b20256e4ef9dea39a7b311d638 /gnu/usr.bin/perl/dist/base | |
| parent | Import perl-5.28.1 (diff) | |
| download | wireguard-openbsd-9f11ffb7133c203312a01e4b986886bc88c7d74b.tar.xz wireguard-openbsd-9f11ffb7133c203312a01e4b986886bc88c7d74b.zip | |
Fix merge issues, remove excess files - match perl-5.28.1 dist
looking good sthen@, Great! bluhm@
Diffstat (limited to 'gnu/usr.bin/perl/dist/base')
| -rw-r--r-- | gnu/usr.bin/perl/dist/base/Changes | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/dist/base/lib/base.pm | 3 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/dist/base/lib/fields.pm | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/gnu/usr.bin/perl/dist/base/Changes b/gnu/usr.bin/perl/dist/base/Changes index 44d579f7680..07755298acb 100644 --- a/gnu/usr.bin/perl/dist/base/Changes +++ b/gnu/usr.bin/perl/dist/base/Changes @@ -70,7 +70,7 @@ pseudohashes * Fixing inheritance from classes which have only private fields * Fixing inheritance when an intermediate class has no fields. - [perlbug 20020326.004] + [perlbug 20020326.004 (#8884)] - Removing uses of 'our' from tests for backwards compat. 2.02 Wed Sep 3 20:40:13 PDT 2003 diff --git a/gnu/usr.bin/perl/dist/base/lib/base.pm b/gnu/usr.bin/perl/dist/base/lib/base.pm index edb35494762..fb48fc295b2 100644 --- a/gnu/usr.bin/perl/dist/base/lib/base.pm +++ b/gnu/usr.bin/perl/dist/base/lib/base.pm @@ -2,8 +2,7 @@ use 5.008; package base; use strict 'vars'; -use vars qw($VERSION); -$VERSION = '2.23_01'; +our $VERSION = '2.27'; $VERSION =~ tr/_//d; # simplest way to avoid indexing of the package: no package statement diff --git a/gnu/usr.bin/perl/dist/base/lib/fields.pm b/gnu/usr.bin/perl/dist/base/lib/fields.pm index c40978bd90e..93eba95bf9b 100644 --- a/gnu/usr.bin/perl/dist/base/lib/fields.pm +++ b/gnu/usr.bin/perl/dist/base/lib/fields.pm @@ -10,9 +10,9 @@ unless( eval q{require warnings::register; warnings::register->import; 1} ) { Carp::carp(@_); } } -use vars qw(%attr $VERSION); +our %attr; -$VERSION = '2.23'; +our $VERSION = '2.24'; $VERSION =~ tr/_//d; # constant.pm is slow |