Bump version to 20030907. Changes from previous version include:

    * Teaching pkg_add(1) to be smarter about how to add a depoted packge.

    * "pkg_delete foo" only deletes foo if it's a unique package.

    * Make "pkg_delete -O foo" for delete file entries for foo from
      pkgdb.byfile.db actually work.

    * Teach pkg_admin(1) two new commands "add" and "delete" for working
      with pkgdb.byfile.db.

    * pkg_view(1) uses the new pkg_admin(1) commands to keep the
      pkgdb.byfile.db files consistent in each view.

    * Man page fixes.

5 files changed, 103 insertions, 90 deletions

diff --git a/pkgtools/pkg_install/files/view/linkfarm.1 b/pkgtools/pkg_install/files/view/linkfarm.1
index 02beed32781..ebf5a11e017 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.2 2003/09/01 16:51:31 wiz Exp $
+.\"	$NetBSD: linkfarm.1,v 1.3 2003/09/09 13:34:21 jlam Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -31,15 +31,18 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 13, 2003
+.Dd September 2, 2003
 .Dt LINKFARM 1
 .Os
 .Sh NAME
 .Nm linkfarm
-.Nd a utility for managing symbolic links to package files
+.Nd manage symbolic links to package files
 .Sh SYNOPSIS
 .Nm
-.Op Ar options
+.Op Fl cDnRVv
+.Op Fl d Ar stowdir
+.Op Fl s Ar subdir
+.Op Fl t Ar target
 .Ar package
 .Sh DESCRIPTION
 The
diff --git a/pkgtools/pkg_install/files/view/linkfarm.cat1 b/pkgtools/pkg_install/files/view/linkfarm.cat1
index 8492e07776b..aae854b99aa 100644
--- a/pkgtools/pkg_install/files/view/linkfarm.cat1
+++ b/pkgtools/pkg_install/files/view/linkfarm.cat1
@@ -1,10 +1,10 @@
 LINKFARM(1)                 NetBSD Reference Manual                LINKFARM(1)
 
 NNAAMMEE
-     lliinnkkffaarrmm - a utility for managing symbolic links to package files
+     lliinnkkffaarrmm - manage symbolic links to package files
 
 SSYYNNOOPPSSIISS
-     lliinnkkffaarrmm [_o_p_t_i_o_n_s] _p_a_c_k_a_g_e
+     lliinnkkffaarrmm [--ccDDnnRRVVvv] [--dd _s_t_o_w_d_i_r] [--ss _s_u_b_d_i_r] [--tt _t_a_r_g_e_t] _p_a_c_k_a_g_e
 
 DDEESSCCRRIIPPTTIIOONN
      The lliinnkkffaarrmm command is used to manage a "linkfarm", a directory tree of
@@ -59,9 +59,9 @@ EENNVVIIRROONNMMEENNTT
              defaults to "info/dir *[~#] *.OLD *.orig *,v".
 
 SSEEEE AALLSSOO
-     pkg_views(1), lndir(1)
+     lndir(1), pkg_view(1)
 
 AAUUTTHHOORRSS
      The lliinnkkffaarrmm utility was written by Alistair G. Crooks <agc@netbsd.org>.
 
-NetBSD 1.6.1_STABLE              July 13, 2003                               1
+NetBSD 1.6.1_STABLE            September 2, 2003                             1
diff --git a/pkgtools/pkg_install/files/view/pkg_view.1 b/pkgtools/pkg_install/files/view/pkg_view.1
index 4aa05762f0e..bc6c5dc33ab 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.4 2003/09/03 14:06:01 jlam Exp $
+.\"	$NetBSD: pkg_view.1,v 1.5 2003/09/09 13:34:22 jlam Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -31,23 +31,28 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 13, 2003
+.Dd September 8, 2003
 .Dt PKG_VIEW 1
 .Os
 .Sh NAME
 .Nm pkg_view
-.Nd a utility for managing package views
+.Nd add and delete instances of depoted packages in views
 .Sh SYNOPSIS
 .Nm
-.Op Ar options
+.Op Ar nVv
+.Op Fl d Ar stowdir
+.Op Fl i Ar ignore
+.Op Fl k Ar pkg_dbdir
+.Op Fl W Ar viewbase
+.Op Fl w Ar view
 .Ar command
 .Ar package ...
 .Sh DESCRIPTION
 The
 .Nm
