move solve_dependency up, so that pkg_create is happy again

sorry

2 files changed, 9 insertions, 9 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm
index 186d37382b1..cfb937e9c5c 100644
--- a/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: AddCreateDelete.pm,v 1.43 2018/02/27 22:46:53 espie Exp $
+# $OpenBSD: AddCreateDelete.pm,v 1.44 2019/06/09 18:58:06 espie Exp $
 #
 # Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org>
 #
@@ -171,6 +171,13 @@ sub ntogo_string
 	    $self->f("");
 }
 
+sub solve_dependency
+{
+	my ($self, $solver, $dep, $package) = @_;
+	# full dependency solving with everything
+	return $solver->really_solve_dependency($self, $dep, $package);
+}
+
 package OpenBSD::AddCreateDelete;
 use OpenBSD::Error;
 
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
index 5d4e6b4e531..e9057a24b1f 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.112 2019/06/09 09:36:24 espie Exp $
+# $OpenBSD: PkgAdd.pm,v 1.113 2019/06/09 18:58:06 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -186,13 +186,6 @@ sub updateset_from_location
 	    OpenBSD::Handle->from_location($location));
 }
 
-sub solve_dependency
-{
-	my ($self, $solver, $dep, $package) = @_;
-	# full dependency solving with everything
-	return $solver->really_solve_dependency($self, $dep, $package);
-}
-
 sub display_timestamp
 {
 	my ($state, $pkgname, $timestamp) = @_;