sync with NetBSD-current's pkg_install-20030923.

47 files changed, 179 insertions, 148 deletions

diff --git a/pkgtools/pkg_install/files/README b/pkgtools/pkg_install/files/README
index c8f73bdb58e..a25c06f1d74 100644
--- a/pkgtools/pkg_install/files/README
+++ b/pkgtools/pkg_install/files/README
@@ -1,4 +1,4 @@
-# $NetBSD: README,v 1.2 2003/09/01 16:27:09 jlam Exp $
+# $NetBSD: README,v 1.3 2003/09/23 07:13:45 grant Exp $
 # Original from FreeBSD, no rcs id.
 
 This is the pkg_install suite of tools for doing maintainance of
@@ -12,7 +12,7 @@ of dozen features on top.  Whee! :-)
 
 In another round of enhancements, NetBSD changes were added by
 Alistair Crooks, Hubert Feyrer, Thorsten Frueauf, Christian E. Hopps,
-and Johnny Lam.
+Johnny Lam and Matthias Scheler.
 
 When making snapshots, please modify PKGTOOLS_VERSION in lib/version.h
 to that day's date.
diff --git a/pkgtools/pkg_install/files/add/add.h b/pkgtools/pkg_install/files/add/add.h
index 24826f8cd1c..9f468cd4660 100644
--- a/pkgtools/pkg_install/files/add/add.h
+++ b/pkgtools/pkg_install/files/add/add.h
@@ -1,4 +1,4 @@
-/* $NetBSD: add.h,v 1.2 2003/09/01 16:27:11 jlam Exp $ */
+/* $NetBSD: add.h,v 1.3 2003/09/23 07:13:46 grant Exp $ */
 
 /* from FreeBSD Id: add.h,v 1.8 1997/02/22 16:09:15 peter Exp  */
 
diff --git a/pkgtools/pkg_install/files/add/futil.c b/pkgtools/pkg_install/files/add/futil.c
index a69bf6760a3..f0560a36061 100644
--- a/pkgtools/pkg_install/files/add/futil.c
+++ b/pkgtools/pkg_install/files/add/futil.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: futil.c,v 1.3 2003/09/02 08:28:23 jlam Exp $	*/
+/*	$NetBSD: futil.c,v 1.4 2003/09/23 07:13:46 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: futil.c,v 1.7 1997/10/08 07:45:39 charnier Exp";
 #else
-__RCSID("$NetBSD: futil.c,v 1.3 2003/09/02 08:28:23 jlam Exp $");
+__RCSID("$NetBSD: futil.c,v 1.4 2003/09/23 07:13:46 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/add/main.c b/pkgtools/pkg_install/files/add/main.c
index e6a19c06717..ee20a31a428 100644
--- a/pkgtools/pkg_install/files/add/main.c
+++ b/pkgtools/pkg_install/files/add/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.4 2003/09/02 08:28:23 jlam Exp $	*/
+/*	$NetBSD: main.c,v 1.5 2003/09/23 07:13:46 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.16 1997/10/08 07:45:43 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.4 2003/09/02 08:28:23 jlam Exp $");
+__RCSID("$NetBSD: main.c,v 1.5 2003/09/23 07:13:46 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c
index c20209aaf96..7b210b75b93 100644
--- a/pkgtools/pkg_install/files/add/perform.c
+++ b/pkgtools/pkg_install/files/add/perform.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: perform.c,v 1.10 2003/09/09 13:34:17 jlam Exp $	*/
+/*	$NetBSD: perform.c,v 1.11 2003/09/23 07:13:46 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.10 2003/09/09 13:34:17 jlam Exp $");
+__RCSID("$NetBSD: perform.c,v 1.11 2003/09/23 07:13:46 grant Exp $");
 #endif
 #endif
 
@@ -654,7 +654,7 @@ ignore_replace_depends_check:
 		if (Verbose)
 			printf("mtree -U -f %s -d -e -p %s\n", MTREE_FNAME, p ? p->name : "/");
 		if (!Fake) {
-			if (vsystem("%s/mtree -U -f %s -d -e -p %s", BINDIR, MTREE_FNAME, p ? p->name : "/"))
+			if (vsystem("%s -U -f %s -d -e -p %s", MTREE_CMD, MTREE_FNAME, p ? p->name : "/"))
 				warnx("mtree returned a non-zero status - continuing");
 		}
 		unlink(MTREE_FNAME); /* remove this line to tar up pkg later  - HF */
diff --git a/pkgtools/pkg_install/files/add/pkg_add.1 b/pkgtools/pkg_install/files/add/pkg_add.1
index 045ca273307..6c816a8a283 100644
--- a/pkgtools/pkg_install/files/add/pkg_add.1
+++ b/pkgtools/pkg_install/files/add/pkg_add.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.4 2003/09/09 13:34:18 jlam Exp $
+.\" $NetBSD: pkg_add.1,v 1.5 2003/09/23 07:13:47 grant Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
diff --git a/pkgtools/pkg_install/files/add/pkg_add.cat1 b/pkgtools/pkg_install/files/add/pkg_add.cat1
index 395b30beab6..e0e4b3f5009 100644
--- a/pkgtools/pkg_install/files/add/pkg_add.cat1
+++ b/pkgtools/pkg_install/files/add/pkg_add.cat1
@@ -1,4 +1,4 @@
-PKG_ADD(1)                  NetBSD Reference Manual                 PKG_ADD(1)
+PKG_ADD(1)              NetBSD General Commands Manual              PKG_ADD(1)
 
 NNAAMMEE
      ppkkgg__aadddd - a utility for installing and upgrading software package distri-
@@ -149,11 +149,11 @@ OOPPTTIIOONNSS
      extract files directly from their anonymous ftp or WWW locations (e.g.
      ppkkgg__aadddd ftp://ftp.NetBSD.org/pub/NetBSD/pack-
      ages/1.5/i386/shells/bash-2.04.tgz).  Note:  If you wish to use _p_a_s_s_i_v_e
-     _m_o_d_e  ftp in such transfers, set the variable _F_T_P___P_A_S_S_I_V_E___M_O_D_E  to some
+     _m_o_d_e ftp in such transfers, set the variable _F_T_P___P_A_S_S_I_V_E___M_O_D_E to some
      value in your environment.  Otherwise, the more standard ACTIVE mode may
      be used.  If ppkkgg__aadddd consistently fails to fetch a package from a site
      known to work, it may be because you have a firewall that demands the us-
