Regen.

2 files changed, 11 insertions, 28 deletions

diff --git a/pkgtools/pkg_install/files/create/pkg_create.cat1 b/pkgtools/pkg_install/files/create/pkg_create.cat1
index b1f4de75c75..77dcf84b3ea 100644
--- a/pkgtools/pkg_install/files/create/pkg_create.cat1
+++ b/pkgtools/pkg_install/files/create/pkg_create.cat1
@@ -4,7 +4,7 @@ NNAAMMEE
      ppkkgg__ccrreeaattee -- a utility for creating software package distributions
 
 SSYYNNOOPPSSIISS
-     ppkkgg__ccrreeaattee [--EEllOORRUUVVvv] [--BB _b_u_i_l_d_-_i_n_f_o_-_f_i_l_e] [--bb _b_u_i_l_d_-_v_e_r_s_i_o_n_-_f_i_l_e]
+     ppkkgg__ccrreeaattee [--EEllOOUUVVvv] [--BB _b_u_i_l_d_-_i_n_f_o_-_f_i_l_e] [--bb _b_u_i_l_d_-_v_e_r_s_i_o_n_-_f_i_l_e]
                 [--CC _c_p_k_g_s] [--DD _d_i_s_p_l_a_y_f_i_l_e] [--gg _g_r_o_u_p] [--II _r_e_a_l_p_r_e_f_i_x]
                 [--ii _i_s_c_r_i_p_t] [--KK _p_k_g___d_b_d_i_r] [--kk _d_s_c_r_i_p_t] [--LL _S_r_c_D_i_r]
                 [--nn _p_r_e_s_e_r_v_e_-_f_i_l_e] [--PP _d_p_k_g_s] [--TT _b_u_i_l_d_p_k_g_s] [--pp _p_r_e_f_i_x]
@@ -129,10 +129,6 @@ OOPPTTIIOONNSS
              Set _p_r_e_f_i_x as the initial directory (base) to start from in
              selecting files for the package.
 
-     --RR      Re-order any directories in the PLIST file into reverse alpha-
-             betic order, so that child directories will automatically be
-             removed before parent directories.
-
      --SS _s_i_z_e_-_a_l_l_-_f_i_l_e
              Store the given file for later querying with the pkg_info(1) --SS
              flag.  The file is expected to contain the size (in bytes) of all
@@ -234,12 +230,6 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS
      @@iiggnnoorree
              Used internally to tell extraction to ignore the next file (don't
              copy it anywhere), as it's used for some special purpose.
-     @@iiggnnoorree__iinnsstt
-             Similar to @@iiggnnoorree, but the ignoring of the next file is delayed
-             one evaluation cycle.  This makes it possible to use this direc-
-             tive in the _p_a_c_k_i_n_g_l_i_s_t file, so you can pack a specialized
-             datafile in with a distribution for your install script (or some-
-             thing) yet have the installer ignore it.
      @@nnaammee _n_a_m_e
              Set the name of the package.  This is mandatory and is usually
              put at the top.  This name is potentially different than the name
@@ -247,14 +237,14 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS
              package for later deinstallation.  Note that ppkkgg__ccrreeaattee will
              derive this field from the _p_k_g_-_n_a_m_e and add it automatically if
              none is given.
+     @@ppkkggddiirr _n_a_m_e
+             Declare directory _n_a_m_e as managed.  If it does not exist at
+             installation time, it is created.  If this directory is no longer
+             referenced by packages and the last file or directory in it is
+             deleted, the directory is removed as well.
      @@ddiirrrrmm _n_a_m_e
-             Declare directory _n_a_m_e to be deleted at deinstall time.  By
-             default, directories created by a package installation are not
-             deleted when the package is deinstalled; this provides an
-             explicit directory cleanup method.  This directive should appear
-             at the end of the package list.  If more than one @@ddiirrrrmm direc-
-             tives are used, the directories are removed in the order speci-
-             fied.  The _n_a_m_e directory will not be removed unless it is empty.
+             This command is supported for compatibility only.  If directory
+             _n_a_m_e exists, it will be deleted at deinstall time.
      @@ddiissppllaayy _n_a_m_e
              Declare _n_a_m_e as the file to be displayed at install time (see --DD
              above).
@@ -289,4 +279,4 @@ AAUUTTHHOORRSS
              NetBSD wildcard dependency processing, pkgdb, pkg size recording
              etc.
 
-NetBSD 5.0                       July 28, 2008                      NetBSD 5.0
+NetBSD 5.0                      April 24, 2009                      NetBSD 5.0
diff --git a/pkgtools/pkg_install/files/delete/pkg_delete.cat1 b/pkgtools/pkg_install/files/delete/pkg_delete.cat1
index c1af26752d2..d81449efc12 100644
--- a/pkgtools/pkg_install/files/delete/pkg_delete.cat1
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.cat1
@@ -5,7 +5,7 @@ NNAAMMEE
      age distributions
 
 SSYYNNOOPPSSIISS
-     ppkkgg__ddeelleettee [--AADDddFFffNNnnOORRrrVVvv] [--KK _p_k_g___d_b_d_i_r] [--PP _d_e_s_t_d_i_r] [--pp _p_r_e_f_i_x]
+     ppkkgg__ddeelleettee [--AADDFFffNNnnOORRrrVVvv] [--KK _p_k_g___d_b_d_i_r] [--PP _d_e_s_t_d_i_r] [--pp _p_r_e_f_i_x]
                 _p_k_g_-_n_a_m_e _._._.
 
 DDEESSCCRRIIPPTTIIOONN
@@ -47,13 +47,6 @@ OOPPTTIIOONNSS
      --DD      If a deinstallation script exists for a given package, do not
              execute it.
 
-     --dd      Remove empty directories created by file cleanup.  By default,
-             only files/directories explicitly listed in a package's contents
-             (either as normal files/directories or with the @@ddiirrrrmm directive)
-             will be removed at deinstallation time.  This option tells
-             ppkkgg__ddeelleettee to also remove any directories that were emptied as a
-             result of removing the package.
-
      --FF      Any pkg-name given will be interpreted as pathname which is sub-
              sequently transformed in a (real) package name via the Package
              Database.  That way, packages can be deleted by giving a filename
@@ -174,4 +167,4 @@ AAUUTTHHOORRSS
              Rewrote most of the code to compute correct order of deinstalla-
              tion and to improve error handling.
 
-NetBSD 5.0                     February 25, 2009                    NetBSD 5.0
+NetBSD 5.0                      April 24, 2009                      NetBSD 5.0