diff --git a/release/packages/acct.ucl b/release/packages/acct.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/acct.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/acpi.ucl b/release/packages/acpi.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/acpi.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/amd.ucl b/release/packages/amd.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/amd.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/apm.ucl b/release/packages/apm.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/apm.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/at.ucl b/release/packages/at.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/at.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/autofs.ucl b/release/packages/autofs.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/autofs.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/bhyve.ucl b/release/packages/bhyve.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/bhyve.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/binutils.ucl b/release/packages/binutils.ucl
index 281d2a593492..fcf05b313b38 100644
--- a/release/packages/binutils.ucl
+++ b/release/packages/binutils.ucl
@@ -1,24 +1,18 @@
 #
 # $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 = [ GPLv2 ]
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
diff --git a/release/packages/bluetooth.ucl b/release/packages/bluetooth.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/bluetooth.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/bsdinstall.ucl b/release/packages/bsdinstall.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/bsdinstall.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/bsnmp.ucl b/release/packages/bsnmp.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/bsnmp.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/caroot.ucl b/release/packages/caroot.ucl
index 923601ea0f3e..d603f9524ddf 100644
--- a/release/packages/caroot.ucl
+++ b/release/packages/caroot.ucl
@@ -1,31 +1,25 @@
 #
 # $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%"
-    }
-}
 scripts: {
 	# XXX If pkg picks up a mechanism to detect in the post-install script
 	# files being added or removed, we should use it instead to gate the
 	# rehash.
 	post-install = <<EOD
 	[ -x /usr/sbin/certctl ] && /usr/sbin/certctl rehash
 EOD
 }
diff --git a/release/packages/clang.ucl b/release/packages/clang.ucl
index 9b2f16fd1451..3f8820abcbdf 100644
--- a/release/packages/clang.ucl
+++ b/release/packages/clang.ucl
@@ -1,24 +1,18 @@
 #
 # $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 = [ NCSA ]
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
diff --git a/release/packages/dma.ucl b/release/packages/dma.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/dma.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/ee.ucl b/release/packages/ee.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/ee.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/gdb.ucl b/release/packages/gdb.ucl
index 281d2a593492..fcf05b313b38 100644
--- a/release/packages/gdb.ucl
+++ b/release/packages/gdb.ucl
@@ -1,24 +1,18 @@
 #
 # $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 = [ GPLv2 ]
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index eff7e3ab8504..f36ac75cb77c 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -1,148 +1,161 @@
 #!/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
+		clibs)
+			# clibs should not have any dependencies or anything
+			# else imposed on it.
+			;;
 		caroot)
 			pkgdeps="utilities"
 			;;
 		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)"
 			;;
 		jail_*)
 			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}"
 			;;
 		${origname})
 			pkgdeps="runtime"
 			;;
 		*)
 			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}"
+	if [ ! -z "${pkgdeps}" ]; then
+		cat <<EOF >> ${uclfile}
+deps: {
+	FreeBSD-${pkgdeps}: {
+		origin: "base",
+		version: "${PKG_VERSION}"
+	}
+}
+EOF
+	fi
 	cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_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/%PKGDEPS%/${pkgdeps}/" \
 		${uclfile}
 	return 0
 }
 
 main "${@}"
