yet more code that no longer makes any sense

diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm
index 1df52e1..31f8d82 100644 (file)
--- a/usr.sbin/pkg_add/OpenBSD/Add.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Add.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Add.pm,v 1.152 2014/05/20 05:46:13 espie Exp $
+# $OpenBSD: Add.pm,v 1.153 2014/05/20 05:55:43 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -32,8 +32,6 @@ sub manpages_index
        my $destdir = $state->{destdir};
 
        # fudge verbose for API differences
-       my $v = $state->{v};
-       $state->{v} = $state->verbose >= 2;
        while (my ($k, $v) = each %{$state->{addman}}) {
                my @l = map { "$destdir$k/$_" } @$v;
                if ($state->{not}) {
@@ -43,7 +41,6 @@ sub manpages_index
                        $state->run_makewhatis(['-d', $destdir.$k], \@l);
                }
        }
-       $state->{v} = $v;
        delete $state->{addman};
 }
 

diff --git a/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm
index 258e3ca..ea2e69a 100644 (file)
--- 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.23 2014/05/20 05:46:13 espie Exp $
+# $OpenBSD: AddCreateDelete.pm,v 1.24 2014/05/20 05:55:43 espie Exp $
 #
 # Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org>
 #
@@ -74,7 +74,6 @@ sub handle_options
 sub vsystem
 {
        my $self = shift;
-       my $verbose = $self;
        if ($self->verbose < 2) {
                $self->system(@_);
        } else {

diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm
index dd4973c..ff2bb14 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.136 2014/05/20 05:46:13 espie Exp $
+# $OpenBSD: Delete.pm,v 1.137 2014/05/20 05:55:43 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -45,9 +45,6 @@ sub manpages_unindex
        return unless defined $state->{rmman};
        my $destdir = $state->{destdir};
 
-       # fudge verbose for API differences
-       my $v = $state->{v};
-       $state->{v} = $state->verbose >= 2;
        while (my ($k, $v) = each %{$state->{rmman}}) {
                my @l = map { "$destdir$k/$_" } @$v;
                if ($state->{not}) {
@@ -57,7 +54,6 @@ sub manpages_unindex
                        $state->run_makewhatis(['-u', $destdir.$k], \@l);
                }
        }
-       $state->{v} = $v;
        delete $state->{rmman};
 }