Update pkgtools/pkg_install to 20040813 (latest release from the HEAD

branch of src).  Changes from version 20040730 include:

Modify pkg_info so that it will only print information on uninstalled
binary packages in the current working directory if -. is given on
the command line. If no -. is given, pkg_info will look for its
information in the ${PKG_DBDIR}.  This addresses a long-held gripe on
the part of a number of people, including myself (agc), which completely
violated the POLS.

Add a -q switch to pkg_admin, which allows it to work in a quiet
manner.  Fixes the change request in PR 26583, but in a different
manner, preserving existing behaviour and making the new behaviour
dependent upon a command line option.

16 files changed, 112 insertions, 48 deletions

diff --git a/pkgtools/pkg_install/files/add/extract.c b/pkgtools/pkg_install/files/add/extract.c
index 7f29fb9cba4..9b936c51ccf 100644
--- a/pkgtools/pkg_install/files/add/extract.c
+++ b/pkgtools/pkg_install/files/add/extract.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: extract.c,v 1.8 2004/08/06 16:57:03 jlam Exp $	*/
+/*	$NetBSD: extract.c,v 1.9 2004/08/20 20:09:53 jlam Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "FreeBSD - Id: extract.c,v 1.17 1997/10/08 07:45:35 charnier Exp";
 #else
-__RCSID("$NetBSD: extract.c,v 1.8 2004/08/06 16:57:03 jlam Exp $");
+__RCSID("$NetBSD: extract.c,v 1.9 2004/08/20 20:09:53 jlam Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/admin/main.c b/pkgtools/pkg_install/files/admin/main.c
index 78608666178..43629a951c3 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.15 2004/08/06 16:57:03 jlam Exp $	*/
+/*	$NetBSD: main.c,v 1.16 2004/08/20 20:09:53 jlam 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.15 2004/08/06 16:57:03 jlam Exp $");
+__RCSID("$NetBSD: main.c,v 1.16 2004/08/20 20:09:53 jlam Exp $");
 #endif
 
 /*
@@ -73,18 +73,20 @@ __RCSID("$NetBSD: main.c,v 1.15 2004/08/06 16:57:03 jlam Exp $");
 
 #define DEFAULT_SFX	".t[bg]z"	/* default suffix for ls{all,best} */
 
-static const char Options[] = "K:SVbd:s:";
+static const char Options[] = "K:SVbd:qs:";
 
 int     filecnt;
 int     pkgcnt;
 
+static int	quiet;
+
 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"
+	(void) fprintf(stderr, "usage: %s [-bqSV] [-d lsdir] [-K pkg_dbdir] [-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"
@@ -345,7 +347,9 @@ rebuild(void)
 #ifdef PKGDB_DEBUG
 		printf("%s\n", de->d_name);
 #else
-		printf(".");
+		if (!quiet) {
+			printf(".");
+		}
 #endif
 
 		filecnt += add1pkg(de->d_name);
@@ -387,7 +391,9 @@ checkall(void)
 		chdir(de->d_name);
 
 		check1pkg(de->d_name);
-		printf(".");
+		if (!quiet) {
+			printf(".");
+		}
 
 		chdir("..");
 	}
@@ -411,7 +417,9 @@ checkpattern_fn(const char *pkg, void *vp)
 		err(EXIT_FAILURE, "Cannot chdir to %s/%s", _pkgdb_getPKGDB_DIR(), pkg);
 
 	check1pkg(pkg);
-	printf(".");
+	if (!quiet) {
+		printf(".");
+	}
 
 	chdir("..");
 
@@ -473,6 +481,10 @@ main(int argc, char *argv[])
 			lsdirp = lsdir;
 			break;
 
+		case 'q':
+			quiet = 1;
+			break;
+
 		case 's':
 			(void) strlcpy(sfx, optarg, sizeof(sfx));
 			use_default_sfx = FALSE;
@@ -554,7 +566,9 @@ main(int argc, char *argv[])
 						}
 					} else {
 						check1pkg(*argv);
-						printf(".");
+						if (!quiet) {
+							printf(".");
+						}
 
 						chdir("..");
 					}
@@ -570,7 +584,9 @@ main(int argc, char *argv[])
 		} else {
 			checkall();
 		}
