kill some old cruft, in particular -F conflicts has never worked...

2 files changed, 3 insertions, 21 deletions

diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index c33933a8568..8b1248b96f6 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.393 2009/11/22 16:52:00 espie Exp $
+# $OpenBSD: pkg_add,v 1.394 2009/11/24 10:32:33 espie Exp $
 #
 # Copyright (c) 2003-2009 Marc Espie <espie@openbsd.org>
 #
@@ -206,10 +206,6 @@ sub can_install
 		@conflicts = keys %conflicts;
 
 		if (!$state->{allow_replacing}) {
-			if ($state->{defines}->{conflicts}) {
-				$state->say("Forcing install of $pkgname in the presence of conflicts (",join(',', @conflicts), ")");
-				return 1;
-			}
 			$state->say("Can't install $pkgname because of conflicts (",join(',', @conflicts), ")");
 			$handle->set_error(OpenBSD::Handle::CANT_INSTALL);
 			return;
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 9980ba5217b..cc564a647df 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.83 2009/11/09 17:52:19 espie Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.84 2009/11/24 10:32:33 espie Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -15,7 +15,7 @@
 .\" Jordan K. Hubbard
 .\"
 .\"
-.Dd $Mdocdate: November 9 2009 $
+.Dd $Mdocdate: November 24 2009 $
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
@@ -235,33 +235,19 @@ These include:
 .Bl -tag -width "updatedependsXX" -compact
 .It Ar allversions
 do not trim older p* variants of packages for updates.
-.It Ar alwaysupdate
-proceed with an update even if
-.Nm
-can't find new packages for all installed packages.
 .It Ar arch
 architecture recorded in package may not match.
-.It Ar conflicts
-force installation of package in the presence of conflicts.
 .It Ar downgrades
 don't filter out package versions older than what's currently installed.
 .It Ar installed
 in update mode, reinstall an existing package with the same signature.
 .It Ar libdepends
 library specifications may not be fulfilled.
-.It Ar noclosure
-do not compute the closure of dependencies to figure out which packages to
-update when using
-.Fl u .
 .It Ar nonroot
 install even if not running as root.
 .It Ar nosig
 do not check digital signatures.
 Still displays a very prominent message if a signature is found.
-.It Ar pkgpath
-with
-.Fl u ,
-do not check the pkgpath matches if only one candidate is found.
 .It Ar repair
 attempt to repair installed packages with missing registration data.
 .It Ar scripts