Sync with basesrc.

2 files changed, 16 insertions, 16 deletions

diff --git a/pkgtools/pkg_install/files/delete/main.c b/pkgtools/pkg_install/files/delete/main.c
index 92689cdaf7c..0fe3b571210 100644
--- a/pkgtools/pkg_install/files/delete/main.c
+++ b/pkgtools/pkg_install/files/delete/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.14 2004/11/02 00:10:15 erh Exp $	*/
+/*	$NetBSD: main.c,v 1.15 2004/11/03 14:03:53 wiz Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.11 1997/10/08 07:46:48 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.14 2004/11/02 00:10:15 erh Exp $");
+__RCSID("$NetBSD: main.c,v 1.15 2004/11/03 14:03:53 wiz Exp $");
 #endif
 #endif
 
@@ -42,7 +42,7 @@ __RCSID("$NetBSD: main.c,v 1.14 2004/11/02 00:10:15 erh Exp $");
 #include "lib.h"
 #include "delete.h"
 
-static char Options[] = "DFK:NORVdfhnp:rv";
+static char Options[] = "DdFfhK:NnOp:RrVv";
 
 char   *Prefix = NULL;
 char   *ProgramPath = NULL;
@@ -58,7 +58,7 @@ lpkg_head_t pkgs;
 static void
 usage(void)
 {
-	fprintf(stderr, "usage: pkg_delete [-vVDdnFfOrR] [-p prefix] pkg-name ...\n");
+	fprintf(stderr, "usage: pkg_delete [-DdFfNnORrVv] [-K pkg_dbdir] [-p prefix] pkg-name ...\n");
 	exit(1);
 }
 
@@ -95,16 +95,16 @@ main(int argc, char **argv)
 			_pkgdb_setPKGDB_DIR(optarg);
 			break;
 
-		case 'n':
-			Fake = TRUE;
-			Verbose = TRUE;
-			break;
-
 		case 'N':
 			NoDeleteFiles = TRUE;
 			NoDeInstall = TRUE;
 			break;
 
+		case 'n':
+			Fake = TRUE;
+			Verbose = TRUE;
+			break;
+
 		case 'O':
 			OnlyDeleteFromPkgDB = TRUE;
 			break;
diff --git a/pkgtools/pkg_install/files/delete/pkg_delete.1 b/pkgtools/pkg_install/files/delete/pkg_delete.1
index 2919439c5c2..84556c9ee09 100644
--- a/pkgtools/pkg_install/files/delete/pkg_delete.1
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_delete.1,v 1.7 2004/11/02 00:10:15 erh Exp $
+.\" $NetBSD: pkg_delete.1,v 1.8 2004/11/03 14:03:53 wiz Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -17,7 +17,7 @@
 .\"
 .\"     from FreeBSD: @(#)pkg_delete.1
 .\"
-.Dd September 2, 2003
+.Dd November 2, 2004
 .Dt PKG_DELETE 1
 .Os
 .Sh NAME
@@ -25,7 +25,7 @@
 .Nd a utility for deleting previously installed software package distributions
 .Sh SYNOPSIS
 .Nm
-.Op Fl DdFfnORrVv
+.Op Fl DdFfNnORrVv
 .Bk -words
 .Op Fl K Ar pkg_dbdir
 .Ek
@@ -111,13 +111,13 @@ taken from the value of the environment variable
 .Ev PKG_DBDIR
 if it's set, otherwise it defaults to
 .Pa /var/db/pkg .
+.It Fl N
+Remove the package's registration and its entries from the package database,
+but leave the files installed.
+Don't run any deinstall scripts or @unexec lines either.
 .It Fl n
 Don't actually deinstall a package, just report the steps that
 would be taken if it were.
-.It Fl N
-Remove the package's registration and its entries from the package database,
-but leave the files installed.  Don't run any deinstall scripts or @unexec lines
-either.
 .It Fl O
 Only delete the package's entries from the package database, do not
 touch the package or its files itself.