zap PKG_PREFIX (undocumented and unused, now)

okay landry@

diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm
index c3128cf..49d952a 100644 (file)
--- a/usr.sbin/pkg_add/OpenBSD/Delete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Delete.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Delete.pm,v 1.122 2013/12/30 09:02:37 espie Exp $
+# $OpenBSD: Delete.pm,v 1.123 2014/01/02 16:05:42 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -147,7 +147,6 @@ sub delete_plist
 
        my $pkgname = $plist->pkgname;
        $state->{pkgname} = $pkgname;
-       $ENV{'PKG_PREFIX'} = $plist->localbase;
        if (!$state->{size_only}) {
                $plist->register_manpage($state);
                manpages_unindex($state);

diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
index d0ef9a0..2f4e0e1 100644 (file)
--- 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.41 2013/12/31 11:24:55 espie Exp $
+# $OpenBSD: PkgAdd.pm,v 1.42 2014/01/02 16:05:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -134,15 +134,11 @@ sub handle_options
                $state->{do_faked} = 1;
        } elsif (defined $state->opt('B')) {
                $state->{destdir} = $state->opt('B');
-       } elsif (defined $ENV{'PKG_PREFIX'}) {
-               $state->{destdir} = $ENV{'PKG_PREFIX'};
        }
        if (defined $state->{destdir}) {
                $state->{destdir}.='/';
-               $ENV{'PKG_DESTDIR'} = $state->{destdir};
        } else {
                $state->{destdir} = '';
-               delete $ENV{'PKG_DESTDIR'};
        }
 
 
@@ -730,8 +726,6 @@ sub really_add
 #      }
        $state->{replacing} = $replacing;
 
-       $ENV{'PKG_PREFIX'} = $state->{localbase};
-
        my $handler = sub {
                $state->{interrupted} = shift;
        };

diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm b/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm
index 7f9bb19..7b865d7 100644 (file)
--- 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.42 2013/12/25 14:38:15 espie Exp $
+# $OpenBSD: PkgCheck.pm,v 1.43 2014/01/02 16:05:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -316,15 +316,11 @@ sub handle_options
        $self->{quick} = $self->opt('q');
        if (defined $self->opt('B')) {
                $self->{destdir} = $self->opt('B');
-       } elsif (defined $ENV{'PKG_PREFIX'}) {
-               $self->{destdir} = $ENV{'PKG_PREFIX'};
-       }
+       } 
        if (defined $self->{destdir}) {
                $self->{destdir} .= '/';
-               $ENV{'PKG_DESTDIR'} = $self->{destdir};
        } else {
                $self->{destdir} = '';
-               delete $ENV{'PKG_DESTDIR'};
        }
 }
 

diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
index 6be2407..ab66ba0 100644 (file)
--- 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.76 2013/12/31 11:21:10 espie Exp $
+# $OpenBSD: PkgCreate.pm,v 1.77 2014/01/02 16:05:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -198,9 +198,7 @@ sub handle_options
        my $base = '/';
        if (defined $state->opt('B')) {
                $base = $state->opt('B');
-       } elsif (defined $ENV{'PKG_PREFIX'}) {
-               $base = $ENV{'PKG_PREFIX'};
-       }
+       } 
 
        $state->{base} = $base;