pass state around.

4 files changed, 8 insertions, 8 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/OldLibs.pm b/usr.sbin/pkg_add/OpenBSD/OldLibs.pm
index 639ab304bf6..c1e9a9b91c3 100644
--- a/usr.sbin/pkg_add/OpenBSD/OldLibs.pm
+++ b/usr.sbin/pkg_add/OpenBSD/OldLibs.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: OldLibs.pm,v 1.8 2010/12/24 09:04:14 espie Exp $
+# $OpenBSD: OldLibs.pm,v 1.9 2010/12/24 10:31:59 espie Exp $
 #
 # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
 #
@@ -175,7 +175,7 @@ sub do_save_libs
 	if ($state->{not}) {
 		require OpenBSD::SharedLibs;
 
-		OpenBSD::SharedLibs::add_libs_from_plist($stub_list);
+		OpenBSD::SharedLibs::add_libs_from_plist($stub_list, $state);
 		$stub_list->to_cache;
 		$o->plist->to_cache;
 	} else {
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
index cad65779184..e6b6fca68eb 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgAdd.pm,v 1.18 2010/12/24 09:04:14 espie Exp $
+# $OpenBSD: PkgAdd.pm,v 1.19 2010/12/24 10:31:59 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -787,7 +787,7 @@ sub really_add
 	for my $handle ($set->newer) {
 		my $pkgname = $handle->pkgname;
 		my $plist = $handle->plist;
-		OpenBSD::SharedLibs::add_libs_from_plist($plist);
+		OpenBSD::SharedLibs::add_libs_from_plist($plist, $state);
 		OpenBSD::Add::tweak_plist_status($plist, $state);
 		$plist->to_cache;
 		OpenBSD::Add::register_installation($plist);
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm b/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm
index de528b65ea9..d1829224290 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgCheck.pm,v 1.26 2010/12/24 09:04:14 espie Exp $
+# $OpenBSD: PkgCheck.pm,v 1.27 2010/12/24 10:31:59 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -516,7 +516,7 @@ sub sanity_check
 sub dependencies_check
 {
 	my ($self, $state, $l) = @_;
-	OpenBSD::SharedLibs::add_libs_from_system($state->{destdir});
+	OpenBSD::SharedLibs::add_libs_from_system($state->{destdir}, $state);
 	$self->for_all_packages($state, $l, "Direct dependencies", sub {
 		my $name = shift;
 		my $plist = OpenBSD::PackingList->from_installation($name,
diff --git a/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm b/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm
index dfb646ab3e8..b633d915d77 100644
--- a/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm
+++ b/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: SharedLibs.pm,v 1.56 2010/12/24 09:09:54 espie Exp $
+# $OpenBSD: SharedLibs.pm,v 1.57 2010/12/24 10:31:59 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -77,7 +77,7 @@ sub add_libs_from_system
 		opendir(my $dir, $destdir.$dirname."/lib") or next;
 		while (my $d = readdir($dir)) {
 			next unless $d =~ m/\.so/;
-			register_libname("$dirname/lib/$d", 'system');
+			register_libname("$dirname/lib/$d", 'system', $state);
 		}
 		closedir($dir);
 	}