-		printf("Done.\n");
+		if (!quiet) {
+			printf("Done.\n");
+		}
 
 	} else if (strcasecmp(argv[0], "lsall") == 0) {
 		int saved_wd;
diff --git a/pkgtools/pkg_install/files/admin/pkg_admin.1 b/pkgtools/pkg_install/files/admin/pkg_admin.1
index 3d89b676880..e8acd26a023 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.7 2004/03/30 15:28:08 tv Exp $
+.\"	$NetBSD: pkg_admin.1,v 1.8 2004/08/20 20:09:53 jlam Exp $
 .\"
 .\" Copyright (c) 1999-2002 Hubert Feyrer.  All rights reserved.
 .\"
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 26, 2004
+.Dd August 13, 2004
 .Dt PKG_ADMIN 1
 .Os
 .Sh NAME
@@ -36,7 +36,7 @@
 .Nd perform various administrative tasks to the pkg system
 .Sh SYNOPSIS
 .Nm
-.Op Fl bSV
+.Op Fl bqSV
 .Nb -words
 .Op Fl d Ar lsdir
 .Bk -words
@@ -74,6 +74,12 @@ 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 q
+Perform checks in a quiet manner.
+In normal operation,
+.Nm
+prints a '.' to standard output to indicate progress.
+This option suppresses this progress indicator.
 .It Fl S
 Set the shell glob pattern for package suffixes 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 58bd14b1314..ce820bff60b 100644
--- a/pkgtools/pkg_install/files/admin/pkg_admin.cat1
+++ b/pkgtools/pkg_install/files/admin/pkg_admin.cat1
@@ -1,11 +1,11 @@
-PKG_ADMIN(1)            NetBSD General Commands Manual            PKG_ADMIN(1)
+PKG_ADMIN(1)                NetBSD Reference Manual               PKG_ADMIN(1)
 
 NNAAMMEE
      ppkkgg__aaddmmiinn - perform various administrative tasks to the pkg system
 
 SSYYNNOOPPSSIISS
-     ppkkgg__aaddmmiinn [--bbSSVV] [--dd _l_s_d_i_r] [--KK _p_k_g___d_b_d_i_r] [--ss _s_f_x___p_a_t_t_e_r_n] _c_o_m_m_a_n_d [args
-               ...]
+     ppkkgg__aaddmmiinn [--bbqqSSVV] [--dd _l_s_d_i_r] [--KK _p_k_g___d_b_d_i_r] [--ss _s_f_x___p_a_t_t_e_r_n] _c_o_m_m_a_n_d
+               [args ...]
 
 DDEESSCCRRIIPPTTIIOONN
      This command performs various administrative tasks around the NetBSD
@@ -27,11 +27,15 @@ 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
+     --qq      Perform checks in a quiet manner.  In normal operation, ppkkgg__aaddmmiinn
+             prints a '.' to standard output to indicate progress.  This op-
+             tion suppresses this progress indicator.
+
+     --SS      Set the shell glob pattern for package suffixes when matching
              package names for llssaallll and llssbbeesstt to be the null suffix.
 
      --ss _s_f_x___p_a_t_t_e_r_n
-             Set the shell glob pattern for package suffices when matching
+             Set the shell glob pattern for package suffixes when matching
              package names for llssaallll and llssbbeesstt.  The default pattern is
              ".t[bg]z".
 
@@ -50,8 +54,8 @@ OOPPTTIIOONNSS
              the packages installed on the local machine against the checksum
              which was recorded in the +CONTENTS files at package installation
              time.  Symbolic links also have their integrity checked against
-             the recorded value at package installation time.  If no addi-
-             tional argument is given, the files of all installed packages are
+             the recorded value at package installation time.  If no addition-
+             al argument is given, the files of all installed packages are
              checked, else only the named packages will be checked (wildcards
              can be used here, see pkg_info(1)).
 
@@ -137,4 +141,4 @@ HHIISSTTOORRYY
 AAUUTTHHOORRSS
      The ppkkgg__aaddmmiinn command was written by Hubert Feyrer.
 
-NetBSD 1.6                     January 26, 2004                     NetBSD 1.6
+NetBSD 1.6.2                    August 13, 2004                              3
diff --git a/pkgtools/pkg_install/files/bpm/bpm.sh.in b/pkgtools/pkg_install/files/bpm/bpm.sh.in
index 04e9850e883..4c03c23a91f 100644
--- a/pkgtools/pkg_install/files/bpm/bpm.sh.in
+++ b/pkgtools/pkg_install/files/bpm/bpm.sh.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: bpm.sh.in,v 1.1 2004/08/06 16:57:03 jlam Exp $
+# $NetBSD: bpm.sh.in,v 1.2 2004/08/20 20:09:53 jlam Exp $
 #
 # Copyright (c) 2003 Alistair G. Crooks.  All rights reserved.
 #
diff --git a/pkgtools/pkg_install/files/info/info.h b/pkgtools/pkg_install/files/info/info.h
index a3e3d101196..21baee0d985 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.5 2004/05/08 14:51:23 jlam Exp $ */
+/* $NetBSD: info.h,v 1.6 2004/08/20 20:09:53 jlam Exp $ */
 
 /* from FreeBSD Id: info.h,v 1.10 1997/02/22 16:09:40 peter Exp */
 
@@ -64,6 +64,7 @@ extern size_t PlayPenSize;
 extern char *CheckPkg;
 extern size_t termwidth;
 extern lpkg_head_t pkgs;
+extern int usedot;
 
 extern void show_file(char *, char *);
 extern void show_var(const char *, const char *);
diff --git a/pkgtools/pkg_install/files/info/main.c b/pkgtools/pkg_install/files/info/main.c
index 512e75a680c..744f5be8fc1 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.10 2004/05/08 14:51:23 jlam Exp $	*/
+/*	$NetBSD: main.c,v 1.11 2004/08/20 20:09:53 jlam 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.10 2004/05/08 14:51:23 jlam Exp $");
+__RCSID("$NetBSD: main.c,v 1.11 2004/08/20 20:09:53 jlam Exp $");
 #endif
 #endif
 
@@ -50,7 +50,7 @@ __RCSID("$NetBSD: main.c,v 1.10 2004/05/08 14:51:23 jlam Exp $");
 #include "lib.h"
 #include "info.h"
 
-static const char Options[] = "aBbcDde:fFhIiK:kLl:mNnpQ:qRrsSvV";
+static const char Options[] = ".aBbcDde:fFhIiK:kLl:mNnpQ:qRrsSvV";
 
 int     Flags = 0;
 Boolean AllInstalled = FALSE;
@@ -63,12 +63,13 @@ size_t  PlayPenSize = sizeof(PlayPen);
 char   *CheckPkg = NULL;
 size_t  termwidth = 0;
 lpkg_head_t pkgs;
+int	usedot;
 
 static void
 usage(void)
 {
 	fprintf(stderr, "%s\n%s\n%s\n%s\n",
-	    "usage: pkg_info [-BbcDdFfIikLmNnpqRrSsVvh] [-e package] [-l prefix]",
+	    "usage: pkg_info [-.BbcDdFfhIikLmNnpqRrSsVv] [-e package] [-K pkg_dbdir] [-l prefix]",
 	    "                pkg-name [pkg-name ...]",
 	    "       pkg_info -a [flags]",
 	    "       pkg_info -Q variable pkg-name [pkg-name ...]");
@@ -85,6 +86,10 @@ main(int argc, char **argv)
 	setprogname(argv[0]);
 	while ((ch = getopt(argc, argv, Options)) != -1)
 		switch (ch) {
+		case '.':
+			usedot = 1;
+			break;
+
 		case 'a':
 			AllInstalled = TRUE;
 			break;
diff --git a/pkgtools/pkg_install/files/info/perform.c b/pkgtools/pkg_install/files/info/perform.c
index 66c0e1f8158..cd4734e85fc 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.15 2004/05/07 16:40:41 jlam Exp $	*/
+/*	$NetBSD: perform.c,v 1.16 2004/08/20 20:09:53 jlam 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.15 2004/05/07 16:40:41 jlam Exp $");
+__RCSID("$NetBSD: perform.c,v 1.16 2004/08/20 20:09:53 jlam Exp $");
 #endif
 #endif
 
@@ -69,6 +69,7 @@ pkg_do(char *pkg)
 	struct stat sb;
 	char   *cp = NULL;
 	int     code = 0;
+	char flist[sizeof(ALL_FNAMES)];
 
 	if (IS_URL(pkg)) {
 		if ((cp = fileGetURL(pkg)) != NULL) {
@@ -112,19 +113,45 @@ pkg_do(char *pkg)
 				}
 				strcpy(PlayPen, cp2);
 			} else {
+				if (!usedot) {
+					/* only recognise a local uninstalled package if usedot was given */
+					warnx("can't find package file '%s'", fname);
+					code = 1;
+					goto bail;
+				}
+
 				/*
 				 * Apply a crude heuristic to see how much space the package will
 				 * take up once it's unpacked.  I've noticed that most packages
-				 * compress an average of 75%, but we're only unpacking the + files so
-				 * be very optimistic.
+				 * compress an average of 75%, but we're only unpacking the + files
+				 * needed so be very optimistic.
 				 */
