Rework the way <packagename>.ucl files are generated.

One of the major pain points with how this was implemented
is the requirement of in-tree, hard-coded <name>.ucl, as
well as <name>-<suffix>.ucl where <suffix> can be lib32,
profile, development, debug, or any combination of the four.

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

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

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

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

Sponsored by:	The FreeBSD Foundation

Makefile.inc1

@@ -1393,22 +1393,13 @@ create-world-packages:	_pkgbootstrap
 		${DESTDIR}/METALOG
 	@for plist in ${DESTDIR}/*.plist; do \
 		plist=$${plist##*/} ; \
-		test -f ${SRCDIR}/release/packages/$${plist%.plist}.ucl || \
+		pkgname=$${plist%.plist} ; \
-			( echo "Unkown package FreeBSD-$${plist%.plist}" ; false ) ; \
+		sh ${SRCDIR}/release/packages/generate-ucl.sh -o $${pkgname} \
+			-s ${SRCDIR} -u ${DESTDIR}/$${pkgname}.ucl ; \
 	done
-	@cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
+	@for plist in ${DESTDIR}/*.plist; do \
-	pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
-	for plist in ${DESTDIR}/*.plist; do \
 		plist=$${plist##*/} ; \
 		pkgname=$${plist%.plist} ; \
-		sed -e "s/%VERSION%/${PKG_VERSION}/" \
-			-e "s/%PKGNAME%/$${pkgname}/" \
-			-e "s/%COMMENT%/Generic comment for $${pkgname}/" \
-			-e "s/%DESC%/Generic description for $${pkgname}/" \
-			-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
-			-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
-			${SRCDIR}/release/packages/$${pkgname}.ucl \
-			> ${DESTDIR}/$${pkgname}.ucl ; \
 		awk -F\" ' \
 			/^name/ { printf("===> Creating %s-", $$2); next } \
 			/^version/ { print $$2; next } \

release/packages/Makefile.package

@@ -0,0 +1,67 @@
+#
+# $FreeBSD$
+#
+
+acct_DESC= 		Accounting Utilties
+acpi_DESC= 		ACPI Utilities
+amd_DESC= 		AMD Utilities
+apm_DESC= 		APM Utilities
+at_DESC= 		AT Utilities
+autofs_DESC= 		Autofs Utilities
+bhyve_DESC= 		Bhyve Utilities
+binutils_DESC= 		Binutils
+bsdinstall_DESC= 	BSDInstall Utilities
+bsnmp_DESC= 		BSNMP Utilities
+clang_DESC= 		Clang Utilities
+docs_DESC= 		Documentation
+dma_DESC= 		DMA Mail Agent Utilities
+ee_DESC= 		Easy Editor Utilities
+gdb_DESC= 		GDB Utilities
+groff_DESC= 		Groff Utilities
+jail_DESC= 		Jail Utilities
+kernel_DESC= 		FreeBSD Kernel
+rcmds_DESC= 		Remote Command Utilities
+manuals_DESC= 		Manual Pages
+ssh_DESC= 		Secure Shell Utilities
+svn_DESC= 		Subversion Version Conrol System
+syscons_DESC= 		Syscons Console
+tests_DESC= 		Test Suite
+unbound_DESC= 		Unbound DNS Resolver
+vi_DESC= 		Vi Editor
+debug_DESC= 		FreeBSD Base System (Debugging Symbols)
+development_DESC= 	FreeBSD Base System (Development Files)
+lib32_DESC= 		FreeBSD Base System (32-bit Libraries)
+profile_DESC= 		FreeBSD Base System (Profiling Libraries)
+runtime_DESC= 		FreeBSD Base System
+
+acct_COMMENT= 		Accounting Utilties
+acpi_COMMENT= 		ACPI Utilities
+amd_COMMENT= 		AMD Utilities
+apm_COMMENT= 		APM Utilities
+at_COMMENT= 		AT Utilities
+autofs_COMMENT= 	Autofs Utilities
+bhyve_COMMENT= 		Bhyve Utilities
+binutils_COMMENT= 	Binutils
+bsdinstall_COMMENT= 	BSDInstall Utilities
+bsnmp_COMMENT= 		BSNMP Utilities
+clang_COMMENT= 		Clang Utilities
+docs_COMMENT= 		Documentation
+dma_COMMENT= 		DMA Mail Agent Utilities
+ee_COMMENT= 		Easy Editor Utilities
+gdb_COMMENT= 		GDB Utilities
+groff_COMMENT= 		Groff Utilities
+jail_COMMENT= 		Jail Utilities
+kernel_COMMENT= 	FreeBSD Kernel
+rcmds_COMMENT= 		Remote Command Utilities
+manuals_COMMENT= 	Manual Pages
+ssh_COMMENT= 		Secure Shell Utilities
+svn_COMMENT= 		Subversion Version Conrol System
+syscons_COMMENT= 	Syscons Console
+tests_COMMENT= 		Test Suite
+unbound_COMMENT= 	Unbound DNS Resolver
+vi_COMMENT= 		Vi Editor
+debug_COMMENT= 		FreeBSD Base System (Debugging Symbols)
+development_COMMENT= 	FreeBSD Base System (Development Files)
+lib32_COMMENT= 		FreeBSD Base System (32-bit Libraries)
+profile_COMMENT= 	FreeBSD Base System (Profiling Libraries)
+runtime_COMMENT= 	FreeBSD Base System

