whitespace cleanup

57 files changed, 126 insertions, 126 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm
index 3f5e082c67f..8a9435245ab 100644
--- 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.111 2010/06/15 08:26:39 espie Exp $
+# $OpenBSD: Add.pm,v 1.112 2010/06/30 10:41:41 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -35,7 +35,7 @@ sub manpages_index
 	while (my ($k, $v) = each %{$state->{mandirs}}) {
 		my @l = map { $destdir.$_ } @$v;
 		if ($state->{not}) {
-			$state->say("Merging manpages in #1: #2", 
+			$state->say("Merging manpages in #1: #2",
 				$destdir.$k, join(@l)) if $state->verbose >= 2;
 		} else {
 			try {
@@ -83,7 +83,7 @@ sub record_partial_installation
 	    my $lastname = $last->realname($state);
 	    $last->{d} = $last->compute_digest($lastname, $old);
 	    if (!$old->equals($last->{d})) {
-		$state->say("Adjusting #1 for #2 from #3 to #4", 
+		$state->say("Adjusting #1 for #2 from #3 to #4",
 		    $old->keyword, $lastname, $old->stringize,
 		    $last->{d}->stringize);
 	    }
@@ -254,7 +254,7 @@ sub prepare_for_addition
 	my $ok = $self->check;
 	if (defined $ok) {
 		if ($ok == 0) {
-			$state->errsay("#1 #2 does not match", 
+			$state->errsay("#1 #2 does not match",
 			    $self->type, $self->name);
 			$state->{problems}++;
 		}
@@ -323,7 +323,7 @@ sub install
 		return;
 	}
 	if ($state->{not}) {
-		$state->say("sysctl -w #1 =! #2", 
+		$state->say("sysctl -w #1 =! #2",
 		    $name, $self->{value}) if $state->verbose >= 2;
 		return;
 	}
@@ -372,7 +372,7 @@ sub install
 
 	if ($state->{extracted_first}) {
 		if ($state->{not}) {
-			$state->say("moving tempfile -> #1", 
+			$state->say("moving tempfile -> #1",
 			    $destdir.$fullname) if $state->verbose >= 5;
 			return;
 		}
@@ -383,17 +383,17 @@ sub install
 			symlink($self->{symlink}, $destdir.$fullname);
 		} else {
 			rename($self->{tempname}, $destdir.$fullname) or
-			    $state->fatal("can't move #1 to #2: #3", 
+			    $state->fatal("can't move #1 to #2: #3",
 			    	$self->{tempname}, $fullname, $!);
-			$state->say("moving #1 -> #2", 
-			    $self->{tempname}, $destdir.$fullname) 
+			$state->say("moving #1 -> #2",
+			    $self->{tempname}, $destdir.$fullname)
 			    	if $state->verbose >= 5;
 			undef $self->{tempname};
 		}
 	} else {
 		my $file = $self->prepare_to_extract($state);
 
-		$state->say("extracting #1", $destdir.$fullname) 
+		$state->say("extracting #1", $destdir.$fullname)
 		    if $state->verbose >= 5;
 		if ($state->{not}) {
 			$state->{archive}->skip;
@@ -419,7 +419,7 @@ sub prepare_to_extract
 	}
 	$file->{cwd} = $self->cwd;
 	if (!$file->check_name($self)) {
-		$state->fatal("archive does not match #1 != #2", 
+		$state->fatal("archive does not match #1 != #2",
 		    $file->name, $self->name);
 	}
 	if (defined $self->{symlink} || $file->isSymLink) {
@@ -427,7 +427,7 @@ sub prepare_to_extract
 			$state->fatal("bogus symlink #1", $self->name);
 		}
 		if (!$file->check_linkname($self->{symlink})) {
-			$state->fatal("archive symlink does not match #1 != #2", 
+			$state->fatal("archive symlink does not match #1 != #2",
 			    $file->{linkname}, $self->{symlink});
 		}
 	} elsif (defined $self->{link} || $file->isHardLink) {
@@ -435,7 +435,7 @@ sub prepare_to_extract
 			$state->fatal("bogus hardlink #1", $self->name);
 		}
 		if (!$file->check_linkname($self->{link})) {
-			$state->fatal("archive hardlink does not match #1 != #2", 
+			$state->fatal("archive hardlink does not match #1 != #2",
 			    $file->{linkname}, $self->{link});
 		}
 	}
@@ -509,7 +509,7 @@ sub install
 			if ($d->equals($orig->{d})) {
 			    $state->say("(but it seems to match the sample file #1)", $origname);
 			} else {
-			    $state->say("It does NOT match the sample file #1", 
+			    $state->say("It does NOT match the sample file #1",
 				$origname);
 			    $state->say("You may wish to update it manually");
 			}
@@ -517,7 +517,7 @@ sub install
 		}
 	} else {
 		if ($state->{not}) {
-			$state->say("The file #1 would be installed from #2", 
+			$state->say("The file #1 would be installed from #2",
 			    $filename, $origname) if $state->verbose >= 2;
 		} else {
 			if (!copy($origname, $filename)) {
@@ -525,7 +525,7 @@ sub install
 			}
 			$self->set_modes($state, $filename);
 			if ($state->verbose >= 2) {
-			    $state->say("installed #1 from #2", 
+			    $state->say("installed #1 from #2",
 				$filename, $origname);
 			}
 		}
@@ -590,7 +590,7 @@ sub install
 	open(my $shells2, '>>', $destdir.OpenBSD::Paths->shells) or return;
 	print $shells2 $fullname, "\n";
 	close $shells2;
-	$state->say("Shell #1 appended to #2", $fullname, 
+	$state->say("Shell #1 appended to #2", $fullname,
 	    $destdir.OpenBSD::Paths->shells) if $state->verbose;
 }
 
@@ -716,7 +716,7 @@ sub prepare_for_addition
 			    	return;
 			}
 		} else {
-			$state->errsay("Can't update #1 now: #2", 
+			$state->errsay("Can't update #1 now: #2",
 			    $pkgname, $self->{message});
 		}
 		$state->{problems}++;
diff --git a/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm
index 20b43200fc7..4bf1a6d4755 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.8 2010/06/25 10:34:03 espie Exp $
+# $OpenBSD: AddCreateDelete.pm,v 1.9 2010/06/30 10:41:41 espie Exp $
 #
 # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/AddDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddDelete.pm
index 7abe595ffbe..be0daeb3e04 100644
--- a/usr.sbin/pkg_add/OpenBSD/AddDelete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/AddDelete.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: AddDelete.pm,v 1.30 2010/06/30 10:27:17 espie Exp $
+# $OpenBSD: AddDelete.pm,v 1.31 2010/06/30 10:41:41 espie Exp $
 #
 # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm b/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm
index f2346e19b54..7bb35ee5239 100644
--- a/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm
+++ b/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: ArcCheck.pm,v 1.15 2010/05/10 09:17:55 espie Exp $
+# $OpenBSD: ArcCheck.pm,v 1.16 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2005-2006 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm
index 0663cd4812c..c95b628c817 100644
--- a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm
+++ b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: CollisionReport.pm,v 1.35 2010/06/09 07:26:01 espie Exp $
+# $OpenBSD: CollisionReport.pm,v 1.36 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm
index e569d174e14..ec368a1af01 100644
--- 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.103 2010/06/09 08:13:19 espie Exp $
+# $OpenBSD: Delete.pm,v 1.104 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -49,7 +49,7 @@ sub manpages_unindex
 	while (my ($k, $v) = each %{$state->{mandirs}}) {
 		my @l = map { $destdir.$_ } @$v;
 		if ($state->{not}) {
-			$state->say("Removing manpages in #1: #2", 
+			$state->say("Removing manpages in #1: #2",
 			    $destdir.$k, join(@l)) if $state->verbose >= 2;
 		} else {
 			eval { OpenBSD::Makewhatis::remove($destdir.$k, \@l); };
@@ -84,7 +84,7 @@ sub remove_packing_info
 	}
 	OpenBSD::RequiredBy->forget($dir);
 	OpenBSD::Requiring->forget($dir);
-	rmdir($dir) or 
+	rmdir($dir) or
 	    $state->fatal("can't finish removing directory #1: #2", $dir, $!);
 }
 
@@ -95,12 +95,12 @@ sub delete_package
 	my $plist = OpenBSD::PackingList->from_installation($pkgname) or
 	    $state->fatal("bad package #1", $pkgname);
 	if (!defined $plist->pkgname) {
-		$state->fatal("package #1 is missing a \@name in plist", 
+		$state->fatal("package #1 is missing a \@name in plist",
 		    $pkgname);
 	}
 	if ($plist->pkgname ne $pkgname) {
-		$state->fatal("Package real name #1 does not match #2", 
-			$plist->pkgname, $pkgname); 
+		$state->fatal("Package real name #1 does not match #2",
+			$plist->pkgname, $pkgname);
 	}
 	if ($plist->is_signed) {
 		if (!$state->{quick}) {
@@ -385,7 +385,7 @@ sub delete
 		if (-l $realname) {
 			my $contents = readlink $realname;
 			if ($contents ne $self->{symlink}) {
-				$state->say("Symlink does not match: #1 (#2 vs. #3)", 
+				$state->say("Symlink does not match: #1 (#2 vs. #3)",
 				    $realname, $contents, $self->{symlink});
 				$self->do_not_delete($state);
 				return;
@@ -587,8 +587,8 @@ sub delete
 			open(my $shells2, '>', $destdir.OpenBSD::Paths->shells);
 			print $shells2 @l;
 			close $shells2;
-			$state->say("Shell #1 removed from #2", 
-			    $fullname, $destdir.OpenBSD::Paths->shells) 
+			$state->say("Shell #1 removed from #2",
+			    $fullname, $destdir.OpenBSD::Paths->shells)
 			    	if $state->verbose;
 		}
 	}
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
index 7736c0eac67..7bba450c026 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.130 2010/06/30 10:37:25 espie Exp $
+# $OpenBSD: Dependencies.pm,v 1.131 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2005-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/Error.pm b/usr.sbin/pkg_add/OpenBSD/Error.pm
index edcd82ec4eb..57125defcd7 100644
--- a/usr.sbin/pkg_add/OpenBSD/Error.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Error.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Error.pm,v 1.26 2010/06/15 08:26:39 espie Exp $
+# $OpenBSD: Error.pm,v 1.27 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm b/usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm
index e598fdcdfe6..e1941a786d8 100644
--- a/usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm
+++ b/usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: ForwardDependencies.pm,v 1.7 2010/06/09 07:26:01 espie Exp $
+# $OpenBSD: ForwardDependencies.pm,v 1.8 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2009 Marc Espie <espie@openbsd.org>
 #
@@ -52,7 +52,7 @@ sub adjust
 				$deps_f->delete($check);
 			} else {
 				my $r = $h->{update_found}->pkgname;
-				$state->say("Adjusting #1 to #2 in #3", 
+				$state->say("Adjusting #1 to #2 in #3",
 				    $check, $r, $f)
 					if $state->verbose >= 3;
 				if ($check ne $r) {
diff --git a/usr.sbin/pkg_add/OpenBSD/Getopt.pm b/usr.sbin/pkg_add/OpenBSD/Getopt.pm
index 0d2d5a3e661..b6bd42dc19c 100644
--- a/usr.sbin/pkg_add/OpenBSD/Getopt.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Getopt.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Getopt.pm,v 1.7 2010/05/10 09:17:55 espie Exp $
+# $OpenBSD: Getopt.pm,v 1.8 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2006 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/Handle.pm b/usr.sbin/pkg_add/OpenBSD/Handle.pm
index 4eaf2305835..52f0db0c728 100644
--- a/usr.sbin/pkg_add/OpenBSD/Handle.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Handle.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Handle.pm,v 1.21 2010/06/30 10:33:09 espie Exp $
+# $OpenBSD: Handle.pm,v 1.22 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2007-2009 Marc Espie <espie@openbsd.org>
 #
@@ -197,7 +197,7 @@ sub get_plist
 		OpenBSD::PackingElement::Url->add($plist, $location->url);
 	}
 	if ($plist->localbase ne $state->{localbase}) {
-		$state->say("Localbase mismatch: package has: #1, user wants: #2", 
+		$state->say("Localbase mismatch: package has: #1, user wants: #2",
 		    $plist->localbase, $state->{localbase});
 		$location->close_with_client_error;
 		$location->wipe_info;
diff --git a/usr.sbin/pkg_add/OpenBSD/IdCache.pm b/usr.sbin/pkg_add/OpenBSD/IdCache.pm
index ba33ae1a206..36615620339 100644
--- a/usr.sbin/pkg_add/OpenBSD/IdCache.pm
+++ b/usr.sbin/pkg_add/OpenBSD/IdCache.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: IdCache.pm,v 1.6 2010/05/10 09:17:55 espie Exp $
+# $OpenBSD: IdCache.pm,v 1.7 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2002-2005 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/Interactive.pm b/usr.sbin/pkg_add/OpenBSD/Interactive.pm
index 8a1a8be0341..9d9778d713b 100644
--- a/usr.sbin/pkg_add/OpenBSD/Interactive.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Interactive.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Interactive.pm,v 1.13 2010/05/10 09:17:55 espie Exp $
+# $OpenBSD: Interactive.pm,v 1.14 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/LibSpec.pm b/usr.sbin/pkg_add/OpenBSD/LibSpec.pm
index eb9d62b25e8..c11639d436c 100644
--- a/usr.sbin/pkg_add/OpenBSD/LibSpec.pm
+++ b/usr.sbin/pkg_add/OpenBSD/LibSpec.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: LibSpec.pm,v 1.10 2010/06/19 08:22:06 espie Exp $
+# $OpenBSD: LibSpec.pm,v 1.11 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/LibSpec/Build.pm b/usr.sbin/pkg_add/OpenBSD/LibSpec/Build.pm
index d4a04509cac..f3a9cd968ae 100644
--- a/usr.sbin/pkg_add/OpenBSD/LibSpec/Build.pm
+++ b/usr.sbin/pkg_add/OpenBSD/LibSpec/Build.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Build.pm,v 1.3 2010/06/19 08:22:06 espie Exp $
+# $OpenBSD: Build.pm,v 1.4 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2010 Marc Espie <espie@openbsd.org>
 #
@@ -71,7 +71,7 @@ sub no_match_static
 sub findbest
 {
 	my ($spec, $repo, $base) = @_;
-	my $spec2 = OpenBSD::LibSpec::GT->new($spec->{dir}, $spec->{stem}, 
+	my $spec2 = OpenBSD::LibSpec::GT->new($spec->{dir}, $spec->{stem},
 	    0, 0);
 	my $r = $spec2->lookup($repo, $base);
 	my $best;
diff --git a/usr.sbin/pkg_add/OpenBSD/Log.pm b/usr.sbin/pkg_add/OpenBSD/Log.pm
index 0cac688b5f4..c54021b05e2 100644
--- a/usr.sbin/pkg_add/OpenBSD/Log.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Log.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Log.pm,v 1.1 2010/06/15 08:26:39 espie Exp $
+# $OpenBSD: Log.pm,v 1.2 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org>
 #
@@ -105,13 +105,13 @@ sub system
 			$self->{p}->_print($_);
 		}
 		if (!close $grab) {
-			$self->{p}->say("system(#1) failed: #2 #3", 
+			$self->{p}->say("system(#1) failed: #2 #3",
 			    join(", ", @_), $!,
 			    $self->{p}->child_error);
 		}
 		return $?;
 	} else {
-		$self->{p}->say("system(#1) was not run: #2 #3", 
+		$self->{p}->say("system(#1) was not run: #2 #3",
 		    join(", ", @_), $!, $self->{p}->child_error);
 	}
 }
diff --git a/usr.sbin/pkg_add/OpenBSD/Mtree.pm b/usr.sbin/pkg_add/OpenBSD/Mtree.pm
index 40687d171d3..aa7cc338f36 100644
--- a/usr.sbin/pkg_add/OpenBSD/Mtree.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Mtree.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Mtree.pm,v 1.8 2010/06/05 12:01:08 espie Exp $
+# $OpenBSD: Mtree.pm,v 1.9 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2004-2005 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/OldLibs.pm b/usr.sbin/pkg_add/OpenBSD/OldLibs.pm
index 99488fa6d83..69c2f396d64 100644
--- a/usr.sbin/pkg_add/OpenBSD/OldLibs.pm
+++ b/usr.sbin/pkg_add/OpenBSD/OldLibs.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: OldLibs.pm,v 1.4 2010/06/09 07:26:01 espie Exp $
+# $OpenBSD: OldLibs.pm,v 1.5 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm b/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm
index adad08af6d0..bfb3e0fb195 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageInfo.pm,v 1.48 2010/06/30 10:33:09 espie Exp $
+# $OpenBSD: PackageInfo.pm,v 1.49 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm
index 8ca296e4a04..31f23ba488a 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageLocation.pm,v 1.20 2010/06/25 10:34:03 espie Exp $
+# $OpenBSD: PackageLocation.pm,v 1.21 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm
index cf3fef32996..c5bfa222336 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageLocator.pm,v 1.90 2010/06/30 10:37:25 espie Exp $
+# $OpenBSD: PackageLocator.pm,v 1.91 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageName.pm b/usr.sbin/pkg_add/OpenBSD/PackageName.pm
index 2bb0c0776c0..653dc470d63 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageName.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageName.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageName.pm,v 1.45 2010/06/18 14:04:20 espie Exp $
+# $OpenBSD: PackageName.pm,v 1.46 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
index 3c675c08c41..f53120316e0 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageRepository.pm,v 1.81 2010/06/30 10:05:54 espie Exp $
+# $OpenBSD: PackageRepository.pm,v 1.82 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm
index 8635ee6aeab..adcf0806afa 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Installed.pm,v 1.23 2010/06/30 10:37:26 espie Exp $
+# $OpenBSD: Installed.pm,v 1.24 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm
index 3f7ebbc4633..9c4a273ca6d 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: SCP.pm,v 1.21 2010/05/10 09:17:55 espie Exp $
+# $OpenBSD: SCP.pm,v 1.22 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm
index 50da7f072c9..b91db69a00a 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Source.pm,v 1.11 2010/05/10 09:17:55 espie Exp $
+# $OpenBSD: Source.pm,v 1.12 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm
index f232d78102b..461f6f7b95c 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageRepositoryList.pm,v 1.23 2010/06/25 10:13:37 espie Exp $
+# $OpenBSD: PackageRepositoryList.pm,v 1.24 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index dc7487a86e5..671569b378a 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackingElement.pm,v 1.180 2010/06/15 08:26:39 espie Exp $
+# $OpenBSD: PackingElement.pm,v 1.181 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -394,7 +394,7 @@ sub check_digest
 	my ($self, $file, $state) = @_;
 	return if $self->{link} or $self->{symlink};
 	if (!defined $self->{d}) {
-		$state->log->fatal($state->f("#1 does not have a signature", 
+		$state->log->fatal($state->f("#1 does not have a signature",
 		    $self->fullname));
 	}
 	my $d = $self->compute_digest($file->{destdir}.$file->name);
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm
index f0d26b2744d..4510dd24c7f 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackingList.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackingList.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackingList.pm,v 1.106 2010/06/05 16:22:08 espie Exp $
+# $OpenBSD: PackingList.pm,v 1.107 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/Paths.pm b/usr.sbin/pkg_add/OpenBSD/Paths.pm
index 89388ceb57b..6a5b7c5e3d7 100644
--- a/usr.sbin/pkg_add/OpenBSD/Paths.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Paths.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Paths.pm,v 1.13 2010/06/15 08:19:31 espie Exp $
+# $OpenBSD: Paths.pm,v 1.14 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2007 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
index d49b2190fca..c6fbb1d5084 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.7 2010/06/30 10:37:26 espie Exp $
+# $OpenBSD: PkgAdd.pm,v 1.8 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm b/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm
index 46bc0b98627..6e170c5627e 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgCfl.pm,v 1.32 2010/06/11 09:56:44 espie Exp $
+# $OpenBSD: PkgCfl.pm,v 1.33 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2005 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm b/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm
index 77ee365ea5c..c9ca3e8f424 100644
--- 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.19 2010/06/25 10:58:08 espie Exp $
+# $OpenBSD: PkgCheck.pm,v 1.20 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -56,7 +56,7 @@ sub basic_check
 			}
 		} else {
 			if (readlink($name) ne $self->{symlink}) {
-				$state->log("#1 should point to #2 but points to #3 instead", 
+				$state->log("#1 should point to #2 but points to #3 instead",
 				    $name, $self->{symlink}, readlink($name));
 			}
 		}
@@ -64,7 +64,7 @@ sub basic_check
 	}
 	if (!-e $name) {
 		if (-l $name) {
-			$state->log("#1 points to non-existent #2", 
+			$state->log("#1 points to non-existent #2",
 			    $name, readlink($name));
 		} else {
 			$state->log("#1 should exist", $name);
@@ -76,7 +76,7 @@ sub basic_check
 	if ($self->{link}) {
 		my ($a, $b) = (stat _)[0, 1];
 		if (!-f $state->{destdir}.$self->{link}) {
-			$state->log("#1 should link to non-existent #2", 
+			$state->log("#1 should link to non-existent #2",
 			    $name, $self->{link});
 		} else {
 			my ($c, $d) = (stat _)[0, 1];
@@ -166,7 +166,7 @@ sub find_dependencies
 	my ($self, $state, $l, $checker) = @_;
 	# several ways to failure
 	if (!$self->spec->is_valid) {
-		$state->log("invalid \@", $self->keyword, " ", 
+		$state->log("invalid \@", $self->keyword, " ",
 		    $self->stringize);
 		return;
 	}
@@ -191,7 +191,7 @@ package OpenBSD::PackingElement::Wantlib;
 sub find_dependencies
 {
 	my ($self, $state, $l, $checker) = @_;
-	my $r = OpenBSD::SharedLibs::lookup_libspec($state->{localbase}, 
+	my $r = OpenBSD::SharedLibs::lookup_libspec($state->{localbase},
 	    $self->spec);
 	if (defined $r && @$r != 0) {
 		my $okay = 0;
@@ -272,9 +272,9 @@ sub new
 {
 	my ($class, $state, $name, $req) = @_;
 	my $o = bless {
-		not_yet => {}, 
-		possible => {}, 
-		others => {}, 
+		not_yet => {},
+		possible => {},
+		others => {},
 		name => $name,
 		req => $req
 	    }, $class;
@@ -283,7 +283,7 @@ sub new
 		if ($state->{exists}{$pkg}) {
 			$o->{possible}{$pkg} = 1;
 		} else {
-			$state->errsay("#1: bogus #2", 
+			$state->errsay("#1: bogus #2",
 			    $name, $o->string($state->safe($pkg)));
 		}
 	}
@@ -364,8 +364,8 @@ sub adjust
 package OpenBSD::DirectDependencyCheck;
 our @ISA = qw(OpenBSD::DependencyCheck);
 use OpenBSD::RequiredBy;
-sub string 
-{ 
+sub string
+{
 	my $self = shift;
 	if (@_ == 1) {
 		return "dependency: ".$_[0];
@@ -377,15 +377,15 @@ sub string
 sub new
 {
 	my ($class, $state, $name) = @_;
-	return $class->SUPER::new($state, $name, 
+	return $class->SUPER::new($state, $name,
 	    OpenBSD::Requiring->new($name));
 }
 
 package OpenBSD::ReverseDependencyCheck;
 our @ISA = qw(OpenBSD::DependencyCheck);
 use OpenBSD::RequiredBy;
-sub string 
-{ 
+sub string
+{
 	my $self = shift;
 	if (@_ == 1) {
 		return "reverse dependency: @_";
@@ -397,7 +397,7 @@ sub string
 sub new
 {
 	my ($class, $state, $name) = @_;
-	return $class->SUPER::new($state, $name, 
+	return $class->SUPER::new($state, $name,
 	    OpenBSD::RequiredBy->new($name));
 }
 
@@ -433,7 +433,7 @@ sub remove
 		}
 		unless ($state->{not}) {
 			unlink($dir) or
-			    $state->errsay("#1: Couldn't delete #2: #3", 
+			    $state->errsay("#1: Couldn't delete #2: #3",
 				$name, $dir, $!);
 		}
 	} elsif (-d $dir) {
@@ -465,7 +465,7 @@ sub for_all_packages
 {
 	my ($self, $state, $l, $msg, $code) = @_;
 
-	$state->progress->for_list($msg, $l, 
+	$state->progress->for_list($msg, $l,
 	    sub {
 		next if $state->{removed}{$_[0]};
 		&$code;
@@ -479,7 +479,7 @@ sub sanity_check
 		my $name = shift;
 		my $info = installed_info($name);
 		if (-f $info) {
-			$state->errsay("#1: #2 should be a directory", 
+			$state->errsay("#1: #2 should be a directory",
 			    $state->safe($name), $state->safe($info));
 			if ($info =~ m/\.core$/) {
 				$state->errsay("looks like a core dump, ".
@@ -492,7 +492,7 @@ sub sanity_check
 		}
 		my $contents = $info.OpenBSD::PackageInfo::CONTENTS;
 		unless (-f $contents) {
-			$state->errsay("#1: missing #2", 
+			$state->errsay("#1: missing #2",
 			    $state->safe($name), $state->safe($contents));
 			$self->may_remove($state, $name);
 			return;
@@ -507,7 +507,7 @@ sub sanity_check
 			return;
 		}
 		if ($plist->pkgname ne $name) {
-			$state->errsay("#1: pkgname does not match", 
+			$state->errsay("#1: pkgname does not match",
 			    $state->safe($name));
 			$self->may_remove($state, $name);
 		}
@@ -524,7 +524,7 @@ sub dependencies_check
 		my $name = shift;
 		my $plist = OpenBSD::PackingList->from_installation($name,
 		    \&OpenBSD::PackingList::DependOnly);
-		my $checker = OpenBSD::DirectDependencyCheck->new($state, 
+		my $checker = OpenBSD::DirectDependencyCheck->new($state,
 		    $name);
 		$state->{localbase} = $plist->localbase;
 		$plist->find_dependencies($state, $l, $checker);
@@ -540,7 +540,7 @@ sub reverse_dependencies_check
 	my ($self, $state, $l) = @_;
 	$self->for_all_packages($state, $l, "Reverse dependencies", sub {
 		my $name = shift;
-		my $checker = OpenBSD::ReverseDependencyCheck->new($state, 
+		my $checker = OpenBSD::ReverseDependencyCheck->new($state,
 		    $name);
 		for my $i (@{$state->{reverse}{$name}}) {
 			$checker->find($i) or $checker->not_found($i);
@@ -589,9 +589,9 @@ sub localbase_check
 	find(sub {
 		$state->progress->working(1024);
 		if (-d $_) {
-			if ($File::Find::name eq 
+			if ($File::Find::name eq
 			    OpenBSD::Paths->localbase."/lost+found") {
-				$state->say("fsck(8) info found: #1", 
+				$state->say("fsck(8) info found: #1",
 				    $File::Find::name);
 				$File::Find::prune = 1;
 				return;
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgConfig.pm b/usr.sbin/pkg_add/OpenBSD/PkgConfig.pm
index 9ab59cf89e4..6c45d3e633d 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgConfig.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgConfig.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgConfig.pm,v 1.14 2010/05/10 09:17:55 espie Exp $
+# $OpenBSD: PkgConfig.pm,v 1.15 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2006 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
index bd4fa01055a..71fe7b4d555 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.17 2010/06/30 10:31:52 espie Exp $
+# $OpenBSD: PkgCreate.pm,v 1.18 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -135,7 +135,7 @@ sub resolve_link
 	my ($filename, $base, $level) = @_;
 	$level //= 0;
 	if (-l $filename) {
-		my $l = readlink($filename); 
+		my $l = readlink($filename);
 		if ($level++ > 14) {
 			return undef;
 		}
@@ -514,7 +514,7 @@ sub handle_fragment
 		return $file unless defined $not;
 	}
 	if (defined $newname) {
-		$state->set_status("switching to $newname") 
+		$state->set_status("switching to $newname")
 		    if !defined $state->opt('q');
 		push(@$stack, $file);
 		$file = MyFile->new($newname);
@@ -608,7 +608,7 @@ sub add_description
 sub add_signature
 {
 	my ($self, $plist, $cert, $privkey) = @_;
-		
+
 	require OpenBSD::x509;
 
 	my $sig = OpenBSD::PackingElement::DigitalSignature->new_x509;
@@ -787,7 +787,7 @@ sub show_bad_symlinks
 {
 	my ($self, $state) = @_;
 	for my $dest (sort keys %{$state->{bad_symlinks}}) {
-		$state->errsay("Warning: symlink(s) point to non-existent #1", 
+		$state->errsay("Warning: symlink(s) point to non-existent #1",
 		    $dest);
 		for my $link (@{$state->{bad_symlinks}{$dest}}) {
 			$state->errsay("\t#1", $link);
@@ -876,7 +876,7 @@ sub parse_and_run
 		}
 		exit(0);
 	} else {
-		$plist = $self->create_plist($state, $ARGV[0], \@contents, 
+		$plist = $self->create_plist($state, $ARGV[0], \@contents,
 		    \%dependencies, \%wantlib);
 	}
 
@@ -946,7 +946,7 @@ sub parse_and_run
 		$plist->pretend_to_archive($state);
 	} else {
 		$self->create_package($state, $plist, $wname);
-	} 
+	}
 	}catch {
 		print STDERR "$0: $_\n";
 		exit(1);
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm
index 1e046e87407..163c3ff9e89 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgDelete.pm,v 1.6 2010/06/25 11:12:14 espie Exp $
+# $OpenBSD: PkgDelete.pm,v 1.7 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -27,7 +27,7 @@ our @ISA = qw(OpenBSD::AddDelete::State);
 sub handle_options
 {
 	my $state = shift;
-	$state->SUPER::handle_options('', 
+	$state->SUPER::handle_options('',
 	    '[-cIinqsvx] [-B pkg-destdir] [-D name[=value]] pkg-name [...]');
 
 	my $base = $state->opt('B') // $ENV{'PKG_DESTDIR'} // '';
@@ -76,11 +76,11 @@ sub process_parameters
 	@todo = OpenBSD::RequiredBy->compute_closure(@realnames);
 
 	if (@todo > @realnames) {
-		my $details = $state->verbose >= 2 || 
+		my $details = $state->verbose >= 2 ||
 		    $state->defines('verbosedeps');
 		my $show = sub {
 			my ($p, $d) = @_;
-			$state->say("Can't remove #1". 
+			$state->say("Can't remove #1".
 			    " without also removing:\n#2",
 			    join(' ', @$p), join(' ', @$d));
 		};
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
index e013dfe7a42..9c452622eed 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgInfo.pm,v 1.10 2010/06/30 10:35:24 espie Exp $
+# $OpenBSD: PkgInfo.pm,v 1.11 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgSpec.pm b/usr.sbin/pkg_add/OpenBSD/PkgSpec.pm
index a60ce5b46de..08406edf503 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgSpec.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgSpec.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgSpec.pm,v 1.29 2010/06/11 09:56:44 espie Exp $
+# $OpenBSD: PkgSpec.pm,v 1.30 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm b/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm
index 3319f68a6ba..12ca300b250 100644
--- a/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm
+++ b/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: ProgressMeter.pm,v 1.34 2010/06/18 09:01:38 espie Exp $
+# $OpenBSD: ProgressMeter.pm,v 1.35 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm b/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm
index 513da21f50c..f632ee308b0 100644
--- a/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm
+++ b/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Term.pm,v 1.10 2010/06/14 08:17:37 espie Exp $
+# $OpenBSD: Term.pm,v 1.11 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2004-2007 Marc Espie <espie@openbsd.org>
 #
@@ -170,7 +170,7 @@ sub _show
 			$prefix += $self->{stars};
 		}
 	}
-	if (defined $self->{hpa} && substr($self->{lastdisplay}, 0, $prefix) eq 
+	if (defined $self->{hpa} && substr($self->{lastdisplay}, 0, $prefix) eq
 	    substr($d, 0, $prefix)) {
 		print $self->hmove($prefix), substr($d, $prefix);
 	} else {
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm
index 61d421ad288..7d0473db7ba 100644
--- a/usr.sbin/pkg_add/OpenBSD/Replace.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Replace.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Replace.pm,v 1.74 2010/06/30 10:09:09 espie Exp $
+# $OpenBSD: Replace.pm,v 1.75 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
 #
@@ -179,7 +179,7 @@ sub check_plist_exec
 	$plist->can_update($new, $state);
 	return 1 if @{$state->{journal}} == 0;
 
-	$state->errsay(($new ? "New": "Old"). 
+	$state->errsay(($new ? "New": "Old").
 	    " package #1 contains potentially unsafe operations", $plist->pkgname);
 	for my $i (@{$state->{journal}}) {
 		if ($new) {
diff --git a/usr.sbin/pkg_add/OpenBSD/RequiredBy.pm b/usr.sbin/pkg_add/OpenBSD/RequiredBy.pm
index 5551e1aa3fc..f1d2e9d4964 100644
--- a/usr.sbin/pkg_add/OpenBSD/RequiredBy.pm
+++ b/usr.sbin/pkg_add/OpenBSD/RequiredBy.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: RequiredBy.pm,v 1.21 2010/05/10 09:17:55 espie Exp $
+# $OpenBSD: RequiredBy.pm,v 1.22 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2005 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/Search.pm b/usr.sbin/pkg_add/OpenBSD/Search.pm
index d3d186ebfab..c5132f52821 100644
--- a/usr.sbin/pkg_add/OpenBSD/Search.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Search.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Search.pm,v 1.22 2010/05/10 09:17:55 espie Exp $
+# $OpenBSD: Search.pm,v 1.23 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2007 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/SharedItems.pm b/usr.sbin/pkg_add/OpenBSD/SharedItems.pm
index 278088b1154..d5e500ba059 100644
--- a/usr.sbin/pkg_add/OpenBSD/SharedItems.pm
+++ b/usr.sbin/pkg_add/OpenBSD/SharedItems.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: SharedItems.pm,v 1.24 2010/06/18 09:05:03 espie Exp $
+# $OpenBSD: SharedItems.pm,v 1.25 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm b/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm
index bdf085feaf1..2bdbd0c3297 100644
--- a/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm
+++ b/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: SharedLibs.pm,v 1.49 2010/06/09 07:26:01 espie Exp $
+# $OpenBSD: SharedLibs.pm,v 1.50 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/Signature.pm b/usr.sbin/pkg_add/OpenBSD/Signature.pm
index 3b783c82338..c7dd3eafbd0 100644
--- a/usr.sbin/pkg_add/OpenBSD/Signature.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Signature.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Signature.pm,v 1.6 2010/05/10 09:17:55 espie Exp $
+# $OpenBSD: Signature.pm,v 1.7 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/State.pm b/usr.sbin/pkg_add/OpenBSD/State.pm
index ea3a51152fc..c5d2d544bd2 100644
--- a/usr.sbin/pkg_add/OpenBSD/State.pm
+++ b/usr.sbin/pkg_add/OpenBSD/State.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: State.pm,v 1.7 2010/06/30 10:11:23 espie Exp $
+# $OpenBSD: State.pm,v 1.8 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org>
 #
@@ -284,7 +284,7 @@ sub child_error
 		$extra = $self->f(" (core dumped)");
 	}
 	if ($error & 127) {
-		return $self->f("killed by signal #1#2", 
+		return $self->f("killed by signal #1#2",
 		    find_signal($error & 127), $extra);
 	} else {
 		return $self->f("exit(#1)#2", ($error >> 8), $extra);
@@ -296,7 +296,7 @@ sub system
 	my $self = shift;
 	my $r = CORE::system(@_);
 	if ($r != 0) {
-		$self->say("system(#1) failed: #2", 
+		$self->say("system(#1) failed: #2",
 		    join(", ", @_), $self->child_error);
 	}
 	return $r;
diff --git a/usr.sbin/pkg_add/OpenBSD/Subst.pm b/usr.sbin/pkg_add/OpenBSD/Subst.pm
index 19674f91c90..3466029f0ff 100644
--- a/usr.sbin/pkg_add/OpenBSD/Subst.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Subst.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Subst.pm,v 1.10 2010/06/05 07:59:52 espie Exp $
+# $OpenBSD: Subst.pm,v 1.11 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2008 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/Temp.pm b/usr.sbin/pkg_add/OpenBSD/Temp.pm
index c002d024a9b..13dad8d55a9 100644
--- a/usr.sbin/pkg_add/OpenBSD/Temp.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Temp.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Temp.pm,v 1.18 2010/05/10 09:17:55 espie Exp $
+# $OpenBSD: Temp.pm,v 1.19 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2005 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/Tracker.pm b/usr.sbin/pkg_add/OpenBSD/Tracker.pm
index 56ddf812f28..bdb02185657 100644
--- a/usr.sbin/pkg_add/OpenBSD/Tracker.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Tracker.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Tracker.pm,v 1.21 2010/06/09 08:13:19 espie Exp $
+# $OpenBSD: Tracker.pm,v 1.22 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2009 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm
index 03c5b339231..1926f3ea5f9 100644
--- a/usr.sbin/pkg_add/OpenBSD/Update.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Update.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Update.pm,v 1.139 2010/06/30 10:36:07 espie Exp $
+# $OpenBSD: Update.pm,v 1.140 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm
index e726ef891dd..07986c53d68 100644
--- a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm
+++ b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: UpdateSet.pm,v 1.58 2010/06/30 10:37:26 espie Exp $
+# $OpenBSD: UpdateSet.pm,v 1.59 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org>
 #
@@ -65,7 +65,7 @@ package OpenBSD::UpdateSet;
 sub new
 {
 	my ($class, $state) = @_;
-	return bless {newer => {}, older => {}, kept => {}, 
+	return bless {newer => {}, older => {}, kept => {},
 	    hints => [], updates => 0, repo => $state->repo}, $class;
 }
 
diff --git a/usr.sbin/pkg_add/OpenBSD/Ustar.pm b/usr.sbin/pkg_add/OpenBSD/Ustar.pm
index 8f8617db5a3..12486dedfd8 100644
--- a/usr.sbin/pkg_add/OpenBSD/Ustar.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Ustar.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Ustar.pm,v 1.57 2010/06/30 10:10:17 espie Exp $
+# $OpenBSD: Ustar.pm,v 1.58 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2002-2007 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/Vstat.pm b/usr.sbin/pkg_add/OpenBSD/Vstat.pm
index 3b22aa596b0..c027a5dc467 100644
--- a/usr.sbin/pkg_add/OpenBSD/Vstat.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Vstat.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Vstat.pm,v 1.59 2010/06/09 07:26:01 espie Exp $
+# $OpenBSD: Vstat.pm,v 1.60 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/md5.pm b/usr.sbin/pkg_add/OpenBSD/md5.pm
index 22448acd390..ef201c86503 100644
--- a/usr.sbin/pkg_add/OpenBSD/md5.pm
+++ b/usr.sbin/pkg_add/OpenBSD/md5.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: md5.pm,v 1.9 2010/05/10 09:17:55 espie Exp $
+# $OpenBSD: md5.pm,v 1.10 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/x509.pm b/usr.sbin/pkg_add/OpenBSD/x509.pm
index a66c62efabb..5270263e192 100644
--- a/usr.sbin/pkg_add/OpenBSD/x509.pm
+++ b/usr.sbin/pkg_add/OpenBSD/x509.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: x509.pm,v 1.6 2010/06/15 08:26:39 espie Exp $
+# $OpenBSD: x509.pm,v 1.7 2010/06/30 10:41:42 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/pkg_merge b/usr.sbin/pkg_add/pkg_merge
index b65ac17eb0d..71b682b79f5 100644
--- a/usr.sbin/pkg_add/pkg_merge
+++ b/usr.sbin/pkg_add/pkg_merge
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org>
-# $OpenBSD: pkg_merge,v 1.16 2010/06/09 11:57:21 espie Exp $
+# $OpenBSD: pkg_merge,v 1.17 2010/06/30 10:41:41 espie Exp $
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above