diff options
| author | skv <skv@FreeBSD.org> | 2009-11-23 23:58:01 +0800 |
|---|---|---|
| committer | skv <skv@FreeBSD.org> | 2009-11-23 23:58:01 +0800 |
| commit | a42abacecae591d3aa1859e11a4e8e0b6972cb04 (patch) | |
| tree | a280bef8ff1abbc797df9076a8fd49a0efab47b7 /lang | |
| parent | 93df5e92a3321f2a50e73f9a416019fa722eda09 (diff) | |
| download | freebsd-ports-gnome-a42abacecae591d3aa1859e11a4e8e0b6972cb04.tar.gz freebsd-ports-gnome-a42abacecae591d3aa1859e11a4e8e0b6972cb04.tar.zst freebsd-ports-gnome-a42abacecae591d3aa1859e11a4e8e0b6972cb04.zip | |
perl-after-upgrade:
- simplify regexes
- catch lines in +CONTENTS like:
@unexec rmdir %D/lib/perl5/5.10.0 2>/dev/null || true
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/perl5.10/files/perl-after-upgrade | 6 | ||||
| -rw-r--r-- | lang/perl5.12/files/perl-after-upgrade | 6 | ||||
| -rw-r--r-- | lang/perl5.14/files/perl-after-upgrade | 6 | ||||
| -rw-r--r-- | lang/perl5.16/files/perl-after-upgrade | 6 |
4 files changed, 8 insertions, 16 deletions
diff --git a/lang/perl5.10/files/perl-after-upgrade b/lang/perl5.10/files/perl-after-upgrade index 7bb37386c4b9..2cd3c3fe8b21 100644 --- a/lang/perl5.10/files/perl-after-upgrade +++ b/lang/perl5.10/files/perl-after-upgrade @@ -530,9 +530,7 @@ while (my $pkg = $db->next) { $modified++ if $new_md5; } my $to = $from; - if ($to =~ s|/perl5/$PERL_VERSION_REGEX/|/perl5/$PERL_VERSION/|g - || $to =~ s|/perl5/site_perl/$PERL_VERSION_REGEX/|/perl5/site_perl/$PERL_VERSION/|g - ) { + if ($to =~ s|(/perl5/(?:site_perl/)?)$PERL_VERSION_REGEX|$1$PERL_VERSION|g) { if ($to ne $from) { my $dir = $to; $dir =~ s|/[^/]+$||; @@ -563,7 +561,7 @@ while (my $pkg = $db->next) { } } my $old = $_; - if (s|/perl5/$PERL_VERSION_REGEX/|/perl5/$PERL_VERSION/|g || s|/perl5/site_perl/$PERL_VERSION_REGEX/|/perl5/site_perl/$PERL_VERSION/|g) { + if (s|(/perl5/(?:site_perl/)?)$PERL_VERSION_REGEX|$1$PERL_VERSION|g) { if ($old ne $_) { $adjusted++; print STDERR "- adjust: $_\n" if $debug; diff --git a/lang/perl5.12/files/perl-after-upgrade b/lang/perl5.12/files/perl-after-upgrade index 7bb37386c4b9..2cd3c3fe8b21 100644 --- a/lang/perl5.12/files/perl-after-upgrade +++ b/lang/perl5.12/files/perl-after-upgrade @@ -530,9 +530,7 @@ while (my $pkg = $db->next) { $modified++ if $new_md5; } my $to = $from; - if ($to =~ s|/perl5/$PERL_VERSION_REGEX/|/perl5/$PERL_VERSION/|g - || $to =~ s|/perl5/site_perl/$PERL_VERSION_REGEX/|/perl5/site_perl/$PERL_VERSION/|g - ) { + if ($to =~ s|(/perl5/(?:site_perl/)?)$PERL_VERSION_REGEX|$1$PERL_VERSION|g) { if ($to ne $from) { my $dir = $to; $dir =~ s|/[^/]+$||; @@ -563,7 +561,7 @@ while (my $pkg = $db->next) { } } my $old = $_; - if (s|/perl5/$PERL_VERSION_REGEX/|/perl5/$PERL_VERSION/|g || s|/perl5/site_perl/$PERL_VERSION_REGEX/|/perl5/site_perl/$PERL_VERSION/|g) { + if (s|(/perl5/(?:site_perl/)?)$PERL_VERSION_REGEX|$1$PERL_VERSION|g) { if ($old ne $_) { $adjusted++; print STDERR "- adjust: $_\n" if $debug; diff --git a/lang/perl5.14/files/perl-after-upgrade b/lang/perl5.14/files/perl-after-upgrade index 7bb37386c4b9..2cd3c3fe8b21 100644 --- a/lang/perl5.14/files/perl-after-upgrade +++ b/lang/perl5.14/files/perl-after-upgrade @@ -530,9 +530,7 @@ while (my $pkg = $db->next) { $modified++ if $new_md5; } my $to = $from; - if ($to =~ s|/perl5/$PERL_VERSION_REGEX/|/perl5/$PERL_VERSION/|g - || $to =~ s|/perl5/site_perl/$PERL_VERSION_REGEX/|/perl5/site_perl/$PERL_VERSION/|g - ) { + if ($to =~ s|(/perl5/(?:site_perl/)?)$PERL_VERSION_REGEX|$1$PERL_VERSION|g) { if ($to ne $from) { my $dir = $to; $dir =~ s|/[^/]+$||; @@ -563,7 +561,7 @@ while (my $pkg = $db->next) { } } my $old = $_; - if (s|/perl5/$PERL_VERSION_REGEX/|/perl5/$PERL_VERSION/|g || s|/perl5/site_perl/$PERL_VERSION_REGEX/|/perl5/site_perl/$PERL_VERSION/|g) { + if (s|(/perl5/(?:site_perl/)?)$PERL_VERSION_REGEX|$1$PERL_VERSION|g) { if ($old ne $_) { $adjusted++; print STDERR "- adjust: $_\n" if $debug; diff --git a/lang/perl5.16/files/perl-after-upgrade b/lang/perl5.16/files/perl-after-upgrade index 7bb37386c4b9..2cd3c3fe8b21 100644 --- a/lang/perl5.16/files/perl-after-upgrade +++ b/lang/perl5.16/files/perl-after-upgrade @@ -530,9 +530,7 @@ while (my $pkg = $db->next) { $modified++ if $new_md5; } my $to = $from; - if ($to =~ s|/perl5/$PERL_VERSION_REGEX/|/perl5/$PERL_VERSION/|g - || $to =~ s|/perl5/site_perl/$PERL_VERSION_REGEX/|/perl5/site_perl/$PERL_VERSION/|g - ) { + if ($to =~ s|(/perl5/(?:site_perl/)?)$PERL_VERSION_REGEX|$1$PERL_VERSION|g) { if ($to ne $from) { my $dir = $to; $dir =~ s|/[^/]+$||; @@ -563,7 +561,7 @@ while (my $pkg = $db->next) { } } my $old = $_; - if (s|/perl5/$PERL_VERSION_REGEX/|/perl5/$PERL_VERSION/|g || s|/perl5/site_perl/$PERL_VERSION_REGEX/|/perl5/site_perl/$PERL_VERSION/|g) { + if (s|(/perl5/(?:site_perl/)?)$PERL_VERSION_REGEX|$1$PERL_VERSION|g) { if ($old ne $_) { $adjusted++; print STDERR "- adjust: $_\n" if $debug; |