-     age of _p_a_s_s_i_v_e _m_o_d_e  ftp.
+     age of _p_a_s_s_i_v_e _m_o_d_e ftp.
 
 TTEECCHHNNIICCAALL DDEETTAAIILLSS
      ppkkgg__aadddd extracts each package's "packing list" into a special staging di-
@@ -334,4 +334,4 @@ BBUUGGSS
 
      Sure to be others.
 
-NetBSD 1.6.1_STABLE            September 8, 2003                             6
+NetBSD 1.6                     September 8, 2003                    NetBSD 1.6
diff --git a/pkgtools/pkg_install/files/add/verify.c b/pkgtools/pkg_install/files/add/verify.c
index 174ee6fde0d..bf28ebb352e 100644
--- a/pkgtools/pkg_install/files/add/verify.c
+++ b/pkgtools/pkg_install/files/add/verify.c
@@ -1,4 +1,4 @@
-/* $NetBSD: verify.c,v 1.3 2003/09/02 08:28:24 jlam Exp $ */
+/* $NetBSD: verify.c,v 1.4 2003/09/23 07:13:47 grant Exp $ */
 
 /*
  * Copyright (c) 2001 Alistair G. Crooks.  All rights reserved.
@@ -41,7 +41,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1999 \
 	        The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: verify.c,v 1.3 2003/09/02 08:28:24 jlam Exp $");
+__RCSID("$NetBSD: verify.c,v 1.4 2003/09/23 07:13:47 grant Exp $");
 #endif
 
 #if HAVE_SYS_TYPES_H
diff --git a/pkgtools/pkg_install/files/add/verify.h b/pkgtools/pkg_install/files/add/verify.h
index c3143b3788f..52a4c07d81d 100644
--- a/pkgtools/pkg_install/files/add/verify.h
+++ b/pkgtools/pkg_install/files/add/verify.h
@@ -1,4 +1,4 @@
-/* $NetBSD: verify.h,v 1.2 2003/09/01 16:27:11 jlam Exp $ */
+/* $NetBSD: verify.h,v 1.3 2003/09/23 07:13:47 grant Exp $ */
 
 /*
  * Copyright (c) 2001 Alistair G. Crooks.  All rights reserved.
diff --git a/pkgtools/pkg_install/files/admin/main.c b/pkgtools/pkg_install/files/admin/main.c
index 90afb224378..54a42518461 100644
--- a/pkgtools/pkg_install/files/admin/main.c
+++ b/pkgtools/pkg_install/files/admin/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.12 2003/09/13 05:50:26 jlam Exp $	*/
+/*	$NetBSD: main.c,v 1.13 2003/09/23 07:13:48 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.12 2003/09/13 05:50:26 jlam Exp $");
+__RCSID("$NetBSD: main.c,v 1.13 2003/09/23 07:13:48 grant Exp $");
 #endif
 
 /*
@@ -73,15 +73,35 @@ __RCSID("$NetBSD: main.c,v 1.12 2003/09/13 05:50:26 jlam Exp $");
 
 #define DEFAULT_SFX	".t[bg]z"	/* default suffix for ls{all,best} */
 
-static const char Options[] = "bd:K:s:V";
-
-void    usage(void);
+static const char Options[] = "K:SVbd:s:";
 
 int     filecnt;
 int     pkgcnt;
 
 static int checkpattern_fn(const char *, void *);
 
+/* print usage message and exit */
+static void 
+usage(const char *prog)
+{
+	(void) fprintf(stderr, "usage: %s [-b] [-d lsdir] [-V] [-s sfx] command args ...\n"
+	    "Where 'commands' and 'args' are:\n"
+	    " rebuild                     - rebuild pkgdb from +CONTENTS files\n"
+	    " check [pkg ...]             - check md5 checksum of installed files\n"
+	    " add pkg ...                 - add pkg files to database\n"
+	    " delete pkg ...              - delete file entries for pkg in database\n"
+#ifdef PKGDB_DEBUG
+	    " addkey key value            - add key and value\n"
+	    " delkey key                  - delete reference to key\n"
+#endif
+	    " lsall /path/to/pkgpattern   - list all pkgs matching the pattern\n"
+	    " lsbest /path/to/pkgpattern  - list pkgs matching the pattern best\n"
+	    " dump                        - dump database\n"
+	    " pmatch pattern pkg          - returns true if pkg matches pattern, otherwise false\n",
+	    prog);
+	exit(EXIT_FAILURE);
+}
+
 /*
  * Assumes CWD is in /var/db/pkg/<pkg>!
  */
@@ -190,7 +210,7 @@ add1pkg(const char *pkgdir)
 	char	       *PkgDBDir, *PkgName, *dirp;
 	char 		file[FILENAME_MAX];
 	char		dir[FILENAME_MAX];
-	int		cnt;
+	int		cnt = 0;
 
 	if (!pkgdb_open(ReadWrite))
 		err(EXIT_FAILURE, "cannot open pkgdb");
