From owner-svn-src-projects@FreeBSD.ORG  Thu Mar  5 16:20:54 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 00BDF3BC;
 Thu,  5 Mar 2015 16:20:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E0CCBF80;
 Thu,  5 Mar 2015 16:20:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25GKrUh033150;
 Thu, 5 Mar 2015 16:20:53 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25GKrOE033149;
 Thu, 5 Mar 2015 16:20:53 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201503051620.t25GKrOE033149@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 5 Mar 2015 16:20:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r279660 - projects/release-pkg/release/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Mar 2015 16:20:54 -0000

Author: bapt
Date: Thu Mar  5 16:20:53 2015
New Revision: 279660
URL: https://svnweb.freebsd.org/changeset/base/279660

Log:
  Support a config tag to flag a file that should be merge on upgrade

Modified:
  projects/release-pkg/release/scripts/mtree-to-plist.awk

Modified: projects/release-pkg/release/scripts/mtree-to-plist.awk
==============================================================================
--- projects/release-pkg/release/scripts/mtree-to-plist.awk	Thu Mar  5 16:19:45 2015	(r279659)
+++ projects/release-pkg/release/scripts/mtree-to-plist.awk	Thu Mar  5 16:20:53 2015	(r279660)
@@ -25,14 +25,30 @@
 	if (length(tags) == 0)
 		next
 	if (tags ~ /package=/) {
-		gsub(/package=/,"",tags)
-		gsub(/,/, "-", tags)
-		gsub(/runtime-/, "", tags)
-		pkg=tags
+		ext = pkgname = ""
+		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 {
+				ext=a[i]
+			}
+		}
+		if (length(ext) > 0) {
+			if (pkgname == "runtime") {
+				pkgname=ext
+			} else {
+				pkgname=pkgname"-"ext
+			}
+		}
 	} else {
-		pkg=tags
+		print "No packages specified in line: $0" > 2
+		next
 	}
-	output=pkg".plist"
+	output=pkgname".plist"
 
 	print "@"type"("uname","gname","mode","flags") " $1 > output
 }