-command is used to add and delete packages in
+command is used to add and delete instances of depoted packages in
 .Ar stowdir
-into a
+in a
 .Ar view
 in the
 .Ar viewbase
@@ -56,16 +61,15 @@ directory.
 .Bf -emphasis
 Since the
 .Nm
-command may execute scripts or programs contained within a package file,
+command may execute scripts or programs provided by a package file,
 your system may be susceptible to ``Trojan horses'' or other subtle
 attacks from miscreants who create dangerous package files.
 .Pp
 You are advised to verify the competence and identity of those who
 provide installable package files.
-For extra protection, use the
-.Fl M
-flag to extract the package file, and inspect its contents and scripts
-to ensure it poses no danger to your system's integrity.
+For extra protection, examine all the package control files in the
+package database directory
+.Pa ( /usr/pkg/packages/\*[Lt]pkg-name\*[Gt]/ ) .
 Pay particular attention to any +INSTALL, +DEINSTALL, +REQUIRE
 or +MTREE_DIRS files, and inspect the +CONTENTS file for
 .Cm @cwd ,
@@ -77,7 +81,7 @@ and
 .Cm @unexec
 directives, and/or use the
 .Xr pkg_info 1
-command to examine the package file.
+command to examine the installed package control files.
 .Ef
 .Sh OPTIONS
 The following command-line options are supported:
@@ -85,14 +89,14 @@ The following command-line options are supported:
 .It Fl d Ar stowdir
 Set
 .Ar stowdir
-as the directory in which the installed packages can be found.
+as the directory in which the depoted packages can be found.
 If this option isn't specified, then the
 .Ar stowdir
 is taken from the value of the environment variable
 .Ev DEPOTBASE
 if it's set, otherwise the default
 .Ar stowdir
-is the
+is the path to the
 .Pa packages
 directory under
 .Ar viewbase .
@@ -101,7 +105,7 @@ Add
 .Ar ignore
 to the list of files in
 .Ar package
-that should ignored when adding or removing the package from
+that should ignored when adding or removing the package instance from
 .Ar view .
 .It Fl k Ar pkg_dbdir
 Set
@@ -113,7 +117,7 @@ taken from the value of the environment variable
 otherwise it defaults to
 .Pa /var/db/pkg .
 .It Fl n
-Don't actually execute the commands for manipulating the depoted packages.
+Don't actually execute the commands for manipulating the package instances.
 .It Fl V
 Print the version number and exit.
 .It Fl v
@@ -137,7 +141,7 @@ Set
 .Ar view
 as the directory in
 .Ar viewbase
-in which the packages should be added or removed.
+in which the package instances should be added or deleted.
 The default
 .Ar view
 is the empty view but may be overridden by the
@@ -147,15 +151,15 @@ environment variable.
 .Pp
 The following commands are supported:
 .Bl -tag -width indent
-.It Ar add
-Add the listed packages into
+.It Cm add
+Add the listed package instances into
 .Ar view .
-.It Ar check
-Check whether the listed packages are present in
+.It Cm check
+Check whether the listed package instances are present in
 .Ar view .
 If they are not present, then return 0, otherwise return 1.
-.It Ar delete
-Delete the listed packages from
+.It Cm delete
+Delete the listed package instances from
 .Ar view .
 .El
 .Sh ENVIRONMENT
@@ -189,20 +193,20 @@ otherwise it defaults to
 .It Ev PLIST_IGNORE_FILES
 This can be used to specify files in
 .Ar package
-that should ignored when adding or removing the package from
+that should ignored when adding or removing the package instance from
 .Ar view .
 .Ev PLIST_IGNORE_FILES
 is a space-separated list of shell glob patterns that match files relative
 to the
 .Ar package
-directory, and it defaults to "info/dir *[~#] *.OLD *.orig *,v".
+depot directory, and it defaults to "info/dir *[~#] *.OLD *.orig *,v".
 This is overridden by any
 .Ev _PLIST_IGNORE_FILES
 setting in a package's
 .Ar build-info-file
 (see
-.Xr pkg_create 1
-) if it exists.
+.Xr pkg_create 1 )
+if it exists.
 .It Ev PKG_VIEW
 The default view can be specified in the
 .Ev PKG_VIEW