@@ -401,20 +421,34 @@ lsbasepattern_fn(const char *pkg, void *vp)
 int 
 main(int argc, char *argv[])
 {
-	int	ch;
-	char	lsdir[FILENAME_MAX];
-	char   *lsdirp = NULL;
-	char	sfx[FILENAME_MAX];
-	Boolean	use_default_sfx = TRUE;
-	Boolean show_basename_only = FALSE;
+	const char	*prog;
+	Boolean		 use_default_sfx = TRUE;
+	Boolean 	 show_basename_only = FALSE;
+	char		 lsdir[FILENAME_MAX];
+	char		 sfx[FILENAME_MAX];
+	char		*lsdirp = NULL;
+	int		 ch;
 
-	setprogname(argv[0]);
+	setprogname(prog = argv[0]);
 
 	if (argc < 2)
-		usage();
+		usage(prog);
 
 	while ((ch = getopt(argc, argv, Options)) != -1)
 		switch (ch) {
+		case 'K':
+			_pkgdb_setPKGDB_DIR(optarg);
+			break;
+
+		case 'S':
+			sfx[0] = 0x0;
+			use_default_sfx = FALSE;
+			break;
+
+		case 'V':
+			show_version();
+			/* NOTREACHED */
+
 		case 'b':
 			show_basename_only = TRUE;
 			break;
@@ -424,26 +458,23 @@ main(int argc, char *argv[])
 			lsdirp = lsdir;
 			break;
 
-		case 'K':
-			_pkgdb_setPKGDB_DIR(optarg);
-			break;
-
 		case 's':
 			(void) strlcpy(sfx, optarg, sizeof(sfx));
 			use_default_sfx = FALSE;
 			break;
 
-		case 'V':
-			show_version();
-			/* NOTREACHED */
-
 		default:
-			usage();
+			usage(prog);
 			/* NOTREACHED */
 		}
+
 	argc -= optind;
 	argv += optind;
 
+	if (argc <= 0) {
+		usage(prog);
+	}
+
 	if (use_default_sfx)
 		(void) snprintf(sfx, sizeof(sfx), "%s", DEFAULT_SFX);
 
@@ -457,7 +488,7 @@ main(int argc, char *argv[])
 		pkg = argv[1];
 
 		if (pattern == NULL || pkg == NULL) {
-			usage();
+			usage(prog);
 		}
 
 		if (pmatch(pattern, pkg)){
@@ -672,34 +703,13 @@ main(int argc, char *argv[])
 	}
 #endif
 	else {
-		usage();
+		usage(prog);
 	}
 
 	return 0;
 }
 
-void 
-usage(void)
-{
-	printf("usage: pkg_admin [-b] [-d lsdir] [-V] [-s sfx] command args ...\n"
-	    "Where 'commands' and 'args' are:\n"
-	    " rebuild                     - rebuild pkgdb from +CONTENTS files\n"
-	    " check [pkg ...]             - check md5 checksum of installed files\n"
-	    " add pkg ...                 - add pkg files to database\n"
-	    " delete pkg ...              - delete file entries for pkg in database\n"
-#ifdef PKGDB_DEBUG
-	    " addkey key value            - add key and value\n"
-	    " delkey key                  - delete reference to key\n"
-#endif
-	    " lsall /path/to/pkgpattern   - list all pkgs matching the pattern\n"
-	    " lsbest /path/to/pkgpattern  - list pkgs matching the pattern best\n"
-	    " dump                        - dump database\n"
-	    " pmatch pattern pkg          - returns true if pkg matches pattern, otherwise false\n");
-	exit(EXIT_FAILURE);
-}
-
 void
 cleanup(int signo)
 {
-	;
 }
diff --git a/pkgtools/pkg_install/files/admin/pkg_admin.1 b/pkgtools/pkg_install/files/admin/pkg_admin.1
index 344ceb08900..d24316ab09a 100644
--- a/pkgtools/pkg_install/files/admin/pkg_admin.1
+++ b/pkgtools/pkg_install/files/admin/pkg_admin.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkg_admin.1,v 1.4 2003/09/13 05:50:26 jlam Exp $
+.\"	$NetBSD: pkg_admin.1,v 1.5 2003/09/23 07:13:48 grant Exp $
 .\"
 .\" Copyright (c) 1999-2002 Hubert Feyrer.  All rights reserved.
 .\"
@@ -72,6 +72,14 @@ 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 S
+Set the shell glob pattern for package suffices when matching package
+names for
+.Cm lsall
+and
+.Cm lsbest
+to be the null suffix.
+The default pattern is ".t[bg]z".
 .It Fl s Ar sfx_pattern
 Set the shell glob pattern for package suffices when matching package
 names for
diff --git a/pkgtools/pkg_install/files/admin/pkg_admin.cat1 b/pkgtools/pkg_install/files/admin/pkg_admin.cat1
index 756caab87a3..38692b21fb4 100644
--- a/pkgtools/pkg_install/files/admin/pkg_admin.cat1
+++ b/pkgtools/pkg_install/files/admin/pkg_admin.cat1
@@ -1,4 +1,4 @@
-PKG_ADMIN(1)                NetBSD Reference Manual               PKG_ADMIN(1)
+PKG_ADMIN(1)            NetBSD General Commands Manual            PKG_ADMIN(1)
 
 NNAAMMEE
      ppkkgg__aaddmmiinn - perform various administrative tasks to the pkg system
@@ -26,6 +26,10 @@ OOPPTTIIOONNSS
              from the value of the environment variable PKG_DBDIR if it's set,
              otherwise it defaults to _/_v_a_r_/_d_b_/_p_k_g.
 
+     --SS      Set the shell glob pattern for package suffices when matching
+             package names for llssaallll and llssbbeesstt to be the null suffix.  The
+             default pattern is ".t[bg]z".
+
      --ss _s_f_x___p_a_t_t_e_r_n
              Set the shell glob pattern for package suffices when matching
              package names for llssaallll and llssbbeesstt.  The default pattern is
@@ -129,4 +133,4 @@ HHIISSTTOORRYY
 AAUUTTHHOORRSS
      The ppkkgg__aaddmmiinn command was written by Hubert Feyrer.
 
-NetBSD 1.6.1_STABLE            September 8, 2003                             2
+NetBSD 1.6                     September 8, 2003                    NetBSD 1.6
diff --git a/pkgtools/pkg_install/files/create/create.h b/pkgtools/pkg_install/files/create/create.h
index a2cc37395aa..ae0ab0e0929 100644
--- a/pkgtools/pkg_install/files/create/create.h
+++ b/pkgtools/pkg_install/files/create/create.h
@@ -1,4 +1,4 @@
-/* $NetBSD: create.h,v 1.3 2003/09/01 16:27:12 jlam Exp $ */
+/* $NetBSD: create.h,v 1.4 2003/09/23 07:13:49 grant Exp $ */
 
 /* from FreeBSD Id: create.h,v 1.13 1997/10/08 07:46:19 charnier Exp */
 
