Index: projects/release-pkg/release/packages/development.ucl
===================================================================
--- projects/release-pkg/release/packages/development.ucl	(revision 296530)
+++ projects/release-pkg/release/packages/development.ucl	(nonexistent)
@@ -1,24 +0,0 @@
-#
-# $FreeBSD$
-#
-
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "%COMMENT%"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

Property changes on: projects/release-pkg/release/packages/development.ucl
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: projects/release-pkg/release/packages/lib32.ucl
===================================================================
--- projects/release-pkg/release/packages/lib32.ucl	(revision 296530)
+++ projects/release-pkg/release/packages/lib32.ucl	(nonexistent)
@@ -1,24 +0,0 @@
-#
-# $FreeBSD$
-#
-
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "%COMMENT%"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

Property changes on: projects/release-pkg/release/packages/lib32.ucl
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: projects/release-pkg/release/packages/debug.ucl
===================================================================
--- projects/release-pkg/release/packages/debug.ucl	(revision 296530)
+++ projects/release-pkg/release/packages/debug.ucl	(nonexistent)
@@ -1,24 +0,0 @@
-#
-# $FreeBSD$
-#
-
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "%COMMENT%"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

Property changes on: projects/release-pkg/release/packages/debug.ucl
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: projects/release-pkg/release/packages/profile.ucl
===================================================================
--- projects/release-pkg/release/packages/profile.ucl	(revision 296530)
+++ projects/release-pkg/release/packages/profile.ucl	(nonexistent)
@@ -1,24 +0,0 @@
-#
-# $FreeBSD$
-#
-
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "%COMMENT%"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

Property changes on: projects/release-pkg/release/packages/profile.ucl
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: projects/release-pkg/release/packages/Makefile.package
===================================================================
--- projects/release-pkg/release/packages/Makefile.package	(revision 296530)
+++ projects/release-pkg/release/packages/Makefile.package	(revision 296531)
@@ -1,74 +1,73 @@
 #
 # $FreeBSD$
 #
 
 acct_COMMENT= 		Accounting Utilties
 acct_DESC= 		Accounting Utilties
 acpi_COMMENT= 		ACPI Utilities
 acpi_DESC= 		ACPI Utilities
 amd_COMMENT= 		AMD Utilities
 amd_DESC= 		AMD Utilities
 apm_COMMENT= 		APM Utilities
 apm_DESC= 		APM Utilities
 at_COMMENT= 		AT Utilities
 at_DESC= 		AT Utilities
 autofs_COMMENT= 	Autofs Utilities
 autofs_DESC= 		Autofs Utilities
 bhyve_COMMENT= 		Bhyve Utilities
 bhyve_DESC= 		Bhyve Utilities
 binutils_COMMENT= 	Binutils
 binutils_DESC= 		Binutils
 bsdinstall_COMMENT= 	BSDInstall Utilities
 bsdinstall_DESC= 	BSDInstall Utilities
 bsnmp_COMMENT= 		BSNMP Utilities
 bsnmp_DESC= 		BSNMP Utilities
 clang_COMMENT= 		Clang Utilities
 clang_DESC= 		Clang Utilities
 clibs_COMMENT= 		Core C Libraries
 clibs_DESC= 		Core C Libraries
-debug_COMMENT= 		FreeBSD Base System (Debugging Symbols)
-debug_DESC= 		FreeBSD Base System (Debugging Symbols)
-development_COMMENT= 	FreeBSD Base System (Development Files)
-development_DESC= 	FreeBSD Base System (Development Files)
 dma_COMMENT= 		DMA Mail Agent Utilities
 dma_DESC= 		DMA Mail Agent Utilities
 docs_COMMENT= 		Documentation
 docs_DESC= 		Documentation
 ee_COMMENT= 		Easy Editor Utilities
 ee_DESC= 		Easy Editor Utilities
 gdb_COMMENT= 		GDB Utilities
 gdb_DESC= 		GDB Utilities
 groff_COMMENT= 		Groff Utilities
 groff_DESC= 		Groff Utilities
 hast_COMMENT= 		Highly Available Storage daemon
 hast_DESC= 		Highly Available Storage daemon
 jail_COMMENT= 		Jail Utilities
 jail_DESC= 		Jail Utilities
 kernel_COMMENT= 	FreeBSD Kernel
 kernel_DESC= 		FreeBSD Kernel