release/packages/acct-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Accounting Tools (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-acct: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/acct.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Accounting Tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/acpi-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "ACPI tools (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-acpi: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/acpi.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "ACPI tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/amd-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "BSD 4.4 Automounter (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-amd: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/amd.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "BSD 4.4 Automounter"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/apm-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Advanced Power Management Utilities (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-apm: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/apm.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Advanced Power Management Utilities"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/at-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "at(1) and related utilities (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-at: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/at.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "at(1) and related utilities"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/autofs-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Autofs(5) Utilities (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-autofs: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/autofs.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Autofs(5) Utilities"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/bhyve-debug.ucl

@@ -1,22 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "The BSD Hypervisor (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-bhyve, the "BSD hypervisor" is a hypervisor/virtual machine manager developed on
-FreeBSD and relies on modern CPU features such as Extended Page Tables (EPT) and
-VirtIO network and storage drivers
-EOD
-deps: {
-    FreeBSD-bhyve: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/bhyve.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "The BSD Hypervisor"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,12 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-bhyve, the "BSD hypervisor" is a hypervisor/virtual machine manager developed on
+%DESC%
-FreeBSD and relies on modern CPU features such as Extended Page Tables (EPT) and
-VirtIO network and storage drivers
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/binutils-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "GNU binutils (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ GPLv2 ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-binutils: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/binutils.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "GNU binutils"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/bsdinstall-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Installer (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsdinstall: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/bsdinstall.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Installer"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/bsnmp-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP daemon and userland tools (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsnmp: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/bsnmp-development.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP development"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsnmp: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/bsnmp-lib32-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP 32-bit libraries (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsnmp-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/bsnmp-lib32-development.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP 32-bit development"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsnmp-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/bsnmp-lib32-profile.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP 32-bit libraries (profiling)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsnmp-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/bsnmp-lib32.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP 32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-runtime: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/bsnmp-profile.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "SNMP libraries (profiling)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-bsnmp: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/bsnmp.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "SNMP daemon and userland tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/clang-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Clang compiler tools (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-clang: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/clang.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Clang compiler tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/debug.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "%COMMENT% (debugging symbols)"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/development.ucl

@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/dma-debug.ucl

@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "DragonFly Mail Agent (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-The DragonFly Mail Agent, a small Mail Transport Agent (MTA), designed for
-home and office use.
-EOD
-deps: {
-    FreeBSD-dma: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/dma.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "DragonFly Mail Agent"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,11 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-The DragonFly Mail Agent, a small Mail Transport Agent (MTA), designed for
+%DESC%
-home and office use.
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/ee-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "ee(1) Utility (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ee: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/ee.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "ee(1) Utility"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/gdb-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "GNU gdb (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ GPLv2 ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-gdb: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/gdb.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "GNU gdb"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/generate-ucl.sh

@@ -0,0 +1,138 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+main() {
+	desc=
+	comment=
+	debug=
+	uclsource=
+	while getopts "do:s:u:" arg; do
+		case ${arg} in
+		d)
+			debug=1
+			;;
+		o)
+			outname="${OPTARG}"
+			origname="${OPTARG}"
+			;;
+		s)
+			srctree="${OPTARG}"
+			;;
+		u)
+			uclfile="${OPTARG}"
+			;;
+		*)
+			echo "Unknown argument"
+			;;
+		esac
+	done
+
+	shift $(( ${OPTIND} - 1 ))
+
+	outname="$(echo ${outname} | tr '-' '_')"
+
+	case "${outname}" in
+		*_lib32_development)
+			outname="${outname%%_lib32_development}"
+			_descr="32-bit Libraries, Development Files"
+			pkgdeps="${outname}"
+			;;
+		*_lib32_debug)
+			outname="${outname%%_lib32_debug}"
+			_descr="32-bit Libraries, Debugging Symbols"
+			pkgdeps="${outname}"
+			;;
+		*_lib32_profile)
+			outname="${outname%%_lib32_profile}"
+			_descr="32-bit Libraries, Profiling"
+			pkgdeps="${outname}"
+			;;
+		*_lib32)
+			outname="${outname%%_lib32}"
+			_descr="32-bit Libraries"
+			pkgdeps="${outname}"
+			;;
+		*_development)
+			outname="${outname%%_development}"
+			_descr="Development Files"
+			pkgdeps="${outname}"
+			;;
+		*_profile)
+			outname="${outname%%_profile}"
+			_descr="Profiling Libraries"
+			pkgdeps="${outname}"
+			;;
+		*_debug)
+			outname="${outname%%_debug}"
+			_descr="Debugging Symbols"
+			pkgdeps="${outname}"
+			;;
+		*_manuals)
+			outname="${origname}"
+			pkgdeps="runtime"
+			;;
+		runtime)
+			outname="runtime"
+			uclfile="${uclfile}"
+			;;
+		${origname})
+			pkgdeps="runtime"
+			;;
+		debug|development|lib32|profile)
+			uclfile="${outname##*}${uclfile}"
+			;;
+		*)
+			uclfile="${outname##*}${origname}"
+			outname="${outname##*}${origname}"
+			;;
+	esac
+
+	outname="${outname%%_*}"
+
+	desc="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESC)"
+	comment="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_COMMENT)"
+
+	uclsource="${srctree}/release/packages/${outname}.ucl"
+	if [ ! -e "${uclsource}" ]; then
+		uclsource="${srctree}/release/packages/template.ucl"
+	fi
+
+	if [ ! -z "${debug}" ]; then
+		echo ""
+		echo "==============================================================="
+		echo "DEBUG:"
+		echo "_descr=${_descr}"
+		echo "outname=${outname}"
+		echo "origname=${origname}"
+		echo "srctree=${srctree}"
+		echo "uclfile=${uclfile}"
+		echo "desc=${desc}"
+		echo "comment=${comment}"
+		echo "cp ${uclsource} -> ${uclfile}"
+		echo "==============================================================="
+		echo ""
+		echo ""
+		echo ""
+	fi
+
+	[ -z "${comment}" ] && comment="${outname} package"
+	[ ! -z "${_descr}" ] && comment="${comment} (${_descr})"
+	[ -z "${desc}" ] && desc="${outname} package"
+
+	cp "${uclsource}" "${uclfile}"
+	cap_arg="$(make -C ${srctree}/etc -VCAP_MKDB_ENDIAN)"
+	pwd_arg="$(make -C ${srctree}/etc -VPWD_MKDB_ENDIAN)"
+	sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \
+		-e "s/%PKGNAME%/${origname}/" \
+		-e "s/%COMMENT%/${comment}/" \
+		-e "s/%DESC%/${desc}/" \
+		-e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \
+		-e "s/%PWD_MKDB_ENDIAN%/${pwd_arg}/g" \
+		-e "s/%PKGDEPS%/${pkgdeps}/" \
+		${uclfile}
+	return 0
+}
+
+main "${@}"