diff --git a/pkgtools/pkg_install/files/create/main.c b/pkgtools/pkg_install/files/create/main.c
index a8dcd47b7b2..2de05f51822 100644
--- a/pkgtools/pkg_install/files/create/main.c
+++ b/pkgtools/pkg_install/files/create/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.4 2003/09/02 08:28:26 jlam Exp $	*/
+/*	$NetBSD: main.c,v 1.5 2003/09/23 07:13:49 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: main.c,v 1.17 1997/10/08 07:46:23 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.4 2003/09/02 08:28:26 jlam Exp $");
+__RCSID("$NetBSD: main.c,v 1.5 2003/09/23 07:13:49 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/create/perform.c b/pkgtools/pkg_install/files/create/perform.c
index d83b6fe0935..1a04af13a80 100644
--- a/pkgtools/pkg_install/files/create/perform.c
+++ b/pkgtools/pkg_install/files/create/perform.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: perform.c,v 1.5 2003/09/02 08:28:26 jlam Exp $	*/
+/*	$NetBSD: perform.c,v 1.6 2003/09/23 07:13:49 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.38 1997/10/13 15:03:51 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.5 2003/09/02 08:28:26 jlam Exp $");
+__RCSID("$NetBSD: perform.c,v 1.6 2003/09/23 07:13:49 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/create/pkg_create.1 b/pkgtools/pkg_install/files/create/pkg_create.1
index eb527bfdea6..6111f35c6d4 100644
--- a/pkgtools/pkg_install/files/create/pkg_create.1
+++ b/pkgtools/pkg_install/files/create/pkg_create.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_create.1,v 1.5 2003/09/09 13:34:18 jlam Exp $
+.\" $NetBSD: pkg_create.1,v 1.6 2003/09/23 07:13:49 grant Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
diff --git a/pkgtools/pkg_install/files/create/pkg_create.cat1 b/pkgtools/pkg_install/files/create/pkg_create.cat1
index 3610916dd25..68ebca65391 100644
--- a/pkgtools/pkg_install/files/create/pkg_create.cat1
+++ b/pkgtools/pkg_install/files/create/pkg_create.cat1
@@ -1,4 +1,4 @@
-PKG_CREATE(1)               NetBSD Reference Manual              PKG_CREATE(1)
+PKG_CREATE(1)           NetBSD General Commands Manual           PKG_CREATE(1)
 
 NNAAMMEE
      ppkkgg__ccrreeaattee - a utility for creating software package distributions
@@ -9,8 +9,8 @@ SSYYNNOOPPSSIISS
                 [--KK _p_k_g___d_b_d_i_r] [--kk _d_s_c_r_i_p_t] [--LL _S_r_c_D_i_r] [--mm _m_t_r_e_e_f_i_l_e]
                 [--nn _p_r_e_s_e_r_v_e_-_f_i_l_e] [--PP _d_p_k_g_s] [--pp _p_r_e_f_i_x] [--rr _r_s_c_r_i_p_t]
                 [--SS _s_i_z_e_-_a_l_l_-_f_i_l_e] [--ss _s_i_z_e_-_p_k_g_-_f_i_l_e] [--tt _t_e_m_p_l_a_t_e]
-                [--XX _e_x_c_l_u_d_e_f_i_l_e] --cc _c_o_m_m_e_n_t --dd _d_e_s_c_r_i_p_t_i_o_n --ff _p_a_c_k_l_i_s_t _p_k_g_-
-                _n_a_m_e
+                [--XX _e_x_c_l_u_d_e_f_i_l_e] --cc _c_o_m_m_e_n_t --dd _d_e_s_c_r_i_p_t_i_o_n --ff _p_a_c_k_l_i_s_t
+                _p_k_g_-_n_a_m_e
 
 DDEESSCCRRIIPPTTIIOONN
      The ppkkgg__ccrreeaattee command is used to create packages that will subsequently
@@ -310,4 +310,4 @@ BBUUGGSS
      cations due to exec argument-space limitations (this depends on the value
      returned by ssyyssccoonnff(___S_C___A_R_G___M_A_X)).
 
-NetBSD 1.6.1_STABLE            September 2, 2003                             5
+NetBSD 1.6                     September 2, 2003                    NetBSD 1.6
diff --git a/pkgtools/pkg_install/files/create/pl.c b/pkgtools/pkg_install/files/create/pl.c
index 9db350e0407..85ca376d8d3 100644
--- a/pkgtools/pkg_install/files/create/pl.c
+++ b/pkgtools/pkg_install/files/create/pl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pl.c,v 1.4 2003/09/02 08:28:26 jlam Exp $	*/
+/*	$NetBSD: pl.c,v 1.5 2003/09/23 07:13:50 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: pl.c,v 1.11 1997/10/08 07:46:35 charnier Exp";
 #else
-__RCSID("$NetBSD: pl.c,v 1.4 2003/09/02 08:28:26 jlam Exp $");
+__RCSID("$NetBSD: pl.c,v 1.5 2003/09/23 07:13:50 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/delete/delete.h b/pkgtools/pkg_install/files/delete/delete.h
index f8e714c493f..1d27f6782f2 100644
--- a/pkgtools/pkg_install/files/delete/delete.h
+++ b/pkgtools/pkg_install/files/delete/delete.h
@@ -1,4 +1,4 @@
-/* $NetBSD: delete.h,v 1.2 2003/09/01 16:27:13 jlam Exp $ */
+/* $NetBSD: delete.h,v 1.3 2003/09/23 07:13:50 grant Exp $ */
 
 /* from FreeBSD Id: delete.h,v 1.4 1997/02/22 16:09:35 peter Exp */
 