@@ -210,37 +214,37 @@ environment variable.
 .El
 .Sh FILES
 .Bl -tag -width indent
-.It Pa <pkg-dbdir>/<package>/+INSTALL
+.It Pa \*[Lt]pkg-dbdir\*[Gt]/\*[Lt]package\*[Gt]/+INSTALL
 If the package contains an
 .Ar install
 script (see
 .Xr pkg_create 1 ) ,
-then after the package is added into a view, the script is executed
-with the following arguments:
+then after the package instance is added into a view, the script is
+executed with the following arguments:
 .Bl -tag -width package
 .It Ar package
-The name of the package being installed.
+The name of the package instance being added.
 .It Cm VIEW-INSTALL
 Keyword denoting that the script is to perform any actions needed after
-the package is added to a view.
+the package instance is added to a view.
 .El
 .Pp
 If the
 .Ar install
 script exits with a non-zero status code, the installation is terminated.
-.It Pa <pkg-dbdir>/<package>/+DEINSTALL
+.It Pa \*[Lt]pkg-dbdir\*[Gt]/\*[Lt]package\*[Gt]/+DEINSTALL
 If the package contains an
 .Ar deinstall
 script (see
 .Xr pkg_create 1 ) ,
-then before the package is removed from a view, the script is executed
-with the following arguments:
+then before the package instance is deleted from a view, the script is
+executed with the following arguments:
 .Bl -tag -width package
 .It Ar package
-The name of the package being installed.
+The name of the package instance being deleted.
 .It Cm VIEW-DEINSTALL
 Keyword denoting that the script is to perform any actions needed before
-the package is removed from a view.
+the package instance is deleted from a view.
 .El
 .Pp
 If the
diff --git a/pkgtools/pkg_install/files/view/pkg_view.cat1 b/pkgtools/pkg_install/files/view/pkg_view.cat1
index 4d006ba9c7a..3e2a9e5a34f 100644
--- a/pkgtools/pkg_install/files/view/pkg_view.cat1
+++ b/pkgtools/pkg_install/files/view/pkg_view.cat1
@@ -1,43 +1,43 @@
 PKG_VIEW(1)                 NetBSD Reference Manual                PKG_VIEW(1)
 
 NNAAMMEE
-     ppkkgg__vviieeww - a utility for managing package views
+     ppkkgg__vviieeww - add and delete instances of depoted packages in views
 
 SSYYNNOOPPSSIISS
-     ppkkgg__vviieeww [_o_p_t_i_o_n_s] _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 packages in _s_t_o_w_d_i_r into a
-     _v_i_e_w in the _v_i_e_w_b_a_s_e directory.
+     The ppkkgg__vviieeww command is used to add and delete instances of depoted pack-
+     ages in _s_t_o_w_d_i_r in a _v_i_e_w in the _v_i_e_w_b_a_s_e directory.
 
 WWAARRNNIINNGG
-     _S_i_n_c_e _t_h_e ppkkgg__vviieeww _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _c_o_n_t_a_i_n_e_d
-     _w_i_t_h_i_n _a _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n _h_o_r_s_-
-     _e_s_'_' _o_r _o_t_h_e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s _p_a_c_k_a_g_e
-     _f_i_l_e_s_.
+     _S_i_n_c_e _t_h_e ppkkgg__vviieeww _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _p_r_o_v_i_d_e_d _b_y _a
+     _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n _h_o_r_s_e_s_'_' _o_r _o_t_h_-
+     _e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s _p_a_c_k_a_g_e _f_i_l_e_s_.
 
      _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_, _u_s_e _t_h_e --MM _f_l_a_g _t_o
