Index: projects/release-pkg/release/packages/unbound-debug-lib32.ucl
===================================================================
--- projects/release-pkg/release/packages/unbound-debug-lib32.ucl	(revision 295126)
+++ projects/release-pkg/release/packages/unbound-debug-lib32.ucl	(nonexistent)
@@ -1,14 +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
Index: projects/release-pkg/release/packages/ssh-debug-lib32.ucl
===================================================================
--- projects/release-pkg/release/packages/ssh-debug-lib32.ucl	(revision 295126)
+++ projects/release-pkg/release/packages/ssh-debug-lib32.ucl	(nonexistent)
@@ -1,13 +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
Index: projects/release-pkg/release/packages/bsnmp-debug-lib32.ucl
===================================================================
--- projects/release-pkg/release/packages/bsnmp-debug-lib32.ucl	(revision 295126)
+++ projects/release-pkg/release/packages/bsnmp-debug-lib32.ucl	(nonexistent)
@@ -1,13 +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
Index: projects/release-pkg/release/packages/jail-debug-lib32.ucl
===================================================================
--- projects/release-pkg/release/packages/jail-debug-lib32.ucl	(revision 295126)
+++ projects/release-pkg/release/packages/jail-debug-lib32.ucl	(nonexistent)
@@ -1,13 +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
Index: projects/release-pkg/release/packages/debug-lib32.ucl
===================================================================
--- projects/release-pkg/release/packages/debug-lib32.ucl	(revision 295126)
+++ projects/release-pkg/release/packages/debug-lib32.ucl	(nonexistent)
@@ -1,13 +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
Index: projects/release-pkg/release/packages/bsnmp-lib32-debug.ucl
===================================================================
--- projects/release-pkg/release/packages/bsnmp-lib32-debug.ucl	(nonexistent)
+++ projects/release-pkg/release/packages/bsnmp-lib32-debug.ucl	(revision 295127)
@@ -0,0 +1,13 @@
+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
Index: projects/release-pkg/release/packages/jail-lib32-debug.ucl
===================================================================
--- projects/release-pkg/release/packages/jail-lib32-debug.ucl	(nonexistent)
+++ projects/release-pkg/release/packages/jail-lib32-debug.ucl	(revision 295127)
@@ -0,0 +1,13 @@
+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
Index: projects/release-pkg/release/packages/lib32-debug.ucl
===================================================================
--- projects/release-pkg/release/packages/lib32-debug.ucl	(nonexistent)
+++ projects/release-pkg/release/packages/lib32-debug.ucl	(revision 295127)
@@ -0,0 +1,13 @@
+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
Index: projects/release-pkg/release/packages/ssh-lib32-debug.ucl
===================================================================
--- projects/release-pkg/release/packages/ssh-lib32-debug.ucl	(nonexistent)
+++ projects/release-pkg/release/packages/ssh-lib32-debug.ucl	(revision 295127)
@@ -0,0 +1,13 @@
+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
Index: projects/release-pkg/release/packages/unbound-lib32-debug.ucl
===================================================================
--- projects/release-pkg/release/packages/unbound-lib32-debug.ucl	(nonexistent)
+++ projects/release-pkg/release/packages/unbound-lib32-debug.ucl	(revision 295127)
@@ -0,0 +1,14 @@
+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
Index: projects/release-pkg/release/scripts/mtree-to-plist.awk
===================================================================
--- projects/release-pkg/release/scripts/mtree-to-plist.awk	(revision 295126)
+++ projects/release-pkg/release/scripts/mtree-to-plist.awk	(revision 295127)
@@ -1,84 +1,84 @@
 #!/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 (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") {
+			} else if (a[i] == "development" || a[i] == "profile" || a[i] == "debug") {
 				pkgend=a[i]
 			} else {
 				if (ext != "")
 					ext=ext"-"a[i]
 				else
 					ext=a[i]
 			}
 		}
 		if (ext != "") {
 			if (pkgname == "runtime") {
 				pkgname=ext
 			} else {
 				pkgname=pkgname"-"ext
 			}
 		}
 		if (pkgend != "") {
 			if (pkgname == "runtime") {
 				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"-release.plist"
 		}
 	} else {
 		output=pkgname".plist"
 	}
 
 	print "@"type"("uname","gname","mode","flags") " $1 > output
 }