diff --git a/pkgtools/pkg_install/files/delete/main.c b/pkgtools/pkg_install/files/delete/main.c
index fd1005a63b6..e5d48078244 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.8 2003/09/02 08:28:27 jlam Exp $	*/
+/*	$NetBSD: main.c,v 1.9 2003/09/23 07:13:50 grant 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.8 2003/09/02 08:28:27 jlam Exp $");
+__RCSID("$NetBSD: main.c,v 1.9 2003/09/23 07:13:50 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/delete/perform.c b/pkgtools/pkg_install/files/delete/perform.c
index aa1b1c1cca3..51e44e93132 100644
--- a/pkgtools/pkg_install/files/delete/perform.c
+++ b/pkgtools/pkg_install/files/delete/perform.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: perform.c,v 1.7 2003/09/14 04:58:32 jlam Exp $	*/
+/*	$NetBSD: perform.c,v 1.8 2003/09/23 07:13:50 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.7 2003/09/14 04:58:32 jlam Exp $");
+__RCSID("$NetBSD: perform.c,v 1.8 2003/09/23 07:13:50 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/delete/pkg_delete.1 b/pkgtools/pkg_install/files/delete/pkg_delete.1
index 80c938a1d5b..6739c780849 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.4 2003/09/09 13:34:20 jlam Exp $
+.\" $NetBSD: pkg_delete.1,v 1.5 2003/09/23 07:13:50 grant Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
diff --git a/pkgtools/pkg_install/files/delete/pkg_delete.cat1 b/pkgtools/pkg_install/files/delete/pkg_delete.cat1
index 63e96352a77..0c507bd3af8 100644
--- a/pkgtools/pkg_install/files/delete/pkg_delete.cat1
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.cat1
@@ -1,4 +1,4 @@
-PKG_DELETE(1)               NetBSD Reference Manual              PKG_DELETE(1)
+PKG_DELETE(1)           NetBSD General Commands Manual           PKG_DELETE(1)
 
 NNAAMMEE
      ppkkgg__ddeelleettee - a utility for deleting previously installed software package
@@ -18,11 +18,12 @@ WWAARRNNIINNGG
 
      _Y_o_u _a_r_e _a_d_v_i_s_e_d _t_o _v_e_r_i_f_y _t_h_e _c_o_m_p_e_t_e_n_c_e _a_n_d _i_d_e_n_t_i_t_y _o_f _t_h_o_s_e _w_h_o _p_r_o_-
      _v_i_d_e _i_n_s_t_a_l_l_a_b_l_e _p_a_c_k_a_g_e _f_i_l_e_s_.  _F_o_r _e_x_t_r_a _p_r_o_t_e_c_t_i_o_n_, _e_x_a_m_i_n_e _a_l_l _t_h_e
-     _p_a_c_k_a_g_e _c_o_n_t_r_o_l _f_i_l_e_s _i_n _t_h_e _p_a_c_k_a_g_e _r_e_c_o_r_d _d_i_r_e_c_t_o_r_y _(_/_v_a_r_/_d_b_/_p_k_g_/_<_p_k_g_-
-     _n_a_m_e_>_/_)_.  _P_a_y _p_a_r_t_i_c_u_l_a_r _a_t_t_e_n_t_i_o_n _t_o _a_n_y _+_I_N_S_T_A_L_L_, _+_D_E_I_N_S_T_A_L_L_, _+_R_E_Q_U_I_R_E
-     _o_r _+_M_T_R_E_E___D_I_R_S _f_i_l_e_s_, _a_n_d _i_n_s_p_e_c_t _t_h_e _+_C_O_N_T_E_N_T_S _f_i_l_e _f_o_r @@ccwwdd_, @@mmooddee
-     _(_c_h_e_c_k _f_o_r _s_e_t_u_i_d_)_, @@ddiirrrrmm_, @@eexxeecc_, _a_n_d @@uunneexxeecc _d_i_r_e_c_t_i_v_e_s_, _a_n_d_/_o_r _u_s_e _t_h_e
-     pkg_info(_1) _c_o_m_m_a_n_d _t_o _e_x_a_m_i_n_e _t_h_e _i_n_s_t_a_l_l_e_d _p_a_c_k_a_g_e _c_o_n_t_r_o_l _f_i_l_e_s_.
+     _p_a_c_k_a_g_e _c_o_n_t_r_o_l _f_i_l_e_s _i_n _t_h_e _p_a_c_k_a_g_e _r_e_c_o_r_d _d_i_r_e_c_t_o_r_y
+     _(_/_v_a_r_/_d_b_/_p_k_g_/_<_p_k_g_-_n_a_m_e_>_/_)_.  _P_a_y _p_a_r_t_i_c_u_l_a_r _a_t_t_e_n_t_i_o_n _t_o _a_n_y _+_I_N_S_T_A_L_L_,
+     _+_D_E_I_N_S_T_A_L_L_, _+_R_E_Q_U_I_R_E _o_r _+_M_T_R_E_E___D_I_R_S _f_i_l_e_s_, _a_n_d _i_n_s_p_e_c_t _t_h_e _+_C_O_N_T_E_N_T_S _f_i_l_e
+     _f_o_r @@ccwwdd_, @@mmooddee _(_c_h_e_c_k _f_o_r _s_e_t_u_i_d_)_, @@ddiirrrrmm_, @@eexxeecc_, _a_n_d @@uunneexxeecc _d_i_r_e_c_-
+     _t_i_v_e_s_, _a_n_d_/_o_r _u_s_e _t_h_e pkg_info(_1) _c_o_m_m_a_n_d _t_o _e_x_a_m_i_n_e _t_h_e _i_n_s_t_a_l_l_e_d _p_a_c_k_-
+     _a_g_e _c_o_n_t_r_o_l _f_i_l_e_s_.
 
 OOPPTTIIOONNSS
      The following command line options are supported:
@@ -146,4 +147,4 @@ AAUUTTHHOORRSS
              NetBSD wildcard dependency processing, pkgdb, recursive "down"
              delete, etc.
 
-NetBSD 1.6.1_STABLE            September 2, 2003                             3
+NetBSD 1.6                     September 2, 2003                    NetBSD 1.6
diff --git a/pkgtools/pkg_install/files/info/info.h b/pkgtools/pkg_install/files/info/info.h
index 24e61be2e07..aa04f5f3545 100644
--- a/pkgtools/pkg_install/files/info/info.h
+++ b/pkgtools/pkg_install/files/info/info.h
@@ -1,4 +1,4 @@
-/* $NetBSD: info.h,v 1.2 2003/09/01 16:27:13 jlam Exp $ */
+/* $NetBSD: info.h,v 1.3 2003/09/23 07:13:51 grant Exp $ */
 
 /* from FreeBSD Id: info.h,v 1.10 1997/02/22 16:09:40 peter Exp */
 
