Regen.

2 files changed, 19 insertions, 2 deletions

diff --git a/pkgtools/pkg_install/files/admin/pkg_admin.cat1 b/pkgtools/pkg_install/files/admin/pkg_admin.cat1
index f59db74a779..e65c6e53324 100644
--- a/pkgtools/pkg_install/files/admin/pkg_admin.cat1
+++ b/pkgtools/pkg_install/files/admin/pkg_admin.cat1
@@ -89,6 +89,11 @@ OOPPTTIIOONNSS
              targets on disk are the same as the contents recorded at package
              installation time.
 
+     cchheecckk--lliicceennssee _c_o_n_d_i_t_i_o_n
+             Check if _c_o_n_d_i_t_i_o_n can be fulfilled with the currently set of
+             accepted licenses.  Prints either yes or no to stdout if the con-
+             dition can be parsed, otherwise it exits with error.
+
      cchheecckk--ppkkgg--vvuullnneerraabbiilliittiieess [--ss] _f_i_l_e
              Check format and hashes in the pkg-vulnerabilities file _f_i_l_e.  If
              --ss is given, also check the embedded signature.
@@ -96,6 +101,11 @@ OOPPTTIIOONNSS
      cchheecckk--ssiiggnnaattuurree _f_i_l_e _._._.
              Reports if _f_i_l_e is a correctly signed package.
 
+     cchheecckk--ssiinnggllee--lliicceennssee _l_i_c_c_e_n_s_e
+             Check if _l_i_c_e_n_s_e is a valid license name and if it is in the set
+             of acceptable licenses.  Prints either yes or no to stdout if the
+             condition can be parsed, otherwise it exits with error.
+
      ccoonnffiigg--vvaarr _v_a_r_i_a_b_l_e
              Print the current value of _v_a_r_i_a_b_l_e as used after parsing the
              configuration file.
@@ -226,4 +236,4 @@ HHIISSTTOORRYY
 AAUUTTHHOORRSS
      The ppkkgg__aaddmmiinn command was written by Hubert Feyrer.
 
-NetBSD 5.0                       May 30, 2008                       NetBSD 5.0
+NetBSD 5.0                      April 25, 2009                      NetBSD 5.0
diff --git a/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in b/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in
index 3848c99edc5..035dd6a175e 100644
--- a/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in
+++ b/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in
@@ -14,6 +14,9 @@ DDEESSCCRRIIPPTTIIOONN
 
      The following variables are supported:
 
+     ACCEPTABLE_LICENSES
+             List of licenses packages are allowed to carry.
+
      ACTIVE_FTP
              Force the use of active FTP.
 
@@ -46,6 +49,10 @@ DDEESSCCRRIIPPTTIIOONN
              interactive    The user is always asked to confirm installation
                             of vulnerable packages.
 
+     DEFAULT_ACCEPTABLE_LICENSES
+             List of common Free and Open Source licenses packages are allowed
+             to carry.
+
      GPG     Path to gpg(1), which can be used to verify the signature in the
              _p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s file when running
                    ppkkgg__aaddmmiinn cchheecckk--ppkkgg--vvuullnneerraabbiilliittiieess --ss
@@ -120,4 +127,4 @@ FFIILLEESS
 SSEEEE AALLSSOO
      pkg_add(1), pkg_admin(1)
 
-NetBSD 5.0                     February 27, 2009                    NetBSD 5.0
+NetBSD 5.0                      April 25, 2009                      NetBSD 5.0