diff --git a/release/packages/groff.ucl b/release/packages/groff.ucl
index 281d2a593492..fcf05b313b38 100644
--- a/release/packages/groff.ucl
+++ b/release/packages/groff.ucl
@@ -1,24 +1,18 @@
 #
 # $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 = [ GPLv2 ]
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
diff --git a/release/packages/hostapd.ucl b/release/packages/hostapd.ucl
deleted file mode 100644
index 65b7e90f42f1..000000000000
--- a/release/packages/hostapd.ucl
+++ /dev/null
@@ -1,23 +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%"
-    }
-}
diff --git a/release/packages/jail-debug.ucl b/release/packages/jail-debug.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/jail-debug.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/jail-development.ucl b/release/packages/jail-development.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/jail-development.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/jail-lib32-debug.ucl b/release/packages/jail-lib32-debug.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/jail-lib32-debug.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/jail-lib32-development.ucl b/release/packages/jail-lib32-development.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/jail-lib32-development.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/jail-lib32-profile.ucl b/release/packages/jail-lib32-profile.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/jail-lib32-profile.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/jail-lib32.ucl b/release/packages/jail-lib32.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/jail-lib32.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/jail-profile.ucl b/release/packages/jail-profile.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/jail-profile.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/jail.ucl b/release/packages/jail.ucl
index 53abd14b8521..fcb9a567125b 100644
--- a/release/packages/jail.ucl
+++ b/release/packages/jail.ucl
@@ -1,25 +1,19 @@
 #
 # $FreeBSD$
 #
 
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
 prefix = "/"
 vital = true
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
diff --git a/release/packages/lld.ucl b/release/packages/lld.ucl
index 9b2f16fd1451..3f8820abcbdf 100644
--- a/release/packages/lld.ucl
+++ b/release/packages/lld.ucl
@@ -1,24 +1,18 @@
 #
 # $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 = [ NCSA ]
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
diff --git a/release/packages/lldb.ucl b/release/packages/lldb.ucl
index 9b2f16fd1451..3f8820abcbdf 100644
--- a/release/packages/lldb.ucl
+++ b/release/packages/lldb.ucl
@@ -1,24 +1,18 @@
 #
 # $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 = [ NCSA ]
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
diff --git a/release/packages/rcmds.ucl b/release/packages/rcmds.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/rcmds.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/runtime-debug.ucl b/release/packages/runtime-debug.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/runtime-debug.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/runtime-development.ucl b/release/packages/runtime-development.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/runtime-development.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/runtime-lib32.ucl b/release/packages/runtime-lib32.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/runtime-lib32.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/runtime-manuals.ucl b/release/packages/runtime-manuals.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/runtime-manuals.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/runtime-profile.ucl b/release/packages/runtime-profile.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/runtime-profile.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl
index 80f5e262be16..1d6f6c3ded29 100644
--- a/release/packages/runtime.ucl
+++ b/release/packages/runtime.ucl
@@ -1,35 +1,29 @@
 #
 # $FreeBSD$
 #
 
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT% %VCS_REVISION%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
 prefix = "/"
 vital = true
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
 scripts: {
 	post-install = <<EOD
 	pwd_mkdb -i -p -d  ${PKG_ROOTDIR}/etc ${PKG_ROOTDIR}/etc/master.passwd
 	services_mkdb %CAP_MKDB_ENDIAN% -q -o ${PKG_ROOTDIR}/var/db/services.db ${PKG_ROOTDIR}/etc/services
 	chmod 1777 ${PKG_ROOTDIR}/tmp
 EOD
 }
-deps: {
-    "FreeBSD-clibs": {
-        origin: "base"
-        version: "%VERSION%"
-    }
-}
 directories {
     /dev = "y";
     /tmp = "y";
 }
diff --git a/release/packages/ssh.ucl b/release/packages/ssh.ucl
index aa934645d245..faf264e00f10 100644
--- a/release/packages/ssh.ucl
+++ b/release/packages/ssh.ucl
@@ -1,24 +1,18 @@
 #
 # $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 = [ ISCL ]
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
diff --git a/release/packages/svn.ucl b/release/packages/svn.ucl
index 4fd345e57138..5211101e9e8c 100644
--- a/release/packages/svn.ucl
+++ b/release/packages/svn.ucl
@@ -1,24 +1,18 @@
 #
 # $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 = [ APACHE20 ]
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
diff --git a/release/packages/syscons.ucl b/release/packages/syscons.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/syscons.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/tests.ucl b/release/packages/tests.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/tests.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/unbound.ucl b/release/packages/unbound.ucl
index 9b953750ba25..1ba9560abf12 100644
--- a/release/packages/unbound.ucl
+++ b/release/packages/unbound.ucl
@@ -1,24 +1,18 @@
 #
 # $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 = [ BSD4CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
diff --git a/release/packages/vi.ucl b/release/packages/vi.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/vi.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-
diff --git a/release/packages/wpa.ucl b/release/packages/wpa.ucl
deleted file mode 100644
index 753c26bc5021..000000000000
--- a/release/packages/wpa.ucl
+++ /dev/null
@@ -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%"
-    }
-}
-