-lib32_COMMENT= 		FreeBSD Base System (32-bit Libraries)
-lib32_DESC= 		FreeBSD Base System (32-bit Libraries)
 manuals_COMMENT= 	Manual Pages
 manuals_DESC= 		Manual Pages
-profile_COMMENT= 	FreeBSD Base System (Profiling Libraries)
-profile_DESC= 		FreeBSD Base System (Profiling Libraries)
 rcmds_COMMENT= 		Remote Command Utilities
 rcmds_DESC= 		Remote Command Utilities
 rescue_COMMENT= 	Rescue Utilities
 rescue_DESC= 		Rescue Utilities
 runtime_COMMENT= 	FreeBSD Base System
 runtime_DESC= 		FreeBSD Base System
+runtime-debug_DESCR= 	Debugging Symbols
+runtime-development_DESCR=Development Files
+runtime-profile_DESCR= 	Profiling Libraries
+runtime-lib32_DESCR= 	32-bit Libraries
+runtime-lib32-debug_DESCR=32-bit Debugging Symbols
+runtime-lib32-development_DESCR=32-bit Development Files
+runtime-lib32-profile_DESCR=32-bit Profiling Libraries
 sendmail_COMMENT= 	Sendmail Utilities
 sendmail_DESC= 		Sendmail Utilities
 ssh_COMMENT= 		Secure Shell Utilities
 ssh_DESC= 		Secure Shell Utilities
 svn_COMMENT= 		Subversion Version Control System
 svn_DESC= 		Subversion Version Control System
 syscons_COMMENT= 	Syscons Console
 syscons_DESC= 		Syscons Console
 tests_COMMENT= 		Test Suite
 tests_DESC= 		Test Suite
 unbound_COMMENT= 	Unbound DNS Resolver
 unbound_DESC= 		Unbound DNS Resolver
 vi_COMMENT= 		Vi Editor
 vi_DESC= 		Vi Editor
Index: projects/release-pkg/release/packages/generate-ucl.sh
===================================================================
--- projects/release-pkg/release/packages/generate-ucl.sh	(revision 296530)
+++ projects/release-pkg/release/packages/generate-ucl.sh	(revision 296531)
@@ -1,138 +1,141 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 main() {
 	desc=
 	comment=
 	debug=
 	uclsource=
 	while getopts "do:s:u:" arg; do
 		case ${arg} in
 		d)
 			debug=1
 			;;
 		o)
 			outname="${OPTARG}"
 			origname="${OPTARG}"
 			;;
 		s)
 			srctree="${OPTARG}"
 			;;
 		u)
 			uclfile="${OPTARG}"
 			;;
 		*)
 			echo "Unknown argument"
 			;;
 		esac
 	done
 
 	shift $(( ${OPTIND} - 1 ))
 
 	outname="$(echo ${outname} | tr '-' '_')"
 
 	case "${outname}" in
