svn commit: r280215 - in projects/release-pkg/release: packages scripts

[Baptiste Daroussin]

Author: bapt
Date: Wed Mar 18 11:27:11 2015
New Revision: 280215
URL: https://svnweb.freebsd.org/changeset/base/280215

Log:
  development and profile are special tags and should always be the last component
  of the name if present

Added:
  projects/release-pkg/release/packages/lib32-development.ucl
     - copied, changed from r280212, projects/release-pkg/release/packages/lib32.ucl
  projects/release-pkg/release/packages/lib32-profile.ucl
     - copied, changed from r280212, projects/release-pkg/release/packages/lib32.ucl
Modified:
  projects/release-pkg/release/packages/lib32.ucl
  projects/release-pkg/release/scripts/mtree-to-plist.awk

Copied and modified: projects/release-pkg/release/packages/lib32-development.ucl (from r280212, projects/release-pkg/release/packages/lib32.ucl)
==============================================================================
--- projects/release-pkg/release/packages/lib32.ucl	Wed Mar 18 11:05:49 2015	(r280212, copy source)
+++ projects/release-pkg/release/packages/lib32-development.ucl	Wed Mar 18 11:27:11 2015	(r280215)
@@ -1,7 +1,7 @@
-name = "FreeBSD-lib32"
+name = "FreeBSD-lib32-development"
 origin = "base"
 version = "%VERSION%"
-comment = "32bits libraries
+comment = "32bits libraries"
 categories = [ base ]
 maintainer = "re at FreeBSD.org"
 www = "http://www.FreeBSD.org"

Copied and modified: projects/release-pkg/release/packages/lib32-profile.ucl (from r280212, projects/release-pkg/release/packages/lib32.ucl)
==============================================================================
--- projects/release-pkg/release/packages/lib32.ucl	Wed Mar 18 11:05:49 2015	(r280212, copy source)
+++ projects/release-pkg/release/packages/lib32-profile.ucl	Wed Mar 18 11:27:11 2015	(r280215)
@@ -1,7 +1,7 @@
-name = "FreeBSD-lib32"
+name = "FreeBSD-lib32-profile"
 origin = "base"
 version = "%VERSION%"
-comment = "32bits libraries
+comment = "32bits libraries"
 categories = [ base ]
 maintainer = "re at FreeBSD.org"
 www = "http://www.FreeBSD.org"

Modified: projects/release-pkg/release/packages/lib32.ucl
==============================================================================
--- projects/release-pkg/release/packages/lib32.ucl	Wed Mar 18 11:26:10 2015	(r280214)
+++ projects/release-pkg/release/packages/lib32.ucl	Wed Mar 18 11:27:11 2015	(r280215)
@@ -1,7 +1,7 @@
 name = "FreeBSD-lib32"
 origin = "base"
 version = "%VERSION%"
-comment = "32bits libraries
+comment = "32bits libraries"
 categories = [ base ]
 maintainer = "re at FreeBSD.org"
 www = "http://www.FreeBSD.org"

Modified: projects/release-pkg/release/scripts/mtree-to-plist.awk
==============================================================================
--- projects/release-pkg/release/scripts/mtree-to-plist.awk	Wed Mar 18 11:26:10 2015	(r280214)
+++ projects/release-pkg/release/scripts/mtree-to-plist.awk	Wed Mar 18 11:27:11 2015	(r280215)
@@ -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