From 5c52b2f5ca1b5b922f322f23dc27ea2362deabdd Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 4 Feb 2016 15:32:03 +0000
Subject: [PATCH] Rework the way <packagename>.ucl files are generated. One of
 the major pain points with how this was implemented is the requirement of
 in-tree, hard-coded <name>.ucl, as well as <name>-<suffix>.ucl where <suffix>
 can be lib32, profile, development, debug, or any combination of the four.

This created significant overhead when adding new packages
and any of the files in any of the combinations were missing.

Instead of test(1)-ing if the <packagename>.ucl file exists,
hand off to a script to figure out what the final ucl file
name should be before invoking pkg(8).

The default behavior is 'template.ucl' is used as a fallback.

This affects only the userland packages, as the kernel code
is already smart enough to handle these variations.

Sponsored by:	The FreeBSD Foundation
---
 Makefile.inc1                                 |  17 +--
 release/packages/Makefile.package             |  67 +++++++++
 release/packages/acct-debug.ucl               |  20 ---
 release/packages/acct.ucl                     |   4 +-
 release/packages/acpi-debug.ucl               |  20 ---
 release/packages/acpi.ucl                     |   4 +-
 release/packages/amd-debug.ucl                |  20 ---
 release/packages/amd.ucl                      |   4 +-
 release/packages/apm-debug.ucl                |  20 ---
 release/packages/apm.ucl                      |   4 +-
 release/packages/at-debug.ucl                 |  20 ---
 release/packages/at.ucl                       |   4 +-
 release/packages/autofs-debug.ucl             |  20 ---
 release/packages/autofs.ucl                   |   4 +-
 release/packages/bhyve-debug.ucl              |  22 ---
 release/packages/bhyve.ucl                    |   8 +-
 release/packages/binutils-debug.ucl           |  20 ---
 release/packages/binutils.ucl                 |   4 +-
 release/packages/bsdinstall-debug.ucl         |  20 ---
 release/packages/bsdinstall.ucl               |   4 +-
 release/packages/bsnmp-debug.ucl              |  20 ---
 release/packages/bsnmp-development.ucl        |  20 ---
 release/packages/bsnmp-lib32-debug.ucl        |  20 ---
 release/packages/bsnmp-lib32-development.ucl  |  20 ---
 release/packages/bsnmp-lib32-profile.ucl      |  20 ---
 release/packages/bsnmp-lib32.ucl              |  20 ---
 release/packages/bsnmp-profile.ucl            |  20 ---
 release/packages/bsnmp.ucl                    |   4 +-
 release/packages/clang-debug.ucl              |  20 ---
 release/packages/clang.ucl                    |   4 +-
 release/packages/debug.ucl                    |   4 +-
 release/packages/development.ucl              |   2 +-
 release/packages/dma-debug.ucl                |  21 ---
 release/packages/dma.ucl                      |   7 +-
 release/packages/ee-debug.ucl                 |  20 ---
 release/packages/ee.ucl                       |   4 +-
 release/packages/gdb-debug.ucl                |  20 ---
 release/packages/gdb.ucl                      |   4 +-
 release/packages/generate-ucl.sh              | 138 ++++++++++++++++++
 release/packages/groff-debug.ucl              |  20 ---
 release/packages/groff.ucl                    |   4 +-
 release/packages/jail-debug.ucl               |  20 ---
 release/packages/jail-development.ucl         |  20 ---
 release/packages/jail-lib32-debug.ucl         |  20 ---
 release/packages/jail-lib32-development.ucl   |  20 ---
 release/packages/jail-lib32-profile.ucl       |  20 ---
 release/packages/jail-lib32.ucl               |  20 ---
 release/packages/jail-profile.ucl             |  20 ---
 release/packages/jail.ucl                     |   4 +-
 release/packages/lib32-debug.ucl              |  20 ---
 release/packages/lib32-development.ucl        |  20 ---
 release/packages/lib32.ucl                    |   4 +-
 release/packages/profile.ucl                  |   2 +-
 release/packages/rcmds-debug.ucl              |  20 ---
 release/packages/rcmds.ucl                    |   4 +-
 release/packages/runtime-manuals.ucl          |   4 +-
 release/packages/runtime.ucl                  |   7 -
 release/packages/ssh-debug.ucl                |  20 ---
 release/packages/ssh-development.ucl          |  20 ---
 release/packages/ssh-lib32-debug.ucl          |  20 ---
 release/packages/ssh-lib32-development.ucl    |  20 ---
 release/packages/ssh-lib32-profile.ucl        |  20 ---
 release/packages/ssh-lib32.ucl                |  20 ---
 release/packages/ssh-profile.ucl              |  20 ---
 release/packages/ssh.ucl                      |   4 +-
 release/packages/svn-debug.ucl                |  20 ---
 release/packages/svn.ucl                      |   6 +-
 release/packages/syscons.ucl                  |   6 +-
 .../{lib32-profile.ucl => template.ucl}       |   9 +-
 release/packages/tests-debug.ucl              |  20 ---
 release/packages/tests-development.ucl        |  20 ---
 release/packages/tests-profile.ucl            |  20 ---
 release/packages/tests.ucl                    |   2 +-
 release/packages/unbound-debug.ucl            |  21 ---
 release/packages/unbound-development.ucl      |  21 ---
 release/packages/unbound-lib32-debug.ucl      |  21 ---
 .../packages/unbound-lib32-development.ucl    |  21 ---
 release/packages/unbound-lib32-profile.ucl    |  21 ---
 release/packages/unbound-lib32.ucl            |  21 ---
 release/packages/unbound-profile.ucl          |  21 ---
 release/packages/unbound.ucl                  |   7 +-
 release/packages/vi-debug.ucl                 |  20 ---
 release/packages/vi.ucl                       |   4 +-
 83 files changed, 268 insertions(+), 1100 deletions(-)
 create mode 100644 release/packages/Makefile.package
 delete mode 100644 release/packages/acct-debug.ucl
 delete mode 100644 release/packages/acpi-debug.ucl
 delete mode 100644 release/packages/amd-debug.ucl
 delete mode 100644 release/packages/apm-debug.ucl
 delete mode 100644 release/packages/at-debug.ucl
 delete mode 100644 release/packages/autofs-debug.ucl
 delete mode 100644 release/packages/bhyve-debug.ucl
 delete mode 100644 release/packages/binutils-debug.ucl
 delete mode 100644 release/packages/bsdinstall-debug.ucl
 delete mode 100644 release/packages/bsnmp-debug.ucl
 delete mode 100644 release/packages/bsnmp-development.ucl
 delete mode 100644 release/packages/bsnmp-lib32-debug.ucl
 delete mode 100644 release/packages/bsnmp-lib32-development.ucl
 delete mode 100644 release/packages/bsnmp-lib32-profile.ucl
 delete mode 100644 release/packages/bsnmp-lib32.ucl
 delete mode 100644 release/packages/bsnmp-profile.ucl
 delete mode 100644 release/packages/clang-debug.ucl
 delete mode 100644 release/packages/dma-debug.ucl
 delete mode 100644 release/packages/ee-debug.ucl
 delete mode 100644 release/packages/gdb-debug.ucl
 create mode 100755 release/packages/generate-ucl.sh
 delete mode 100644 release/packages/groff-debug.ucl
 delete mode 100644 release/packages/jail-debug.ucl
 delete mode 100644 release/packages/jail-development.ucl
 delete mode 100644 release/packages/jail-lib32-debug.ucl
 delete mode 100644 release/packages/jail-lib32-development.ucl
 delete mode 100644 release/packages/jail-lib32-profile.ucl
 delete mode 100644 release/packages/jail-lib32.ucl
 delete mode 100644 release/packages/jail-profile.ucl
 delete mode 100644 release/packages/lib32-debug.ucl
 delete mode 100644 release/packages/lib32-development.ucl
 delete mode 100644 release/packages/rcmds-debug.ucl
 delete mode 100644 release/packages/ssh-debug.ucl
 delete mode 100644 release/packages/ssh-development.ucl
 delete mode 100644 release/packages/ssh-lib32-debug.ucl
 delete mode 100644 release/packages/ssh-lib32-development.ucl
 delete mode 100644 release/packages/ssh-lib32-profile.ucl
 delete mode 100644 release/packages/ssh-lib32.ucl
 delete mode 100644 release/packages/ssh-profile.ucl
 delete mode 100644 release/packages/svn-debug.ucl
 rename release/packages/{lib32-profile.ucl => template.ucl} (66%)
 delete mode 100644 release/packages/tests-debug.ucl
 delete mode 100644 release/packages/tests-development.ucl
 delete mode 100644 release/packages/tests-profile.ucl
 delete mode 100644 release/packages/unbound-debug.ucl
 delete mode 100644 release/packages/unbound-development.ucl
 delete mode 100644 release/packages/unbound-lib32-debug.ucl
 delete mode 100644 release/packages/unbound-lib32-development.ucl
 delete mode 100644 release/packages/unbound-lib32-profile.ucl
 delete mode 100644 release/packages/unbound-lib32.ucl
 delete mode 100644 release/packages/unbound-profile.ucl
 delete mode 100644 release/packages/vi-debug.ucl