+
+				/* Determine which +-files to unpack - not all may be present! */
+				strcat(flist, CONTENTS_FNAME); strcat(flist, " ");
+				strcat(flist, COMMENT_FNAME); strcat(flist, " ");
+				strcat(flist, DESC_FNAME); strcat(flist, " ");
+				if (Flags & SHOW_MTREE)		{ strcat(flist, MTREE_FNAME); 		strcat(flist, " "); }
+				if (Flags & SHOW_BUILD_VERSION)	{ strcat(flist, BUILD_VERSION_FNAME);	strcat(flist, " "); }
+				if (Flags & SHOW_BUILD_INFO)	{ strcat(flist, BUILD_INFO_FNAME); 	strcat(flist, " "); }
+				if (Flags & SHOW_PKG_SIZE)	{ strcat(flist, SIZE_PKG_FNAME); 	strcat(flist, " "); }
+				if (Flags & SHOW_ALL_SIZE)	{ strcat(flist, SIZE_ALL_FNAME); 	strcat(flist, " "); }
+#if 0
+				if (Flags & SHOW_REQBY)		{ strcat(flist, REQUIRED_BY_FNAME); 	strcat(flist, " "); }
+				if (Flags & SHOW_DISPLAY)	{ strcat(flist, DISPLAY_FNAME); 	strcat(flist, " "); }
+				if (Flags & SHOW_INSTALL)	{ strcat(flist, INSTALL_FNAME); 	strcat(flist, " "); }
+				if (Flags & SHOW_DEINSTALL)	{ strcat(flist, DEINSTALL_FNAME); 	strcat(flist, " "); }
+				if (Flags & SHOW_REQUIRE)	{ strcat(flist, REQUIRE_FNAME); 	strcat(flist, " "); }
+				/* PRESERVE_FNAME? */
+#endif				
+
 				if (stat(fname, &sb) == FAIL) {
 					warnx("can't stat package file '%s'", fname);
 					code = 1;
 					goto bail;
 				}
 				Home = make_playpen(PlayPen, PlayPenSize, sb.st_size / 2);
