remove -Fboguslibs, we haven't had unmarked libraries for years

3 files changed, 3 insertions, 60 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
index 01c1e51ca95..a8e427946f3 100644
--- a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Dependencies.pm,v 1.14 2007/05/07 08:10:45 espie Exp $
+# $OpenBSD: Dependencies.pm,v 1.15 2007/05/07 08:14:51 espie Exp $
 #
 # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org>
 #
@@ -194,26 +194,6 @@ sub lookup_library
 		}
 	}
 	
-	if ($state->{forced}->{boguslibs}) {
-		my $explored = {};
-		# lookup through the full tree...
-		my @todo = keys %$dependencies;
-		while (my $dep = pop @todo) {
-			require OpenBSD::RequiredBy;
-
-			next if $explored->{$dep};
-			$explored->{$dep} = 1;
-			for my $dep2 (OpenBSD::Requiring->new($dep)->list()) {
-				push(@todo, $dep2) unless $done->{$dep2};
-			}
-			OpenBSD::SharedLibs::add_bogus_package_libs($dep);
-			if (check_lib_spec($plist->localbase, $lib, {$dep => 1})) {
-				print "found libspec $lib in dependent package $dep (unmarked library)\n" if $state->{verbose};
-				$dependencies->{$dep} = 1;
-				return 1;
-			}
-		}
-	}
 	print "libspec $lib not found\n" if $state->{very_verbose};
 	return;
 }
diff --git a/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm b/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm
index 562e3421ed2..ca8e19e2652 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.11 2007/05/02 15:05:30 espie Exp $
+# $OpenBSD: SharedLibs.pm,v 1.12 2007/05/07 08:14:51 espie Exp $
 #
 # Copyright (c) 2003-2005 Marc Espie <espie@openbsd.org>
 #
@@ -23,20 +23,6 @@ sub mark_available_lib
 {
 }
 
-sub mark_bogus_lib
-{
-}
-
-package OpenBSD::PackingElement::FileBase;
-
-sub mark_bogus_lib
-{
-	my ($self, $pkgname) = @_;
-	my $fname = $self->fullname;
-	return unless $fname =~ m/\/lib[^\/]+\.so\.\d+\.\d+$/;
-	OpenBSD::SharedLibs::register_lib($fname, $pkgname);
-}
-
 package OpenBSD::PackingElement::Lib;
 
 sub mark_available_lib
@@ -45,10 +31,6 @@ sub mark_available_lib
 	OpenBSD::SharedLibs::register_lib($self->fullname, $pkgname);
 }
 
-sub mark_bogus_lib
-{
-}
-
 package OpenBSD::SharedLibs;
 use File::Basename;
 use OpenBSD::Error;
@@ -149,22 +131,6 @@ sub add_package_libs
 	$plist->mark_available_lib($pkgname);
 }
 
-sub add_bogus_package_libs
-{
-	my $pkgname = $_[0];
-	if (!defined $done_plist->{$pkgname}) {
-		add_package_libs($pkgname);
-	}
-	return if $done_plist->{$pkgname} == 2;
-	$done_plist->{$pkgname} = 2;
-	my $plist = OpenBSD::PackingList->from_installation($pkgname);
-	if (!defined $plist) {
-		Warn "Can't read plist for $pkgname\n";
-		return;
-	}
-	$plist->mark_bogus_lib($pkgname);
-}
-
 sub add_plist_libs
 {
 	my ($plist) = @_;
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 43f964681cb..b9ec140ab39 100644
--- a/usr.sbin/pkg_add/pkg_add.1
+++ b/usr.sbin/pkg_add/pkg_add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_add.1,v 1.62 2007/04/15 10:17:29 espie Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.63 2007/05/07 08:14:51 espie Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -208,9 +208,6 @@ proceed with an update even if
 can't find new packages for all installed packages.
 .It Ar arch
 architecture recorded in package may not match.
-.It Ar boguslibs
-not all shared libraries are marked with @lib.
-Inefficiently rescan package lists for non marked libraries.
 .It Ar conflicts
 force installation of package in the presence of conflicts.
 .It Ar installed