diff --git a/Makefile.inc1 b/Makefile.inc1
index 8fc07557dbf1..ded62724a588 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1393,22 +1393,13 @@ create-world-packages:	_pkgbootstrap
 		${DESTDIR}/METALOG
 	@for plist in ${DESTDIR}/*.plist; do \
 		plist=$${plist##*/} ; \
-		test -f ${SRCDIR}/release/packages/$${plist%.plist}.ucl || \
-			( echo "Unkown package FreeBSD-$${plist%.plist}" ; false ) ; \
+		pkgname=$${plist%.plist} ; \
+		sh ${SRCDIR}/release/packages/generate-ucl.sh -o $${pkgname} \
+			-s ${SRCDIR} -u ${DESTDIR}/$${pkgname}.ucl ; \
 	done
-	@cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
-	pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
-	for plist in ${DESTDIR}/*.plist; do \
+	@for plist in ${DESTDIR}/*.plist; do \
 		plist=$${plist##*/} ; \
 		pkgname=$${plist%.plist} ; \
-		sed -e "s/%VERSION%/${PKG_VERSION}/" \
-			-e "s/%PKGNAME%/$${pkgname}/" \
-			-e "s/%COMMENT%/Generic comment for $${pkgname}/" \
-			-e "s/%DESC%/Generic description for $${pkgname}/" \
-			-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
-			-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
-			${SRCDIR}/release/packages/$${pkgname}.ucl \
-			> ${DESTDIR}/$${pkgname}.ucl ; \
 		awk -F\" ' \
 			/^name/ { printf("===> Creating %s-", $$2); next } \
 			/^version/ { print $$2; next } \
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
new file mode 100644
index 000000000000..27e310aabf11
--- /dev/null
+++ b/release/packages/Makefile.package
@@ -0,0 +1,67 @@
+#
+# $FreeBSD$
+#
+
+acct_DESC= 		Accounting Utilties
+acpi_DESC= 		ACPI Utilities
+amd_DESC= 		AMD Utilities
+apm_DESC= 		APM Utilities
+at_DESC= 		AT Utilities
+autofs_DESC= 		Autofs Utilities
+bhyve_DESC= 		Bhyve Utilities
+binutils_DESC= 		Binutils
+bsdinstall_DESC= 	BSDInstall Utilities
+bsnmp_DESC= 		BSNMP Utilities
+clang_DESC= 		Clang Utilities
+docs_DESC= 		Documentation
+dma_DESC= 		DMA Mail Agent Utilities
+ee_DESC= 		Easy Editor Utilities
+gdb_DESC= 		GDB Utilities
+groff_DESC= 		Groff Utilities
+jail_DESC= 		Jail Utilities
+kernel_DESC= 		FreeBSD Kernel
+rcmds_DESC= 		Remote Command Utilities
+manuals_DESC= 		Manual Pages
+ssh_DESC= 		Secure Shell Utilities
+svn_DESC= 		Subversion Version Conrol System
+syscons_DESC= 		Syscons Console
+tests_DESC= 		Test Suite
+unbound_DESC= 		Unbound DNS Resolver
+vi_DESC= 		Vi Editor
+debug_DESC= 		FreeBSD Base System (Debugging Symbols)
+development_DESC= 	FreeBSD Base System (Development Files)
+lib32_DESC= 		FreeBSD Base System (32-bit Libraries)
+profile_DESC= 		FreeBSD Base System (Profiling Libraries)
+runtime_DESC= 		FreeBSD Base System
+
+acct_COMMENT= 		Accounting Utilties
+acpi_COMMENT= 		ACPI Utilities
+amd_COMMENT= 		AMD Utilities
+apm_COMMENT= 		APM Utilities
+at_COMMENT= 		AT Utilities
+autofs_COMMENT= 	Autofs Utilities
+bhyve_COMMENT= 		Bhyve Utilities
+binutils_COMMENT= 	Binutils
+bsdinstall_COMMENT= 	BSDInstall Utilities
+bsnmp_COMMENT= 		BSNMP Utilities
+clang_COMMENT= 		Clang Utilities
+docs_COMMENT= 		Documentation
+dma_COMMENT= 		DMA Mail Agent Utilities
+ee_COMMENT= 		Easy Editor Utilities
+gdb_COMMENT= 		GDB Utilities
+groff_COMMENT= 		Groff Utilities
+jail_COMMENT= 		Jail Utilities
+kernel_COMMENT= 	FreeBSD Kernel
+rcmds_COMMENT= 		Remote Command Utilities
+manuals_COMMENT= 	Manual Pages
+ssh_COMMENT= 		Secure Shell Utilities
+svn_COMMENT= 		Subversion Version Conrol System
+syscons_COMMENT= 	Syscons Console
+tests_COMMENT= 		Test Suite
+unbound_COMMENT= 	Unbound DNS Resolver
+vi_COMMENT= 		Vi Editor
+debug_COMMENT= 		FreeBSD Base System (Debugging Symbols)
+development_COMMENT= 	FreeBSD Base System (Development Files)
+lib32_COMMENT= 		FreeBSD Base System (32-bit Libraries)
+profile_COMMENT= 	FreeBSD Base System (Profiling Libraries)
+runtime_COMMENT= 	FreeBSD Base System
diff --git a/release/packages/acct-debug.ucl b/release/packages/acct-debug.ucl
deleted file mode 100644
index 90dc7a7dabb6..000000000000
--- a/release/packages/acct-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Accounting Tools (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-acct: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/acct.ucl b/release/packages/acct.ucl
index 8d361d984883..85bc4c7125ef 100644
--- a/release/packages/acct.ucl
+++ b/release/packages/acct.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Accounting Tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/acpi-debug.ucl b/release/packages/acpi-debug.ucl
deleted file mode 100644
index 646a2a8ef1b1..000000000000
--- a/release/packages/acpi-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "ACPI tools (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-acpi: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/acpi.ucl b/release/packages/acpi.ucl
index 97546908d410..85bc4c7125ef 100644
--- a/release/packages/acpi.ucl
+++ b/release/packages/acpi.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "ACPI tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/amd-debug.ucl b/release/packages/amd-debug.ucl
deleted file mode 100644
index 88e9c7d52733..000000000000
--- a/release/packages/amd-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "BSD 4.4 Automounter (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-amd: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/amd.ucl b/release/packages/amd.ucl
index f60d902a9d93..85bc4c7125ef 100644
--- a/release/packages/amd.ucl
+++ b/release/packages/amd.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "BSD 4.4 Automounter"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/apm-debug.ucl b/release/packages/apm-debug.ucl
deleted file mode 100644
index a6361fce46ee..000000000000
--- a/release/packages/apm-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Advanced Power Management Utilities (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-apm: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/apm.ucl b/release/packages/apm.ucl
index 32a7fad6fd86..85bc4c7125ef 100644
--- a/release/packages/apm.ucl
+++ b/release/packages/apm.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Advanced Power Management Utilities"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/at-debug.ucl b/release/packages/at-debug.ucl
deleted file mode 100644
index 795cf3f22f09..000000000000
--- a/release/packages/at-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "at(1) and related utilities (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-at: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/at.ucl b/release/packages/at.ucl
index 2fdde537f4e8..85bc4c7125ef 100644
--- a/release/packages/at.ucl
+++ b/release/packages/at.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "at(1) and related utilities"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/autofs-debug.ucl b/release/packages/autofs-debug.ucl
deleted file mode 100644
index 77ea944e91ae..000000000000
--- a/release/packages/autofs-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Autofs(5) Utilities (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-autofs: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/autofs.ucl b/release/packages/autofs.ucl
index 108186757ba8..85bc4c7125ef 100644
--- a/release/packages/autofs.ucl
+++ b/release/packages/autofs.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Autofs(5) Utilities"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/bhyve-debug.ucl b/release/packages/bhyve-debug.ucl
deleted file mode 100644
index 225c2738819d..000000000000
--- a/release/packages/bhyve-debug.ucl
+++ /dev/null
@@ -1,22 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "The BSD Hypervisor (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-bhyve, the "BSD hypervisor" is a hypervisor/virtual machine manager developed on
-FreeBSD and relies on modern CPU features such as Extended Page Tables (EPT) and
-VirtIO network and storage drivers
-EOD
-deps: {
-    FreeBSD-bhyve: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/bhyve.ucl b/release/packages/bhyve.ucl
index cd586f0966d5..85bc4c7125ef 100644
--- a/release/packages/bhyve.ucl
+++ b/release/packages/bhyve.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "The BSD Hypervisor"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,12 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-bhyve, the "BSD hypervisor" is a hypervisor/virtual machine manager developed on
-FreeBSD and relies on modern CPU features such as Extended Page Tables (EPT) and
-VirtIO network and storage drivers
+%DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/binutils-debug.ucl b/release/packages/binutils-debug.ucl
deleted file mode 100644
index f89ea6d7c0de..000000000000
--- a/release/packages/binutils-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "GNU binutils (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ GPLv2 ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-binutils: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/binutils.ucl b/release/packages/binutils.ucl
index a4d5503a02ac..bd401ec2f7fd 100644
--- a/release/packages/binutils.ucl
+++ b/release/packages/binutils.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "GNU binutils"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/bsdinstall-debug.ucl b/release/packages/bsdinstall-debug.ucl
deleted file mode 100644
index 7592df0f8e1f..000000000000
--- a/release/packages/bsdinstall-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Installer (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsdinstall: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/bsdinstall.ucl b/release/packages/bsdinstall.ucl
index d81b76980838..85bc4c7125ef 100644
--- a/release/packages/bsdinstall.ucl
+++ b/release/packages/bsdinstall.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Installer"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/bsnmp-debug.ucl b/release/packages/bsnmp-debug.ucl
deleted file mode 100644
index d93c68da677b..000000000000
--- a/release/packages/bsnmp-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP daemon and userland tools (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsnmp: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/bsnmp-development.ucl b/release/packages/bsnmp-development.ucl
deleted file mode 100644
index 40010538d673..000000000000
--- a/release/packages/bsnmp-development.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP development"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsnmp: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/bsnmp-lib32-debug.ucl b/release/packages/bsnmp-lib32-debug.ucl
deleted file mode 100644
index c07571c6266f..000000000000
--- a/release/packages/bsnmp-lib32-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP 32-bit libraries (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsnmp-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/bsnmp-lib32-development.ucl b/release/packages/bsnmp-lib32-development.ucl
deleted file mode 100644
index 3bd6cd767e4e..000000000000
--- a/release/packages/bsnmp-lib32-development.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP 32-bit development"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsnmp-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/bsnmp-lib32-profile.ucl b/release/packages/bsnmp-lib32-profile.ucl
deleted file mode 100644
index c147f3f84dc8..000000000000
--- a/release/packages/bsnmp-lib32-profile.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP 32-bit libraries (profiling)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsnmp-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/bsnmp-lib32.ucl b/release/packages/bsnmp-lib32.ucl
deleted file mode 100644
index e84ab6ac8625..000000000000
--- a/release/packages/bsnmp-lib32.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP 32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-runtime: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/bsnmp-profile.ucl b/release/packages/bsnmp-profile.ucl
deleted file mode 100644
index 984f84c2d7c9..000000000000
--- a/release/packages/bsnmp-profile.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP libraries (profiling)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsnmp: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/bsnmp.ucl b/release/packages/bsnmp.ucl
index f9b412b8ea8e..85bc4c7125ef 100644
--- a/release/packages/bsnmp.ucl
+++ b/release/packages/bsnmp.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "SNMP daemon and userland tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/clang-debug.ucl b/release/packages/clang-debug.ucl
deleted file mode 100644
index 15bbc7f32d86..000000000000
--- a/release/packages/clang-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Clang compiler tools (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-clang: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/clang.ucl b/release/packages/clang.ucl
index 128d15af4eb2..85bc4c7125ef 100644
--- a/release/packages/clang.ucl
+++ b/release/packages/clang.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Clang compiler tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/debug.ucl b/release/packages/debug.ucl
index ecdb1a4eb838..85bc4c7125ef 100644
--- a/release/packages/debug.ucl
+++ b/release/packages/debug.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "%COMMENT% (debugging symbols)"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/development.ucl b/release/packages/development.ucl
index 3ac8a73a52ab..85bc4c7125ef 100644
--- a/release/packages/development.ucl
+++ b/release/packages/development.ucl
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/dma-debug.ucl b/release/packages/dma-debug.ucl
deleted file mode 100644
index dce74b5d9442..000000000000
--- a/release/packages/dma-debug.ucl
+++ /dev/null
@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "DragonFly Mail Agent (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-The DragonFly Mail Agent, a small Mail Transport Agent (MTA), designed for
-home and office use.
-EOD
-deps: {
-    FreeBSD-dma: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/dma.ucl b/release/packages/dma.ucl
index 21bd1d93437b..85bc4c7125ef 100644
--- a/release/packages/dma.ucl
+++ b/release/packages/dma.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "DragonFly Mail Agent"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,11 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-The DragonFly Mail Agent, a small Mail Transport Agent (MTA), designed for
-home and office use.
+%DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/ee-debug.ucl b/release/packages/ee-debug.ucl
deleted file mode 100644
index 5c8ba566f830..000000000000
--- a/release/packages/ee-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "ee(1) Utility (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ee: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/ee.ucl b/release/packages/ee.ucl
index b49c5a671d27..85bc4c7125ef 100644
--- a/release/packages/ee.ucl
+++ b/release/packages/ee.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "ee(1) Utility"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/gdb-debug.ucl b/release/packages/gdb-debug.ucl
deleted file mode 100644
index 5892a535207e..000000000000
--- a/release/packages/gdb-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "GNU gdb (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ GPLv2 ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-gdb: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/gdb.ucl b/release/packages/gdb.ucl
index c62b0e0b21e4..bd401ec2f7fd 100644
--- a/release/packages/gdb.ucl
+++ b/release/packages/gdb.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "GNU gdb"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
new file mode 100755
index 000000000000..c395ffdeaa21
--- /dev/null
+++ b/release/packages/generate-ucl.sh
@@ -0,0 +1,138 @@
+#!/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
+		*_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 "${@}"
diff --git a/release/packages/groff-debug.ucl b/release/packages/groff-debug.ucl
deleted file mode 100644
index e753a1ed76f4..000000000000
--- a/release/packages/groff-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "GNU groff (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ GPLv2 ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-groff: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/groff.ucl b/release/packages/groff.ucl
index c494a2a3cd10..bd401ec2f7fd 100644
--- a/release/packages/groff.ucl
+++ b/release/packages/groff.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "GNU groff"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/jail-debug.ucl b/release/packages/jail-debug.ucl
deleted file mode 100644
index f518dfe42a22..000000000000
--- a/release/packages/jail-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail utilities (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-jail: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/jail-development.ucl b/release/packages/jail-development.ucl
deleted file mode 100644
index 8ab0279fa6a5..000000000000
--- a/release/packages/jail-development.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail utilities development"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-jail: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/jail-lib32-debug.ucl b/release/packages/jail-lib32-debug.ucl
deleted file mode 100644
index d7880c737c84..000000000000
--- a/release/packages/jail-lib32-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail 32-bit libraries (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-jail-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/jail-lib32-development.ucl b/release/packages/jail-lib32-development.ucl
deleted file mode 100644
index 2546f6d86a7d..000000000000
--- a/release/packages/jail-lib32-development.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail 32-bit development" 
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-jail-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/jail-lib32-profile.ucl b/release/packages/jail-lib32-profile.ucl
deleted file mode 100644
index 5ba65cf62573..000000000000
--- a/release/packages/jail-lib32-profile.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail 32-bit libraries (profiling)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-jail-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/jail-lib32.ucl b/release/packages/jail-lib32.ucl
deleted file mode 100644
index da6c8e6e06d2..000000000000
--- a/release/packages/jail-lib32.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail 32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-runtime: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/jail-profile.ucl b/release/packages/jail-profile.ucl
deleted file mode 100644
index 9f49b31c123c..000000000000
--- a/release/packages/jail-profile.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail libraries (profiling)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-jail: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/jail.ucl b/release/packages/jail.ucl
index 6e215bad122a..85bc4c7125ef 100644
--- a/release/packages/jail.ucl
+++ b/release/packages/jail.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Jail utilities"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/lib32-debug.ucl b/release/packages/lib32-debug.ucl
deleted file mode 100644
index 8e4ef62bacdb..000000000000
--- a/release/packages/lib32-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "32-bit libraries (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/lib32-development.ucl b/release/packages/lib32-development.ucl
deleted file mode 100644
index 990d2009e5e0..000000000000
--- a/release/packages/lib32-development.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/lib32.ucl b/release/packages/lib32.ucl
index eda4a8a5e043..85bc4c7125ef 100644
--- a/release/packages/lib32.ucl
+++ b/release/packages/lib32.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "32-bit libraries"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/profile.ucl b/release/packages/profile.ucl
index 3ac8a73a52ab..85bc4c7125ef 100644
--- a/release/packages/profile.ucl
+++ b/release/packages/profile.ucl
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/rcmds-debug.ucl b/release/packages/rcmds-debug.ucl
deleted file mode 100644
index 36f1ad70d071..000000000000
--- a/release/packages/rcmds-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Remote Command Tools (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-rcmds: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/rcmds.ucl b/release/packages/rcmds.ucl
index 376ec7e9ee4f..85bc4c7125ef 100644
--- a/release/packages/rcmds.ucl
+++ b/release/packages/rcmds.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Remote Command Tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/runtime-manuals.ucl b/release/packages/runtime-manuals.ucl
index 002c5bebe522..85bc4c7125ef 100644
--- a/release/packages/runtime-manuals.ucl
+++ b/release/packages/runtime-manuals.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "FreeBSD runtime manual pages"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl
index 16ab12d0f63a..30096c1c004e 100644
--- a/release/packages/runtime.ucl
+++ b/release/packages/runtime.ucl
@@ -17,10 +17,3 @@ scripts: {
 	pwd_mkdb %PWD_MKDB_ENDIAN% -i -p -d  ${PKG_ROOTDIR}/etc ${PKG_ROOTDIR}/etc/master.passwd
 EOD
 }
-deps: {
-    FreeBSD-runtime: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/ssh-debug.ucl b/release/packages/ssh-debug.ucl
deleted file mode 100644
index db3ff9e3d455..000000000000
--- a/release/packages/ssh-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ssh: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/ssh-development.ucl b/release/packages/ssh-development.ucl
deleted file mode 100644
index 0011ea88d815..000000000000
--- a/release/packages/ssh-development.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ssh: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/ssh-lib32-debug.ucl b/release/packages/ssh-lib32-debug.ucl
deleted file mode 100644
index 016bd14c8478..000000000000
--- a/release/packages/ssh-lib32-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell 32-bit libraries (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ssh-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/ssh-lib32-development.ucl b/release/packages/ssh-lib32-development.ucl
deleted file mode 100644
index 5c40cff4bec5..000000000000
--- a/release/packages/ssh-lib32-development.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell 32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ssh-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/ssh-lib32-profile.ucl b/release/packages/ssh-lib32-profile.ucl
deleted file mode 100644
index 5c40cff4bec5..000000000000
--- a/release/packages/ssh-lib32-profile.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell 32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ssh-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/ssh-lib32.ucl b/release/packages/ssh-lib32.ucl
deleted file mode 100644
index d082f5cf77cb..000000000000
--- a/release/packages/ssh-lib32.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell 32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-runtime: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/ssh-profile.ucl b/release/packages/ssh-profile.ucl
deleted file mode 100644
index 0011ea88d815..000000000000
--- a/release/packages/ssh-profile.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ssh: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/ssh.ucl b/release/packages/ssh.ucl
index ac9e59f8497e..4717172795b9 100644
--- a/release/packages/ssh.ucl
+++ b/release/packages/ssh.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Secure SHell"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/svn-debug.ucl b/release/packages/svn-debug.ucl
deleted file mode 100644
index 24ee96c8d9bd..000000000000
--- a/release/packages/svn-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Version control system (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ APACHE20 ]
-desc = <<EOD
-Lite version of the Subversion version control system
-EOD
-deps: {
-    FreeBSD-svn: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/svn.ucl b/release/packages/svn.ucl
index 740caac6ac33..ba440684107d 100644
--- a/release/packages/svn.ucl
+++ b/release/packages/svn.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Version control system"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,10 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ APACHE20 ]
 desc = <<EOD
-Lite version of the Subversion version control system
+%DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/syscons.ucl b/release/packages/syscons.ucl
index 5a0bde7d2549..85bc4c7125ef 100644
--- a/release/packages/syscons.ucl
+++ b/release/packages/syscons.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "syscons(4) support files"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,10 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-syscons(4) support files such as keyboard maps, fonts and screen output maps.
+%DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/lib32-profile.ucl b/release/packages/template.ucl
similarity index 66%
rename from release/packages/lib32-profile.ucl
rename to release/packages/template.ucl
index 990d2009e5e0..c78cd7096fdd 100644
--- a/release/packages/lib32-profile.ucl
+++ b/release/packages/template.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "32-bit libraries"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -11,10 +11,3 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/tests-debug.ucl b/release/packages/tests-debug.ucl
deleted file mode 100644
index c2f161bb365d..000000000000
--- a/release/packages/tests-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "%COMMENT% (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-tests: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/tests-development.ucl b/release/packages/tests-development.ucl
deleted file mode 100644
index a2327c6b8984..000000000000
--- a/release/packages/tests-development.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "%COMMENT% (development)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-tests: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/tests-profile.ucl b/release/packages/tests-profile.ucl
deleted file mode 100644
index 316bad1e56b7..000000000000
--- a/release/packages/tests-profile.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "%COMMENT% (profiling)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-tests: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/tests.ucl b/release/packages/tests.ucl
index 3ac8a73a52ab..85bc4c7125ef 100644
--- a/release/packages/tests.ucl
+++ b/release/packages/tests.ucl
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/unbound-debug.ucl b/release/packages/unbound-debug.ucl
deleted file mode 100644
index 77a1ead9ed17..000000000000
--- a/release/packages/unbound-debug.ucl
+++ /dev/null
@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-unbound: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/unbound-development.ucl b/release/packages/unbound-development.ucl
deleted file mode 100644
index d8c1f1cdd21c..000000000000
--- a/release/packages/unbound-development.ucl
+++ /dev/null
@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-unbound: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/unbound-lib32-debug.ucl b/release/packages/unbound-lib32-debug.ucl
deleted file mode 100644
index 24fc22798c84..000000000000
--- a/release/packages/unbound-lib32-debug.ucl
+++ /dev/null
@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver, 32-bit libraries (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-unbound-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/unbound-lib32-development.ucl b/release/packages/unbound-lib32-development.ucl
deleted file mode 100644
index ce7ee21b9692..000000000000
--- a/release/packages/unbound-lib32-development.ucl
+++ /dev/null
@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-unbound-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/unbound-lib32-profile.ucl b/release/packages/unbound-lib32-profile.ucl
deleted file mode 100644
index ce7ee21b9692..000000000000
--- a/release/packages/unbound-lib32-profile.ucl
+++ /dev/null
@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-unbound-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/unbound-lib32.ucl b/release/packages/unbound-lib32.ucl
deleted file mode 100644
index 6eced1b7dddc..000000000000
--- a/release/packages/unbound-lib32.ucl
+++ /dev/null
@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver, 32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-runtime: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/unbound-profile.ucl b/release/packages/unbound-profile.ucl
deleted file mode 100644
index d8c1f1cdd21c..000000000000
--- a/release/packages/unbound-profile.ucl
+++ /dev/null
@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-unbound: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/unbound.ucl b/release/packages/unbound.ucl
index 8efb77c2ba7a..3b8176a3ed71 100644
--- a/release/packages/unbound.ucl
+++ b/release/packages/unbound.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,11 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD4CLAUSE ]
 desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
+%DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }
diff --git a/release/packages/vi-debug.ucl b/release/packages/vi-debug.ucl
deleted file mode 100644
index e320d6248939..000000000000
--- a/release/packages/vi-debug.ucl
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Vi Editor (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-vi: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-
diff --git a/release/packages/vi.ucl b/release/packages/vi.ucl
index f485b7bc1c52..85bc4c7125ef 100644
--- a/release/packages/vi.ucl
+++ b/release/packages/vi.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Vi Editor"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }