cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lexical $_ fixes in package tools

Browse Source 
okay espie@
This commit is contained in:
afresh1 2014-03-24 15:18:17 +00:00
parent 452793efdb
commit 03fb3296fa
4 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
infrastructure/bin/make-plist
View File

@ -1,5 +1,5 @@
#! /usr/bin/perl
# $OpenBSD: make-plist,v 1.6 2014/03/21 11:01:43 espie Exp $
# $OpenBSD: make-plist,v 1.7 2014/03/24 15:18:17 afresh1 Exp $
# Copyright (c) 2004-2008 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -72,25 +72,25 @@ sub add
sub reverse
{
my ($self, $_) = @_;
my ($self, $path) = @_;
for my $k (@{$self->{r}}) {
if ($k =~ m/^\^(.*)$/) {
my $k2 = $1;
my $v = $self->{h}->{$k2};
s/^\Q$v\E/\$\{\Q$k2\E\}/g;
$path =~ s/^\Q$v\E/\$\{\Q$k2\E\}/g;
} else {
my $v = $self->{h}->{$k};
s/\Q$v\E/\$\{\Q$k\E\}/g;
$path =~ s/\Q$v\E/\$\{\Q$k\E\}/g;
}
}
return $_;
return $path;
}
my $first_warn = 1;
sub reverse_with_lib
{
my ($self, $_) = @_;
if (m/^(.*?)lib([^\/]+)\.so\.(\d+\.\d+)$/) {
my ($self, $path) = @_;
if ($path =~ m/^(.*?)lib([^\/]+)\.so\.(\d+\.\d+)$/) {
my ($path, $name, $version) = ($1, $2, $3);
if (!defined $self->{l}->{$name}) {
if ($first_warn) {
@ -107,7 +107,7 @@ sub reverse_with_lib
$self->{found}->{$name} = 1;
return $self->reverse("${path}lib$name.so.")."\${LIB${name}_VERSION}";
} else {
return $self->reverse($_);
return $self->reverse($path);
}
}
@ -506,24 +506,24 @@ sub register
package OpenBSD::PackingElement::ExeclikeAction;
sub pseudo_expand
{
my ($_, $item) = @_;
if (m/\%F/o) {
my ($file, $item) = @_;
if ($file =~ m/\%F/o) {
return "XXXX" unless defined $item;
s/\%F/$item->{name}/g;
$file =~ s/\%F/$item->{name}/g;
}
if (m/\%D/o) {
if ($file =~ m/\%D/o) {
return "XXXX" unless defined $item;
s/\%D/$item->cwd/ge;
$file =~ s/\%D/$item->cwd/ge;
}
if (m/\%B/o) {
if ($file =~ m/\%B/o) {
return "XXXX" unless defined $item;
s/\%B/dirname($item->fullname)/ge;
$file =~ s/\%B/dirname($item->fullname)/ge;
}
if (m/\%f/o) {
if ($file =~ m/\%f/o) {
return "XXXX" unless defined $item;
s/\%f/basename($item->fullname)/ge;
$file =~ s/\%f/basename($item->fullname)/ge;
}
return $_;
return $file;
}
sub delay_tag

4
infrastructure/lib/OpenBSD/FS.pm
View File

@ -1,4 +1,4 @@
# $OpenBSD: FS.pm,v 1.1 2010/08/20 15:22:22 espie Exp $
# $OpenBSD: FS.pm,v 1.2 2014/03/24 15:18:17 afresh1 Exp $
# Copyright (c) 2008 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -167,7 +167,7 @@ sub is_info
sub is_manpage
{
my $_ = shift;
local $_ = shift;
if (m,/man/(?:[^/]*?/)?man(.*?)/[^/]+\.\1[[:alpha:]]?(?:\.gz|\.Z)?$,) {
return 1;
}

11
infrastructure/lib/OpenBSD/Recorder.pm
View File

@ -1,4 +1,4 @@
# $OpenBSD: Recorder.pm,v 1.5 2011/12/01 11:13:25 espie Exp $
# $OpenBSD: Recorder.pm,v 1.6 2014/03/24 15:18:17 afresh1 Exp $
# Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -146,10 +146,9 @@ sub retrieve
my ($self, $state, $filename) = @_;
open(my $fh, '<', $filename) or
$state->fatal("Can't read #1: #2", $filename, $!);
my $_;
while (<$fh>) {
chomp;
if (m/^(.*?)\:\s(.*)$/) {
while (my $line = <$fh>) {
chomp $line;
if ($line =~ m/^(.*?)\:\s(.*)$/) {
my ($binary, $libs) = ($1, $2);
if ($binary =~ m/^(.*)\((.*)\)$/) {
$binary = $1;
@ -159,7 +158,7 @@ sub retrieve
my @libs = split(/,/, $libs);
$self->{$binary}{libs}= \@libs;
} else {
$state->errsay("Can't parse #1", $_);
$state->errsay("Can't parse #1", $line);
}
}
close $fh;

11
infrastructure/package/check-lib-depends
View File

@ -1,6 +1,6 @@
#!/usr/bin/perl
# $OpenBSD: check-lib-depends,v 1.28 2010/07/12 20:19:40 espie Exp $
# $OpenBSD: check-lib-depends,v 1.29 2014/03/24 15:18:17 afresh1 Exp $
# Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -204,10 +204,9 @@ sub retrieve
my ($self, $state, $filename) = @_;
open(my $fh, '<', $filename) or
$state->fatal("Can't read #1: #2", $filename, $!);
my $_;
while (<$fh>) {
chomp;
if (m/^(.*?)\:\s(.*)$/) {
while (my $line = <$fh>) {
chomp $line;
if ($line =~ m/^(.*?)\:\s(.*)$/) {
my ($binary, $libs) = ($1, $2);
if ($binary =~ m/^(.*)\(.*\)$/) {
$binary = $1;
@ -215,7 +214,7 @@ sub retrieve
my @libs = split(/,/, $libs);
$self->{$binary}= \@libs;
} else {
$state->errsay("Can't parse #1", $_);
$state->errsay("Can't parse #1", $line);
}
}
close $fh;