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

handle modern dependencies.

Browse Source
This commit is contained in:
espie 2010-03-20 18:04:28 +00:00
parent d3f436429f
commit 44ae75fc67
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
infrastructure/package/check-common-dirs
View File

@ -1,6 +1,6 @@
#!/usr/bin/perl #!/usr/bin/perl
# $OpenBSD: check-common-dirs,v 1.8 2009/10/01 19:38:40 matthieu Exp $ # $OpenBSD: check-common-dirs,v 1.9 2010/03/20 18:04:28 espie Exp $
# Copyright (c) 2004 Marc Espie <espie@openbsd.org> # Copyright (c) 2004 Marc Espie <espie@openbsd.org>
# #
# Permission to use, copy, modify, and distribute this software for any # Permission to use, copy, modify, and distribute this software for any
@ -47,7 +47,7 @@ use File::Basename;
sub check_common_dirs sub check_common_dirs
{ {
my ($item, $t) = @_; my ($item, $t) = @_;
my $d = File::Spec->canonpath($item->fullname()); my $d = File::Spec->canonpath($item->fullname);
main::register_dir(dirname($d), $t->{need_dirs}); main::register_dir(dirname($d), $t->{need_dirs});
} }
@ -55,35 +55,23 @@ package OpenBSD::PackingElement::DirlikeObject;
sub check_common_dirs sub check_common_dirs
{ {
my ($item, $t) = @_; my ($item, $t) = @_;
my $d = File::Spec->canonpath($item->fullname()); my $d = File::Spec->canonpath($item->fullname);
$t->{dirs}->{$d} = 1; $t->{dirs}->{$d} = 1;
} }
package OpenBSD::PackingElement::PkgDep; package OpenBSD::PackingElement::Dependency;
sub check_common_dirs
{
my ($item, $t) = @_;
$t->{deps}->{$item->{name}} = 1;
}
package OpenBSD::PackingElement::Depend;
sub check_common_dirs sub check_common_dirs
{ {
my ($item, $t) = @_; my ($item, $t) = @_;
$t->{deps}->{$item->{def}} = 1; $t->{deps}->{$item->{def}} = 1;
} }
package OpenBSD::PackingElement::Wantlib;
sub check_common_dirs
{
}
package main; package main;
sub analyze sub analyze
{ {
my ($plist, $db) = @_; my ($plist, $db) = @_;
my $pkgname = $plist->pkgname(); my $pkgname = $plist->pkgname;
$db->{$pkgname} = { $db->{$pkgname} = {
pkgname => $pkgname, pkgname => $pkgname,
missing_deps => {}, missing_deps => {},
@ -181,8 +169,8 @@ for my $pkgname (@ARGV) {
print STDERR "$pkgname\n"; print STDERR "$pkgname\n";
my $true_package = OpenBSD::PackageLocator->find($pkgname); my $true_package = OpenBSD::PackageLocator->find($pkgname);
next unless $true_package; next unless $true_package;
my $dir = $true_package->info(); my $dir = $true_package->info;
$true_package->close(); $true_package->close;
my $plist = OpenBSD::PackingList->fromfile($dir.CONTENTS); my $plist = OpenBSD::PackingList->fromfile($dir.CONTENTS);
rmtree($dir); rmtree($dir);
analyze($plist, $db); analyze($plist, $db);