release/packages/groff-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "GNU groff (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ GPLv2 ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-groff: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/groff.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "GNU groff"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/jail-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail utilities (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-jail: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/jail-development.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail utilities development"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-jail: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/jail-lib32-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail 32-bit libraries (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-jail-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/jail-lib32-development.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail 32-bit development" 
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-jail-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/jail-lib32-profile.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail 32-bit libraries (profiling)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-jail-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/jail-lib32.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail 32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-runtime: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/jail-profile.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Jail libraries (profiling)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-jail: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/jail.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Jail utilities"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/lib32-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "32-bit libraries (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/lib32-development.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/lib32.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "32-bit libraries"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/profile.ucl

@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/rcmds-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Remote Command Tools (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-rcmds: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/rcmds.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Remote Command Tools"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/runtime-manuals.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "FreeBSD runtime manual pages"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/runtime.ucl

@@ -17,10 +17,3 @@ scripts: {
 	pwd_mkdb %PWD_MKDB_ENDIAN% -i -p -d  ${PKG_ROOTDIR}/etc ${PKG_ROOTDIR}/etc/master.passwd
 EOD
 }
-deps: {
-    FreeBSD-runtime: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/ssh-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ssh: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/ssh-development.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ssh: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/ssh-lib32-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell 32-bit libraries (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ssh-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/ssh-lib32-development.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell 32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ssh-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/ssh-lib32-profile.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell 32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ssh-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/ssh-lib32.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell 32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-runtime: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/ssh-profile.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Secure SHell"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ ISCL ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-ssh: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/ssh.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Secure SHell"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/svn-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Version control system (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ APACHE20 ]
-desc = <<EOD
-Lite version of the Subversion version control system
-EOD
-deps: {
-    FreeBSD-svn: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/svn.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Version control system"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,10 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ APACHE20 ]
 desc = <<EOD
-Lite version of the Subversion version control system
+%DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/syscons.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "syscons(4) support files"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,10 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-syscons(4) support files such as keyboard maps, fonts and screen output maps.
+%DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/template.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "32-bit libraries"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -11,10 +11,3 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
-deps: {
-    FreeBSD-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/tests-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "%COMMENT% (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-tests: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/tests-development.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "%COMMENT% (development)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-tests: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/tests-profile.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "%COMMENT% (profiling)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-tests: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/tests.ucl

@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/unbound-debug.ucl

@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-unbound: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/unbound-development.ucl

@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-unbound: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/unbound-lib32-debug.ucl

@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver, 32-bit libraries (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-unbound-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/unbound-lib32-development.ucl

@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-unbound-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/unbound-lib32-profile.ucl

@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-unbound-lib32: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/unbound-lib32.ucl

@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver, 32-bit libraries"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-runtime: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/unbound-profile.ucl

@@ -1,21 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD4CLAUSE ]
-desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
-validation of results
-EOD
-deps: {
-    FreeBSD-unbound: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/unbound.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Validating, recursive, and caching DNS resolver"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -9,11 +9,10 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD4CLAUSE ]
 desc = <<EOD
-Unbound is a recursive-only caching DNS server which can perform DNSSEC
+%DESC%
-validation of results
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }

release/packages/vi-debug.ucl

@@ -1,20 +0,0 @@
-name = "FreeBSD-%PKGNAME%"
-origin = "base"
-version = "%VERSION%"
-comment = "Vi Editor (debugging symbols)"
-categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
-prefix = "/"
-licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-deps: {
-    FreeBSD-vi: {
-        origin: "base",
-        version: "%VERSION%"
-    }
-}
-

release/packages/vi.ucl

@@ -1,7 +1,7 @@
 name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
-comment = "Vi Editor"
+comment = "%COMMENT%"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "https://www.FreeBSD.org"
@@ -12,7 +12,7 @@ desc = <<EOD
 %DESC%
 EOD
 deps: {
-    FreeBSD-runtime: {
+    FreeBSD-%PKGDEPS%: {
         origin: "base",
         version: "%VERSION%"
     }