Index: head/release/packages/acct.ucl
===================================================================
--- head/release/packages/acct.ucl
+++ head/release/packages/acct.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/acpi.ucl
===================================================================
--- head/release/packages/acpi.ucl
+++ head/release/packages/acpi.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/amd.ucl
===================================================================
--- head/release/packages/amd.ucl
+++ head/release/packages/amd.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/apm.ucl
===================================================================
--- head/release/packages/apm.ucl
+++ head/release/packages/apm.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/at.ucl
===================================================================
--- head/release/packages/at.ucl
+++ head/release/packages/at.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/autofs.ucl
===================================================================
--- head/release/packages/autofs.ucl
+++ head/release/packages/autofs.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/bhyve.ucl
===================================================================
--- head/release/packages/bhyve.ucl
+++ head/release/packages/bhyve.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/binutils.ucl
===================================================================
--- head/release/packages/binutils.ucl
+++ head/release/packages/binutils.ucl
@@ -15,10 +15,4 @@
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
Index: head/release/packages/bluetooth.ucl
===================================================================
--- head/release/packages/bluetooth.ucl
+++ head/release/packages/bluetooth.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/bsdinstall.ucl
===================================================================
--- head/release/packages/bsdinstall.ucl
+++ head/release/packages/bsdinstall.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/bsnmp.ucl
===================================================================
--- head/release/packages/bsnmp.ucl
+++ head/release/packages/bsnmp.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/caroot.ucl
===================================================================
--- head/release/packages/caroot.ucl
+++ head/release/packages/caroot.ucl
@@ -15,12 +15,6 @@
 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
Index: head/release/packages/clang.ucl
===================================================================
--- head/release/packages/clang.ucl
+++ head/release/packages/clang.ucl
@@ -15,10 +15,4 @@
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
Index: head/release/packages/dma.ucl
===================================================================
--- head/release/packages/dma.ucl
+++ head/release/packages/dma.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/ee.ucl
===================================================================
--- head/release/packages/ee.ucl
+++ head/release/packages/ee.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/gdb.ucl
===================================================================
--- head/release/packages/gdb.ucl
+++ head/release/packages/gdb.ucl
@@ -15,10 +15,4 @@
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
Index: head/release/packages/generate-ucl.sh
===================================================================
--- head/release/packages/generate-ucl.sh
+++ head/release/packages/generate-ucl.sh
@@ -34,6 +34,10 @@
 	outname="$(echo ${outname} | tr '-' '_')"
 
 	case "${outname}" in
+		clibs)
+			# clibs should not have any dependencies or anything
+			# else imposed on it.
+			;;
 		caroot)
 			pkgdeps="utilities"
 			;;
@@ -134,13 +138,22 @@
 	[ -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
 }
Index: head/release/packages/groff.ucl
===================================================================
--- head/release/packages/groff.ucl
+++ head/release/packages/groff.ucl
@@ -15,10 +15,4 @@
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
Index: head/release/packages/hostapd.ucl
===================================================================
--- head/release/packages/hostapd.ucl
+++ head/release/packages/hostapd.ucl
@@ -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%"
-    }
-}
Index: head/release/packages/jail-debug.ucl
===================================================================
--- head/release/packages/jail-debug.ucl
+++ head/release/packages/jail-debug.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/jail-development.ucl
===================================================================
--- head/release/packages/jail-development.ucl
+++ head/release/packages/jail-development.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/jail-lib32-debug.ucl
===================================================================
--- head/release/packages/jail-lib32-debug.ucl
+++ head/release/packages/jail-lib32-debug.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/jail-lib32-development.ucl
===================================================================
--- head/release/packages/jail-lib32-development.ucl
+++ head/release/packages/jail-lib32-development.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/jail-lib32-profile.ucl
===================================================================
--- head/release/packages/jail-lib32-profile.ucl
+++ head/release/packages/jail-lib32-profile.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/jail-lib32.ucl
===================================================================
--- head/release/packages/jail-lib32.ucl
+++ head/release/packages/jail-lib32.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/jail-profile.ucl
===================================================================
--- head/release/packages/jail-profile.ucl
+++ head/release/packages/jail-profile.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/jail.ucl
===================================================================
--- head/release/packages/jail.ucl
+++ head/release/packages/jail.ucl
@@ -16,10 +16,4 @@
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
Index: head/release/packages/lld.ucl
===================================================================
--- head/release/packages/lld.ucl
+++ head/release/packages/lld.ucl
@@ -15,10 +15,4 @@
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
Index: head/release/packages/lldb.ucl
===================================================================
--- head/release/packages/lldb.ucl
+++ head/release/packages/lldb.ucl
@@ -15,10 +15,4 @@
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
Index: head/release/packages/rcmds.ucl
===================================================================
--- head/release/packages/rcmds.ucl
+++ head/release/packages/rcmds.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/runtime-debug.ucl
===================================================================
--- head/release/packages/runtime-debug.ucl
+++ head/release/packages/runtime-debug.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/runtime-development.ucl
===================================================================
--- head/release/packages/runtime-development.ucl
+++ head/release/packages/runtime-development.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/runtime-lib32.ucl
===================================================================
--- head/release/packages/runtime-lib32.ucl
+++ head/release/packages/runtime-lib32.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/runtime-manuals.ucl
===================================================================
--- head/release/packages/runtime-manuals.ucl
+++ head/release/packages/runtime-manuals.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/runtime-profile.ucl
===================================================================
--- head/release/packages/runtime-profile.ucl
+++ head/release/packages/runtime-profile.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/runtime.ucl
===================================================================
--- head/release/packages/runtime.ucl
+++ head/release/packages/runtime.ucl
@@ -23,12 +23,6 @@
 	chmod 1777 ${PKG_ROOTDIR}/tmp
 EOD
 }
-deps: {
-    "FreeBSD-clibs": {
-        origin: "base"
-        version: "%VERSION%"
-    }
-}
 directories {
     /dev = "y";
     /tmp = "y";
Index: head/release/packages/ssh.ucl
===================================================================
--- head/release/packages/ssh.ucl
+++ head/release/packages/ssh.ucl
@@ -15,10 +15,4 @@
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
Index: head/release/packages/svn.ucl
===================================================================
--- head/release/packages/svn.ucl
+++ head/release/packages/svn.ucl
@@ -15,10 +15,4 @@
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
Index: head/release/packages/syscons.ucl
===================================================================
--- head/release/packages/syscons.ucl
+++ head/release/packages/syscons.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/tests.ucl
===================================================================
--- head/release/packages/tests.ucl
+++ head/release/packages/tests.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/unbound.ucl
===================================================================
--- head/release/packages/unbound.ucl
+++ head/release/packages/unbound.ucl
@@ -15,10 +15,4 @@
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-%PKGDEPS%: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
 
Index: head/release/packages/vi.ucl
===================================================================
--- head/release/packages/vi.ucl
+++ head/release/packages/vi.ucl
@@ -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%"
-    }
-}
-
Index: head/release/packages/wpa.ucl
===================================================================
--- head/release/packages/wpa.ucl
+++ head/release/packages/wpa.ucl
@@ -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%"
-    }
-}
-