diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-01-30 03:01:00 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-01-30 03:01:00 +0000 |
| commit | f2c462994d27a13044607f330c5f54133fb5863c (patch) | |
| tree | bcf065b7fc9eef06b70436d140abb732103fb4a9 | |
| parent | 42a9f8f21d636f38a2d71b7a84a686eb436886f9 (diff) | |
| download | src-f2c462994d27a13044607f330c5f54133fb5863c.tar.gz src-f2c462994d27a13044607f330c5f54133fb5863c.zip | |
pkgbase: generate dependencies in generate-ucl.sh
This cuts out a large chunk of duplicated *.ucl files that just needed
dependencies tacked on, and gives generate-ucl.sh some leeway in case a
future pkg may need more than one dependency.
Run-through to determine which ones could simply be removed done with for i
in *.ucl; do diff -U3 template.ucl ${i}; done | less and inspecting for any
differences beyond just adding deps at the end. The remaining ucl files are
basically all differently-licensed, require scripts, or are marked vital.
I've opted to remove %PKGDEPS% entirely without regard for third-party ucl,
as pkgbase is not yet considered production. However, I do not hold a strong
position on this and there is approximately 0 chance it will return.
clibs should have been added previously in generate-ucl.sh as one that
doesn't have any dependencies, but do so now that we would otherwise be
tacking on the runtime dependency.
Reviewed by: manu, bapt (earlier version)
Differential Revision: https://reviews.freebsd.org/D23415
Notes
Notes:
svn path=/head/; revision=357283
43 files changed, 14 insertions, 792 deletions
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 @@ -15,10 +15,4 @@ 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 @@ -15,12 +15,6 @@ 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 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 @@ -15,10 +15,4 @@ 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 @@ -15,10 +15,4 @@ 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 @@ -34,6 +34,10 @@ main() { 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 @@ main() { [ -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 } 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 @@ -15,10 +15,4 @@ 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 @@ -16,10 +16,4 @@ 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 @@ -15,10 +15,4 @@ 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 @@ -15,10 +15,4 @@ 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 @@ -23,12 +23,6 @@ scripts: { 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 @@ -15,10 +15,4 @@ 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 @@ -15,10 +15,4 @@ 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 @@ -15,10 +15,4 @@ 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%" - } -} - |