Index: head/release/packages/Makefile.package
===================================================================
--- head/release/packages/Makefile.package	(revision 351847)
+++ head/release/packages/Makefile.package	(revision 351848)
@@ -1,86 +1,88 @@
 #
 # $FreeBSD$
 #
 
 acct_COMMENT= 		Accounting Utilties
 acct_DESC= 		Accounting Utilties
 acpi_COMMENT= 		ACPI Utilities
 acpi_DESC= 		ACPI Utilities
 amd_COMMENT= 		AMD Utilities
 amd_DESC= 		AMD Utilities
 apm_COMMENT= 		APM Utilities
 apm_DESC= 		APM Utilities
 at_COMMENT= 		AT Utilities
 at_DESC= 		AT Utilities
 autofs_COMMENT= 	Autofs Utilities
 autofs_DESC= 		Autofs Utilities
 bhyve_COMMENT= 		Bhyve Utilities
 bhyve_DESC= 		Bhyve Utilities
 binutils_COMMENT= 	Binutils
 binutils_DESC= 		Binutils
 bluetooth_COMMENT=	Bluetooth Utilities
 bluetooth_DESC=		Bluetooth Utilities
+bootloader_COMMENT=	Bootloader
+bootloader_DESC=	Bootloader and configuration files
 bsdinstall_COMMENT= 	BSDInstall Utilities
 bsdinstall_DESC= 	BSDInstall Utilities
 bsnmp_COMMENT= 		BSNMP Utilities
 bsnmp_DESC= 		BSNMP Utilities
 clang_COMMENT= 		Clang Utilities
 clang_DESC= 		Clang Utilities
 clibs_COMMENT= 		Core C Libraries
 clibs_DESC= 		Core C Libraries
 dma_COMMENT= 		DMA Mail Agent Utilities
 dma_DESC= 		DMA Mail Agent Utilities
 docs_COMMENT= 		Documentation
 docs_DESC= 		Documentation
 ee_COMMENT= 		Easy Editor Utilities
 ee_DESC= 		Easy Editor Utilities
 gdb_COMMENT= 		GDB Utilities
 gdb_DESC= 		GDB Utilities
 groff_COMMENT= 		Groff Utilities
 groff_DESC= 		Groff Utilities
 hast_COMMENT= 		Highly Available Storage daemon
 hast_DESC= 		Highly Available Storage daemon
 hostapd_COMMENT=	802.11 Access Point Daemon an Utilities
 hostapd_DESC=		802.11 Access Point Daemon an Utilities
 jail_COMMENT= 		Jail Utilities
 jail_DESC= 		Jail Utilities
 jail-debug_DESCR= 	Debugging Symbols
 jail-development_DESCR=Development Files
 jail-profile_DESCR= 	Profiling Libraries
 jail-lib32_DESCR= 	32-bit Libraries
 jail-lib32-debug_DESCR=32-bit Debugging Symbols
 jail-lib32-development_DESCR=32-bit Development Files
 jail-lib32-profile_DESCR=32-bit Profiling Libraries
 kernel_COMMENT= 	FreeBSD Kernel
 kernel_DESC= 		FreeBSD Kernel
 manuals_COMMENT= 	Manual Pages
 manuals_DESC= 		Manual Pages
 rcmds_COMMENT= 		Remote Command Utilities
 rcmds_DESC= 		Remote Command Utilities
 rescue_COMMENT= 	Rescue Utilities
 rescue_DESC= 		Rescue Utilities
 runtime_COMMENT= 	FreeBSD Base System
 runtime_DESC= 		FreeBSD Base System
 runtime-debug_DESCR= 	Debugging Symbols
 runtime-development_DESCR=Development Files
 runtime-profile_DESCR= 	Profiling Libraries
 runtime-lib32_DESCR= 	32-bit Libraries
 runtime-lib32-debug_DESCR=32-bit Debugging Symbols
 runtime-lib32-development_DESCR=32-bit Development Files
 runtime-lib32-profile_DESCR=32-bit Profiling Libraries
 sendmail_COMMENT= 	Sendmail Utilities
 sendmail_DESC= 		Sendmail Utilities
 ssh_COMMENT= 		Secure Shell Utilities
 ssh_DESC= 		Secure Shell Utilities
 svn_COMMENT= 		Subversion Version Control System
 svn_DESC= 		Subversion Version Control System
 syscons_COMMENT= 	Syscons Console
 syscons_DESC= 		Syscons Console
 tests_COMMENT= 		Test Suite
 tests_DESC= 		Test Suite
 unbound_COMMENT= 	Unbound DNS Resolver
 unbound_DESC= 		Unbound DNS Resolver
 vi_COMMENT= 		Vi Editor
 vi_DESC= 		Vi Editor
 wpa_COMMENT=		802.11 Supplicant
 wpa_DESC=		802.11 Supplicant
