rename -f -> -F

okay pvalchev@, naddy@, marco@, deraadt@

(keep -f around for the transition, will scrap it soon)

4 files changed, 25 insertions, 14 deletions

diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index a4128ddad6b..57a34a7c719 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.164 2004/12/28 14:50:38 espie Exp $
+# $OpenBSD: pkg_add,v 1.165 2005/01/03 01:02:45 espie Exp $
 #
 # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
 #
@@ -687,15 +687,20 @@ sub reorder
 	}
 }
 
-set_usage('pkg_add [-acInqrvvx] [-A arch] [-B pkg-destdir] [-f keys]',
+set_usage('pkg_add [-acInqrvvx] [-A arch] [-B pkg-destdir] [-F keywords]',
 '[-L localbase] [-P type] [-Q quick-destdir] pkgname [...]');
 
 our ($opt_a, $opt_v, $opt_n, $opt_I, $opt_L, $opt_B, $opt_A, $opt_P, $opt_Q, $opt_x, $opt_r, $opt_q, $opt_c);
 $opt_v = 0;
 try { 
-	getopts('aqchvnrxIL:f:B:A:P:Q:',
+	getopts('aqchvnrxIL:f:F:B:A:P:Q:',
 	{'v' => sub {++$opt_v;},
 	 'h' => sub { Usage(); },
+	 'F' => sub { 
+	 		for my $o (split/,/, shift) { 
+				$forced{$o} = 1;
+			}
+	    	},
 	 'f' => sub { 
 	 		for my $o (split/,/, shift) { 
 				$forced{$o} = 1;
@@ -748,6 +753,7 @@ if (defined $state->{destdir}) {
 	$ENV{'PKG_DESTDIR'} = $state->{destdir};
 } else {
 	$state->{destdir} = '';
+	delete $ENV{'PKG_DESTDIR'};
 }
 
 
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 819201e9afd..92467f9270d 100644
--- a/usr.sbin/pkg_add/pkg_add.1
+++ b/usr.sbin/pkg_add/pkg_add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_add.1,v 1.31 2004/12/28 14:50:38 espie Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.32 2005/01/03 01:02:45 espie Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -28,7 +28,7 @@
 .Op Fl acInqrvx
 .Op Fl A Ar arch
 .Op Fl B Ar pkg-destdir
-.Op Fl f Ar keys
+.Op Fl F Ar keyword
 .Op Fl L Ar localbase
 .Op Fl P Ar type
 .Op Fl Q Ar quick-destdir
@@ -133,9 +133,9 @@ While replacing packages, delete extra configuration file in the old package,
 mentioned as
 .Dl @extra file
 in the packing-list.
-.It Fl f Ar keys
+.It Fl F Ar keywords
 Force installation of the package.
-.Ar keys
+.Ar keywords
 is a comma-separated list of keywords that state what failsafes
 should be waived.
 These include:
diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete
index 4e98e0f6b4f..6483b0d0d76 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.84 2004/12/27 22:54:25 espie Exp $
+# $OpenBSD: pkg_delete,v 1.85 2005/01/03 01:02:45 espie Exp $
 #
 # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
 #
@@ -30,15 +30,20 @@ use OpenBSD::PackageInfo;
 our %forced = ();
 our $not;
 
-set_usage('pkg_delete [-cInqvx] [-B pkg-destdir] [-f keys] pkgname [...]');
+set_usage('pkg_delete [-cInqvx] [-B pkg-destdir] [-F keywords] pkgname [...]');
 our ($opt_v, $opt_D, $opt_d, $opt_n, $opt_q, $opt_p, $opt_c, $opt_L, $opt_B, $opt_I, $opt_x);
 
 $opt_v = 0;
 
 try { 
-	getopts('vchxDdnf:qpS:L:B:I',
+	getopts('vchxDdnf:F:qpS:L:B:I',
 	    {'v' => sub {++$opt_v;},
 	     'h' => sub { Usage(); },
+	     'F' => sub { 
+			    for my $o (split/,/, shift) { 
+				    $forced{$o} = 1;
+			    }
+		    },
 	     'f' => sub { 
 			    for my $o (split/,/, shift) { 
 				    $forced{$o} = 1;
diff --git a/usr.sbin/pkg_add/pkg_delete.1 b/usr.sbin/pkg_add/pkg_delete.1
index 96135d6159e..088c2e0afd8 100644
--- a/usr.sbin/pkg_add/pkg_delete.1
+++ b/usr.sbin/pkg_add/pkg_delete.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_delete.1,v 1.16 2004/12/27 22:54:25 espie Exp $
+.\"	$OpenBSD: pkg_delete.1,v 1.17 2005/01/03 01:02:45 espie Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -27,7 +27,7 @@
 .Nm pkg_delete
 .Op Fl cInqvx
 .Op Fl B Ar pkg-destdir
-.Op Fl f Ar keys
+.Op Fl F Ar keywords
 .Ar pkgname Op Ar ...
 .Sh DESCRIPTION
 The
@@ -61,9 +61,9 @@ as the prefix to prepend to any object deleted.
 Delete extra configuration file, mentioned as
 .Dl @extra file
 in the packing-list.
-.It Fl f Ar keys
+.It Fl F Ar keywords
 Force removal of the package.
-.Ar keys
+.Ar keywords
 is a comma-separated list of keywords that state what failsafes
 should be waived.
 These include: