Sync to latest pkg_install sources from the HEAD for pkg_delete

optimizations and man page fixes.  Also use recent src2nbcompat to reverse
the order that "config.h" and <nbcompat.h> are included in *.[ch] files.

14 files changed, 39 insertions, 39 deletions

diff --git a/pkgtools/pkg_install/files/lib/defs.h b/pkgtools/pkg_install/files/lib/defs.h
index b9740ccaa28..d2a5228d121 100644
--- a/pkgtools/pkg_install/files/lib/defs.h
+++ b/pkgtools/pkg_install/files/lib/defs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.2 2003/09/01 16:27:14 jlam Exp $ */
+/* $NetBSD: defs.h,v 1.3 2003/09/02 08:28:31 jlam Exp $ */
 
 /*
  * Copyright (c) 1999-2000 Alistair G. Crooks.  All rights reserved.
@@ -33,10 +33,10 @@
 #ifndef DEFS_H_
 #define DEFS_H_
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_ERR_H
 #include <err.h>
 #endif
diff --git a/pkgtools/pkg_install/files/lib/exec.c b/pkgtools/pkg_install/files/lib/exec.c
index 6268e238896..b3ed644d170 100644
--- a/pkgtools/pkg_install/files/lib/exec.c
+++ b/pkgtools/pkg_install/files/lib/exec.c
@@ -1,9 +1,9 @@
-/*	$NetBSD: exec.c,v 1.2 2003/09/01 16:27:14 jlam Exp $	*/
+/*	$NetBSD: exec.c,v 1.3 2003/09/02 08:28:32 jlam Exp $	*/
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: exec.c,v 1.6 1997/10/08 07:47:50 charnier Exp";
 #else