+		runtime)
+			outname="runtime"
+			uclfile="${uclfile}"
+			;;
+		runtime_manuals)
+			outname="${origname}"
+			pkgdeps="runtime"
+			;;
+		runtime_*)
+			outname="${origname}"
+			uclfile="${outname##*}${uclfile}"
+			pkgdeps="runtime"
+			_descr="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESCR)"
+			;;
 		*_lib32_development)
 			outname="${outname%%_lib32_development}"
 			_descr="32-bit Libraries, Development Files"
 			pkgdeps="${outname}"
 			;;
 		*_lib32_debug)
 			outname="${outname%%_lib32_debug}"
 			_descr="32-bit Libraries, Debugging Symbols"
 			pkgdeps="${outname}"
 			;;
 		*_lib32_profile)
 			outname="${outname%%_lib32_profile}"
 			_descr="32-bit Libraries, Profiling"
 			pkgdeps="${outname}"
 			;;
 		*_lib32)
 			outname="${outname%%_lib32}"
 			_descr="32-bit Libraries"
 			pkgdeps="${outname}"
 			;;
 		*_development)
 			outname="${outname%%_development}"
 			_descr="Development Files"
 			pkgdeps="${outname}"
 			;;
 		*_profile)
 			outname="${outname%%_profile}"
 			_descr="Profiling Libraries"
 			pkgdeps="${outname}"
 			;;
 		*_debug)
 			outname="${outname%%_debug}"
 			_descr="Debugging Symbols"
 			pkgdeps="${outname}"
 			;;
-		*_manuals)
-			outname="${origname}"
-			pkgdeps="runtime"
-			;;
-		runtime)
-			outname="runtime"
-			uclfile="${uclfile}"
-			;;
 		${origname})
 			pkgdeps="runtime"
-			;;
-		debug|development|lib32|profile)
-			uclfile="${outname##*}${uclfile}"
 			;;
 		*)
 			uclfile="${outname##*}${origname}"
 			outname="${outname##*}${origname}"
 			;;
 	esac
 
 	outname="${outname%%_*}"
 
 	desc="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESC)"
 	comment="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_COMMENT)"
 
 	uclsource="${srctree}/release/packages/${outname}.ucl"
 	if [ ! -e "${uclsource}" ]; then
 		uclsource="${srctree}/release/packages/template.ucl"
 	fi
 
 	if [ ! -z "${debug}" ]; then
 		echo ""
 		echo "==============================================================="
 		echo "DEBUG:"
 		echo "_descr=${_descr}"
 		echo "outname=${outname}"
 		echo "origname=${origname}"
 		echo "srctree=${srctree}"
 		echo "uclfile=${uclfile}"
 		echo "desc=${desc}"
 		echo "comment=${comment}"
 		echo "cp ${uclsource} -> ${uclfile}"
 		echo "==============================================================="
 		echo ""
 		echo ""
 		echo ""
 	fi
 
 	[ -z "${comment}" ] && comment="${outname} package"
 	[ ! -z "${_descr}" ] && comment="${comment} (${_descr})"
 	[ -z "${desc}" ] && desc="${outname} package"
 
 	cp "${uclsource}" "${uclfile}"
 	cap_arg="$(make -C ${srctree}/etc -VCAP_MKDB_ENDIAN)"
 	pwd_arg="$(make -C ${srctree}/etc -VPWD_MKDB_ENDIAN)"
 	sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \
 		-e "s/%PKGNAME%/${origname}/" \
 		-e "s/%COMMENT%/${comment}/" \
 		-e "s/%DESC%/${desc}/" \
 		-e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \
 		-e "s/%PWD_MKDB_ENDIAN%/${pwd_arg}/g" \
 		-e "s/%PKGDEPS%/${pkgdeps}/" \
 		${uclfile}
 	return 0
 }
 
 main "${@}"
