fix semantics to match old tools. This prefix is what was passed on

the command line, not the first cwd in the archive, sorry.

No way to override this currently.

To be safe,
- packages would need to be built with a specific base.
- packages would need to be installed with the same base.

Somewhat the same semantic difference as with LOCALBASE/PREFIX.

2 files changed, 5 insertions, 5 deletions

diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index e3eb8719915..968389ff608 100644
--- a/usr.sbin/pkg_add/pkg_add
+++ b/usr.sbin/pkg_add/pkg_add
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # ex:ts=8 sw=4:
-# $OpenBSD: pkg_add,v 1.11 2003/11/06 22:05:19 espie Exp $
+# $OpenBSD: pkg_add,v 1.12 2003/11/09 15:42:48 espie Exp $
 #
 # Copyright (c) 2003 Marc Espie.
 # 
@@ -305,7 +305,7 @@ sub really_add($)
 	my $plist = $handle->{plist};
 	my $dir = $handle->info();
 	my $pkgname = $plist->pkgname();
-	$ENV{'PKG_PREFIX'} = $plist->prefix();
+	$ENV{'PKG_PREFIX'} = '/usr/local';
 	# check for collisions with existing stuff
 	my $collisions = 0;
 	for my $item (@{$plist->{items}}) {
@@ -405,7 +405,7 @@ while (my $pkg = shift @todo) {
 	}
 	for my $dep (@{$plist->{libdepend}}) {
 		next if $dep->{name} ne $plist->pkgname();
-		if (!check_lib_specs($plist->prefix(), $dep->{libspec})) {
+		if (!check_lib_specs('/usr/local', $dep->{libspec})) {
 			print "Can't install $pkg: incorrect libspec: ",
 			    $dep->{libspec}, "\n";
 			next MAINLOOP;
diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete
index cc26534467d..6b37c71b638 100644
--- a/usr.sbin/pkg_add/pkg_delete
+++ b/usr.sbin/pkg_add/pkg_delete
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: pkg_delete,v 1.11 2003/11/06 18:42:01 espie Exp $
+# $OpenBSD: pkg_delete,v 1.12 2003/11/09 15:42:48 espie Exp $
 #
 # Copyright (c) 2003 Marc Espie.
 # 
@@ -272,7 +272,7 @@ sub delete_package
 		die "Package $pkgname real name does not match";
 	}
 
-	$ENV{'PKG_PREFIX'} = $plist->prefix();
+	$ENV{'PKG_PREFIX'} = '/usr/local';
 	if ($plist->has(REQUIRE)) {
 		$plist->get(REQUIRE)->delete($state);
 	}