-__RCSID("$NetBSD: exec.c,v 1.2 2003/09/01 16:27:14 jlam Exp $");
+__RCSID("$NetBSD: exec.c,v 1.3 2003/09/02 08:28:32 jlam Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/fexec.c b/pkgtools/pkg_install/files/lib/fexec.c
index 9d1ab6f9e00..34d601791c0 100644
--- a/pkgtools/pkg_install/files/lib/fexec.c
+++ b/pkgtools/pkg_install/files/lib/fexec.c
@@ -35,10 +35,10 @@
  */
 
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
@@ -65,7 +65,7 @@
 #include "lib.h"
 
 #ifndef lint
-__RCSID("$NetBSD: fexec.c,v 1.1 2003/09/01 16:27:14 jlam Exp $");
+__RCSID("$NetBSD: fexec.c,v 1.2 2003/09/02 08:28:32 jlam Exp $");
 #endif
 
 static int	vfcexec(const char *, const char *, va_list);
diff --git a/pkgtools/pkg_install/files/lib/file.c b/pkgtools/pkg_install/files/lib/file.c
index 64d4ef1a3e3..cbe57827b43 100644
--- a/pkgtools/pkg_install/files/lib/file.c
+++ b/pkgtools/pkg_install/files/lib/file.c
@@ -1,9 +1,9 @@
-/*	$NetBSD: file.c,v 1.5 2003/09/01 16:27:14 jlam Exp $	*/
+/*	$NetBSD: file.c,v 1.6 2003/09/02 08:28:32 jlam Exp $	*/
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp";
 #else
-__RCSID("$NetBSD: file.c,v 1.5 2003/09/01 16:27:14 jlam Exp $");
+__RCSID("$NetBSD: file.c,v 1.6 2003/09/02 08:28:32 jlam Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/ftpio.c b/pkgtools/pkg_install/files/lib/ftpio.c
index 7f7f742faf7..e7189179589 100644
--- a/pkgtools/pkg_install/files/lib/ftpio.c
+++ b/pkgtools/pkg_install/files/lib/ftpio.c
@@ -1,14 +1,14 @@
-/*	$NetBSD: ftpio.c,v 1.3 2003/09/01 16:27:14 jlam Exp $	*/
+/*	$NetBSD: ftpio.c,v 1.4 2003/09/02 08:28:33 jlam Exp $	*/
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.3 2003/09/01 16:27:14 jlam Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.4 2003/09/02 08:28:33 jlam Exp $");
 #endif
 
 /*
diff --git a/pkgtools/pkg_install/files/lib/global.c b/pkgtools/pkg_install/files/lib/global.c
index 794d493b938..85480caebff 100644
--- a/pkgtools/pkg_install/files/lib/global.c
+++ b/pkgtools/pkg_install/files/lib/global.c
@@ -1,9 +1,9 @@
-/*	$NetBSD: global.c,v 1.2 2003/09/01 16:27:14 jlam Exp $	*/
+/*	$NetBSD: global.c,v 1.3 2003/09/02 08:28:33 jlam Exp $	*/
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: global.c,v 1.6 1997/10/08 07:47:58 charnier Exp";
 #else
-__RCSID("$NetBSD: global.c,v 1.2 2003/09/01 16:27:14 jlam Exp $");
+__RCSID("$NetBSD: global.c,v 1.3 2003/09/02 08:28:33 jlam Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/lib.h b/pkgtools/pkg_install/files/lib/lib.h
index 16d0173066f..cc40a739dfb 100644
--- a/pkgtools/pkg_install/files/lib/lib.h
+++ b/pkgtools/pkg_install/files/lib/lib.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lib.h,v 1.1 2003/09/01 16:27:15 jlam Exp $ */
+/* $NetBSD: lib.h,v 1.2 2003/09/02 08:28:33 jlam Exp $ */
 
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 
@@ -25,10 +25,10 @@
 #ifndef _INST_LIB_LIB_H_
 #define _INST_LIB_LIB_H_
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
diff --git a/pkgtools/pkg_install/files/lib/lpkg.c b/pkgtools/pkg_install/files/lib/lpkg.c
index 7901269acb5..24a86267b03 100644
--- a/pkgtools/pkg_install/files/lib/lpkg.c
+++ b/pkgtools/pkg_install/files/lib/lpkg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpkg.c,v 1.3 2003/09/01 16:27:15 jlam Exp $	*/
+/*	$NetBSD: lpkg.c,v 1.4 2003/09/02 08:28:34 jlam Exp $	*/
 
 /*
  * Copyright (c) 1999 Christian E. Hopps
@@ -29,10 +29,10 @@
  * Package-list auxiliary functions
  */
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_ERR_H
 #include <err.h>
 #endif
diff --git a/pkgtools/pkg_install/files/lib/path.c b/pkgtools/pkg_install/files/lib/path.c
index 143a2df93b5..f4b22929a09 100644
--- a/pkgtools/pkg_install/files/lib/path.c
+++ b/pkgtools/pkg_install/files/lib/path.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: path.c,v 1.3 2003/09/01 16:27:15 jlam Exp $	*/
+/*	$NetBSD: path.c,v 1.4 2003/09/02 08:28:34 jlam Exp $	*/
 
 /*-
  * Copyright (c)2002 YAMAMOTO Takashi,
@@ -26,15 +26,15 @@
  * SUCH DAMAGE.
  */
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: path.c,v 1.3 2003/09/01 16:27:15 jlam Exp $");
+__RCSID("$NetBSD: path.c,v 1.4 2003/09/02 08:28:34 jlam Exp $");
 #endif
 
 #if HAVE_ERR_H
diff --git a/pkgtools/pkg_install/files/lib/pen.c b/pkgtools/pkg_install/files/lib/pen.c
index 64377e716ba..b98afd6d0b0 100644
--- a/pkgtools/pkg_install/files/lib/pen.c
+++ b/pkgtools/pkg_install/files/lib/pen.c
@@ -1,9 +1,9 @@
-/*	$NetBSD: pen.c,v 1.7 2003/09/01 16:27:15 jlam Exp $	*/
+/*	$NetBSD: pen.c,v 1.8 2003/09/02 08:28:34 jlam Exp $	*/
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: pen.c,v 1.25 1997/10/08 07:48:12 charnier Exp";
 #else
-__RCSID("$NetBSD: pen.c,v 1.7 2003/09/01 16:27:15 jlam Exp $");
+__RCSID("$NetBSD: pen.c,v 1.8 2003/09/02 08:28:34 jlam Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/pkgdb.c b/pkgtools/pkg_install/files/lib/pkgdb.c
index 07658a4b85b..41f0a44a0ff 100644
--- a/pkgtools/pkg_install/files/lib/pkgdb.c
+++ b/pkgtools/pkg_install/files/lib/pkgdb.c
@@ -1,14 +1,14 @@
-/*	$NetBSD: pkgdb.c,v 1.12 2003/09/02 01:37:05 jlam Exp $	*/
+/*	$NetBSD: pkgdb.c,v 1.13 2003/09/02 08:28:35 jlam Exp $	*/
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: pkgdb.c,v 1.12 2003/09/02 01:37:05 jlam Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.13 2003/09/02 08:28:35 jlam Exp $");
 #endif
 
 /*
@@ -253,7 +253,7 @@ pkgdb_remove_pkg(const char *pkg)
 	return ret;
 }
 
-#else /* if !HAVE_DBOPEN */
+#else /* !HAVE_DBOPEN */
 
 int	pkgdb_open(int mode) { return -1; }
 void	pkgdb_close(void) {}
diff --git a/pkgtools/pkg_install/files/lib/plist.c b/pkgtools/pkg_install/files/lib/plist.c
index 6c71b187f9a..80ca9594632 100644
--- a/pkgtools/pkg_install/files/lib/plist.c
+++ b/pkgtools/pkg_install/files/lib/plist.c
@@ -1,9 +1,9 @@
-/*	$NetBSD: plist.c,v 1.4 2003/09/01 16:27:15 jlam Exp $	*/
+/*	$NetBSD: plist.c,v 1.5 2003/09/02 08:28:35 jlam Exp $	*/
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: plist.c,v 1.24 1997/10/08 07:48:15 charnier Exp";
 #else
-__RCSID("$NetBSD: plist.c,v 1.4 2003/09/01 16:27:15 jlam Exp $");
+__RCSID("$NetBSD: plist.c,v 1.5 2003/09/02 08:28:35 jlam Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/str.c b/pkgtools/pkg_install/files/lib/str.c
index a9cf0c19867..53a2ede3f94 100644
--- a/pkgtools/pkg_install/files/lib/str.c
+++ b/pkgtools/pkg_install/files/lib/str.c
@@ -1,9 +1,9 @@
-/*	$NetBSD: str.c,v 1.3 2003/09/01 16:27:15 jlam Exp $	*/
+/*	$NetBSD: str.c,v 1.4 2003/09/02 08:28:36 jlam Exp $	*/
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "Id: str.c,v 1.5 1997/10/08 07:48:21 charnier Exp";
 #else
-__RCSID("$NetBSD: str.c,v 1.3 2003/09/01 16:27:15 jlam Exp $");
+__RCSID("$NetBSD: str.c,v 1.4 2003/09/02 08:28:36 jlam Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/version.c b/pkgtools/pkg_install/files/lib/version.c
index 821102f1a34..69ffd031245 100644
--- a/pkgtools/pkg_install/files/lib/version.c
+++ b/pkgtools/pkg_install/files/lib/version.c
@@ -1,14 +1,14 @@
-/*	$NetBSD: version.c,v 1.2 2003/09/01 16:27:16 jlam Exp $	*/
+/*	$NetBSD: version.c,v 1.3 2003/09/02 08:28:36 jlam Exp $	*/
 
-#include <nbcompat.h>
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: version.c,v 1.2 2003/09/01 16:27:16 jlam Exp $");
+__RCSID("$NetBSD: version.c,v 1.3 2003/09/02 08:28:36 jlam Exp $");
 #endif
 
 /*