diff --git a/pkgtools/pkg_install/files/info/main.c b/pkgtools/pkg_install/files/info/main.c
index 168a7d93520..9efe301467f 100644
--- a/pkgtools/pkg_install/files/info/main.c
+++ b/pkgtools/pkg_install/files/info/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.5 2003/09/02 08:28:28 jlam Exp $	*/
+/*	$NetBSD: main.c,v 1.6 2003/09/23 07:13:51 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.14 1997/10/08 07:47:26 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.5 2003/09/02 08:28:28 jlam Exp $");
+__RCSID("$NetBSD: main.c,v 1.6 2003/09/23 07:13:51 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/info/perform.c b/pkgtools/pkg_install/files/info/perform.c
index c5f6e2e8856..c6f53738d0b 100644
--- a/pkgtools/pkg_install/files/info/perform.c
+++ b/pkgtools/pkg_install/files/info/perform.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: perform.c,v 1.11 2003/09/10 17:31:49 jlam Exp $	*/
+/*	$NetBSD: perform.c,v 1.12 2003/09/23 07:13:51 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.23 1997/10/13 15:03:53 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.11 2003/09/10 17:31:49 jlam Exp $");
+__RCSID("$NetBSD: perform.c,v 1.12 2003/09/23 07:13:51 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/info/pkg_info.1 b/pkgtools/pkg_install/files/info/pkg_info.1
index dd3483fcc1e..781846415f2 100644
--- a/pkgtools/pkg_install/files/info/pkg_info.1
+++ b/pkgtools/pkg_install/files/info/pkg_info.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_info.1,v 1.3 2003/09/09 13:34:21 jlam Exp $
+.\" $NetBSD: pkg_info.1,v 1.4 2003/09/23 07:13:51 grant Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
diff --git a/pkgtools/pkg_install/files/info/pkg_info.cat1 b/pkgtools/pkg_install/files/info/pkg_info.cat1
index 0426a53083f..b21c693ecbd 100644
--- a/pkgtools/pkg_install/files/info/pkg_info.cat1
+++ b/pkgtools/pkg_install/files/info/pkg_info.cat1
@@ -1,4 +1,4 @@
-PKG_INFO(1)                 NetBSD Reference Manual                PKG_INFO(1)
+PKG_INFO(1)             NetBSD General Commands Manual             PKG_INFO(1)
 
 NNAAMMEE
      ppkkgg__iinnffoo - a utility for displaying information on software packages
@@ -127,9 +127,9 @@ EENNVVIIRROONNMMEENNTT
 
      PKG_PATH   This can be used to specify a semicolon-separated list of
                 paths and URLs to search for package files.  If PKG_PATH is
-                used, the suffix _._t_g_z is automatically appended to the _p_k_g_-
-                _n_a_m_e, whereas searching in the current directory uses _p_k_g_-_n_a_m_e
-                literally.
+                used, the suffix _._t_g_z is automatically appended to the
+                _p_k_g_-_n_a_m_e, whereas searching in the current directory uses
+                _p_k_g_-_n_a_m_e literally.
 
      PKG_TMPDIR, TMPDIR
                 These are tried in turn (if set) as candidate directories in
@@ -146,8 +146,8 @@ EENNVVIIRROONNMMEENNTT
 
 TTEECCHHNNIICCAALL DDEETTAAIILLSS
      Package info is either extracted from package files named on the command
-     line, or from already installed package information in _/_v_a_r_/_d_b_/_p_k_g_/_<_p_k_g_-
-     _n_a_m_e_>.
+     line, or from already installed package information in
+     _/_v_a_r_/_d_b_/_p_k_g_/_<_p_k_g_-_n_a_m_e_>.
 
      A filename can be given instead of a (installed) package name to query
      information on the package this file belongs to.  This filename is then
@@ -168,4 +168,4 @@ AAUUTTHHOORRSS
              NetBSD wildcard dependency processing, pkgdb, depends displaying,
              pkg size display etc.
 
-NetBSD 1.6.1_STABLE            September 2, 2003                             3
+NetBSD 1.6                     September 2, 2003                    NetBSD 1.6
diff --git a/pkgtools/pkg_install/files/info/show.c b/pkgtools/pkg_install/files/info/show.c
index 8469b920a99..367092d665b 100644
--- a/pkgtools/pkg_install/files/info/show.c
+++ b/pkgtools/pkg_install/files/info/show.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: show.c,v 1.3 2003/09/02 08:28:28 jlam Exp $	*/
+/*	$NetBSD: show.c,v 1.4 2003/09/23 07:13:52 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: show.c,v 1.11 1997/10/08 07:47:38 charnier Exp";
 #else
-__RCSID("$NetBSD: show.c,v 1.3 2003/09/02 08:28:28 jlam Exp $");
+__RCSID("$NetBSD: show.c,v 1.4 2003/09/23 07:13:52 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/defs.h b/pkgtools/pkg_install/files/lib/defs.h
index d2a5228d121..1c815087a80 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.3 2003/09/02 08:28:31 jlam Exp $ */
+/* $NetBSD: defs.h,v 1.4 2003/09/23 07:13:52 grant Exp $ */
 
 /*
  * Copyright (c) 1999-2000 Alistair G. Crooks.  All rights reserved.
diff --git a/pkgtools/pkg_install/files/lib/exec.c b/pkgtools/pkg_install/files/lib/exec.c
index b3ed644d170..218a27834cd 100644
--- a/pkgtools/pkg_install/files/lib/exec.c
+++ b/pkgtools/pkg_install/files/lib/exec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec.c,v 1.3 2003/09/02 08:28:32 jlam Exp $	*/
+/*	$NetBSD: exec.c,v 1.4 2003/09/23 07:13:52 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -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.3 2003/09/02 08:28:32 jlam Exp $");
+__RCSID("$NetBSD: exec.c,v 1.4 2003/09/23 07:13:52 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/fexec.c b/pkgtools/pkg_install/files/lib/fexec.c
index 34d601791c0..6461a622f43 100644
--- a/pkgtools/pkg_install/files/lib/fexec.c
+++ b/pkgtools/pkg_install/files/lib/fexec.c
@@ -65,7 +65,7 @@
 #include "lib.h"
 
 #ifndef lint
-__RCSID("$NetBSD: fexec.c,v 1.2 2003/09/02 08:28:32 jlam Exp $");
+__RCSID("$NetBSD: fexec.c,v 1.3 2003/09/23 07:13:52 grant 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 cbe57827b43..fcd2e5e1534 100644
--- a/pkgtools/pkg_install/files/lib/file.c
+++ b/pkgtools/pkg_install/files/lib/file.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: file.c,v 1.6 2003/09/02 08:28:32 jlam Exp $	*/
+/*	$NetBSD: file.c,v 1.7 2003/09/23 07:13:53 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -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.6 2003/09/02 08:28:32 jlam Exp $");
+__RCSID("$NetBSD: file.c,v 1.7 2003/09/23 07:13:53 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/global.c b/pkgtools/pkg_install/files/lib/global.c
index 85480caebff..e76cc3c160b 100644
--- a/pkgtools/pkg_install/files/lib/global.c
+++ b/pkgtools/pkg_install/files/lib/global.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: global.c,v 1.3 2003/09/02 08:28:33 jlam Exp $	*/
+/*	$NetBSD: global.c,v 1.4 2003/09/23 07:13:53 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -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.3 2003/09/02 08:28:33 jlam Exp $");
+__RCSID("$NetBSD: global.c,v 1.4 2003/09/23 07:13:53 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/lib.h b/pkgtools/pkg_install/files/lib/lib.h
index c5bc7f16f04..831808ed210 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.3 2003/09/03 14:06:00 jlam Exp $ */
+/* $NetBSD: lib.h,v 1.4 2003/09/23 07:13:53 grant Exp $ */
 
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 
@@ -115,6 +115,14 @@
 #define CHGRP_CMD "chgrp"
 #endif
 
