rename forced to defines

8 files changed, 24 insertions, 24 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm
index b600fdd9eea..8fd72fa0ac3 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.81 2007/06/25 09:30:16 espie Exp $
+# $OpenBSD: Add.pm,v 1.82 2008/03/08 12:07:45 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -369,7 +369,7 @@ sub prepare_for_addition
 	if ($s->{ro}) {
 		$s->report_ro($state, $fname);
 	}
-	if ($state->{forced}->{kitchensink} && $state->{not}) {
+	if ($state->{defines}->{kitchensink} && $state->{not}) {
 		return;
 	}
 	if ($s->avail < 0) {
@@ -489,7 +489,7 @@ sub prepare_for_addition
 	if ($s->{ro}) {
 		$s->report_ro($state, $fname);
 	}
-	if ($state->{forced}->{kitchensink} && $state->{not}) {
+	if ($state->{defines}->{kitchensink} && $state->{not}) {
 		return;
 	}
 	if ($s->avail < 0) {
@@ -680,7 +680,7 @@ sub prepare_for_addition
 	if ($s->{noexec} && $self->exec_on_delete) {
 		$s->report_noexec($state, $fname);
 	}
-	if ($state->{forced}->{kitchensink} && $state->{not}) {
+	if ($state->{defines}->{kitchensink} && $state->{not}) {
 		return;
 	}
 	if ($s->avail < 0) {
diff --git a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm
index 4022f9c5d97..9f6d5fd57e4 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.15 2007/06/20 13:44:39 espie Exp $
+# $OpenBSD: CollisionReport.pm,v 1.16 2008/03/08 12:07:45 espie Exp $
 #
 # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
 #
@@ -27,7 +27,7 @@ sub collision_report($$)
 {
 	my ($list, $state) = @_;
 
-	if ($state->{forced}->{removecollisions}) {
+	if ($state->{defines}->{removecollisions}) {
 		for my $f (@$list) {
 			print "rm ", $f->fullname, "\n";
 			unlink($f->fullname);
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
index 806eff3606e..7d2d3d1980b 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.59 2007/06/26 14:40:25 espie Exp $
+# $OpenBSD: Dependencies.pm,v 1.60 2008/03/08 12:07:45 espie Exp $
 #
 # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org>
 #
@@ -239,7 +239,7 @@ sub find_dep_in_repositories
 	# XXX not really efficient, but hey
 	my %c = map {($_->{name}, $_)} @candidates;
 	my @pkgs = keys %c;
-	if (!$state->{forced}->{allversions}) {
+	if (!$state->{defines}->{allversions}) {
 		@pkgs = OpenBSD::PackageName::keep_most_recent(@pkgs);
 	}
 	if (@pkgs == 1) {
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm b/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm
index 39bd8f5aa05..22cbc33c09c 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.36 2008/01/12 14:02:32 espie Exp $
+# $OpenBSD: PackageInfo.pm,v 1.37 2008/03/08 12:07:45 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -250,7 +250,7 @@ sub solve_installed_names
 			next if $found;
 
 			print "Ambiguous: $pkgname could be ", join(' ', @l),"\n";
-			if ($state->{forced}->{ambiguous}) {
+			if ($state->{defines}->{ambiguous}) {
 			    print "$msg\n";
 			    push(@$new, @l);
 			    for my $p (@l) {
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index 3e2b6513751..5938bfaf28d 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.143 2007/07/14 21:50:05 ajacoutot Exp $
+# $OpenBSD: PackingElement.pm,v 1.144 2008/03/08 12:07:45 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -1368,7 +1368,7 @@ sub run
 	return if $not;
 	chmod 0755, $name;
 	return if $state->system($name, $pkgname, @args) == 0;
-	if ($state->{forced}->{scripts}) {
+	if ($state->{defines}->{scripts}) {
 		$state->warn($self->beautify, " script failed\n");
 	} else {
 		$state->fatal($self->beautify." script failed");
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm
index a94382537ea..fe56bb59933 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.43 2008/03/02 23:43:32 espie Exp $
+# $OpenBSD: Replace.pm,v 1.44 2008/03/08 12:07:45 espie Exp $
 #
 # Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org>
 #
@@ -224,7 +224,7 @@ sub validate_depend
 	# nothing to do if new dependency just matches
 	return if $self->spec->filter($replacement);
 
-	if ($state->{forced}->{updatedepends}) {
+	if ($state->{defines}->{updatedepends}) {
 	    Warn "Forward dependency of $wanting on $toreplace doesn't match $replacement, forcing it\n";
 	    $state->{forcedupdates} = {} unless defined $state->{forcedupdates};
 	    $state->{forcedupdates}->{$wanting} = 1;
@@ -312,7 +312,7 @@ sub can_old_package_be_replaced
 		for my $i (@{$state->{journal}}) {
 			Warn "\t$i\n";
 		}
-		if ($state->{forced}->{update}) {
+		if ($state->{defines}->{update}) {
 			Warn "(forcing update)\n";
 			$state->{okay} = 1;
 		} elsif ($state->{interactive}) {
@@ -356,7 +356,7 @@ sub is_new_package_safe
 		for my $i (@{$state->{journal}}) {
 			Warn "\t$i\n";
 		}
-		if ($state->{forced}->{update}) {
+		if ($state->{defines}->{update}) {
 			Warn "(forcing update)\n";
 			$state->{okay} = 1;
 		} elsif ($state->{interactive}) {
diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm
index 9555dbbbb04..f91723474b3 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.81 2007/09/20 09:01:34 espie Exp $
+# $OpenBSD: Update.pm,v 1.82 2008/03/08 12:07:45 espie Exp $
 #
 # Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org>
 #
@@ -64,7 +64,7 @@ sub process_package
 	}
 	my @search = ();
 	push(@search, OpenBSD::Search::Stem->split($pkgname));
-	if (!$state->{forced}->{allversions}) {
+	if (!$state->{defines}->{allversions}) {
 		push(@search, OpenBSD::Search::Filter->keep_most_recent);
 	}
 
@@ -77,7 +77,7 @@ sub process_package
 		if (@l == 0) {
 			return @l;
 		}
-		if (@l == 1 && $state->{forced}->{pkgpath}) {
+		if (@l == 1 && $state->{defines}->{pkgpath}) {
 			return @l;
 		}
 		my @l2 = ();
@@ -126,14 +126,14 @@ sub process_package
 		return;
 	}
 	if (@l == 1) {
-		if ($state->{forced}->{pkgpath}) {
+		if ($state->{defines}->{pkgpath}) {
 			$state->progress->clear;
 			print "Directly updating $pkgname -> ", $l[0], "\n";
 			$self->add2updates($l[0]);
 			return;
 		}
 		if (defined $found && $found eq  $l[0] && 
-		    !$plist->uses_old_libs && !$state->{forced}->{installed}) {
+		    !$plist->uses_old_libs && !$state->{defines}->{installed}) {
 				my $msg = "No need to update $pkgname";
 				$state->progress->message($msg);
 				print "$msg\n" if $state->{beverbose};
@@ -168,7 +168,7 @@ sub process
 	my @list = ();
 
 	OpenBSD::PackageInfo::solve_installed_names($old, \@list, "(updating them all)", $state);
-	unless (defined $state->{full_update} or defined $state->{forced}->{noclosure}) {
+	unless (defined $state->{full_update} or defined $state->{defines}->{noclosure}) {
 		require OpenBSD::RequiredBy;
 
 		@list = OpenBSD::Requiring->compute_closure(@list);
diff --git a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm
index 761584438f0..b30dd7917fc 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.2 2007/06/30 11:38:38 espie Exp $
+# $OpenBSD: UpdateSet.pm,v 1.3 2008/03/08 12:07:45 espie Exp $
 #
 # Copyright (c) 2007 Marc Espie <espie@openbsd.org>
 #
@@ -62,7 +62,7 @@ sub setup_progressmeter
 sub check_root
 {
 	my $state = shift;
-	if ($< && !$state->{forced}->{nonroot}) {
+	if ($< && !$state->{defines}->{nonroot}) {
 		if ($state->{not}) {
 			Warn "$0 should be run as root\n";
 		} else {