kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support dependencies that have backtick expressions in them, and fix a few

Browse source 
related nits.  Bump version to 2.6.2.
This commit is contained in:
Dag-Erling Smørgrav 2002-01-21 00:21:41 +00:00
parent 97bd3a5c0a
commit 5f336a9945
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=53420
4 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
misc/porteasy/Makefile
View file

@ -8,7 +8,7 @@
#
PORTNAME= porteasy
PORTVERSION= 2.6.1
PORTVERSION= 2.6.2
CATEGORIES= misc
MASTER_SITES= # none
DISTFILES= # none

20
misc/porteasy/src/porteasy.pl
View file

@ -33,7 +33,7 @@ use strict;
use Fcntl;
use Getopt::Long;
my $VERSION = "2.6.1";
my $VERSION = "2.6.2";
my $COPYRIGHT = "Copyright (c) 2000 Dag-Erling Smørgrav. All rights reserved.";
# Constants
@ -237,7 +237,11 @@ sub cmd($@) {
}
return undef;
}
return $output || "\n";
if ($capture) {
$output =~ s/\n*$//s;
return $output;
}
return 1;
}
#
@ -502,7 +506,8 @@ sub find_library($) {
my $ldconfig; # Output from ldconfig(8)
$ldconfig = capture(\&cmd, (&PATH_LDCONFIG, "-r"))
$ldconfig = capture(\&cmd, (&PATH_LDCONFIG, "-r"));
defined($ldconfig)
or errx(1, "unable to run ldconfig");
if ($ldconfig =~ m/^\s*\d+:-l$library => (.*)$/m) {
info("The $library library is installed as $1");
@ -548,10 +553,13 @@ sub find_dependencies($) {
"-VBUILD_DEPENDS",
"-VRUN_DEPENDS",
"-VLIB_DEPENDS",
"-VDEPENDS"))
"-VDEPENDS"));
defined($dependvars)
or bsd::errx(1, "failed to obtain dependency list");
%depends = ();
foreach $item (split(' ', $dependvars)) {
while ($dependvars =~ m/\G\s*((?:[^\s\`]|\`[^\`]+\`)+)/g) {
$item = $1;
$item =~ s|\`([^\`]+)\`|capture(\&cmd, "sh", "-c", $1)|eg;
if ($item !~ m|^(?:([^:]+):)?$portsdir/([^/:]+/[^/:]+)/?(:[^:]+)?$|) {
bsd::warnx("invalid dependency: %s", $item);
next;
@ -659,7 +667,7 @@ sub update_ports_tree(@) {
$portname{$port} = $1.$2;
$pkgname{$port} = $3;
} else {
warnx("failed to obtain package name for $port");
bsd::warnx("failed to obtain package name for $port");
}
}

2
ports-mgmt/porteasy/Makefile
View file

@ -8,7 +8,7 @@
#
PORTNAME= porteasy
PORTVERSION= 2.6.1
PORTVERSION= 2.6.2
CATEGORIES= misc
MASTER_SITES= # none
DISTFILES= # none

20
ports-mgmt/porteasy/src/porteasy.pl
View file

@ -33,7 +33,7 @@ use strict;
use Fcntl;
use Getopt::Long;
my $VERSION = "2.6.1";
my $VERSION = "2.6.2";
my $COPYRIGHT = "Copyright (c) 2000 Dag-Erling Smørgrav. All rights reserved.";
# Constants
@ -237,7 +237,11 @@ sub cmd($@) {
}
return undef;
}
return $output || "\n";
if ($capture) {
$output =~ s/\n*$//s;
return $output;
}
return 1;
}
#
@ -502,7 +506,8 @@ sub find_library($) {
my $ldconfig; # Output from ldconfig(8)
$ldconfig = capture(\&cmd, (&PATH_LDCONFIG, "-r"))
$ldconfig = capture(\&cmd, (&PATH_LDCONFIG, "-r"));
defined($ldconfig)
or errx(1, "unable to run ldconfig");
if ($ldconfig =~ m/^\s*\d+:-l$library => (.*)$/m) {
info("The $library library is installed as $1");
@ -548,10 +553,13 @@ sub find_dependencies($) {
"-VBUILD_DEPENDS",
"-VRUN_DEPENDS",
"-VLIB_DEPENDS",
"-VDEPENDS"))
"-VDEPENDS"));
defined($dependvars)
or bsd::errx(1, "failed to obtain dependency list");
%depends = ();
foreach $item (split(' ', $dependvars)) {
while ($dependvars =~ m/\G\s*((?:[^\s\`]|\`[^\`]+\`)+)/g) {
$item = $1;
$item =~ s|\`([^\`]+)\`|capture(\&cmd, "sh", "-c", $1)|eg;
if ($item !~ m|^(?:([^:]+):)?$portsdir/([^/:]+/[^/:]+)/?(:[^:]+)?$|) {
bsd::warnx("invalid dependency: %s", $item);
next;
@ -659,7 +667,7 @@ sub update_ports_tree(@) {
$portname{$port} = $1.$2;
$pkgname{$port} = $3;
} else {
warnx("failed to obtain package name for $port");
bsd::warnx("failed to obtain package name for $port");
}
}