Index: projects/release-pkg/release/packages/runtime-debug.ucl
===================================================================
--- projects/release-pkg/release/packages/runtime-debug.ucl	(nonexistent)
+++ projects/release-pkg/release/packages/runtime-debug.ucl	(revision 296531)
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+    FreeBSD-%PKGDEPS%: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Property changes on: projects/release-pkg/release/packages/runtime-debug.ucl
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: projects/release-pkg/release/packages/runtime-development.ucl
===================================================================
--- projects/release-pkg/release/packages/runtime-development.ucl	(nonexistent)
+++ projects/release-pkg/release/packages/runtime-development.ucl	(revision 296531)
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+    FreeBSD-%PKGDEPS%: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Property changes on: projects/release-pkg/release/packages/runtime-development.ucl
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: projects/release-pkg/release/packages/runtime-lib32.ucl
===================================================================
--- projects/release-pkg/release/packages/runtime-lib32.ucl	(nonexistent)
+++ projects/release-pkg/release/packages/runtime-lib32.ucl	(revision 296531)
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+    FreeBSD-%PKGDEPS%: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Property changes on: projects/release-pkg/release/packages/runtime-lib32.ucl
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: projects/release-pkg/release/packages/runtime-profile.ucl
===================================================================
--- projects/release-pkg/release/packages/runtime-profile.ucl	(nonexistent)
+++ projects/release-pkg/release/packages/runtime-profile.ucl	(revision 296531)
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+    FreeBSD-%PKGDEPS%: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Property changes on: projects/release-pkg/release/packages/runtime-profile.ucl
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: projects/release-pkg/release/scripts/mtree-to-plist.awk
===================================================================
--- projects/release-pkg/release/scripts/mtree-to-plist.awk	(revision 296530)
+++ projects/release-pkg/release/scripts/mtree-to-plist.awk	(revision 296531)
@@ -1,84 +1,80 @@
 #!/usr/bin/awk
 /^[^#]/ {
 	gsub(/^\./,"", $1)
 	uname = gname = mode = flags = tags = type = ""
 	for (i=2; i<=NF; i++) {
 		if ($i ~ /^uname=/) {
 			uname=$i
 			gsub(/uname=/, "", uname)
 		} else if ($i ~ /^gname=/) {
 			gname=$i
 			gsub(/gname=/, "", gname)
 		} else if ($i ~ /^mode=/) {
 			mode=$i
 			gsub(/mode=/,"", mode)
 		} else if ($i ~ /^flags=/) {
 			flags=$i
 			gsub(/flags=/, "", flags)
 		} else if ($i ~ /^tags=/) {
 			tags=$i
 			gsub(/tags=/, "", tags)
 		} else if ($i ~ /^type=dir/) {
 			type="dir"
 		}
 	}
 	if (kernel != "") {
 		tags="package=kernel"
 		if (_kernconf != "") {
 			tags=tags""_kernconf
 		}
 	}
 	if (length(tags) == 0)
 		next
 	if (tags ~ /package=/) {
 		ext = pkgname = pkgend = ""
 		split(tags, a, ",");
 		for (i in a) {
 			if (a[i] ~ /^package=/) {
 				pkgname=a[i]
 				gsub(/package=/, "", pkgname)
 			} else if (a[i] == "config") {
 				type="config"
-			} else if (a[i] == "development" || a[i] == "profile" || a[i] == "debug") {
+			} else if (a[i] == "development" || a[i] == "profile" || a[i] == "debug" || a[i] == "docs") {
 				pkgend=a[i]
 			} else {
 				if (ext != "")
 					ext=ext"-"a[i]
 				else
 					ext=a[i]
 			}
 		}
 		if (ext != "") {
-			if (pkgname == "runtime") {
-				pkgname=ext
-			} else {
-				pkgname=pkgname"-"ext
-			}
+			pkgname=pkgname"-"ext
 		}
 		if (pkgend != "") {
-			if (pkgname == "runtime") {
+			if (pkgend == "docs") {
 				pkgname=pkgend
 			} else {
 				pkgname=pkgname"-"pkgend
 			}
 		}
 	} else {
 		print "No packages specified in line: $0"
 		next
 	}
 	if (kernel != "") {
 		output="kernel"
 		if (_kernconf != "") {
 			output=output"."_kernconf
 		}
 		if ($1 ~ /^\/usr\/lib\/debug\/boot/) {
 			output=output"-debug.plist"
 		} else {
 			output=output"-release.plist"
 		}
 	} else {
 		output=pkgname".plist"
 	}
 
 	print "@"type"("uname","gname","mode","flags") " $1 > output
 }