diff options
| author |   espie <espie@openbsd.org> | 2004-11-18 21:46:07 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2004-11-18 21:46:07 +0000 |
| commit | a630be9d5df5b7818217f35599edfdf3ba8e4761 (patch) | |
| tree | f4443732848777f9b12a19c4171402a262d81b35 | |
| parent | use the filesystem based firmware loader; deraadt ok (diff) | |
| download | wireguard-openbsd-a630be9d5df5b7818217f35599edfdf3ba8e4761.tar.xz wireguard-openbsd-a630be9d5df5b7818217f35599edfdf3ba8e4761.zip | |
add @wantlib and @depend keyword
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 30 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingList.pm | 10 |
2 files changed, 34 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index c483adb5f96..cdbe7ba07ff 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingElement.pm,v 1.71 2004/11/13 12:01:30 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.72 2004/11/18 21:46:07 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -710,6 +710,34 @@ sub stringize($) ':'.$self->{pattern}.':'.$self->{def}; } +package OpenBSD::PackingElement::Dependency; +our @ISA=qw(OpenBSD::PackingElement::Depend); + +__PACKAGE__->setKeyword('depend'); +sub category() { "depend" } +sub keyword() { "depend" } + +sub new +{ + my ($class, $args) = @_; + my ($pkgpath, $pattern, $def) = split /\:/, $args; + bless { pkgpath => $pkgpath, pattern => $pattern, def => $def }, $class; +} + +sub stringize($) +{ + my $self = $_[0]; + return $self->{pkgpath}.':'.$self->{pattern}.':'.$self->{def}; +} + +package OpenBSD::PackingElement::Wantlib; +our @ISA=qw(OpenBSD::PackingElement::Depend); + +__PACKAGE__->setKeyword('wantlib'); +sub category() { "wantlib" } +sub keyword() { "wantlib" } + + package OpenBSD::PackingElement::LibDepend; our @ISA=qw(OpenBSD::PackingElement::Depend); diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm index 0a0a59ff1a3..000abf5b9ff 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingList.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingList.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingList.pm,v 1.40 2004/11/15 15:06:22 espie Exp $ +# $OpenBSD: PackingList.pm,v 1.41 2004/11/18 21:46:07 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -132,7 +132,7 @@ sub DependOnly # XXX optimization if (m/^\@arch\b/o) { while (<$fh>) { - if (m/^\@(?:pkgdep|newdepend|libdepend)\b/o) { + if (m/^\@(?:depend|wantlib|pkgdep|newdepend|libdepend)\b/o) { &$cont($_); } elsif (m/^\@(?:groups|users|cwd)\b/o) { last; @@ -140,7 +140,7 @@ sub DependOnly } return; } - next unless m/^\@(?:pkgdep|newdepend|libdepend)\b/o; + next unless m/^\@(?:depend|wantlib|pkgdep|newdepend|libdepend)\b/o; &$cont($_); } } @@ -169,7 +169,7 @@ sub ConflictOnly while (<$fh>) { if (m/^\@(?:pkgcfl|conflict|option|name)\b/o) { &$cont($_); - } elsif (m/^\@(?:pkgdep|newdepend|libdepend|groups|users|cwd)\b/o) { + } elsif (m/^\@(?:depend|wantlib|pkgdep|newdepend|libdepend|groups|users|cwd)\b/o) { last; } } @@ -313,7 +313,7 @@ sub visit $self->{$special}->$method(@l) if defined $self->{$special}; } - for my $listname (qw(modules pkgcfl conflict pkgdep newdepend libdepend groups users items)) { + for my $listname (qw(modules pkgcfl conflict depend wantlib pkgdep newdepend libdepend groups users items)) { if (defined $self->{$listname}) { for my $item (@{$self->{$listname}}) { $item->$method(@l); |