diff --git a/release/packages/generate-set-ucl.lua b/release/packages/generate-set-ucl.lua
index 3c8474bf8e68..ab8765c8cf2d 100755
--- a/release/packages/generate-set-ucl.lua
+++ b/release/packages/generate-set-ucl.lua
@@ -1,96 +1,96 @@
 #!/usr/libexec/flua
 
 --[[ usage:
 generate-set-ucl.lua <template> [<variablename> <variablevalue>]
 
 Generate the UCL for a set metapackage.  The variables provided will be
 substituted as UCL variables.
 ]]--
 
 local ucl = require("ucl")
 
 -- This parser is the output UCL we want to build.
 local parser = ucl.parser()
 
 if #arg < 1 then
 	io.stderr:write(arg[0] .. ": missing template filename\n")
 	os.exit(1)
 end
 
 local template = table.remove(arg, 1)
 
 -- Set any $VARIABLES from the command line in the parser.  This causes ucl to
 -- automatically replace them when we load the source ucl.
 if #arg % 2 ~= 0 then
 	io.stderr:write(arg[0] .. ": expected an even number of arguments, "
 	    .. "got " .. #arg .. "\n")
 	os.exit(1)
 end
 
 local pkgprefix = nil
 local pkgversion = nil
 local pkgdeps = ""
 
 for i = 2, #arg, 2 do
 	local varname = arg[i - 1]
 	local varvalue = arg[i]
 
 	if varname == "PKG_NAME_PREFIX" and #varvalue > 0 then
 		pkgprefix = varvalue
 	elseif varname == "VERSION" and #varvalue > 0 then
 		pkgversion = varvalue
 	elseif varname == "SET_DEPENDS" and #varvalue > 0 then
 		pkgdeps = varvalue
 	end
 
 	parser:register_variable(varname, varvalue)
 end
 
 -- Load the source template.
 local res,err = parser:parse_file(template)
 if not res then
 	io.stderr:write(arg[0] .. ": fail to parse(" .. template .. "): "
 	    .. err .. "\n")
 	os.exit(1)
 end
 
 local obj = parser:get_object()
 
 -- Dependency handling.
 obj["deps"] = obj["deps"] or {}
 
 -- If PKG_NAME_PREFIX is provided, rewrite the names of dependency packages.
 -- We can't do this in UCL since variable substitution doesn't work in array
 -- keys.  Note that this only applies to dependencies from the set UCL files,
 -- because SET_DEPENDS already have the correct prefix.
 if pkgprefix ~= nil then
 	newdeps = {}
 	for dep, opts in pairs(obj["deps"]) do
 		local newdep = pkgprefix .. "-" .. dep
 		newdeps[newdep] = opts
 	end
 	obj["deps"] = newdeps
 end
 
 -- Add dependencies from SET_DEPENDS.
 for dep in string.gmatch(pkgdeps, "[^%s]+") do
 	obj["deps"][dep] = {
-		["origin"] = "base"
+		["origin"] = "base/"..dep
 	}
 end
 
--- Add a version key to all dependencies, otherwise pkg doesn't like it.
+-- Add a version and origin key to all dependencies, otherwise pkg
+-- doesn't like it.
 for dep, opts in pairs(obj["deps"]) do
-	if obj["deps"][dep]["version"] == nil then
-		obj["deps"][dep]["version"] = pkgversion
-	end
+	obj["deps"][dep]["origin"] = obj["deps"][dep]["origin"] or "base/"..dep
+	obj["deps"][dep]["version"] = obj["deps"][dep]["version"] or pkgversion
 end
 
 -- If there are no dependencies, remove the deps key, otherwise pkg raises an
 -- error trying to read the manifest.
 if next(obj["deps"]) == nil then
 	obj["deps"] = nil
 end
 
 -- Write the output.
 io.stdout:write(ucl.to_format(obj, 'ucl', true))
diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua
index c61cbb251d8b..d9125182a1a4 100755
--- a/release/packages/generate-ucl.lua
+++ b/release/packages/generate-ucl.lua
@@ -1,238 +1,240 @@
 #!/usr/libexec/flua
 
 --[[ usage:
 generate-ucl.lua [<variablename> <variablevalue>]... <sourceucl> <destucl>
 
 Build a package's UCL configuration by loading the template UCL file
 <sourceucl>, replacing any $VARIABLES in the UCL based on the provided
 variables, then writing the result to <destucl>.
 ]]--
 
 local ucl = require("ucl")
 
 -- Give subpackages a special comment and description suffix to indicate what
 -- they contain, so e.g. "foo-man" has " (manual pages)" appended to its
 -- comment.  This avoids having to create a separate ucl files for every
 -- subpackage just to set this.
 --
 -- Note that this is not a key table because the order of the pattern matches
 -- is important.
 pkg_suffixes = {
 	{
 		"%-dev%-lib32$", "(32-bit development files)",
 		"This package contains development files for compiling "..
 		"32-bit applications on a 64-bit host."
 	},
 	{
 		"%-dbg%-lib32$", "(32-bit debugging symbols)",
 		"This package contains 32-bit external debugging symbols "..
 		"for use with a source-level debugger.",
 	},
 	{
 		"%-man%-lib32$", "(32-bit manual pages)",
 		"This package contains the online manual pages for 32-bit "..
 		"components on a 64-bit host.",
 	},
 	{
 		"%-lib32$", "(32-bit libraries)",
 		"This package contains 32-bit libraries for running 32-bit "..
 		"applications on a 64-bit host.",
 	},
 	{
 		"%-lib$", "(libraries)",
 		"This package contains runtime shared libraries.",
 	},
 	{
 		"%-dev$", "(development files)",
 		"This package contains development files for "..
 		"compiling applications."
 	},
 	{
 		"%-man$", "(manual pages)",
 		"This package contains the online manual pages."
 	},
 	{
 		"%-dbg$", "(debugging symbols)",
 		"This package contains external debugging symbols for use "..
 		"with a source-level debugger.",
 	},
 }
 
 -- A list of packages which don't get the automatic suffix handling,
 -- e.g. -man packages with no corresponding base package.
 local no_suffix_pkgs = {
 	["kernel-man"] = true,
 }
 
 function add_suffixes(obj)
 	local pkgname = obj["name"]
 
 	for _,pattern in pairs(pkg_suffixes) do
 		if pkgname:match(pattern[1]) ~= nil then
 			obj["comment"] = obj["comment"] .. " " .. pattern[2]
 			obj["desc"] = obj["desc"] .. "\n\n" .. pattern[3]
 			return
 		end
 	end
 end
 
 -- Hardcode a list of packages which don't get the automatic pkggenname
 -- dependency because the base package doesn't exist.  We should have a better
 -- way to handle this.
 local no_gen_deps = {
 	["libcompat-dev"] = true,
 	["libcompat-dev-lib32"] = true,
 	["libcompat-man"] = true,
 	["libcompiler_rt-dev"] = true,
 	["libcompiler_rt-dev-lib32"] = true,
 	["liby-dev"] = true,
 	["liby-dev-lib32"] = true,
 	["kernel-man"] = true,
 }
 
 -- Return true if the package 'pkgname' should have a dependency on the package
 -- pkggenname.
 function add_gen_dep(pkgname, pkggenname)
 	if pkgname == pkggenname then
 		return false
 	end
 	if pkgname == nil or pkggenname == nil then
 		return false
 	end
 	if no_gen_deps[pkgname] ~= nil then
 		return false
 	end
 	if pkgname:match("%-lib$") ~= nil then
 		return false
 	end
 	if pkggenname == "kernel" then
 		return false
 	end
 
 	return true
 end
 
 local pkgname = nil
 local pkggenname = nil
 local pkgprefix = nil
 local pkgversion = nil
 
 -- This parser is the output UCL we want to build.
 local parser = ucl.parser()
 
 -- Set any $VARIABLES from the command line in the parser.  This causes ucl to
 -- automatically replace them when we load the source ucl.
 if #arg < 2 or #arg % 2 ~= 0 then
 	io.stderr:write(arg[0] .. ": expected an even number of arguments, got " .. #arg)
 	os.exit(1)
 end
 
 for i = 2, #arg - 2, 2 do
 	local varname = arg[i - 1]
 	local varvalue = arg[i]
 
 	if varname == "PKGNAME" and #varvalue > 0 then
 		pkgname = varvalue
 	elseif varname == "PKGGENNAME" and #varvalue > 0 then
 		pkggenname = varvalue
 	elseif varname == "VERSION" and #varvalue > 0 then
 		pkgversion = varvalue
 	elseif varname == "PKG_NAME_PREFIX" and #varvalue > 0 then
 		pkgprefix = varvalue
 	end
 
 	parser:register_variable(varname, varvalue)
 end
 
 -- Load the source ucl file.
 local res,err = parser:parse_file(arg[#arg - 1])
 if not res then
 	io.stderr:write(arg[0] .. ": fail to parse("..arg[#arg - 1].."): "..err)
 	os.exit(1)
 end
 
 local obj = parser:get_object()
 
 -- If pkgname is different from pkggenname, add a dependency on pkggenname.
 -- This means that e.g. -dev packages depend on their respective base package.
 if add_gen_dep(pkgname, pkggenname) then
 	if obj["deps"] == nil then
 		obj["deps"] = {}
 	end
 	obj["deps"][pkggenname] = {
 		["version"] = pkgversion,
-		["origin"] = "base"
+		["origin"] = "base/"..pkgprefix.."-"..pkggenname,
 	}
 end
 
 --
 -- Handle the 'set' annotation, a comma-separated list of sets which this
 -- package should be placed in.  If it's not specified, the package goes
 -- in the default set which is base.
 --
 -- Ensure we have an annotations table to work with.
 obj["annotations"] = obj["annotations"] or {}
 -- If no set is provided, use the default set which is "base".
 sets = obj["annotations"]["set"] or "base"
 -- For subpackages, we may need to rewrite the set name.  This is done a little
 -- differently from the normal pkg suffix processing, because we don't need sets
 -- to be as a granular as the base packages.
 --
 -- Create a single lib32 set for all lib32 packages.  Most users don't need
 -- lib32, so this avoids creating a large number of unnecessary lib32 sets.
 -- However, lib32 debug symbols still go into their own package since they're
 -- quite large.
 if pkgname:match("%-dbg%-lib32$") then
 	sets = "lib32-dbg"
 elseif pkgname:match("%-lib32$") then
 	sets = "lib32"
 -- If this is a -dev package, put it in a single set called "devel" which
 -- contains all development files.  Also include lib*-man packages, which
 -- contain manpages for libraries. Having a separate <set>-dev for every
 -- set is not necessary, because generally you either want development
 -- support or you don't.
 elseif pkgname:match("%-dev$") or pkgname:match("^lib.*%-man$") then
 	sets = "devel"
 -- Don't separate tests and tests-dbg into 2 sets, if the user wants tests
 -- they should be able to debug failures.
 elseif sets == "tests" then
 	sets = sets
 -- If this is a -dbg package, put it in the -dbg subpackage of each set,
 -- which means the user can install debug symbols only for the sets they
 -- have installed.
 elseif pkgname:match("%-dbg$") then
 	local newsets = {}
 	for set in sets:gmatch("[^,]+") do
 		newsets[#newsets + 1] = set .. "-dbg"
 	end
 	sets = table.concat(newsets, ",")
 end
 -- Put our new sets back into the package.
 obj["annotations"]["set"] = sets
 
 -- If PKG_NAME_PREFIX is provided, rewrite the names of dependency packages.
 -- We can't do this in UCL since variable substitution doesn't work in array
 -- keys.
 if pkgprefix ~= nil and obj["deps"] ~= nil then
 	newdeps = {}
 	for dep, opts in pairs(obj["deps"]) do
 		local newdep = pkgprefix .. "-" .. dep
+		-- Make sure origin is set.
+		opts["origin"] = opts["origin"] or "base/"..newdep
 		newdeps[newdep] = opts
 	end
 	obj["deps"] = newdeps
 end
 
 -- Add comment and desc suffix.
 if no_suffix_pkgs[pkgname] == nil then
 	add_suffixes(obj)
 end
 
 -- Write the output file.
 local f,err = io.open(arg[#arg], "w")
 if not f then
 	io.stderr:write(arg[0] .. ": fail to open("..arg[#arg].."): ".. err)
 	os.exit(1)
 end
 
 f:write(ucl.to_format(obj, 'ucl', true))
 f:close()
diff --git a/release/packages/set-template.ucl b/release/packages/set-template.ucl
index b7ea2b830168..ff2c2d3e6057 100644
--- a/release/packages/set-template.ucl
+++ b/release/packages/set-template.ucl
@@ -1,15 +1,15 @@
 # This is the default set of options applied to the set metapackages.
 # The options are the same as template.ucl, but we don't include any
 # additional UCL files.
 
 name = "${PKG_NAME_PREFIX}-set-${PKGNAME}"
 prefix = "/"
-origin = "base"
+origin = "base/${PKG_NAME_PREFIX}-set-${PKGNAME}"
 categories = [ base ]
 version = "${VERSION}"
 maintainer = "${PKG_MAINTAINER}"
 www = "${PKG_WWW}"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 
 .include(try=false,duplicate=merge) "${UCLFILES}/${PKGNAME}.ucl"
diff --git a/release/packages/sets/base-dbg.ucl b/release/packages/sets/base-dbg.ucl
index d9eeb2c49677..79e5de22522e 100644
--- a/release/packages/sets/base-dbg.ucl
+++ b/release/packages/sets/base-dbg.ucl
@@ -1,34 +1,32 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 comment = "Base system debug symbols (metapackage)"
 
 desc = <<EOD
 This metapackage installs debugging symbols for the complete base system.
 EOD
 
 deps {
 	"set-minimal-dbg" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 	"set-devel-dbg" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/sets/base-jail-dbg.ucl b/release/packages/sets/base-jail-dbg.ucl
index 7996b9afbb21..56a130367fa3 100644
--- a/release/packages/sets/base-jail-dbg.ucl
+++ b/release/packages/sets/base-jail-dbg.ucl
@@ -1,34 +1,32 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 comment = "Base jail system debug symbols (metapackage)"
 
 desc = <<EOD
 This metapackage installs debugging symbols for the base jail system.
 EOD
 
 deps {
 	"set-minimal-jail-dbg" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 	"set-devel-dbg" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/sets/base-jail.ucl b/release/packages/sets/base-jail.ucl
index d1dc17bc9860..88861510f954 100644
--- a/release/packages/sets/base-jail.ucl
+++ b/release/packages/sets/base-jail.ucl
@@ -1,41 +1,38 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 comment = "Base system for jails (metapackage)"
 
 vital = true
 
 desc = <<EOD
 This metapackage installs the complete base system, excluding packages which
 are not generally useful in a jail(8) environment.
 EOD
 
 deps {
 	"set-minimal-jail" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 	"set-optional-jail" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 	"set-devel" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/sets/base.ucl b/release/packages/sets/base.ucl
index 823e2342fab8..6a970668c13e 100644
--- a/release/packages/sets/base.ucl
+++ b/release/packages/sets/base.ucl
@@ -1,44 +1,41 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 comment = "Base system (metapackage)"
 
 vital = true
 
 desc = <<EOD
 This metapackage installs all packages which are part of the base system,
 excluding 32-bit compatibility libraries, tests, debugging symbols, and
 source code.
 
 This is equivalent to installing the legacy "base.txz" distribution set.
 EOD
 
 deps {
 	"set-minimal" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 	"set-optional" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 	"set-devel" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/sets/optional-dbg.ucl b/release/packages/sets/optional-dbg.ucl
index a221327518f9..882469c3ad57 100644
--- a/release/packages/sets/optional-dbg.ucl
+++ b/release/packages/sets/optional-dbg.ucl
@@ -1,31 +1,30 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 comment = "Optional software debug symbols (metapackage)"
 
 desc = <<EOD
 This metapackage installs debugging symbols for optional software
 which is not part of the minimal set.
 EOD
 
 deps {
 	"set-minimal-dbg" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/sets/optional-jail-dbg.ucl b/release/packages/sets/optional-jail-dbg.ucl
index 84c76fa407fe..54e7309abdf1 100644
--- a/release/packages/sets/optional-jail-dbg.ucl
+++ b/release/packages/sets/optional-jail-dbg.ucl
@@ -1,31 +1,30 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 comment = "Optional software debug symbols for jails (metapackage)"
 
 desc = <<EOD
 This metapackage installs debugging symbols for optional software
 which is not part of the minimal set.
 EOD
 
 deps {
 	"set-minimal-jail-dbg" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/sets/optional-jail.ucl b/release/packages/sets/optional-jail.ucl
index da6d5fb00825..877023a10eed 100644
--- a/release/packages/sets/optional-jail.ucl
+++ b/release/packages/sets/optional-jail.ucl
@@ -1,34 +1,33 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 comment = "Optional base system software for jails (metapackage)"
 
 vital = true
 
 desc = <<EOD
 This metapackage installs all optional software which is part of the
 base system but not installed by the minimal set, other than compilers
 and software which is not generally useful in a jail(8) environment.
 EOD
 
 deps {
 	"set-minimal-jail" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/sets/optional.ucl b/release/packages/sets/optional.ucl
index f50fa17e4297..8b44dfe1f3ea 100644
--- a/release/packages/sets/optional.ucl
+++ b/release/packages/sets/optional.ucl
@@ -1,33 +1,32 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 comment = "Optional base system software (metapackage)"
 
 vital = true
 
 desc = <<EOD
 This metapackage installs all optional software, other than compilers,
 which is part of the base system but not installed by the minimal set.
 EOD
 
 deps {
 	"set-minimal" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/ucl/at.ucl b/release/packages/ucl/at.ucl
index 25724adfd7af..1e2495028b30 100644
--- a/release/packages/ucl/at.ucl
+++ b/release/packages/ucl/at.ucl
@@ -1,33 +1,31 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 deps {
 	# atrun relies on cron to work.
 	"cron" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 
 	# at(1) passes the command to /bin/sh
 	"runtime" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
 
 
diff --git a/release/packages/ucl/bluetooth.ucl b/release/packages/ucl/bluetooth.ucl
index c87d5e9c8420..e9c4787fdbfb 100644
--- a/release/packages/ucl/bluetooth.ucl
+++ b/release/packages/ucl/bluetooth.ucl
@@ -1,28 +1,27 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 deps {
 	# rfcomm_pppd(8) uses ppp(8)
 	"ppp" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
 
 
 
diff --git a/release/packages/ucl/bsdconfig.ucl b/release/packages/ucl/bsdconfig.ucl
index 752c352ae904..98981f65bea4 100644
--- a/release/packages/ucl/bsdconfig.ucl
+++ b/release/packages/ucl/bsdconfig.ucl
@@ -1,25 +1,24 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 deps {
 	# bsdconfig is written in shell script, so it needs /bin/sh
 	"runtime" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/ucl/bsdinstall.ucl b/release/packages/ucl/bsdinstall.ucl
index 6e5cbce4e342..7fe8898b9427 100644
--- a/release/packages/ucl/bsdinstall.ucl
+++ b/release/packages/ucl/bsdinstall.ucl
@@ -1,25 +1,24 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 deps {
 	# bsdinstall is written in shell script, so it needs /bin/sh
 	"runtime" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/ucl/caroot.ucl b/release/packages/ucl/caroot.ucl
index 4d2b52d300fc..e43c9d0771f2 100644
--- a/release/packages/ucl/caroot.ucl
+++ b/release/packages/ucl/caroot.ucl
@@ -1,10 +1,9 @@
 deps {
 	"certctl": {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
 scripts: {
 	post-install = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ rehash"
 	post-uninstall = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ rehash"
 }
diff --git a/release/packages/ucl/certctl.ucl b/release/packages/ucl/certctl.ucl
index f12158459c5e..d2b4790946ec 100644
--- a/release/packages/ucl/certctl.ucl
+++ b/release/packages/ucl/certctl.ucl
@@ -1,24 +1,23 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 deps {
 	"openssl": {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/ucl/clang.ucl b/release/packages/ucl/clang.ucl
index 956b769a1ee7..3c15d9b7ef03 100644
--- a/release/packages/ucl/clang.ucl
+++ b/release/packages/ucl/clang.ucl
@@ -1,11 +1,9 @@
 deps {
 	"lld" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 
 	"libcompiler_rt-dev" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/ucl/devd.ucl b/release/packages/ucl/devd.ucl
index 8d83ab9ee020..c5fcfef1c368 100644
--- a/release/packages/ucl/devd.ucl
+++ b/release/packages/ucl/devd.ucl
@@ -1,25 +1,24 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 deps {
 	# devd uses /bin/sh to invoke hooks.
 	"runtime" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/ucl/newsyslog.ucl b/release/packages/ucl/newsyslog.ucl
index b1dfa8253737..27b212a42b77 100644
--- a/release/packages/ucl/newsyslog.ucl
+++ b/release/packages/ucl/newsyslog.ucl
@@ -1,7 +1,6 @@
 deps {
 	# newsyslog uses bzip2 to compress log files.
 	"bzip2" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/ucl/periodic.ucl b/release/packages/ucl/periodic.ucl
index c8b8ac57c676..2a8a482f959f 100644
--- a/release/packages/ucl/periodic.ucl
+++ b/release/packages/ucl/periodic.ucl
@@ -1,24 +1,23 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 deps {
 	"cron" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/ucl/rc.ucl b/release/packages/ucl/rc.ucl
index 1a734aaa187c..854963a81ca1 100644
--- a/release/packages/ucl/rc.ucl
+++ b/release/packages/ucl/rc.ucl
@@ -1,25 +1,24 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 deps {
 	"runtime": {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
 
diff --git a/release/packages/ucl/rcmds.ucl b/release/packages/ucl/rcmds.ucl
index b572ff25e6c3..de608487e07d 100644
--- a/release/packages/ucl/rcmds.ucl
+++ b/release/packages/ucl/rcmds.ucl
@@ -1,26 +1,25 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 deps {
 	# The RPC daemons require rpcbind.
 	"utilities" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
 
diff --git a/release/packages/ucl/sendmail.ucl b/release/packages/ucl/sendmail.ucl
index 62d0a1f2bc61..318fd5aabbe5 100644
--- a/release/packages/ucl/sendmail.ucl
+++ b/release/packages/ucl/sendmail.ucl
@@ -1,25 +1,24 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 deps {
 	# sendmail requires make to build its configuration file.
 	"bmake": {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/ucl/tests-all.ucl b/release/packages/ucl/tests-all.ucl
index 1f3b027b7037..3ad2d0f50e6b 100644
--- a/release/packages/ucl/tests-all.ucl
+++ b/release/packages/ucl/tests-all.ucl
@@ -1,49 +1,46 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 comment = "Test suite"
 
 desc = <<EOD
 The test suite, installed in /usr/tests, allows the functionality of the
 installed system to be verified.
 EOD
 
 deps {
 	# Nearly all the tests require atf to run.
 	"atf": {
 		version = "${VERSION}"
-		origin = "base"
 	},
 
 	# The test framework requires Kyua.
 	"kyua": {
 		version = "${VERSION}"
-		origin = "base"
 	},
 
 	# Since the purpose of the tests is to test the base system, the base
 	# system must be installed.
 	"set-base": {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
 
 annotations {
 	set = tests
 }
diff --git a/release/packages/ucl/yp.ucl b/release/packages/ucl/yp.ucl
index be4310c85591..9babdbe98fb1 100644
--- a/release/packages/ucl/yp.ucl
+++ b/release/packages/ucl/yp.ucl
@@ -1,25 +1,24 @@
 /*
  * SPDX-License-Identifier: ISC
  *
  * Copyright (c) 2025 Lexi Winter <ivy@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 deps {
 	# YP requires bmake to rebuild the database.
 	"bmake": {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }