summaryrefslogtreecommitdiff
path: root/lang/perl5.16/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/perl5.16/files')
-rw-r--r--lang/perl5.16/files/patch-INST_PREFIX.t20
-rw-r--r--lang/perl5.16/files/patch-IO-Socket-INET-udp14
-rw-r--r--lang/perl5.16/files/patch-MM_Any.pm18
-rw-r--r--lang/perl5.16/files/patch-bug4900318
-rw-r--r--lang/perl5.16/files/patch-bug4947248
-rw-r--r--lang/perl5.16/files/patch-bug52074-5456644
-rw-r--r--lang/perl5.16/files/patch-bug5265815
-rw-r--r--lang/perl5.16/files/patch-bug5274015
-rw-r--r--lang/perl5.16/files/patch-bug5418677
-rw-r--r--lang/perl5.16/files/patch-bug5475829
-rw-r--r--lang/perl5.16/files/patch-bug5493415
-rw-r--r--lang/perl5.16/files/patch-bug5690831
-rw-r--r--lang/perl5.16/files/patch-bug5951616
-rw-r--r--lang/perl5.16/files/patch-freebsd.sh51
-rw-r--r--lang/perl5.16/files/patch-perl.c61
-rw-r--r--lang/perl5.16/files/patch-qr-leak16
-rw-r--r--lang/perl5.16/files/patch-sv.c21
-rw-r--r--lang/perl5.16/files/perl-after-upgrade588
-rw-r--r--lang/perl5.16/files/use.perl151
19 files changed, 0 insertions, 1248 deletions
diff --git a/lang/perl5.16/files/patch-INST_PREFIX.t b/lang/perl5.16/files/patch-INST_PREFIX.t
deleted file mode 100644
index 9520ef26890c..000000000000
--- a/lang/perl5.16/files/patch-INST_PREFIX.t
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/ExtUtils/t/INST_PREFIX.t.orig Wed Feb 15 12:46:31 2006
-+++ lib/ExtUtils/t/INST_PREFIX.t Wed Feb 15 12:46:52 2006
-@@ -16,7 +16,7 @@ BEGIN {
- }
-
- use strict;
--use Test::More tests => 52;
-+use Test::More tests => 51;
- use MakeMaker::Test::Utils;
- use MakeMaker::Test::Setup::BFD;
- use ExtUtils::MakeMaker;
-@@ -62,7 +62,7 @@ like( $stdout->read, qr{
- Writing\ $Makefile\ for\ Big::Dummy\n
- }x );
-
--is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
-+## is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
-
- isa_ok( $mm, 'ExtUtils::MakeMaker' );
-
diff --git a/lang/perl5.16/files/patch-IO-Socket-INET-udp b/lang/perl5.16/files/patch-IO-Socket-INET-udp
deleted file mode 100644
index 2c0ff86f110a..000000000000
--- a/lang/perl5.16/files/patch-IO-Socket-INET-udp
+++ /dev/null
@@ -1,14 +0,0 @@
-# http://perl5.git.perl.org/perl.git/commitdiff/7027b9a31bf80c5639c73f75155ed1a89c674c30?hp=f175cff5cac5f8199b897ce2f1c73312d99d5761
-diff --git a/ext/IO/lib/IO/Socket/INET.pm b/ext/IO/lib/IO/Socket/INET.pm
-index f8bb338..2f0e5d1 100644
---- ext/IO/lib/IO/Socket/INET.pm
-+++ ext/IO/lib/IO/Socket/INET.pm
-@@ -27,7 +27,7 @@ my %socket_type = ( tcp => SOCK_STREAM,
- );
- my %proto_number;
- $proto_number{tcp} = Socket::IPPROTO_TCP() if defined &Socket::IPPROTO_TCP;
--$proto_number{upd} = Socket::IPPROTO_UDP() if defined &Socket::IPPROTO_UDP;
-+$proto_number{udp} = Socket::IPPROTO_UDP() if defined &Socket::IPPROTO_UDP;
- $proto_number{icmp} = Socket::IPPROTO_ICMP() if defined &Socket::IPPROTO_ICMP;
- my %proto_name = reverse %proto_number;
-
diff --git a/lang/perl5.16/files/patch-MM_Any.pm b/lang/perl5.16/files/patch-MM_Any.pm
deleted file mode 100644
index 4e50627b00a8..000000000000
--- a/lang/perl5.16/files/patch-MM_Any.pm
+++ /dev/null
@@ -1,18 +0,0 @@
---- lib/ExtUtils/MM_Any.pm.orig Wed Feb 15 12:20:43 2006
-+++ lib/ExtUtils/MM_Any.pm Wed Feb 15 12:22:29 2006
-@@ -1069,13 +1069,14 @@ sub init_INSTALL_from_PREFIX {
- ('$(PREFIX)') x 3;
- }
- else {
-+ $self->{PREFIX} ||= $iprefix;
- $self->{PERLPREFIX} ||= $iprefix;
- $self->{SITEPREFIX} ||= $sprefix;
- $self->{VENDORPREFIX} ||= $vprefix;
-
- # Lots of MM extension authors like to use $(PREFIX) so we
- # put something sensible in there no matter what.
-- $self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)';
-+ #$self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)';
- }
-
- my $arch = $Config{archname};
diff --git a/lang/perl5.16/files/patch-bug49003 b/lang/perl5.16/files/patch-bug49003
deleted file mode 100644
index c43ef58891fb..000000000000
--- a/lang/perl5.16/files/patch-bug49003
+++ /dev/null
@@ -1,18 +0,0 @@
-# http://rt.perl.org/rt3/Public/Bug/Display.html?id=49003
-# http://perl5.git.perl.org/perl.git/commitdiff/b376053de54af4268a31e5a60d1f9e57db30af11?hp=3a28f3fb1bfd44e4e3dfe6842af867c8c1c9de28
-diff --git a/pp_sys.c b/pp_sys.c
-index 66ca0fb..da07e46 100644
---- pp_sys.c
-+++ pp_sys.c
-@@ -2999,10 +2999,9 @@ PP(pp_ftrread)
- effective = TRUE;
- break;
-
--
- case OP_FTEEXEC:
- #ifdef PERL_EFF_ACCESS
-- access_mode = W_OK;
-+ access_mode = X_OK;
- #else
- use_access = 0;
- #endif
diff --git a/lang/perl5.16/files/patch-bug49472 b/lang/perl5.16/files/patch-bug49472
deleted file mode 100644
index afc02952ba56..000000000000
--- a/lang/perl5.16/files/patch-bug49472
+++ /dev/null
@@ -1,48 +0,0 @@
-# http://rt.perl.org/rt3/Public/Bug/Display.html?id=49472
-# http://perl5.git.perl.org/perl.git/commitdiff/ca4cfd28534303b82a216cfe83a1c80cbc3b9dc5?hp=41d86c6b932c287037db3584f7658c067cae5e84
-diff --git a/t/comp/require.t b/t/comp/require.t
-index af5e4b2..0746b3b 100755
---- t/comp/require.t
-+++ t/comp/require.t
-@@ -15,7 +15,7 @@ krunch.pm krunch.pmc whap.pm whap.pmc);
-
- my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
- my $Is_UTF8 = (${^OPEN} || "") =~ /:utf8/;
--my $total_tests = 49;
-+my $total_tests = 50;
- if ($Is_EBCDIC || $Is_UTF8) { $total_tests -= 3; }
- print "1..$total_tests\n";
-
-@@ -258,6 +258,20 @@ EOT
- }
- }
-
-+# [perl #49472] Attributes + Unkown Error
-+
-+{
-+ do_require
-+ 'use strict;sub MODIFY_CODE_ATTRIBUTE{} sub f:Blah {$nosuchvar}';
-+ my $err = $@;
-+ $err .= "\n" unless $err =~ /\n$/;
-+ unless ($err =~ /Global symbol "\$nosuchvar" requires /) {
-+ $err =~ s/^/# /mg;
-+ print "${err}not ";
-+ }
-+ print "ok ", ++$i, " [perl #49472]\n";
-+}
-+
- ##########################################
- # What follows are UTF-8 specific tests. #
- # Add generic tests before this point. #
-diff --git a/toke.c b/toke.c
-index 2ae8b75..ecee902 100644
---- toke.c
-+++ toke.c
-@@ -692,6 +692,7 @@ Perl_lex_start(pTHX_ SV *line, PerlIO *rsfp, bool new_filter)
- #else
- parser->nexttoke = 0;
- #endif
-+ parser->error_count = oparser ? oparser->error_count : 0;
- parser->copline = NOLINE;
- parser->lex_state = LEX_NORMAL;
- parser->expect = XSTATE;
diff --git a/lang/perl5.16/files/patch-bug52074-54566 b/lang/perl5.16/files/patch-bug52074-54566
deleted file mode 100644
index 259a39585db7..000000000000
--- a/lang/perl5.16/files/patch-bug52074-54566
+++ /dev/null
@@ -1,44 +0,0 @@
-# http://rt.perl.org/rt3/Public/Bug/Display.html?id=52074
-# http://rt.perl.org/rt3/Public/Bug/Display.html?id=54566
-# http://perl5.git.perl.org/perl.git/commitdiff/5562fa714b8071354c365365c26a950efa73179a?hp=b3562f19ee0d76b60d176a0b1cfdac4f5f36785c
-# http://perl5.git.perl.org/perl.git/commitdiff/ea86b3de3510ce31d0c08dd6a21701d74b25369d?hp=72bfe1b2b35945ea3c95d9b94ae2908121292236
-diff --git a/mg.c b/mg.c
-index c4d7aeb..91a36f2 100644
---- mg.c
-+++ mg.c
-@@ -1543,10 +1543,11 @@ Perl_magic_setisa(pTHX_ SV *sv, MAGIC *mg)
- stash = GvSTASH(
- SvTYPE(mg->mg_obj) == SVt_PVGV
- ? (GV*)mg->mg_obj
-- : (GV*)SvMAGIC(mg->mg_obj)->mg_obj
-+ : (GV*)mg_find(mg->mg_obj, PERL_MAGIC_isa)->mg_obj
- );
-
-- mro_isa_changed_in(stash);
-+ if (stash)
-+ mro_isa_changed_in(stash);
-
- return 0;
- }
-diff --git a/t/mro/pkg_gen.t b/t/mro/pkg_gen.t
-index 6a507ac..e1f5eb0 100644
---- t/mro/pkg_gen.t
-+++ t/mro/pkg_gen.t
-@@ -4,7 +4,7 @@ use strict;
- use warnings;
-
- chdir 't' if -d 't';
--require q(./test.pl); plan(tests => 6);
-+require q(./test.pl); plan(tests => 7);
-
- {
- package Foo;
-@@ -34,3 +34,7 @@ is(mro::get_pkg_gen('Foo'), 1, "pkg_gen 1 for undef %Pkg::");
-
- delete $::{"Foo::"};
- is(mro::get_pkg_gen('Foo'), 0, 'pkg_gen 0 for delete $::{Pkg::}');
-+
-+delete $::{"Quux::"};
-+push @Quux::ISA, "Woot"; # should not segfault
-+ok(1, "No segfault on modification of ISA in a deleted stash");
-
diff --git a/lang/perl5.16/files/patch-bug52658 b/lang/perl5.16/files/patch-bug52658
deleted file mode 100644
index 435f66e1f988..000000000000
--- a/lang/perl5.16/files/patch-bug52658
+++ /dev/null
@@ -1,15 +0,0 @@
-# http://rt.perl.org/rt3/Public/Bug/Display.html?id=52658
-# http://perl5.git.perl.org/perl.git/commitdiff/62b40d2474e7487e6909e1872b6bccdf812c6818?hp=d49025b75d9b5002071bd1a4210654dab5663ef0#patch1
-diff --git a/pp_ctl.c b/pp_ctl.c
-index 7a377f0..88269a7 100644
---- pp_ctl.c
-+++ pp_ctl.c
-@@ -218,7 +218,6 @@ PP(pp_substcont)
- if (!(cx->sb_rxtainted & 2) && SvTAINTED(TOPs))
- cx->sb_rxtainted |= 2;
- sv_catsv(dstr, POPs);
-- FREETMPS; /* Prevent excess tmp stack */
-
- /* Are we done */
- if (cx->sb_once || !CALLREGEXEC(rx, s, cx->sb_strend, orig,
-
diff --git a/lang/perl5.16/files/patch-bug52740 b/lang/perl5.16/files/patch-bug52740
deleted file mode 100644
index 08a73a1547ee..000000000000
--- a/lang/perl5.16/files/patch-bug52740
+++ /dev/null
@@ -1,15 +0,0 @@
-# http://rt.perl.org/rt3/Public/Bug/Display.html?id=52740
-# http://perl5.git.perl.org/perl.git/commitdiff/785bee4f7cf89837cba8e6e0859abbb4b407e1f1?hp=90e91dd8c9549b16c38f6ab2e9fa25c7ea28dff8
-diff --git a/sv.c b/sv.c
-index f721e6f..5fcf018 100644
---- sv.c
-+++ sv.c
-@@ -3717,7 +3717,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV* sstr, const I32 flags)
- Perl_croak(aTHX_ "Cannot copy to %s", type);
- } else if (sflags & SVf_ROK) {
- if (isGV_with_GP(dstr) && dtype == SVt_PVGV
-- && SvTYPE(SvRV(sstr)) == SVt_PVGV) {
-+ && SvTYPE(SvRV(sstr)) == SVt_PVGV && isGV_with_GP(SvRV(sstr))) {
- sstr = SvRV(sstr);
- if (sstr == dstr) {
- if (GvIMPORTED(dstr) != GVf_IMPORTED
diff --git a/lang/perl5.16/files/patch-bug54186 b/lang/perl5.16/files/patch-bug54186
deleted file mode 100644
index 3421afe56091..000000000000
--- a/lang/perl5.16/files/patch-bug54186
+++ /dev/null
@@ -1,77 +0,0 @@
-# http://rt.perl.org/rt3/Public/Bug/Display.html?id=54186
-# http://perl5.git.perl.org/perl.git/commitdiff/a5d752217825fadff051e943940b4abad8e8b552?hp=8d2082b01041d30d9a510164df9c5e4703949441
-diff --git a/ext/POSIX/Makefile.PL b/ext/POSIX/Makefile.PL
-index bd93e59..5f6679d 100644
---- ext/POSIX/Makefile.PL
-+++ ext/POSIX/Makefile.PL
-@@ -48,13 +48,11 @@ my @names =
- MAX_INPUT MB_LEN_MAX MSG_CTRUNC MSG_DONTROUTE MSG_EOR MSG_OOB MSG_PEEK
- MSG_TRUNC MSG_WAITALL NAME_MAX NCCS NGROUPS_MAX NOFLSH OPEN_MAX OPOST
- PARENB PARMRK PARODD PATH_MAX PIPE_BUF RAND_MAX R_OK SCHAR_MAX
-- SCHAR_MIN SEEK_CUR SEEK_END SEEK_SET SHRT_MAX SHRT_MIN SIGABRT SIGALRM
-+ SCHAR_MIN SHRT_MAX SHRT_MIN SIGABRT SIGALRM
- SIGCHLD SIGCONT SIGFPE SIGHUP SIGILL SIGINT SIGKILL SIGPIPE SIGQUIT
- SIGSEGV SIGSTOP SIGTERM SIGTSTP SIGTTIN SIGTTOU
- SIGUSR1 SIGUSR2 SIG_BLOCK SIG_SETMASK SIG_UNBLOCK SSIZE_MAX
-- STDERR_FILENO STDIN_FILENO STDOUT_FILENO STREAM_MAX
-- S_IRGRP S_IROTH S_IRUSR S_IRWXG S_IRWXO S_IRWXU S_ISGID S_ISUID
-- S_IWGRP S_IWOTH S_IWUSR S_IXGRP S_IXOTH S_IXUSR TCIFLUSH TCIOFF
-+ STDERR_FILENO STDIN_FILENO STDOUT_FILENO STREAM_MAX TCIFLUSH TCIOFF
- TCIOFLUSH TCION TCOFLUSH TCOOFF TCOON TCSADRAIN TCSAFLUSH TCSANOW
- TMP_MAX TOSTOP TZNAME_MAX VEOF VEOL VERASE VINTR VKILL VMIN VQUIT
- VSTART VSTOP VSUSP VTIME WNOHANG WUNTRACED W_OK X_OK
-diff --git a/ext/POSIX/POSIX.pm b/ext/POSIX/POSIX.pm
-index fbbd253..97d0b2c 100644
---- ext/POSIX/POSIX.pm
-+++ ext/POSIX/POSIX.pm
-@@ -13,7 +13,9 @@ use XSLoader ();
- use Fcntl qw(FD_CLOEXEC F_DUPFD F_GETFD F_GETFL F_GETLK F_RDLCK F_SETFD
- F_SETFL F_SETLK F_SETLKW F_UNLCK F_WRLCK O_ACCMODE O_APPEND
- O_CREAT O_EXCL O_NOCTTY O_NONBLOCK O_RDONLY O_RDWR O_TRUNC
-- O_WRONLY);
-+ O_WRONLY SEEK_CUR SEEK_END SEEK_SET
-+ S_IRGRP S_IROTH S_IRUSR S_IRWXG S_IRWXO S_IRWXU S_ISGID S_ISUID
-+ S_IWGRP S_IWOTH S_IWUSR S_IXGRP S_IXOTH S_IXUSR);
-
- # Grandfather old foo_h form to new :foo_h form
- my $loaded;
-diff --git a/t/lib/proxy_constant_subs.t b/t/lib/proxy_constant_subs.t
-index 4af73d3..45b0a54 100644
---- t/lib/proxy_constant_subs.t
-+++ t/lib/proxy_constant_subs.t
-@@ -7,20 +7,20 @@ BEGIN {
- print "1..0 # Skip -- Perl configured without B module\n";
- exit 0;
- }
-- if ($Config::Config{'extensions'} !~ /\bPOSIX\b/) {
-- print "1..0 # Skip -- Perl configured without POSIX\n";
-+ if ($Config::Config{'extensions'} !~ /\bFcntl\b/) {
-+ print "1..0 # Skip -- Perl configured without Fcntl\n";
- exit 0;
- }
-- # errno is a real subroutine, and acts as control
-+ # S_IFMT is a real subroutine, and acts as control
- # SEEK_SET is a proxy constant subroutine.
-- @symbols = qw(errno SEEK_SET);
-+ @symbols = qw(S_IFMT SEEK_SET);
- }
-
- use strict;
- use warnings;
- use Test::More tests => 4 * @symbols;
- use B qw(svref_2object GVf_IMPORTED_CV);
--use POSIX @symbols;
-+use Fcntl @symbols;
-
- # GVf_IMPORTED_CV should not be set on the original, but should be set on the
- # imported GV.
-@@ -29,7 +29,7 @@ foreach my $symbol (@symbols) {
- my ($ps, $ms);
- {
- no strict 'refs';
-- $ps = svref_2object(\*{"POSIX::$symbol"});
-+ $ps = svref_2object(\*{"Fcntl::$symbol"});
- $ms = svref_2object(\*{"::$symbol"});
- }
- isa_ok($ps, 'B::GV');
-
diff --git a/lang/perl5.16/files/patch-bug54758 b/lang/perl5.16/files/patch-bug54758
deleted file mode 100644
index a969568a7e10..000000000000
--- a/lang/perl5.16/files/patch-bug54758
+++ /dev/null
@@ -1,29 +0,0 @@
-# http://rt.perl.org/rt3/Public/Bug/Display.html?id=54758
-# http://perl5.git.perl.org/perl.git/commitdiff/62b40d2474e7487e6909e1872b6bccdf812c6818?hp=d49025b75d9b5002071bd1a4210654dab5663ef0#patch1
-diff --git a/pp_sort.c b/pp_sort.c
-index 9fe0dad..edfdadf 100644
---- pp_sort.c
-+++ pp_sort.c
-@@ -1557,11 +1557,12 @@ PP(pp_sort)
- max = AvFILL(av) + 1;
- if (SvMAGICAL(av)) {
- MEXTEND(SP, max);
-- p2 = SP;
- for (i=0; i < max; i++) {
- SV **svp = av_fetch(av, i, FALSE);
- *SP++ = (svp) ? *svp : NULL;
- }
-+ SP--;
-+ p1 = p2 = SP - (max-1);
- }
- else {
- if (SvREADONLY(av))
-@@ -1717,7 +1718,7 @@ PP(pp_sort)
- SvREADONLY_off(av);
- else if (av && !sorting_av) {
- /* simulate pp_aassign of tied AV */
-- SV** const base = ORIGMARK+1;
-+ SV** const base = MARK+1;
- for (i=0; i < max; i++) {
- base[i] = newSVsv(base[i]);
- }
diff --git a/lang/perl5.16/files/patch-bug54934 b/lang/perl5.16/files/patch-bug54934
deleted file mode 100644
index 7c4544f58c0b..000000000000
--- a/lang/perl5.16/files/patch-bug54934
+++ /dev/null
@@ -1,15 +0,0 @@
-# http://rt.perl.org/rt3/Public/Bug/Display.html?id=49003
-# http://perl5.git.perl.org/perl.git/commitdiff/5a33563ff27918110ac4f876f12dae861e2d2fa2?hp=24ead1638d1eb17b67e49c614831261308ed561f
-diff --git a/ext/PerlIO/via/via.xs b/ext/PerlIO/via/via.xs
-index 3bc3cbb..5e6ddd3 100644
---- ext/PerlIO/via/via.xs
-+++ ext/PerlIO/via/via.xs
-@@ -89,7 +89,7 @@ PerlIOVia_method(pTHX_ PerlIO * f, const char *method, CV ** save, int flags,
- if (!s->fh) {
- GV *gv = newGVgen(HvNAME_get(s->stash));
- GvIOp(gv) = newIO();
-- s->fh = newRV_noinc((SV *) gv);
-+ s->fh = newRV((SV *) gv);
- s->io = GvIOp(gv);
- }
- IoIFP(s->io) = PerlIONext(f);
diff --git a/lang/perl5.16/files/patch-bug56908 b/lang/perl5.16/files/patch-bug56908
deleted file mode 100644
index f6789866cff7..000000000000
--- a/lang/perl5.16/files/patch-bug56908
+++ /dev/null
@@ -1,31 +0,0 @@
-# http://rt.perl.org/rt3/Public/Bug/Display.html?id=56908
-# http://perl5.git.perl.org/perl.git/commitdiff/b17f5ab768c4daa8faac6c85c0c20d3895f406e1?hp=7ee5fac837a8a4ebf1956da1b1d252aa82fe506d
-diff --git a/hv.c b/hv.c
-index 3d4d3af..24d9150 100644
---- hv.c
-+++ hv.c
-@@ -1985,6 +1985,7 @@ Perl_hv_kill_backrefs(pTHX_ HV *hv) {
- if (av) {
- HvAUX(hv)->xhv_backreferences = 0;
- Perl_sv_kill_backrefs(aTHX_ (SV*) hv, av);
-+ SvREFCNT_dec(av);
- }
- }
-
-diff --git a/sv.c b/sv.c
-index 04d6e43..4792ad1 100644
---- sv.c
-+++ sv.c
-@@ -10784,10 +10784,11 @@ Perl_sv_dup(pTHX_ const SV *const sstr, CLONE_PARAMS *const param)
- daux->xhv_eiter = saux->xhv_eiter
- ? he_dup(saux->xhv_eiter,
- (bool)!!HvSHAREKEYS(sstr), param) : 0;
-+ /* backref array needs refcnt=2; see sv_add_backref */
- daux->xhv_backreferences =
- saux->xhv_backreferences
- ? (AV*) SvREFCNT_inc(
-- sv_dup((SV*)saux->xhv_backreferences, param))
-+ sv_dup_inc((SV*)saux->xhv_backreferences, param))
- : 0;
-
- daux->xhv_mro_meta = saux->xhv_mro_meta
diff --git a/lang/perl5.16/files/patch-bug59516 b/lang/perl5.16/files/patch-bug59516
deleted file mode 100644
index 572c96e63d3c..000000000000
--- a/lang/perl5.16/files/patch-bug59516
+++ /dev/null
@@ -1,16 +0,0 @@
-# http://rt.perl.org/rt3/Public/Bug/Display.html?id=59516
-# http://perl5.git.perl.org/perl.git/commitdiff/b023a8eeff463528d4a2b46396f79056c0ef9677?hp=a954f6ee3112c0edfbc59783d1b424d995122784
-diff --git a/regcomp.c b/regcomp.c
-index 54347cc..68cc58c 100644
---- regcomp.c
-+++ regcomp.c
-@@ -8350,6 +8350,9 @@ parseit:
- *STRING(ret)= (char)value;
- STR_LEN(ret)= 1;
- RExC_emit += STR_SZ(1);
-+ if (listsv) {
-+ SvREFCNT_dec(listsv);
-+ }
- return ret;
- }
- /* optimize case-insensitive simple patterns (e.g. /[a-z]/i) */
diff --git a/lang/perl5.16/files/patch-freebsd.sh b/lang/perl5.16/files/patch-freebsd.sh
deleted file mode 100644
index 4587e5338e7f..000000000000
--- a/lang/perl5.16/files/patch-freebsd.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- hints/freebsd.sh
-+++ hints/freebsd.sh
-@@ -88,6 +88,8 @@
- esac
- libswanted=`echo $libswanted | sed 's/ malloc / /'`
- libswanted=`echo $libswanted | sed 's/ bind / /'`
-+ libswanted=`echo $libswanted | sed 's/ dl / /'`
-+ libswanted=`echo $libswanted | sed 's/ c / /'`
- # iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
- libswanted=`echo $libswanted | sed 's/ iconv / /'`
- d_setregid='define'
-@@ -102,6 +104,10 @@
- ;;
- esac
- libswanted=`echo $libswanted | sed 's/ malloc / /'`
-+ libswanted=`echo $libswanted | sed 's/ bind / /'`
-+ libswanted=`echo $libswanted | sed 's/ dl / /'`
-+ libswanted=`echo $libswanted | sed 's/ iconv / /'`
-+ libswanted=`echo $libswanted | sed 's/ c / /'`
- ;;
- esac
-
-@@ -125,7 +131,7 @@
- else
- libpth="/usr/lib /usr/local/lib"
- glibpth="/usr/lib /usr/local/lib"
-- ldflags="-Wl,-E "
-+ ldflags="%%PTHREAD_LIBS%% -Wl,-E "
- lddlflags="-shared "
- fi
- cccdlflags='-DPIC -fPIC'
-@@ -136,7 +142,7 @@
- 0*|1*|2*|3*) ;;
-
- *)
-- ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
-+ ccflags="${ccflags} %%PTHREAD_CFLAGS%% -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
- if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
- usenm=false
- fi
-@@ -183,7 +189,9 @@
-
- # This script UU/usethreads.cbu will get 'called-back' by Configure
- # after it has prompted the user for whether to use threads.
--cat > UU/usethreads.cbu <<'EOCBU'
-+## not quite - modern FreeBSD perl port is supposed to take care of that
-+## we just add extra libraries and cflags nowadays
-+cat > /dev/null <<'EOCBU'
- case "$usethreads" in
- $define|true|[yY]*)
- lc_r=`/sbin/ldconfig -r|grep ':-lc_r'|awk '{print $NF}'|sed -n '$p'`
diff --git a/lang/perl5.16/files/patch-perl.c b/lang/perl5.16/files/patch-perl.c
deleted file mode 100644
index 2f3753750e72..000000000000
--- a/lang/perl5.16/files/patch-perl.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- perl.c
-+++ perl.c
- #else /* IAMSUID */
-@@ -4882,6 +4882,28 @@
- incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
- #endif
-
-+#ifdef SITEARCH_EXP
-+ /* sitearch is always relative to sitelib on Windows for
-+ * DLL-based path intuition to work correctly */
-+# if !defined(WIN32)
-+ incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE);
-+# endif
-+#endif
-+
-+#ifdef SITELIB_EXP
-+# if defined(WIN32)
-+ /* this picks up sitearch as well */
-+ incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE);
-+# else
-+ incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE);
-+# endif
-+#endif
-+
-+#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
-+ /* Search for version-specific dirs below here */
-+ incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
-+#endif
-+
- #ifdef ARCHLIB_EXP
- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
- #endif
-@@ -4915,28 +4937,6 @@
- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
- #endif
-
--#ifdef SITEARCH_EXP
-- /* sitearch is always relative to sitelib on Windows for
-- * DLL-based path intuition to work correctly */
--# if !defined(WIN32)
-- incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE);
--# endif
--#endif
--
--#ifdef SITELIB_EXP
--# if defined(WIN32)
-- /* this picks up sitearch as well */
-- incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE);
--# else
-- incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE);
--# endif
--#endif
--
--#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
-- /* Search for version-specific dirs below here */
-- incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
--#endif
--
- #ifdef PERL_VENDORARCH_EXP
- /* vendorarch is always relative to vendorlib on Windows for
- * DLL-based path intuition to work correctly */
diff --git a/lang/perl5.16/files/patch-qr-leak b/lang/perl5.16/files/patch-qr-leak
deleted file mode 100644
index 842c0074af46..000000000000
--- a/lang/perl5.16/files/patch-qr-leak
+++ /dev/null
@@ -1,16 +0,0 @@
-# http://perl5.git.perl.org/perl.git/commitdiff/a954f6ee3112c0edfbc59783d1b424d995122784?hp=711690a16d2a16be7070e06779c46a6d8f482689
-diff --git a/pp_hot.c b/pp_hot.c
-index 57fa328..4a4e9e8 100644
---- pp_hot.c
-+++ pp_hot.c
-@@ -1198,6 +1198,9 @@ PP(pp_qr)
- if (rx->extflags & RXf_TAINTED)
- SvTAINTED_on(rv);
- sv_magic(sv,(SV*)ReREFCNT_inc(rx), PERL_MAGIC_qr,0,0);
-+ if (pkg) {
-+ SvREFCNT_dec(pkg);
-+ }
- XPUSHs(rv);
- RETURN;
- }
-
diff --git a/lang/perl5.16/files/patch-sv.c b/lang/perl5.16/files/patch-sv.c
deleted file mode 100644
index 5ee260a4b4bd..000000000000
--- a/lang/perl5.16/files/patch-sv.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- sv.c
-+++ sv.c
-@@ -10421,7 +10421,8 @@ Perl_sv_dup(pTHX_ const SV *sstr, CLONE_PARAMS* param)
- IoBOTTOM_NAME(dstr) = SAVEPV(IoBOTTOM_NAME(dstr));
- break;
- case SVt_PVAV:
-- if (AvARRAY((AV*)sstr)) {
-+ /* avoid cloning an empty array */
-+ if (AvARRAY((AV *)sstr) && AvFILLp((AV *)sstr) >= 0) {
- SV **dst_ary, **src_ary;
- SSize_t items = AvFILLp((AV*)sstr) + 1;
-
-@@ -10446,6 +10447,8 @@ Perl_sv_dup(pTHX_ const SV *sstr, CLONE_PARAMS* param)
- else {
- AvARRAY((AV*)dstr) = NULL;
- AvALLOC((AV*)dstr) = (SV**)NULL;
-+ AvMAX( (AV *)dstr) = -1;
-+ AvFILLp((AV *)dstr) = -1;
- }
- break;
- case SVt_PVHV:
diff --git a/lang/perl5.16/files/perl-after-upgrade b/lang/perl5.16/files/perl-after-upgrade
deleted file mode 100644
index a7f074d7566a..000000000000
--- a/lang/perl5.16/files/perl-after-upgrade
+++ /dev/null
@@ -1,588 +0,0 @@
-#! %%PERL%% -w
-# ----------------------------------------------------------------------------
-# "THE BEER-WARE LICENSE" (Revision 42)
-# <tobez@FreeBSD.org> wrote this file. As long as you retain this notice you
-# can do whatever you want with this stuff. If we meet some day, and you think
-# this stuff is worth it, you can buy me a beer in return. Anton Berezin
-# ----------------------------------------------------------------------------
-#
-# $FreeBSD$
-# $Id: perl-after-upgrade,v 1.11 2005/06/23 19:39:00 tobez Exp $
-#
-=pod
-
-=head1 NAME
-
-perl-after-upgrade -- fixup FreeBSD packages that depend on perl
-
-=head1 SYNOPSIS
-
- perl-after-upgrade
- perl-after-upgrade -f
- perl-after-upgrade -v
-
-=head1 DESCRIPTION
-
-The standard procedure after a perl port (lang/perl5.X) upgrade is to
-basically reinstall all other packages that depend on perl.
-This is always a painful exercise. The perl-after-upgrade utility makes
-this process mostly unnecessary.
-
-The tool goes through the list of installed packages, looks for those
-that depend on perl, moves files around, modifies shebang lines in those
-scripts in which it is necessary to do so, tries its best to adjust
-dynamically linked binaries that link with libperl.so in the old path,
-and updates the package database.
-
-After installation of the new perl is complete, either by hand from the
-ports collection, or from a package, or via portupgrade, do the
-following:
-
-=over 4
-
-=item o go root;
-
-=item o run perl-after-upgrade utility.
-
-Do not specify any arguments at first, so it does nothing destructive.
-Pay attention to the produced output and especially to errorlist at the
-end, if any;
-
-=item o run the utility again, with B<-f> command line option.
-
-This will actually do the work. Again, pay attention to the output
-produced;
-
-=item o fix any reported errors;
-
-=item o reinstall required packages:
-
-The utility will tell you what packages that depend on perl it could not
-handle. It will also tell you why it happened (for example, they were
-compiled against a binary incompatible perl). If you want such packages
-to remain operational, you will have to reinstall then by hand or via
-portupgrade.
-
-=item o review the files left in the older perl installation.
-
-This is typically /usr/local/lib/perl5/site_perl/5.X.Y/. There should
-be very little, if any, files in that directory and its subdirectories,
-excepting a number of .ph files;
-
-=item o check that things work as they should;
-
-=item o remove backup files from the package database.
-
-Those will be /var/db/pkg/*/+CONTENTS.bak;
-
-=item o that's all.
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2005 by Anton Berezin
-
- "THE BEER-WARE LICENSE" (Revision 42)
- <tobez@FreeBSD.org> wrote this module. As long as you retain this
- notice you can do whatever you want with this stuff. If we meet some
- day, and you think this stuff is worth it, you can buy me a beer in
- return.
-
- Anton Berezin
-
-NO WARRANTY OF ANY KIND, USE AT YOUR OWN RISK.
-
-=head1 HISTORY
-
-The first version of this utility was not bundled with perl package on
-FreeBSD. It was dumber than the current version in several important
-areas. It was faster.
-
-=head1 CREDITS
-
-Thanks to Mathieu Arnold for discussion.
-
-=head1 SEE ALSO
-
-perl(1).
-
-=cut
-
-my $debug = 0;
-
-# |/-\
-my $pchar = "|";
-my $do_progress = -t *STDOUT;
-sub progress
-{
- if ($do_progress) {
- print STDERR "$pchar";
- $pchar =~ tr<|/\\-><-|/\\>;
- }
-}
-
-package FreeBSD::Package;
-use IO::File;
-use File::Copy;
-
-sub new
-{
- my ($pkg, %p) = @_;
- my $pkgdir = $p{pkgdir} || return undef;
- my $name = $pkgdir;
- $name =~ s|.*/||;
- main::progress();
- my $c = IO::File->new("< $pkgdir/+CONTENTS");
- return undef unless $c;
- my @lines;
- while (<$c>) {
- chomp;
- push @lines, $_;
- }
- my $me = bless {
- pkgdir => $pkgdir,
- lines => \@lines,
- name => $name,
- }, $pkg;
- return $me;
-}
-
-sub name
-{
- return $_[0]->{name};
-}
-
-sub lines
-{
- my $me = shift;
- if (@_ && @_ == 1 && ref(@_) eq 'ARRAY') {
- $me->{lines} = [@{$_[0]}];
- $me->{changed} = 1;
- } elsif (@_) {
- $me->{lines} = [@_];
- $me->{changed} = 1;
- } else {
- return @{$me->{lines}};
- }
-}
-
-sub write_back
-{
- my ($me) = @_;
-
- return unless $me->{changed};
- main::progress();
- my $file = "$me->{pkgdir}/+CONTENTS";
- copy($file, "$file.bak");
- my $c = IO::File->new("> $file");
- return unless $c;
- for (@{$me->{lines}}) {
- print $c "$_\n";
- }
-}
-
-package FreeBSD::Package::DB;
-use strict;
-
-sub new
-{
- my ($pkg, %p) = @_;
- my $me = bless {
- dbdir => $p{dbdir} || $ENV{PKG_DBDIR} || "/var/db/pkg",
- }, $pkg;
- $me->{packages} = [ grep { -d } glob "$me->{dbdir}/*" ];
- $me->reset;
- return $me;
-}
-
-sub next
-{
- my ($me) = @_;
- while (1) {
- $me->{current}++;
- if ($me->{current} >= @{$me->{packages}}) {
- $me->reset;
- return undef;
- }
- my $pkg = FreeBSD::Package->new(pkgdir => $me->{packages}->[$me->{current}]);
- return $pkg if $pkg;
- }
-}
-
-sub reset
-{
- my ($me) = @_;
- $me->{current} = -1;
-}
-
-package main;
-use File::Temp qw/tempfile/;
-use File::Copy;
-
-my $dry_run = 1;
-my @tmpl;
-my $VERSION = "1.3";
-
-while (@ARGV) {
- my $opt = shift;
- if ($opt eq "-f") {
- $dry_run = 0;
- } elsif ($opt eq "-d") {
- $debug = 1;
- } elsif ($opt eq "-v") {
- $_ = $0;
- s|.*/||;
- print "$_ version $VERSION\n";
- exit 0;
- } elsif ($opt =~ /^-/) {
- $_ = $0;
- s|.*/||;
- print "Unknown option `$opt'\n";
- print "Usage:\n";
- print "\t$_\n\t$_ -v\n\t$_ -f\n";
- exit 1;
- } else {
- push @tmpl, $opt;
- }
-}
-
-my $target = '%%PERL_VERSION%%';
-my $new_perl_pkgname = '%%PKGNAME%%';
-
-my $fuzzy_source = qr/5\.10\.\d+/;
-print STDERR "- Fuzzy source re: <$fuzzy_source>\n" if $debug;
-
-my @errors;
-my @notes;
-
-sub fix_script
-{
- my ($file, $target) = @_;
-
- main::progress();
- return 1 if $dry_run;
- my $sf = IO::File->new("< $file");
- return "" unless $sf;
- my $line = <$sf>;
- my $md5 = "";
- if ($line && $line =~ s|^(\s*#!\s*[\w/]+perl)$fuzzy_source\b|$1$target|) {
- my $dir = $file;
- $dir =~ s|/[^/]+$||;
- my ($fh, $fn) = tempfile(DIR=> $dir);
- if ($fh) {
- print $fh $line;
- while (<$sf>) {
- print $fh $_;
- }
- close $fh;
- $md5 = `/sbin/md5 -q $fn`;
- chomp $md5;
- my $mode = (stat($file))[2] & 07777;
- unlink $file or do {
- push @errors, "Failed to unlink $file: $!";
- unlink $fn;
- return "";
- };
- rename $fn, $file or do {
- push @errors, "Failed to rename $fn to $file: $!";
- return "";
- };
- chmod $mode, $file;
- } else {
- push @errors, "Failed to modify $file: $!";
- }
- }
- return $md5;
-}
-
-sub fix_binary
-{
- my ($file, $target) = @_;
-
- main::progress();
- my $sf = IO::File->new("< $file");
- return "" unless $sf;
- my $was = $dry_run ? "would be" : "was";
- push @notes, "The $file binary $was modified, make sure it works";
- return 1 if $dry_run;
- my $md5 = "";
-
- my $dir = $file;
- $dir =~ s|/[^/]+$||;
- my ($fh, $fn) = tempfile(DIR=> $dir);
- unless ($fn) {
- push @errors, "Failed to modify $file: $!";
- return "";
- }
-
- while (<$sf>) {
- s|/lib/perl5/$fuzzy_source/mach/CORE|/lib/perl5/$target/mach/CORE|g;
- print $fh $_;
- }
- close $fh;
- $md5 = `/sbin/md5 -q $fn`;
- chomp $md5;
- my $mode = (stat($file))[2] & 07777;
- unlink $file or do {
- push @errors, "Failed to unlink $file: $!";
- unlink $fn;
- return "";
- };
- rename $fn, $file or do {
- push @errors, "Failed to rename $fn to $file: $!";
- return "";
- };
- chmod $mode, $file;
- return $md5;
-}
-
-sub mkdir_recur
-{
- my ($dir) = @_;
-
- main::progress();
- $dir =~ s|/+$||;
- my $orig = $dir;
- if ($dir =~ m|^$|) {
- return 1;
- } else {
- $dir =~ s|/[^/]+$||;
- my $r = mkdir_recur($dir);
- return $r unless $r;
- mkdir $orig, 0777;
- my $e = $!;
- unless (-d $orig) {
- push @errors, "Could not create directory $orig: $e";
- return 0;
- }
- return 1;
- }
-}
-
-sub might_need_to_fix
-{
- my ($pkg) = @_;
- my $pkg_name = $pkg->name;
-
- main::progress();
- if ($pkg_name =~ /^bsdpan-/) {
- return 1;
- }
- for ($pkg->lines) {
- if (/^\@pkgdep\s+perl-(threaded-)?($fuzzy_source)\S*\s*$/) {
- return 1;
- }
- }
- return 0;
-}
-
-sub fixable_binary
-{
- my ($file, $name) = @_;
-
- main::progress();
- my $fixable = 0;
- for (`/usr/bin/ldd $file 2>&1`) {
- if (/^\s+libperl\.so\s+=>/) {
- my $found;
- for (`strings $file`) {
- if (m</lib/perl5/($fuzzy_source)/mach/CORE>) {
- $found++;
- if (length($1) != length($target)) {
- push @notes, "$name cannot be fixed up (and has to be reinstalled): cannot patch $file due to length difference";
- print STDERR "- Skipping $name: cannot patch $file due to length difference\n" if $debug;
- return undef;
- }
- print STDERR "- $name: fixable binary $file\n" if $debug && $found < 2;
- $fixable = 1 if $1 ne $target;
- }
- }
- if (!$found) {
- push @notes, "$name cannot be fixed up (and has to be reinstalled): $file is using unknown libperl";
- print STDERR "- Skipping $name: $file is using unknown libperl\n" if $debug;
- return undef;
- }
- }
- }
- return $fixable;
-}
-
-sub fixable_shared_lib
-{
- my ($file, $name) = @_;
-
- main::progress();
- my ($old);
- for (`strings $file`) {
- if (/^perl_get_sv$/) {
- push @notes, "$name cannot be fixed up (and has to be reinstalled): $file uses an old perl API";
- print STDERR "- Skipping $name: $file uses an old perl API\n" if $debug;
- return 0;
- }
- }
- return 1;
-}
-
-sub cannot_be_fixed
-{
- my ($pkg, $binaries, $scripts) = @_;
- my $pkg_name = $pkg->name;
- my $prefix = "";
-
- main::progress();
-
- for ($pkg->lines) {
- if (/^\@cwd\s+(\S+)\s*$/) {
- $prefix = $1;
- next;
- }
- my $file = "$prefix/$_";
- next if -l $file;
- next if $file =~ /\.gz$/;
- next if $file =~ /\.bz2$/;
- my $sf = IO::File->new("< $file");
- next unless $sf;
- my $line;
- sysread $sf, $line, 256;
-
- # binary executable
- if ($line && $line =~ /^\177ELF.\x01.\x09.{8}\x02\0/) {
- my $fixable = fixable_binary($file, $pkg_name);
- return 0 unless defined $fixable;
- push @$binaries, $file if $fixable;
- # shared library - can prevent us from being able to upgrade
- } elsif ($line && $line =~ /^\177ELF.\x01.\x09.{8}\x03\0/) {
- return 0 unless fixable_shared_lib($file, $pkg_name);
- } elsif ($line && $line =~ m<^\s*#!\s*[\w/]+perl($fuzzy_source)\b>) {
- print STDERR "- $pkg_name: fixable script $file\n" if $debug;
- push @$scripts, $file if $1 ne $target;
- }
- main::progress();
- }
-}
-
-#
-my $db = FreeBSD::Package::DB->new;
-my ($fixed, $skipped, $tot_moved, $tot_modified) = (0,0,0,0);
-while (my $pkg = $db->next) {
- my @lines;
- my $new_md5;
- my ($adjusted, $moved, $modified) = (0,0,0);
-
- my $pkg_name = $pkg->name;
- if (@tmpl) {
- my $ok;
- for (@tmpl) {
- if ($pkg_name =~ /^$_/) {
- $ok = 1;
- last;
- }
- }
- next unless $ok;
- }
-
- unless (might_need_to_fix($pkg)) {
- $skipped++;
- print STDERR "- Skipping $pkg_name, it does not depend on perl\n" if $debug;
- next;
- }
-
- my (@binaries_to_fix, @scripts_to_fix);
- if (cannot_be_fixed($pkg, \@binaries_to_fix, \@scripts_to_fix)) {
- $skipped++;
- next;
- }
- if ($debug) {
- print STDERR "- $pkg_name: ", scalar(@binaries_to_fix), " binaries to fix\n" if @binaries_to_fix;
- print STDERR "- $pkg_name: ", scalar(@scripts_to_fix), " scripts to fix\n" if @scripts_to_fix;
- }
- my %binaries = map { $_ => 1 } @binaries_to_fix;
- my %scripts = map { $_ => 1 } @scripts_to_fix;
-
- my $prefix = "";
- my $pcnt = 0;
- for ($pkg->lines) {
- if (/^([^@]\S+)\s*$/) {
- my $from = "$prefix/$_";
- local $_; # we'll need it later
- $new_md5 = "";
- unless (-l $from) { # skip symlinks
- if ($binaries{$from}) {
- $new_md5 = fix_binary($from, $target);
- } elsif ($scripts{$from}) {
- $new_md5 = fix_script($from, $target);
- }
- $modified++ if $new_md5;
- }
- my $to = $from;
- if ($to =~ s|/perl5/$fuzzy_source/|/perl5/$target/|g or $to =~ s|/perl5/site_perl/$fuzzy_source/|/perl5/site_perl/$target/|g) {
- if ($to ne $from) {
- my $dir = $to;
- $dir =~ s|/[^/]+$||;
- main::progress();
- unless ($dry_run) {
- if (mkdir_recur($dir)) {
- move($from, $to);
- } else {
- push @errors, " could not move $from to $to";
- }
- }
- $moved++;
- print STDERR "- move: $from => $to\n" if $debug;
- }
- }
- } elsif (/^\@comment\s+MD5:[\da-f]+\s*$/ && $new_md5) {
- s|MD5:(\S+)|MD5:$new_md5|;
- $new_md5 = "";
- } else {
- $new_md5 = "";
- }
- if (/^\@cwd\s+(\S+)\s*$/) {
- $prefix = $1;
- } elsif (/^\@pkgdep\s+perl-(threaded-)?($fuzzy_source)\S*\s*$/) {
- if ($target ne $2) {
- my $perlver = $2;
- s|perl-(threaded-)?\Q$perlver\E|$new_perl_pkgname|;
- }
- }
- my $old = $_;
- if (s|/perl5/$fuzzy_source/|/perl5/$target/|g || s|/perl5/site_perl/$fuzzy_source/|/perl5/site_perl/$target/|g) {
- if ($old ne $_) {
- $adjusted++;
- print STDERR "- adjust: $_\n" if $debug;
- }
- }
- push @lines, $_;
- main::progress() if $pcnt++ % 250 == 0;
- }
- unless ($dry_run) {
- $pkg->lines(@lines);
- $pkg->write_back;
- }
- $fixed++ if $moved || $modified || $adjusted;
- $tot_modified += $modified;
- $tot_moved += $moved;
- print "$pkg_name: $moved moved, $modified modified, $adjusted adjusted\n";
-}
-print "\n---\n";
-print "Fixed $fixed packages ($tot_moved files moved, $tot_modified files modified)\n";
-print "Skipped $skipped packages\n";
-if (@errors) {
- print "\n**** The script has encountered following problems:\n";
- for (@errors) {
- print "$_\n";
- }
- print "\n--- Repeating summary:\n";
- print "Fixed $fixed packages ($tot_moved files moved, $tot_modified files modified)\n";
- print "Skipped $skipped packages\n";
-}
-if (@notes) {
- print "\n**** In addition, please pay attention to the following:\n";
- for (@notes) {
- print "$_\n";
- }
- print "\n--- Repeating summary:\n";
- print "Fixed $fixed packages ($tot_moved files moved, $tot_modified files modified)\n";
- print "Skipped $skipped packages\n";
-}
diff --git a/lang/perl5.16/files/use.perl b/lang/perl5.16/files/use.perl
deleted file mode 100644
index a75ac2641a65..000000000000
--- a/lang/perl5.16/files/use.perl
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-this=`echo -n $0 | /usr/bin/sed -e 's!^.*/!!'`
-PERL_VERSION="%%PERL_VERSION%%"
-MAKE_CONF=%%MAKE_CONF%%
-banner=`date +"%F %T"`
-banner="# added by use.perl $banner"
-if [ -z "${OSVERSION}" ]; then
- if [ -f /sbin/sysctl -a -x /sbin/sysctl ] ; then
- osreldate=`/sbin/sysctl -n kern.osreldate`
- else
- osreldate=`/usr/sbin/sysctl -n kern.osreldate`
- fi
-else
- osreldate=${OSVERSION}
-fi
-
-if [ "$2" = "POST-INSTALL" ] ; then
- need_remove_links=yes
- need_create_links=yes
- need_cleanup_make_conf=yes
- need_cleanup_manpath=yes
- need_spam_make_conf=yes
- need_spam_manpath=yes
- need_post_install=yes
-elif [ "$2" = "POST-DEINSTALL" ] ; then
- need_remove_links=yes
- need_cleanup_make_conf=yes
- need_cleanup_manpath=yes
-else
- exit 0;
-fi
-
-special_link_list="
- perl
- perl5"
-
-do_remove_links()
-{
- echo "Removing stale symlinks from /usr/bin..."
- for binary in $special_link_list
- do
- if [ -L "/usr/bin/$binary" ] ; then
- echo " Removing /usr/bin/$binary"
- /bin/rm -f "/usr/bin/$binary"
- else
- echo " Skipping /usr/bin/$binary"
- fi
- done
- bins=`/bin/ls /usr/bin/*perl*5.* ${PKG_PREFIX}/bin/*perl*5.* 2>/dev/null`
- for binary in $bins
- do
- if [ -L "$binary" ] ; then
- echo " Removing $binary installed by an older perl port"
- /bin/rm -f "$binary"
- fi
- done
- echo "Done."
-}
-
-do_create_links()
-{
- echo "Creating various symlinks in /usr/bin..."
- for binary in $special_link_list
- do
- if [ -f "/usr/bin/$binary" ] ; then
- echo " Backing up /usr/bin/$binary as /usr/bin/$binary.freebsd"
- /bin/mv -f "/usr/bin/$binary" "/usr/bin/$binary.freebsd"
- fi
- bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
- if [ -e "/usr/bin/$binary" ] ; then
- echo " *** /usr/bin/$binary is still there, which should not happen"
- elif [ -e "$PKG_PREFIX/bin/${bin}%%PERL_VERSION%%" ] ; then
- echo " Symlinking $PKG_PREFIX/bin/${bin}%%PERL_VERSION%% to /usr/bin/$binary"
- /bin/ln -sf "$PKG_PREFIX/bin/${bin}%%PERL_VERSION%%" "/usr/bin/$binary"
- else
- echo " *** $PKG_PREFIX/bin/${bin}%%PERL_VERSION%% is not there, a symlink won't do any good"
- fi
- done
- echo "Done."
-}
-
-do_post_install()
-{
- INCLUDEDIR=/usr/include
- install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/auto
- install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/auto
- install -d ${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man/man3
- cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h >/dev/null
-}
-
-do_cleanup_make_conf()
-{
- echo -n "Cleaning up ${MAKE_CONF}..."
- if [ -f ${MAKE_CONF} ] ; then
- /usr/bin/awk 's=0;
- /^#.*use.perl/ { s=1; mode=1 }
- /^#/ { s=1; if (mode != 1) { mode=0 } }
- /.*PERL.*=/ { s=1; if (mode == 1) { mode=2 } }
- /^$/ { s=1; if (mode != 2) { mode = 0 } }
- { if (s != 1) { mode = 0 } if (mode == 0) print }' ${MAKE_CONF} >${MAKE_CONF}.new
- /bin/mv ${MAKE_CONF} ${MAKE_CONF}.bak
- /bin/mv ${MAKE_CONF}.new ${MAKE_CONF}
- fi
- echo " Done."
-}
-
-do_cleanup_manpath()
-{
- echo -n "Cleaning up /etc/manpath.config..."
- if [ -f /etc/manpath.config ] ; then
- /usr/bin/awk 's=0;
- /^#.*use.perl/ { s=1; mode=1 }
- /^#/ { s=1; if (mode != 1) { mode=0 } }
- /^OPTIONAL_MANPATH.*perl5/ { s=1; if (mode == 1) { mode=2 } }
- /^$/ { s=1; if (mode != 2) { mode = 0 } }
- { if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new
- /bin/mv /etc/manpath.config /etc/manpath.config.bak
- /bin/mv /etc/manpath.config.new /etc/manpath.config
- fi
- echo " Done."
-}
-
-do_spam_make_conf()
-{
- echo -n "Spamming ${MAKE_CONF}..."
- echo "$banner" >>${MAKE_CONF}
- echo "PERL_VERSION=%%PERL_VERSION%%" >>${MAKE_CONF}
- echo " Done."
-}
-
-do_spam_manpath()
-{
- echo -n "Spamming /etc/manpath.config..."
- echo "$banner" >>/etc/manpath.config
- echo "OPTIONAL_MANPATH ${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man" >>/etc/manpath.config
- echo "OPTIONAL_MANPATH ${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/perl/man" >>/etc/manpath.config
- echo " Done."
-}
-
-[ $need_remove_links ] && do_remove_links
-[ $need_create_links ] && do_create_links
-[ $need_post_install ] && do_post_install
-[ $need_cleanup_make_conf ] && do_cleanup_make_conf
-[ $need_spam_make_conf ] && do_spam_make_conf
-[ $need_cleanup_manpath ] && do_cleanup_manpath
-[ $need_spam_manpath ] && do_spam_manpath
-
-exit 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-07 01:21:37 +0000