Index: head/release/scripts/mtree-to-plist.awk
===================================================================
--- head/release/scripts/mtree-to-plist.awk	(revision 351847)
+++ head/release/scripts/mtree-to-plist.awk	(revision 351848)
@@ -1,80 +1,83 @@
 #!/usr/bin/awk
 /^[^#]/ {
 	gsub(/^\./,"", $1)
 	uname = gname = mode = flags = tags = type = ""
 	for (i=2; i<=NF; i++) {
 		if ($i ~ /^uname=/) {
 			uname=$i
 			gsub(/uname=/, "", uname)
 		} else if ($i ~ /^gname=/) {
 			gname=$i
 			gsub(/gname=/, "", gname)
 		} else if ($i ~ /^mode=/) {
 			mode=$i
 			gsub(/mode=/,"", mode)
 		} else if ($i ~ /^flags=/) {
 			flags=$i
 			gsub(/flags=/, "", flags)
 		} else if ($i ~ /^tags=/) {
 			tags=$i
 			gsub(/tags=/, "", tags)
 		} else if ($i ~ /^type=dir/) {
 			type="dir"
 		}
 	}
 	if (kernel != "") {
 		tags="package=kernel"
 		if (_kernconf != "") {
 			tags=tags""_kernconf
 		}
 	}
+	if ($1 ~ /^\/boot\//) {
+		tags="package=bootloader"
+	}
 	if (length(tags) == 0)
 		next
 	if (tags ~ /package=/) {
 		ext = pkgname = pkgend = ""
 		split(tags, a, ",");
 		for (i in a) {
 			if (a[i] ~ /^package=/) {
 				pkgname=a[i]
 				gsub(/package=/, "", pkgname)
 			} else if (a[i] == "config") {
 				type="config"
 			} else if (a[i] == "development" || a[i] == "profile" || a[i] == "debug" || a[i] == "docs") {
 				pkgend=a[i]
 			} else {
 				if (ext != "")
 					ext=ext"-"a[i]
 				else
 					ext=a[i]
 			}
 		}
 		if (ext != "") {
 			pkgname=pkgname"-"ext
 		}
 		if (pkgend != "") {
 			if (pkgend == "docs") {
 				pkgname=pkgend
 			} else {
 				pkgname=pkgname"-"pkgend
 			}
 		}
 	} else {
 		print "No packages specified in line: $0"
 		next
 	}
 	if (kernel != "") {
 		output="kernel"
 		if (_kernconf != "") {
 			output=output"."_kernconf
 		}
 		if ($1 ~ /^\/usr\/lib\/debug\/boot/) {
 			output=output"-debug.plist"
 		} else {
 			output=output".plist"
 		}
 	} else {
 		output=pkgname".plist"
 	}
 
 	print "@"type"("uname","gname","mode","flags") " $1 > output
 }

Property changes on: head/release/scripts/mtree-to-plist.awk
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property