11 files changed, 47 insertions, 16 deletions
diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua
index a243c6ea7ad0..5637bbd3ad99 100755
--- a/release/packages/generate-ucl.lua
+++ b/release/packages/generate-ucl.lua
@@ -39,6 +39,10 @@ pkg_suffixes = {
 		"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."
@@ -98,6 +102,9 @@ function add_gen_dep(pkgname, pkggenname)
 	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
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index 3078185a3c4e..a08840d5b321 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -49,6 +49,9 @@ main() {
 		*-lib32)
 			outname="${outname%%-lib32}"
 			;;
+		*-lib)
+			outname="${outname%%-lib}"
+			;;
 		*-man)
 			outname="${outname%%-man}"
 			;;
diff --git a/release/packages/ucl/dma-all.ucl b/release/packages/ucl/dma-all.ucl
index e8824acf7a36..63d6c86b0be4 100644
--- a/release/packages/ucl/dma-all.ucl
+++ b/release/packages/ucl/dma-all.ucl
@@ -1,4 +1,12 @@
-comment = "DMA Mail Agent Utilities"
+comment = "DragonFly Mail Agent"
 desc = <<EOD
-DMA Mail Agent Utilities
+The DragonFly Mail Agent (dma) is a lightweight mail transport agent intended
+for home and office use.  dma can accept mail from local users and deliver it
+either locally or remotely (via SMTP).  dma can be configured to route remote
+mail via an SMTP smart host, optionally using STARTTLS and/or authentication.
+
+dma does not implement an SMTP server and cannot receive mail from remote
+systems, nor act as a mail exchanger for other hosts.  If an SMTP server
+is required, or when more advanced mail routing is needed, consider using
+the $PKG_NAME_PREFIX-sendmail package instead.
 EOD
diff --git a/release/packages/ucl/kerberos-lib-all.ucl b/release/packages/ucl/kerberos-lib-all.ucl
deleted file mode 100644
index b524563a976d..000000000000
--- a/release/packages/ucl/kerberos-lib-all.ucl
+++ /dev/null
@@ -1,4 +0,0 @@
-comment = "Kerberos libraries"
-desc = <<EOD
-Libraries requires to run programs that use Kerberos.
-EOD
diff --git a/release/packages/ucl/libmilter-all.ucl b/release/packages/ucl/libmilter-all.ucl
new file mode 100644
index 000000000000..5c0e4925a9c2
--- /dev/null
+++ b/release/packages/ucl/libmilter-all.ucl
@@ -0,0 +1,7 @@
+comment = "sendmail Mail Filter API library"
+desc = <<EOD
+The sendmail Mail Filter API (Milter) is designed to allow third-party
+programs access to mail messages as they are being processed in order
+to filter meta-information and content.  libmilter provides support for
+applications implementing the milter interface.
+EOD
diff --git a/release/packages/ucl/openssl-lib-all.ucl b/release/packages/ucl/openssl-lib-all.ucl
deleted file mode 100644
index c81dd44855cd..000000000000
--- a/release/packages/ucl/openssl-lib-all.ucl
+++ /dev/null
@@ -1,4 +0,0 @@
-comment = "OpenSSL Libraries"
-desc = <<EOD
-OpenSSL Libraries
-EOD
diff --git a/release/packages/ucl/sendmail-all.ucl b/release/packages/ucl/sendmail-all.ucl
index 2711e33a31a8..38f697da24fc 100644
--- a/release/packages/ucl/sendmail-all.ucl
+++ b/release/packages/ucl/sendmail-all.ucl
@@ -1,4 +1,15 @@
-comment = "Sendmail Utilities"
+comment = "sendmail mail transport agent"
 desc = <<EOD
-Sendmail Utilities
+The sendmail mail transport agent allows the system to send and receive mail
+for both local and remote users.   sendmail can also act as a mail exchanger
+for other hosts, and has a flexible configuration format that can be used to
+rewrite, filter or otherwise process mail before delivering it.
+
+sendmail supports multiple mail transport protocols, including Internet SMTP,
+LMTP, UUCP and DECnet.  Support for protocols other than SMTP and LMTP needs
+third-party software not shipped with the base system.
+
+When the full functionality of sendmail is not required, consider using the
+$PKG_NAME_PREFIX-dma package instead, a lightweight MTA which can send (but
+not receive) mail over SMTP.
 EOD
diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index 519ab13fe432..a633e6e508d4 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -27,7 +27,8 @@ vm_extra_pre_umount() {
 	# them from the image allows it to boot faster.
 	chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
 		/usr/sbin/pkg delete -f -y pkg
-	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD
+	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports
+	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods
 
 	chroot ${DESTDIR} ${EMULATOR} pw usermod root -h -
 
diff --git a/release/tools/basic-ci.conf b/release/tools/basic-ci.conf
index 12c9abb15fb1..4bcb87aec791 100644
--- a/release/tools/basic-ci.conf
+++ b/release/tools/basic-ci.conf
@@ -6,7 +6,7 @@
 export VMSIZE=5g
 
 # Set to a list of third-party software to enable in rc.conf(5).
-export VM_RC_LIST="sshd growfs"
+export VM_RC_LIST="sshd growfs nuageinit"
 
 vm_extra_pre_umount() {
 	cat << EOF >> ${DESTDIR}/etc/rc.conf
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index ef7a603efea9..31f40962b19d 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -27,7 +27,8 @@ ec2_common() {
 	chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
 		/usr/sbin/pkg delete -f -y pkg
 	umount ${DESTDIR}/dev
-	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD
+	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports
+	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods
 
 	# Turn off IPv6 Duplicate Address Detection; the EC2 networking
 	# configuration makes it unnecessary.
diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf
index c212af7d012e..506174d0ea16 100644
--- a/release/tools/vagrant.conf
+++ b/release/tools/vagrant.conf
@@ -20,7 +20,8 @@ vagrant_common () {
 	# them from the image allows it to boot faster.
 	env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} clean -y -a
 	env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg
-	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD
+	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports
+	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods
 
 	# Vagrant instances use DHCP to get their network configuration.
 	echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf