split the common half of dependencies handling into SolverBase, as PkgCreate

only uses that

3 files changed, 386 insertions, 386 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
index c317a3c139f..5083f63f3c8 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.165 2018/06/20 14:56:55 espie Exp $
+# $OpenBSD: Dependencies.pm,v 1.166 2018/06/21 08:28:21 espie Exp $
 #
 # Copyright (c) 2005-2010 Marc Espie <espie@openbsd.org>
 #
@@ -18,171 +18,7 @@ use strict;
 use warnings;
 
 use OpenBSD::SharedLibs;
-
-# generic dependencies lookup class: walk the dependency tree as far
-# as necessary to resolve dependencies
-package OpenBSD::lookup;
-
-sub lookup
-{
-	my ($self, $solver, $dependencies, $state, $obj) = @_;
-
-	my $known = $self->{known};
-	if (my $r = $self->find_in_already_done($solver, $state, $obj)) {
-		$dependencies->{$r} = 1;
-		return 1;
-	}
-	if ($self->find_in_extra_sources($solver, $state, $obj)) {
-		return 1;
-	}
-	# lookup through the rest of the tree...
-	my $done = $self->{done};
-
-	while (my $dep = pop @{$self->{todo}}) {
-		require OpenBSD::RequiredBy;
-
-		next if $done->{$dep};
-		# may need to replace older dep with newer ?
-		my $newer = $self->may_adjust($solver, $state, $dep);
-		if (defined $newer) {
-			push(@{$self->{todo}}, $newer);
-			next;
-		}
-		$done->{$dep} = 1;
-		for my $dep2 (OpenBSD::Requiring->new($dep)->list) {
-			push(@{$self->{todo}}, $dep2) unless $done->{$dep2};
-		}
-		$known->{$dep} = 1;
-		if ($self->find_in_new_source($solver, $state, $obj, $dep)) {
-			$dependencies->{$dep} = 2;
-			return 1;
-		}
-	}
-	if (my $r = $self->find_elsewhere($solver, $state, $obj)) {
-		$dependencies->{$r} = 3;
-		return 1;
-	}
-
-	return 0;
-}
-
-# While walking the dependency tree, we may loop back to an older package,
-# because we're relying on dep lists on disk, that we haven't adjusted yet
-# since we're just checking. We need to prepare for the update here as well!
-sub may_adjust
-{
-	my ($self, $solver, $state, $dep) = @_;
-	my $h = $solver->{set}{older}{$dep};
-	if (defined $h) {
-		$state->print("Detecting older #1...", $dep) 
-		    if $state->verbose >=3;
-		my $u = $h->{update_found};
-		if (!defined $u) {
-			$state->errsay("NO UPDATE FOUND for #1!", $dep);
-		} elsif ($u->pkgname ne $dep) {
-			$state->say("converting into #1", $u->pkgname) 
-			    if $state->verbose >=3;
-			return $u->pkgname;
-		} else {
-			$state->say("didn't change") 
-			    if $state->verbose >=3;
-		}	
-	}
-	return undef;
-}
-
-sub new
-{
-	my ($class, $solver) = @_;
-
-	# prepare for closure
-	my @todo = $solver->dependencies;
-	bless { todo => \@todo, done => {}, known => {} }, $class;
-}
-
-sub dump
-{
-	my ($self, $state) = @_;
-
-	return unless %{$self->{done}};
-	$state->say("Full dependency tree is #1",
-	    join(' ', keys %{$self->{done}}));
-}
-
-package OpenBSD::lookup::library;
-our @ISA=qw(OpenBSD::lookup);
-
-sub say_found
-{
-	my ($self, $state, $obj, $where) = @_;
-
-	$state->say("found libspec #1 in #2", $obj->to_string, $where)
-	    if $state->verbose >= 3;
-}
-
-sub find_in_already_done
-{
-	my ($self, $solver, $state, $obj) = @_;
-
-
-	my $r = $solver->check_lib_spec($solver->{localbase}, $obj,
-	    $self->{known});
-	if ($r) {
-		$self->say_found($state, $obj, $state->f("package #1", $r));
-		return $r;
-	} else {
-		return undef;
-	}
-}
-
-sub find_in_extra_sources
-{
-	my ($self, $solver, $state, $obj) = @_;
-	return undef if !$obj->is_valid || defined $obj->{dir};
-
-	OpenBSD::SharedLibs::add_libs_from_system($state->{destdir}, $state);
-	for my $dir (OpenBSD::SharedLibs::system_dirs()) {
-		if ($solver->check_lib_spec($dir, $obj, {system => 1})) {
-			$self->say_found($state, $obj, $state->f("#1/lib", $dir));
-			return 'system';
-		}
-	}
-	return undef;
-}
-
-sub find_in_new_source
-{
-	my ($self, $solver, $state, $obj, $dep) = @_;
-
-	if (defined $solver->{set}{newer}{$dep}) {
-		OpenBSD::SharedLibs::add_libs_from_plist($solver->{set}->{newer}->{$dep}->plist, $state);
-	} else {
-		OpenBSD::SharedLibs::add_libs_from_installed_package($dep, $state);
-	}
-	if ($solver->check_lib_spec($solver->{localbase}, $obj, {$dep => 1})) {
-		$self->say_found($state, $obj, $state->f("package #1", $dep));
-		return $dep;
-	}
-	return undef;
-}
-
-sub find_elsewhere
-{
-	my ($self, $solver, $state, $obj) = @_;
-
-	for my $n ($solver->{set}->newer) {
-		for my $dep (@{$n->dependency_info->{depend}}) {
-			my $r = $solver->find_old_lib($state,
-			    $solver->{localbase}, $dep->{pattern}, $obj);
-			if ($r) {
-				$self->say_found($state, $obj,
-				    $state->f("old package #1", $r));
-				return $r;
-			}
-		}
-	}
-	return undef;
-}
+use OpenBSD::Dependencies::SolverBase;
 
 package OpenBSD::lookup::tag;
 our @ISA=qw(OpenBSD::lookup);
@@ -342,222 +178,6 @@ sub do
 	return;
 }
 
-# both the solver and the conflict cache inherit from cloner
-# they both want to merge several hashes from extra data.
-package OpenBSD::Cloner;
-sub clone
-{
-	my ($self, $h, @extra) = @_;
-	for my $extra (@extra) {
-		next unless defined $extra;
-		while (my ($k, $e) = each %{$extra->{$h}}) {
-			$self->{$h}{$k} //= $e;
-		}
-	}
-}
-
-# The actual solver derives from SolverBase:
-# there is a specific subclass for pkg_create which does resolve
-# dependencies in a much lighter way than the normal pkg_add code.
-package OpenBSD::Dependencies::SolverBase;
-our @ISA = qw(OpenBSD::Cloner);
-
-my $global_cache = {};
-
-sub cached
-{
-	my ($self, $dep) = @_;
-	return $global_cache->{$dep->{pattern}} ||
-	    $self->{cache}{$dep->{pattern}};
-}
-
-sub set_cache
-{
-	my ($self, $dep, $value) = @_;
-	$self->{cache}{$dep->{pattern}} = $value;
-}
-
-sub set_global
-{
-	my ($self, $dep, $value) = @_;
-	$global_cache->{$dep->{pattern}} = $value;
-}
-
-sub global_cache
-{
-	my ($self, $pattern) = @_;
-	return $global_cache->{$pattern};
-}
-
-sub find_candidate
-{
-	my ($self, $dep, @list) = @_;
-	my @candidates = $dep->spec->filter(@list);
-	if (@candidates >= 1) {
-		return $candidates[0];
-	} else {
-		return undef;
-	}
-}
-
-sub solve_dependency
-{
-	my ($self, $state, $dep, $package) = @_;
-
-	my $v;
-
-	if (defined $self->cached($dep)) {
-		if ($state->defines('stat_cache')) {
-			if (defined $self->global_cache($dep->{pattern})) {
-				$state->print("Global ");
-			}
-			$state->say("Cache hit on #1: #2", $dep->{pattern},
-			    $self->cached($dep)->pretty);
-		}
-		$v = $self->cached($dep)->do($self, $state, $dep, $package);
-		return $v if $v;
-	}
-	if ($state->defines('stat_cache')) {
-		$state->say("No cache hit on #1", $dep->{pattern});
-	}
-
-	$self->really_solve_dependency($state, $dep, $package);
-}
-
-sub solve_depends
-{
-	my ($self, $state) = @_;
-
-	$self->{all_dependencies} = {};
-	$self->{to_register} = {};
-	$self->{deplist} = {};
-	delete $self->{installed_list};
-
-	for my $package ($self->{set}->newer, $self->{set}->kept) {
-		$package->{before} = [];
-		for my $dep (@{$package->dependency_info->{depend}}) {
-			my $v = $self->solve_dependency($state, $dep, $package);
-			# XXX
-			next if !defined $v;
-			$self->{all_dependencies}{$v} = $dep;
-			$self->{to_register}{$package}{$v} = $dep;
-		}
-	}
-
-	return sort values %{$self->{deplist}};
-}
-
-sub solve_old_depends
-{
-	my ($self, $state) = @_;
-
-	$self->{old_dependencies} = {};
-	for my $package ($self->{set}->older) {
-		for my $dep (@{$package->dependency_info->{depend}}) {
-			my $v = $self->solve_dependency($state, $dep, $package);
-			# XXX
-			next if !defined $v;
-			$self->{old_dependencies}{$v} = $dep;
-		}
-	}
-}
-
-sub solve_wantlibs
-{
-	my ($solver, $state) = @_;
-	my $okay = 1;
-
-	my $lib_finder = OpenBSD::lookup::library->new($solver);
-	for my $h ($solver->{set}->newer) {
-		for my $lib (@{$h->{plist}->{wantlib}}) {
-			$solver->{localbase} = $h->{plist}->localbase;
-			next if $lib_finder->lookup($solver,
-			    $solver->{to_register}->{$h}, $state,
-			    $lib->spec);
-			if ($okay) {
-				$solver->errsay_library($state, $h);
-			}
-			$okay = 0;
-			OpenBSD::SharedLibs::report_problem($state,
-			    $lib->spec);
-		}
-	}
-	if (!$okay) {
-		$solver->dump($state);
-		$lib_finder->dump($state);
-	}
-	return $okay;
-}
-
-sub dump
-{
-	my ($self, $state) = @_;
-	if ($self->dependencies) {
-	    $state->print("Direct dependencies for #1 resolve to #2",
-	    	$self->{set}->print, join(' ',  $self->dependencies));
-	    $state->print(" (todo: #1)",
-	    	join(' ', (map {$_->print} values %{$self->{deplist}})))
-	    	if %{$self->{deplist}};
-	    $state->print("\n");
-	}
-}
-
-sub dependencies
-{
-	my $self = shift;
-	if (wantarray) {
-		return keys %{$self->{all_dependencies}};
-	} else {
-		return scalar(%{$self->{all_dependencies}});
-	}
-}
-
-sub check_lib_spec
-{
-	my ($self, $base, $spec, $dependencies) = @_;
-	my $r = OpenBSD::SharedLibs::lookup_libspec($base, $spec);
-	for my $candidate (@$r) {
-		if ($dependencies->{$candidate->origin}) {
-			return $candidate->origin;
-		}
-	}
-	return;
-}
-
-sub find_dep_in_installed
-{
-	my ($self, $state, $dep) = @_;
-
-	return $self->find_candidate($dep, @{$self->installed_list});
-}
-
-sub find_dep_in_self
-{
-	my ($self, $state, $dep) = @_;
-
-	return $self->find_candidate($dep, $self->{set}->newer_names,
-	    $self->{set}->kept_names);
-}
-
-use OpenBSD::PackageInfo;
-OpenBSD::Auto::cache(installed_list,
-	sub {
-		my $self = shift;
-		my @l = installed_packages();
-
-		for my $o ($self->{set}->older_names) {
-			@l = grep {$_ ne $o} @l;
-		}
-		return \@l;
-	}
-);
-
-sub add_dep
-{
-	my ($self, $d) = @_;
-	$self->{deplist}{$d} = $d;
-}
-
 package OpenBSD::Dependencies::Solver;
 our @ISA = qw(OpenBSD::Dependencies::SolverBase);
 
