From 6b710cc6fe1d5a04a17d775851dc27c519c7d910 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 18 Mar 2015 11:27:11 +0000
Subject: [PATCH] development and profile are special tags and should always be
 the last component of the name if present

---
 release/packages/lib32-development.ucl | 13 +++++++++++++
 release/packages/lib32-profile.ucl     | 13 +++++++++++++
 release/packages/lib32.ucl             |  2 +-
 release/scripts/mtree-to-plist.awk     | 18 +++++++++++++++---
 4 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 release/packages/lib32-development.ucl
 create mode 100644 release/packages/lib32-profile.ucl

diff --git a/release/packages/lib32-development.ucl b/release/packages/lib32-development.ucl
new file mode 100644
index 000000000000..c4e7152512b4
--- /dev/null
+++ b/release/packages/lib32-development.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-lib32-development"
+origin = "base"
+version = "%VERSION%"
+comment = "32bits libraries"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+TODO
+EOD
diff --git a/release/packages/lib32-profile.ucl b/release/packages/lib32-profile.ucl
new file mode 100644
index 000000000000..b2cdb7db12df
--- /dev/null
+++ b/release/packages/lib32-profile.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-lib32-profile"
+origin = "base"
+version = "%VERSION%"
+comment = "32bits libraries"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+TODO
+EOD
diff --git a/release/packages/lib32.ucl b/release/packages/lib32.ucl
index 95b563152e00..14f5b9eb25bc 100644
--- a/release/packages/lib32.ucl
+++ b/release/packages/lib32.ucl
@@ -1,7 +1,7 @@
 name = "FreeBSD-lib32"
 origin = "base"
 version = "%VERSION%"
-comment = "32bits libraries
+comment = "32bits libraries"
 categories = [ base ]
 maintainer = "re@FreeBSD.org"
 www = "http://www.FreeBSD.org"
diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk
index e61805f2cd01..9aa172b79ddc 100644
--- a/release/scripts/mtree-to-plist.awk
+++ b/release/scripts/mtree-to-plist.awk
@@ -25,7 +25,7 @@
 	if (length(tags) == 0)
 		next
 	if (tags ~ /package=/) {
-		ext = pkgname = ""
+		ext = pkgname = pkgend = ""
 		split(tags, a, ",");
 		for (i in a) {
 			if (a[i] ~ /^package=/) {
@@ -33,17 +33,29 @@
 				gsub(/package=/, "", pkgname)
 			} else if (a[i] == "config") {
 				type="config"
+			} else if (a[i] == "development" || a[i] == "profile") {
+				pkgend=a[i]
 			} else {
-				ext=a[i]
+				if (ext != "")
+					ext=ext"-"a[i]
+				else
+					ext=a[i]
 			}
 		}
-		if (length(ext) > 0) {
+		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" > 2
 		next