+#ifndef MTREE_CMD
+# ifdef BINDIR
+#  define MTREE_CMD BINDIR "/mtree"
+# else
+#  define MTREE_CMD "mtree"
+# endif
+#endif
+
 /* The names of our "special" files */
 #define CONTENTS_FNAME		"+CONTENTS"
 #define COMMENT_FNAME		"+COMMENT"
@@ -225,8 +233,8 @@ char   *make_playpen(char *, size_t, size_t);
 char   *where_playpen(void);
 void    leave_playpen(char *);
 uint64_t min_free(char *);
-void    save_dirs(char **c, char **p);
-void    restore_dirs(char *c, char *p);
+void    save_dirs(char **, char **);
+void    restore_dirs(char *, char *);
 void    show_version(void);
 int	fexec(const char *, ...);
 int	fcexec(const char *, const char *, ...);
@@ -241,8 +249,8 @@ int     pmatch(const char *, const char *);
 int     findmatchingname(const char *, const char *, matchfn, void *); /* doesn't really belong to "strings" */
 char   *findbestmatchingname(const char *, const char *);	/* neither */
 int     ispkgpattern(const char *);
-char   *strnncpy(char *to, size_t tosize, char *from, size_t cc);
-void	strip_txz(char *buf, char *sfx, const char *fname);
+char   *strnncpy(char *, size_t, char *, size_t);
+void	strip_txz(char *, char *, const char *);
 
 /* callback functions for findmatchingname */
 int     findbestmatchingname_fn(const char *, void *);	/* neither */
@@ -273,24 +281,24 @@ int     unpack(const char *, const char *);
 void    format_cmd(char *, size_t, char *, char *, char *);
 
 /* ftpio.c: FTP handling */
-int	expandURL(char *expandedurl, const char *wildcardurl);
-int	unpackURL(const char *url, const char *dir);
-int	ftp_cmd(const char *cmd, const char *expectstr);
-int	ftp_start(char *base);
+int	expandURL(char *, const char *);
+int	unpackURL(const char *, const char *);
+int	ftp_cmd(const char *, const char *);
+int	ftp_start(char *);
 void	ftp_stop(void);
 
 /* Packing list */
 plist_t *new_plist_entry(void);
 plist_t *last_plist(package_t *);
 plist_t *find_plist(package_t *, pl_ent_t);
-char   *find_plist_option(package_t *, char *name);
+char   *find_plist_option(package_t *, char *);
 void    plist_delete(package_t *, Boolean, pl_ent_t, char *);
 void    free_plist(package_t *);
 void    mark_plist(package_t *);
 void    csum_plist_entry(char *, plist_t *);
 void    add_plist(package_t *, pl_ent_t, const char *);
 void    add_plist_top(package_t *, pl_ent_t, const char *);
-void    delete_plist(package_t *pkg, Boolean all, pl_ent_t type, char *name);
+void    delete_plist(package_t *, Boolean, pl_ent_t, char *);
 void    write_plist(package_t *, FILE *, char *);
 void    read_plist(package_t *, FILE *);
 int     plist_cmd(char *, char **);
diff --git a/pkgtools/pkg_install/files/lib/lpkg.c b/pkgtools/pkg_install/files/lib/lpkg.c
index 24a86267b03..58325d03568 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.4 2003/09/02 08:28:34 jlam Exp $	*/
+/*	$NetBSD: lpkg.c,v 1.5 2003/09/23 07:13:53 grant Exp $	*/
 
 /*
  * Copyright (c) 1999 Christian E. Hopps
diff --git a/pkgtools/pkg_install/files/lib/path.c b/pkgtools/pkg_install/files/lib/path.c
index f4b22929a09..9a4eef13467 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.4 2003/09/02 08:28:34 jlam Exp $	*/
+/*	$NetBSD: path.c,v 1.5 2003/09/23 07:13:53 grant Exp $	*/
 
 /*-
  * Copyright (c)2002 YAMAMOTO Takashi,
@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: path.c,v 1.4 2003/09/02 08:28:34 jlam Exp $");
+__RCSID("$NetBSD: path.c,v 1.5 2003/09/23 07:13:53 grant Exp $");
 #endif
 
 #if HAVE_ERR_H
diff --git a/pkgtools/pkg_install/files/lib/path.h b/pkgtools/pkg_install/files/lib/path.h
index c348c176ec6..946eeae378b 100644
--- a/pkgtools/pkg_install/files/lib/path.h
+++ b/pkgtools/pkg_install/files/lib/path.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: path.h,v 1.2 2003/09/01 16:27:15 jlam Exp $	*/
+/*	$NetBSD: path.h,v 1.3 2003/09/23 07:13:53 grant Exp $	*/
 
 /*-
  * Copyright (c)2002 YAMAMOTO Takashi,
diff --git a/pkgtools/pkg_install/files/lib/pen.c b/pkgtools/pkg_install/files/lib/pen.c
index 120cd4a66b7..67708e0b7af 100644
--- a/pkgtools/pkg_install/files/lib/pen.c
+++ b/pkgtools/pkg_install/files/lib/pen.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pen.c,v 1.11 2003/09/03 14:22:57 jlam Exp $	*/
+/*	$NetBSD: pen.c,v 1.12 2003/09/23 07:13:53 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -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.11 2003/09/03 14:22:57 jlam Exp $");
+__RCSID("$NetBSD: pen.c,v 1.12 2003/09/23 07:13:53 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/plist.c b/pkgtools/pkg_install/files/lib/plist.c
index 80ca9594632..575d095bdeb 100644
--- a/pkgtools/pkg_install/files/lib/plist.c
+++ b/pkgtools/pkg_install/files/lib/plist.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: plist.c,v 1.5 2003/09/02 08:28:35 jlam Exp $	*/
+/*	$NetBSD: plist.c,v 1.6 2003/09/23 07:13:54 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -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.5 2003/09/02 08:28:35 jlam Exp $");
+__RCSID("$NetBSD: plist.c,v 1.6 2003/09/23 07:13:54 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/str.c b/pkgtools/pkg_install/files/lib/str.c
index e8c1911eb9b..41200fcb4f6 100644
--- a/pkgtools/pkg_install/files/lib/str.c
+++ b/pkgtools/pkg_install/files/lib/str.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: str.c,v 1.5 2003/09/09 13:34:21 jlam Exp $	*/
+/*	$NetBSD: str.c,v 1.6 2003/09/23 07:13:54 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -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.5 2003/09/09 13:34:21 jlam Exp $");
+__RCSID("$NetBSD: str.c,v 1.6 2003/09/23 07:13:54 grant Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/version.c b/pkgtools/pkg_install/files/lib/version.c
index 69ffd031245..c4d99519a6f 100644
--- a/pkgtools/pkg_install/files/lib/version.c
+++ b/pkgtools/pkg_install/files/lib/version.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.c,v 1.3 2003/09/02 08:28:36 jlam Exp $	*/
+/*	$NetBSD: version.c,v 1.4 2003/09/23 07:13:54 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: version.c,v 1.3 2003/09/02 08:28:36 jlam Exp $");
+__RCSID("$NetBSD: version.c,v 1.4 2003/09/23 07:13:54 grant Exp $");
 #endif
 
 /*
diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h
index 00b72eaba4f..be41f9cb779 100644
--- a/pkgtools/pkg_install/files/lib/version.h
+++ b/pkgtools/pkg_install/files/lib/version.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.15 2003/09/14 04:58:32 jlam Exp $	*/
+/*	$NetBSD: version.h,v 1.16 2003/09/23 07:13:54 grant Exp $	*/
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -33,6 +33,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20030914"
+#define PKGTOOLS_VERSION "20030923"
 
 #endif /* _INST_LIB_VERSION_H_ */