@@ -831,6 +451,21 @@ sub find_in_self
 	return 0;
 }
 
+sub solve_old_depends
+{
+	my ($self, $state) = @_;
+
+	$self->{old_dependencies} = {};
+	for my $package ($self->{set}->older) {
+		for my $dep (@{$package->dependency_info->{depend}}) {
+			my $v = $self->solve_dependency($state, $dep, $package);
+			# XXX
+			next if !defined $v;
+			$self->{old_dependencies}{$v} = $dep;
+		}
+	}
+}
+
 sub solve_handle_tags
 {
 	my ($solver, $h, $state) = @_;
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies/SolverBase.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies/SolverBase.pm
index 2f7ace8d301..f9f912d514b 100644
--- a/usr.sbin/pkg_add/OpenBSD/Dependencies/SolverBase.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Dependencies/SolverBase.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: SolverBase.pm,v 1.1 2018/06/20 08:53:49 espie Exp $
+# $OpenBSD: SolverBase.pm,v 1.2 2018/06/21 08:28:21 espie Exp $
 #
 # Copyright (c) 2005-2018 Marc Espie <espie@openbsd.org>
 #
@@ -17,6 +17,371 @@
 use strict;
 use warnings;
 
-# placeholder for common dependencies code between pkg_add/pkg_delete/pkg_create
+# generic dependencies lookup class: walk the dependency tree as far
+# as necessary to resolve dependencies
+package OpenBSD::lookup;
+
+sub lookup
+{
+	my ($self, $solver, $dependencies, $state, $obj) = @_;
+
+	my $known = $self->{known};
+	if (my $r = $self->find_in_already_done($solver, $state, $obj)) {
+		$dependencies->{$r} = 1;
+		return 1;
+	}
+	if ($self->find_in_extra_sources($solver, $state, $obj)) {
+		return 1;
+	}
+	# lookup through the rest of the tree...
+	my $done = $self->{done};
+
+	while (my $dep = pop @{$self->{todo}}) {
+		require OpenBSD::RequiredBy;
+
+		next if $done->{$dep};
+		# may need to replace older dep with newer ?
+		my $newer = $self->may_adjust($solver, $state, $dep);
+		if (defined $newer) {
+			push(@{$self->{todo}}, $newer);
+			next;
+		}
+		$done->{$dep} = 1;
+		for my $dep2 (OpenBSD::Requiring->new($dep)->list) {
+			push(@{$self->{todo}}, $dep2) unless $done->{$dep2};
+		}
+		$known->{$dep} = 1;
+		if ($self->find_in_new_source($solver, $state, $obj, $dep)) {
+			$dependencies->{$dep} = 2;
+			return 1;
+		}
+	}
+	if (my $r = $self->find_elsewhere($solver, $state, $obj)) {
+		$dependencies->{$r} = 3;
+		return 1;
+	}
+
+	return 0;
+}
+
+# While walking the dependency tree, we may loop back to an older package,
+# because we're relying on dep lists on disk, that we haven't adjusted yet
+# since we're just checking. We need to prepare for the update here as well!
+sub may_adjust
+{
+	my ($self, $solver, $state, $dep) = @_;
+	my $h = $solver->{set}{older}{$dep};
+	if (defined $h) {
+		$state->print("Detecting older #1...", $dep) 
+		    if $state->verbose >=3;
+		my $u = $h->{update_found};
+		if (!defined $u) {
+			$state->errsay("NO UPDATE FOUND for #1!", $dep);
+		} elsif ($u->pkgname ne $dep) {
+			$state->say("converting into #1", $u->pkgname) 
+			    if $state->verbose >=3;
+			return $u->pkgname;
+		} else {
+			$state->say("didn't change") 
+			    if $state->verbose >=3;
+		}	
+	}
+	return undef;
+}
+
+sub new
+{
+	my ($class, $solver) = @_;
+
+	# prepare for closure
+	my @todo = $solver->dependencies;
+	bless { todo => \@todo, done => {}, known => {} }, $class;
+}
+
+sub dump
+{
+	my ($self, $state) = @_;
+
+	return unless %{$self->{done}};
+	$state->say("Full dependency tree is #1",
+	    join(' ', keys %{$self->{done}}));
+}
+
+package OpenBSD::lookup::library;
+our @ISA=qw(OpenBSD::lookup);
+
+sub say_found
+{
+	my ($self, $state, $obj, $where) = @_;
+
+	$state->say("found libspec #1 in #2", $obj->to_string, $where)
+	    if $state->verbose >= 3;
+}
+
+sub find_in_already_done
+{
+	my ($self, $solver, $state, $obj) = @_;
+
+
+	my $r = $solver->check_lib_spec($solver->{localbase}, $obj,
+	    $self->{known});
+	if ($r) {
+		$self->say_found($state, $obj, $state->f("package #1", $r));
+		return $r;
+	} else {
+		return undef;
+	}
+}
+
+sub find_in_extra_sources
+{
+	my ($self, $solver, $state, $obj) = @_;
+	return undef if !$obj->is_valid || defined $obj->{dir};
+
+	OpenBSD::SharedLibs::add_libs_from_system($state->{destdir}, $state);
+	for my $dir (OpenBSD::SharedLibs::system_dirs()) {
+		if ($solver->check_lib_spec($dir, $obj, {system => 1})) {
+			$self->say_found($state, $obj, $state->f("#1/lib", $dir));
+			return 'system';
+		}
+	}
+	return undef;
+}
+
+sub find_in_new_source
+{
+	my ($self, $solver, $state, $obj, $dep) = @_;
+
+	if (defined $solver->{set}{newer}{$dep}) {
+		OpenBSD::SharedLibs::add_libs_from_plist($solver->{set}->{newer}->{$dep}->plist, $state);
+	} else {
+		OpenBSD::SharedLibs::add_libs_from_installed_package($dep, $state);
+	}
+	if ($solver->check_lib_spec($solver->{localbase}, $obj, {$dep => 1})) {
+		$self->say_found($state, $obj, $state->f("package #1", $dep));
+		return $dep;
+	}
+	return undef;
+}
+
+sub find_elsewhere
+{
+	my ($self, $solver, $state, $obj) = @_;
+
+	for my $n ($solver->{set}->newer) {
+		for my $dep (@{$n->dependency_info->{depend}}) {
+			my $r = $solver->find_old_lib($state,
+			    $solver->{localbase}, $dep->{pattern}, $obj);
+			if ($r) {
+				$self->say_found($state, $obj,
+				    $state->f("old package #1", $r));
+				return $r;
+			}
+		}
+	}
+	return undef;
+}
+
+
+# both the solver and the conflict cache inherit from cloner
+# they both want to merge several hashes from extra data.
+package OpenBSD::Cloner;
+sub clone
+{
+	my ($self, $h, @extra) = @_;
+	for my $extra (@extra) {
+		next unless defined $extra;
+		while (my ($k, $e) = each %{$extra->{$h}}) {
+			$self->{$h}{$k} //= $e;
+		}
+	}
+}
+
+# The actual solver derives from SolverBase:
+# there is a specific subclass for pkg_create which does resolve
+# dependencies in a much lighter way than the normal pkg_add code.
+package OpenBSD::Dependencies::SolverBase;
+our @ISA = qw(OpenBSD::Cloner);
+
+my $global_cache = {};
+
+sub cached
+{
+	my ($self, $dep) = @_;
+	return $global_cache->{$dep->{pattern}} ||
+	    $self->{cache}{$dep->{pattern}};
+}
+
+sub set_cache
+{
+	my ($self, $dep, $value) = @_;
+	$self->{cache}{$dep->{pattern}} = $value;
+}
+
+sub set_global
+{
+	my ($self, $dep, $value) = @_;
+	$global_cache->{$dep->{pattern}} = $value;
+}
+
+sub global_cache
+{
+	my ($self, $pattern) = @_;
+	return $global_cache->{$pattern};
+}
+
+sub find_candidate
+{
+	my ($self, $dep, @list) = @_;
+	my @candidates = $dep->spec->filter(@list);
+	if (@candidates >= 1) {
+		return $candidates[0];
+	} else {
+		return undef;
+	}
+}
+
+sub solve_dependency
+{
+	my ($self, $state, $dep, $package) = @_;
+
+	my $v;
+
+	if (defined $self->cached($dep)) {
+		if ($state->defines('stat_cache')) {
+			if (defined $self->global_cache($dep->{pattern})) {
+				$state->print("Global ");
+			}
+			$state->say("Cache hit on #1: #2", $dep->{pattern},
+			    $self->cached($dep)->pretty);
+		}
+		$v = $self->cached($dep)->do($self, $state, $dep, $package);
+		return $v if $v;
+	}
+	if ($state->defines('stat_cache')) {
+		$state->say("No cache hit on #1", $dep->{pattern});
+	}
+
+	$self->really_solve_dependency($state, $dep, $package);
+}
+
+sub solve_depends
+{
+	my ($self, $state) = @_;
+
+	$self->{all_dependencies} = {};
+	$self->{to_register} = {};
+	$self->{deplist} = {};
+	delete $self->{installed_list};
+
+	for my $package ($self->{set}->newer, $self->{set}->kept) {
+		$package->{before} = [];
+		for my $dep (@{$package->dependency_info->{depend}}) {
+			my $v = $self->solve_dependency($state, $dep, $package);
+			# XXX
+			next if !defined $v;
+			$self->{all_dependencies}{$v} = $dep;
+			$self->{to_register}{$package}{$v} = $dep;
+		}
+	}
+
+	return sort values %{$self->{deplist}};
+}
+
+sub solve_wantlibs
+{
+	my ($solver, $state) = @_;
+	my $okay = 1;
+
+	my $lib_finder = OpenBSD::lookup::library->new($solver);
+	for my $h ($solver->{set}->newer) {
+		for my $lib (@{$h->{plist}->{wantlib}}) {
+			$solver->{localbase} = $h->{plist}->localbase;
+			next if $lib_finder->lookup($solver,
+			    $solver->{to_register}->{$h}, $state,
+			    $lib->spec);
+			if ($okay) {
+				$solver->errsay_library($state, $h);
+			}
+			$okay = 0;
+			OpenBSD::SharedLibs::report_problem($state,
+			    $lib->spec);
+		}
+	}
+	if (!$okay) {
+		$solver->dump($state);
+		$lib_finder->dump($state);
+	}
+	return $okay;
+}
+
+sub dump
+{
+	my ($self, $state) = @_;
+	if ($self->dependencies) {
+	    $state->print("Direct dependencies for #1 resolve to #2",
+	    	$self->{set}->print, join(' ',  $self->dependencies));
+	    $state->print(" (todo: #1)",
+	    	join(' ', (map {$_->print} values %{$self->{deplist}})))
+	    	if %{$self->{deplist}};
+	    $state->print("\n");
+	}
+}
+
+sub dependencies
+{
+	my $self = shift;
+	if (wantarray) {
+		return keys %{$self->{all_dependencies}};
+	} else {
+		return scalar(%{$self->{all_dependencies}});
+	}
+}
+
+sub check_lib_spec
+{
+	my ($self, $base, $spec, $dependencies) = @_;
+	my $r = OpenBSD::SharedLibs::lookup_libspec($base, $spec);
+	for my $candidate (@$r) {
+		if ($dependencies->{$candidate->origin}) {
+			return $candidate->origin;
+		}
+	}
+	return;
+}
+
+sub find_dep_in_installed
+{
+	my ($self, $state, $dep) = @_;
+
+	return $self->find_candidate($dep, @{$self->installed_list});
+}
+
+sub find_dep_in_self
+{
+	my ($self, $state, $dep) = @_;
+
+	return $self->find_candidate($dep, $self->{set}->newer_names,
+	    $self->{set}->kept_names);
+}
+
+use OpenBSD::PackageInfo;
+OpenBSD::Auto::cache(installed_list,
+	sub {
+		my $self = shift;
+		my @l = installed_packages();
+
+		for my $o ($self->{set}->older_names) {
+			@l = grep {$_ ne $o} @l;
+		}
+		return \@l;
+	}
+);
+
+sub add_dep
+{
+	my ($self, $d) = @_;
+	$self->{deplist}{$d} = $d;
+}
 
 1;
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
index 7a4c9dbd582..639252687d3 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.143 2018/06/18 17:59:36 espie Exp $
+# $OpenBSD: PkgCreate.pm,v 1.144 2018/06/21 08:28:21 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -20,7 +20,7 @@ use strict;
 use warnings;
 
 use OpenBSD::AddCreateDelete;
-use OpenBSD::Dependencies;
+use OpenBSD::Dependencies::SolverBase;
 use OpenBSD::SharedLibs;
 use OpenBSD::Signer;