-				if (unpack(fname, ALL_FNAMES)) {
+				if (unpack(fname, flist)) {
 					warnx("error during unpacking, no info for '%s' available", pkg);
 					code = 1;
 					goto bail;
diff --git a/pkgtools/pkg_install/files/info/pkg_info.1 b/pkgtools/pkg_install/files/info/pkg_info.1
index 5567187b3e9..a1aadb4593e 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.10 2004/08/06 16:57:03 jlam Exp $
+.\" $NetBSD: pkg_info.1,v 1.11 2004/08/20 20:09:53 jlam Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -17,7 +17,7 @@
 .\"
 .\"     @(#)pkg_info.1
 .\"
-.Dd May 7, 2004
+.Dd August 13, 2004
 .Dt PKG_INFO 1
 .Os
 .Sh NAME
@@ -25,7 +25,7 @@
 .Nd a utility for displaying information on software packages
 .Sh SYNOPSIS
 .Nm
-.Op Fl BbcDdFfhIikLmNnpqRrSsVv
+.Op Fl .BbcDdFfhIikLmNnpqRrSsVv
 .Bk -words
 .Op Fl e Ar package
 .Ek
@@ -67,6 +67,8 @@ is also given), or a URL to an ftp-available package.
 .Pp
 The following command-line options are supported:
 .Bl -tag -width indent
+.It Fl .
+Recognise uninstalled binary packages in the current working directory.
 .It Fl a
 Show information for all currently installed packages.
 .It Fl B
diff --git a/pkgtools/pkg_install/files/info/pkg_info.cat1 b/pkgtools/pkg_install/files/info/pkg_info.cat1
index 607b7aad32e..0bf4d9bc89e 100644
--- a/pkgtools/pkg_install/files/info/pkg_info.cat1
+++ b/pkgtools/pkg_install/files/info/pkg_info.cat1
@@ -4,7 +4,7 @@ NNAAMMEE
      ppkkgg__iinnffoo - a utility for displaying information on software packages
 
 SSYYNNOOPPSSIISS
-     ppkkgg__iinnffoo [--BBbbccDDddFFffhhIIiikkLLmmNNnnppqqRRrrSSssVVvv] [--ee _p_a_c_k_a_g_e] [--KK _p_k_g___d_b_d_i_r]
+     ppkkgg__iinnffoo [--..BBbbccDDddFFffhhIIiikkLLmmNNnnppqqRRrrSSssVVvv] [--ee _p_a_c_k_a_g_e] [--KK _p_k_g___d_b_d_i_r]
               [--ll _p_r_e_f_i_x] _p_k_g_-_n_a_m_e _._._.
      ppkkgg__iinnffoo [--aa _f_l_a_g_s]
      ppkkgg__iinnffoo [--QQ _v_a_r_i_a_b_l_e] _p_k_g_-_n_a_m_e _._._.
@@ -22,6 +22,9 @@ DDEESSCCRRIIPPTTIIOONN
 
      The following command-line options are supported:
 
+     --.      Recognise uninstalled binary packages in the current working di-
+             rectory.
+
      --aa      Show information for all currently installed packages.
 
      --BB      Show some of the important definitions used when building the bi-
@@ -177,4 +180,4 @@ AAUUTTHHOORRSS
              NetBSD wildcard dependency processing, pkgdb, depends displaying,
              pkg size display etc.
 
-NetBSD 1.6.2                      May 7, 2004                                3
+NetBSD 1.6.2                    August 13, 2004                              3
diff --git a/pkgtools/pkg_install/files/lib/ftpio.c b/pkgtools/pkg_install/files/lib/ftpio.c
index d7ea5b9468d..dd97f25bace 100644
--- a/pkgtools/pkg_install/files/lib/ftpio.c
+++ b/pkgtools/pkg_install/files/lib/ftpio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftpio.c,v 1.9 2004/08/13 14:35:24 jlam Exp $	*/
+/*	$NetBSD: ftpio.c,v 1.10 2004/08/20 20:09:53 jlam Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.9 2004/08/13 14:35:24 jlam Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.10 2004/08/20 20:09:53 jlam Exp $");
 #endif
 
 /*-
diff --git a/pkgtools/pkg_install/files/lib/pen.c b/pkgtools/pkg_install/files/lib/pen.c
index 3f5a9be5631..11dc7cf86e8 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.14 2004/08/06 16:57:03 jlam Exp $	*/
+/*	$NetBSD: pen.c,v 1.15 2004/08/20 20:09:53 jlam 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.14 2004/08/06 16:57:03 jlam Exp $");
+__RCSID("$NetBSD: pen.c,v 1.15 2004/08/20 20:09:53 jlam Exp $");
 #endif
 #endif
 
diff --git a/pkgtools/pkg_install/files/lib/pkgdb.c b/pkgtools/pkg_install/files/lib/pkgdb.c
index 8734e837ad0..67b04906d93 100644
--- a/pkgtools/pkg_install/files/lib/pkgdb.c
+++ b/pkgtools/pkg_install/files/lib/pkgdb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pkgdb.c,v 1.20 2004/08/06 16:57:03 jlam Exp $	*/
+/*	$NetBSD: pkgdb.c,v 1.21 2004/08/20 20:09:53 jlam Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: pkgdb.c,v 1.20 2004/08/06 16:57:03 jlam Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.21 2004/08/20 20:09:53 jlam Exp $");
 #endif
 
 /*
diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h
index ab353cdd6ea..c02d6e3b6b1 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.32 2004/08/06 16:57:03 jlam Exp $	*/
+/*	$NetBSD: version.h,v 1.33 2004/08/20 20:09:53 jlam 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 "20040730"
+#define PKGTOOLS_VERSION "20040813"
 
 #endif /* _INST_LIB_VERSION_H_ */
diff --git a/pkgtools/pkg_install/files/view/linkfarm.sh.in b/pkgtools/pkg_install/files/view/linkfarm.sh.in
index 2c0523d8f82..a1b1049e572 100644
--- a/pkgtools/pkg_install/files/view/linkfarm.sh.in
+++ b/pkgtools/pkg_install/files/view/linkfarm.sh.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: linkfarm.sh.in,v 1.3 2004/08/06 16:57:03 jlam Exp $
+# $NetBSD: linkfarm.sh.in,v 1.4 2004/08/20 20:09:53 jlam Exp $
 
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
diff --git a/pkgtools/pkg_install/files/view/pkg_view.sh.in b/pkgtools/pkg_install/files/view/pkg_view.sh.in
index 5e15c87362c..96b69e16884 100644
--- a/pkgtools/pkg_install/files/view/pkg_view.sh.in
+++ b/pkgtools/pkg_install/files/view/pkg_view.sh.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: pkg_view.sh.in,v 1.5 2004/08/06 16:57:03 jlam Exp $
+# $NetBSD: pkg_view.sh.in,v 1.6 2004/08/20 20:09:53 jlam Exp $
 
 #
 # Copyright (c) 2001 Alistair G. Crooks.  All rights reserved.