-     _e_x_t_r_a_c_t _t_h_e _p_a_c_k_a_g_e _f_i_l_e_, _a_n_d _i_n_s_p_e_c_t _i_t_s _c_o_n_t_e_n_t_s _a_n_d _s_c_r_i_p_t_s _t_o _e_n_s_u_r_e
-     _i_t _p_o_s_e_s _n_o _d_a_n_g_e_r _t_o _y_o_u_r _s_y_s_t_e_m_'_s _i_n_t_e_g_r_i_t_y_.  _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
-     _p_a_c_k_a_g_e _f_i_l_e_.
+     _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 _d_a_t_a_b_a_s_e _d_i_r_e_c_t_o_r_y
+     _(_/_u_s_r_/_p_k_g_/_p_a_c_k_a_g_e_s_/_<_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:
 
      --dd _s_t_o_w_d_i_r
-             Set _s_t_o_w_d_i_r as the directory in which the installed packages can
-             be found.  If this option isn't specified, then the _s_t_o_w_d_i_r is
-             taken from the value of the environment variable DEPOTBASE if
-             it's set, otherwise the default _s_t_o_w_d_i_r is the _p_a_c_k_a_g_e_s directory
-             under _v_i_e_w_b_a_s_e.
+             Set _s_t_o_w_d_i_r as the directory in which the depoted packages can be
+             found.  If this option isn't specified, then the _s_t_o_w_d_i_r is taken
+             from the value of the environment variable DEPOTBASE if it's set,
+             otherwise the default _s_t_o_w_d_i_r is the path to the _p_a_c_k_a_g_e_s direc-
+             tory under _v_i_e_w_b_a_s_e.
 
      --ii _i_g_n_o_r_e
              Add _i_g_n_o_r_e to the list of files in _p_a_c_k_a_g_e that should ignored
-             when adding or removing the package from _v_i_e_w.
+             when adding or removing the package instance from _v_i_e_w.
 
      --kk _p_k_g___d_b_d_i_r
              Set _p_k_g___d_b_d_i_r as the package database directory for the default
@@ -45,8 +45,8 @@ OOPPTTIIOONNSS
              database directory is taken from the value of the environment
              variable PKG_DBDIR, otherwise it defaults to _/_v_a_r_/_d_b_/_p_k_g.
 
-     --nn      Don't actually execute the commands for manipulating the depoted
-             packages.
+     --nn      Don't actually execute the commands for manipulating the package
+             instances.
 
      --VV      Print the version number and exit.
 
@@ -59,18 +59,19 @@ OOPPTTIIOONNSS
              by the LOCALBASE environment variable.
 
      --ww _v_i_e_w
-             Set _v_i_e_w as the directory in _v_i_e_w_b_a_s_e in which the packages
-             should be added or removed.  The default _v_i_e_w is the empty view
-             but may be overridden by the PKG_VIEW environment variable.
+             Set _v_i_e_w as the directory in _v_i_e_w_b_a_s_e in which the package in-
+             stances should be added or deleted.  The default _v_i_e_w is the emp-
+             ty view but may be overridden by the PKG_VIEW environment vari-
+             able.
 
      The following commands are supported:
 
-     _a_d_d     Add the listed packages into _v_i_e_w.
+     aadddd     Add the listed package instances into _v_i_e_w.
 
-     _c_h_e_c_k   Check whether the listed packages are present in _v_i_e_w.  If they
-             are not present, then return 0, otherwise return 1.
+     cchheecckk   Check whether the listed package instances are present in _v_i_e_w.
+             If they are not present, then return 0, otherwise return 1.
 
-     _d_e_l_e_t_e  Delete the listed packages from _v_i_e_w.
+     ddeelleettee  Delete the listed package instances from _v_i_e_w.
 
 EENNVVIIRROONNMMEENNTT
      DEPOTBASE
@@ -89,12 +90,12 @@ EENNVVIIRROONNMMEENNTT
 
      PLIST_IGNORE_FILES
              This can be used to specify files in _p_a_c_k_a_g_e that should ignored
-             when adding or removing the package from _v_i_e_w.
+             when adding or removing the package instance from _v_i_e_w.
              PLIST_IGNORE_FILES is a space-separated list of shell glob pat-
-             terns that match files relative to the _p_a_c_k_a_g_e directory, and it
-             defaults to "info/dir *[~#] *.OLD *.orig *,v".  This is overrid-
-             den by any _PLIST_IGNORE_FILES setting in a package's _b_u_i_l_d_-_i_n_f_o_-
-             _f_i_l_e (see pkg_create(1) ) if it exists.
+             terns that match files relative to the _p_a_c_k_a_g_e depot directory,
+             and it defaults to "info/dir *[~#] *.OLD *.orig *,v".  This is
+             overridden by any _PLIST_IGNORE_FILES setting in a package's
+             _b_u_i_l_d_-_i_n_f_o_-_f_i_l_e (see pkg_create(1)) if it exists.
 
      PKG_VIEW
              The default view can be specified in the PKG_VIEW environment
@@ -103,28 +104,30 @@ EENNVVIIRROONNMMEENNTT
 FFIILLEESS
      <pkg-dbdir>/<package>/+INSTALL
              If the package contains an _i_n_s_t_a_l_l script (see pkg_create(1)),
-             then after the package is added into a view, the script is exe-
-             cuted with the following arguments:
+             then after the package instance is added into a view, the script
+             is executed with the following arguments:
 
-             _p_a_c_k_a_g_e  The name of the package being installed.
+             _p_a_c_k_a_g_e  The name of the package instance being added.
 
              VVIIEEWW--IINNSSTTAALLLL
                       Keyword denoting that the script is to perform any ac-
-                      tions needed after the package is added to a view.
+                      tions needed after the package instance is added to a
+                      view.
 
              If the _i_n_s_t_a_l_l script exits with a non-zero status code, the in-
              stallation is terminated.
 
      <pkg-dbdir>/<package>/+DEINSTALL
              If the package contains an _d_e_i_n_s_t_a_l_l script (see pkg_create(1)),
-             then before the package is removed from a view, the script is ex-
-             ecuted with the following arguments:
+             then before the package instance is deleted from a view, the
+             script is executed with the following arguments:
 
-             _p_a_c_k_a_g_e  The name of the package being installed.
+             _p_a_c_k_a_g_e  The name of the package instance being deleted.
 
              VVIIEEWW--DDEEIINNSSTTAALLLL
                       Keyword denoting that the script is to perform any ac-
-                      tions needed before the package is removed from a view.
+                      tions needed before the package instance is deleted from
+                      a view.
 
              If the _d_e_i_n_s_t_a_l_l script exits with a non-zero status code, the
              de-installation is terminated.
@@ -138,4 +141,4 @@ SSEEEE AALLSSOO
 AAUUTTHHOORRSS
      The ppkkgg__vviieeww utility was written by Alistair G. Crooks <agc@netbsd.org>.
 
-NetBSD 1.6.1_STABLE              July 13, 2003                               3
+NetBSD 1.6.1_STABLE            September 8, 2003                             3
diff --git a/pkgtools/pkg_install/files/view/pkg_view.sh.in b/pkgtools/pkg_install/files/view/pkg_view.sh.in
index 447c27813e4..8f78b4eba1b 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.1 2003/09/08 04:49:07 jlam Exp $
+# $NetBSD: pkg_view.sh.in,v 1.2 2003/09/09 13:34:22 jlam Exp $
 
 #
 # Copyright (c) 2001 Alistair G. Crooks.  All rights reserved.
@@ -49,6 +49,7 @@ linkfarmprog="@sbindir@/linkfarm"
 lnprog="@LN@"
 mkdirprog="@MKDIR@"
 paxprog="@PAX@"
+pkgadminprog="@sbindir@/pkg_admin"
 pkginfoprog="@sbindir@/pkg_info"
 rmprog="@RM@"
 rmdirprog="@RMDIR@"
@@ -215,6 +216,7 @@ while [ $# -gt 0 ]; do
 			echo "${depot_pkg_dbdir}/$1" > ${pkg_dbdir}/$1/+DEPOT
 			;;
 		esac
+		$doit $pkgadminprog -K ${pkg_dbdir} add $1
 		if [ -f ${pkg_dbdir}/$1/+INSTALL ]; then
 			$doit $chmodprog +x ${pkg_dbdir}/$1/+INSTALL
 			$doit $envprog -i PKG_PREFIX=${targetdir} ${pkg_dbdir}/$1/+INSTALL $1 VIEW-INSTALL
@@ -264,6 +266,7 @@ while [ $# -gt 0 ]; do
 		esac
 		$doit $rmprog ${temp}
 		$doit $rmprog -rf ${pkg_dbdir}/$1
+		$doit $pkgadminprog -K ${pkg_dbdir} delete $1
 		;;
 	esac
 	shift