diff --git a/pkgtools/pkg_install/files/view/linkfarm.1 b/pkgtools/pkg_install/files/view/linkfarm.1
index ebf5a11e017..a509a15da2b 100644
--- a/pkgtools/pkg_install/files/view/linkfarm.1
+++ b/pkgtools/pkg_install/files/view/linkfarm.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: linkfarm.1,v 1.3 2003/09/09 13:34:21 jlam Exp $
+.\"	$NetBSD: linkfarm.1,v 1.4 2003/09/23 07:13:55 grant Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/pkgtools/pkg_install/files/view/linkfarm.cat1 b/pkgtools/pkg_install/files/view/linkfarm.cat1
index aae854b99aa..44f5b56ac44 100644
--- a/pkgtools/pkg_install/files/view/linkfarm.cat1
+++ b/pkgtools/pkg_install/files/view/linkfarm.cat1
@@ -1,4 +1,4 @@
-LINKFARM(1)                 NetBSD Reference Manual                LINKFARM(1)
+LINKFARM(1)             NetBSD General Commands Manual             LINKFARM(1)
 
 NNAAMMEE
      lliinnkkffaarrmm - manage symbolic links to package files
@@ -64,4 +64,4 @@ SSEEEE AALLSSOO
 AAUUTTHHOORRSS
      The lliinnkkffaarrmm utility was written by Alistair G. Crooks <agc@netbsd.org>.
 
-NetBSD 1.6.1_STABLE            September 2, 2003                             1
+NetBSD 1.6                     September 2, 2003                    NetBSD 1.6
diff --git a/pkgtools/pkg_install/files/view/pkg_view.1 b/pkgtools/pkg_install/files/view/pkg_view.1
index bc6c5dc33ab..e0c06a53be8 100644
--- a/pkgtools/pkg_install/files/view/pkg_view.1
+++ b/pkgtools/pkg_install/files/view/pkg_view.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkg_view.1,v 1.5 2003/09/09 13:34:22 jlam Exp $
+.\"	$NetBSD: pkg_view.1,v 1.6 2003/09/23 07:13:55 grant Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/pkgtools/pkg_install/files/view/pkg_view.cat1 b/pkgtools/pkg_install/files/view/pkg_view.cat1
index 3e2a9e5a34f..148e902f413 100644
--- a/pkgtools/pkg_install/files/view/pkg_view.cat1
+++ b/pkgtools/pkg_install/files/view/pkg_view.cat1
@@ -1,11 +1,11 @@
-PKG_VIEW(1)                 NetBSD Reference Manual                PKG_VIEW(1)
+PKG_VIEW(1)             NetBSD General Commands Manual             PKG_VIEW(1)
 
 NNAAMMEE
      ppkkgg__vviieeww - add and delete instances of depoted packages in views
 
 SSYYNNOOPPSSIISS
-     ppkkgg__vviieeww [_n_V_v] [--dd _s_t_o_w_d_i_r] [--ii _i_g_n_o_r_e] [--kk _p_k_g___d_b_d_i_r] [--WW _v_i_e_w_b_a_s_e] [--ww
-              _v_i_e_w] _c_o_m_m_a_n_d _p_a_c_k_a_g_e _._._.
+     ppkkgg__vviieeww [_n_V_v] [--dd _s_t_o_w_d_i_r] [--ii _i_g_n_o_r_e] [--kk _p_k_g___d_b_d_i_r] [--WW _v_i_e_w_b_a_s_e]
+              [--ww _v_i_e_w] _c_o_m_m_a_n_d _p_a_c_k_a_g_e _._._.
 
 DDEESSCCRRIIPPTTIIOONN
      The ppkkgg__vviieeww command is used to add and delete instances of depoted pack-
@@ -141,4 +141,4 @@ SSEEEE AALLSSOO
 AAUUTTHHOORRSS
      The ppkkgg__vviieeww utility was written by Alistair G. Crooks <agc@netbsd.org>.
 
-NetBSD 1.6.1_STABLE            September 8, 2003                             3
+NetBSD 1.6                     September 8, 2003                    NetBSD 1.6