diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2011-11-14 10:31:21 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2011-11-14 10:31:21 +0000 |
| commit | 75233fa0f8cc1176135ebcd0b7b8a466c31e5fec (patch) | |
| tree | 4fd40fe2be2d9b16fcf920f9226ef0097d573ec5 | |
| parent | 9951ea4c6f95c1afba57717b578ccc3d12e52bb0 (diff) | |
use print-plist-libs-with-depends (and make sure it does not skip depends)
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgCreate.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm index 4a855f297c4..3ad8750e696 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgCreate.pm,v 1.50 2011/10/21 18:19:34 espie Exp $ +# $OpenBSD: PkgCreate.pm,v 1.51 2011/11/14 10:31:20 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -608,7 +608,7 @@ sub solve_from_ports $pkgname = $cache->{$dep->{pkgpath}}; } else { my $plist = $self->ask_tree($state, $dep, $portsdir, - 'print-plist-with-depends', 'wantlib_args=no-wantlib-args'); + 'print-plist-libs-with-depends', 'wantlib_args=no-wantlib-args'); if ($? != 0 || !defined $plist->pkgname) { $state->error("Can't obtain dependency #1 from ports tree", $dep->{pattern}); @@ -805,7 +805,7 @@ sub read_fragments } else { $_ = $subst->do($_); if ($fast) { - next unless m/^\@(?:cwd|lib)\b/o || m/lib.*\.a$/o; + next unless m/^\@(?:cwd|lib|depend|wantlib)\b/o || m/lib.*\.a$/o; } &$cont($_); } |