9 files changed, 55 insertions, 5 deletions
diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua
index 3d91d11bc42f..a243c6ea7ad0 100755
--- a/release/packages/generate-ucl.lua
+++ b/release/packages/generate-ucl.lua
@@ -54,8 +54,15 @@ pkg_suffixes = {
 	},
 }
 
+-- A list of packages which don't get the automatic suffix handling,
+-- e.g. -man packages with no corresponding base package.
+local no_suffix_pkgs = {
+	["kernel-man"] = true,
+}
+
 function add_suffixes(obj)
 	local pkgname = obj["name"]
+
 	for _,pattern in pairs(pkg_suffixes) do
 		if pkgname:match(pattern[1]) ~= nil then
 			obj["comment"] = obj["comment"] .. " " .. pattern[2]
@@ -76,6 +83,7 @@ local no_gen_deps = {
 	["libcompiler_rt-dev-lib32"] = true,
 	["liby-dev"] = true,
 	["liby-dev-lib32"] = true,
+	["kernel-man"] = true,
 }
 
 -- Return true if the package 'pkgname' should have a dependency on the package
@@ -163,7 +171,9 @@ if pkgprefix ~= nil and obj["deps"] ~= nil then
 end
 
 -- Add comment and desc suffix.
-add_suffixes(obj)
+if no_suffix_pkgs[pkgname] == nil then
+	add_suffixes(obj)
+end
 
 -- Write the output file.
 local f,err = io.open(arg[#arg], "w")
diff --git a/release/packages/ucl/bmake-all.ucl b/release/packages/ucl/bmake-all.ucl
new file mode 100644
index 000000000000..ee8175d1dd8a
--- /dev/null
+++ b/release/packages/ucl/bmake-all.ucl
@@ -0,0 +1,5 @@
+comment = "Program maintenance utility"
+desc = <<EOD
+make(1) allows programs to be built from source files based on a specification
+of the program's dependencies called a Makefile.
+EOD
diff --git a/release/packages/ucl/gssd-all.ucl b/release/packages/ucl/gssd-all.ucl
new file mode 100644
index 000000000000..5a01b0559854
--- /dev/null
+++ b/release/packages/ucl/gssd-all.ucl
@@ -0,0 +1,11 @@
+comment = "gssd(8) daemon for kernel GSS-API"
+desc = <<EOD
+The Generic Security Services (GSS) API is used to perform authentication over
+a network connection, most commonly when using Kerberos authentication.
+
+The kernel contains an implementation of GSS-API primarily for use by the NFS
+client and server.  When kernel GSS-API is in use, gssd(8) allows the kernel
+to fetch authentication data such as Kerberos tickets from userland.
+
+This daemon is required when using Kerberos authentication with NFS.
+EOD
diff --git a/release/packages/ucl/kerberos-all.ucl b/release/packages/ucl/kerberos-all.ucl
index 6fb7f059296b..bf82040da3d0 100644
--- a/release/packages/ucl/kerberos-all.ucl
+++ b/release/packages/ucl/kerberos-all.ucl
@@ -1,4 +1,4 @@
-comment = "Kerberos Utilities"
+comment = "Kerberos utilities"
 desc = <<EOD
-Kerberos Utilities
+The Kerberos command-line utilities, including kinit and kadmin.
 EOD
diff --git a/release/packages/ucl/kerberos-kdc-all.ucl b/release/packages/ucl/kerberos-kdc-all.ucl
new file mode 100644
index 000000000000..068d2f26bc8d
--- /dev/null
+++ b/release/packages/ucl/kerberos-kdc-all.ucl
@@ -0,0 +1,5 @@
+comment = "Kerberos key distribution center"
+desc = <<EOD
+The Kerberos KDC, which manages the Kerberos database and issues tickets
+to clients.
+EOD
diff --git a/release/packages/ucl/kerberos-lib-all.ucl b/release/packages/ucl/kerberos-lib-all.ucl
index ab769ee16f96..b524563a976d 100644
--- a/release/packages/ucl/kerberos-lib-all.ucl
+++ b/release/packages/ucl/kerberos-lib-all.ucl
@@ -1,4 +1,4 @@
-comment = "Kerberos Libraries"
+comment = "Kerberos libraries"
 desc = <<EOD
-Kerberos Libraries
+Libraries requires to run programs that use Kerberos.
 EOD
diff --git a/release/packages/ucl/kernel-man.ucl b/release/packages/ucl/kernel-man.ucl
new file mode 100644
index 000000000000..9d70baf2c3af
--- /dev/null
+++ b/release/packages/ucl/kernel-man.ucl
@@ -0,0 +1,5 @@
+comment = "Kernel manual pages"
+desc = <<EOD
+Manual pages for kernel interfaces and drivers (section 4) and the kernel
+developer manual pages (section 9).
+EOD
diff --git a/release/packages/ucl/sendmail.ucl b/release/packages/ucl/sendmail.ucl
new file mode 100644
index 000000000000..c79775eb8af4
--- /dev/null
+++ b/release/packages/ucl/sendmail.ucl
@@ -0,0 +1,7 @@
+deps {
+	# sendmail requires make to build its configuration file.
+	"bmake": {
+		version = "${VERSION}"
+		origin = "base"
+	}
+}
diff --git a/release/packages/ucl/yp.ucl b/release/packages/ucl/yp.ucl
new file mode 100644
index 000000000000..14b2327e56d1
--- /dev/null
+++ b/release/packages/ucl/yp.ucl
@@ -0,0 +1,7 @@
+deps {
+	# YP requires bmake to rebuild the database.
+	"bmake": {
+		version = "${VERSION}"
+		origin = "base"
+	}
+}