[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/delete Sync with basesrc.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3fb1cf36dbd1
branches:  trunk
changeset: 482810:3fb1cf36dbd1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Nov 03 14:03:53 2004 +0000

description:
Sync with basesrc.

diffstat:

 pkgtools/pkg_install/files/delete/main.c       |  18 +++++++++---------
 pkgtools/pkg_install/files/delete/pkg_delete.1 |  14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diffs (103 lines):

diff -r 09d1f7a7e1f5 -r 3fb1cf36dbd1 pkgtools/pkg_install/files/delete/main.c
--- a/pkgtools/pkg_install/files/delete/main.c  Wed Nov 03 13:44:24 2004 +0000
+++ b/pkgtools/pkg_install/files/delete/main.c  Wed Nov 03 14:03:53 2004 +0000
@@ -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 @@
 #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 @@
 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 @@
                        _pkgdb_setPKGDB_DIR(optarg);
                        break;
 
+               case 'N':
+                       NoDeleteFiles = TRUE;
+                       NoDeInstall = TRUE;
+                       break;
+
                case 'n':
                        Fake = TRUE;
                        Verbose = TRUE;
                        break;
 
-               case 'N':
-                       NoDeleteFiles = TRUE;
-                       NoDeInstall = TRUE;
-                       break;
-
                case 'O':
                        OnlyDeleteFromPkgDB = TRUE;
                        break;
diff -r 09d1f7a7e1f5 -r 3fb1cf36dbd1 pkgtools/pkg_install/files/delete/pkg_delete.1
--- a/pkgtools/pkg_install/files/delete/pkg_delete.1    Wed Nov 03 13:44:24 2004 +0000
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.1    Wed Nov 03 14:03:53 2004 +0000
@@ -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 @@
 .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.