From owner-svn-src-projects@FreeBSD.ORG  Wed Mar  4 23:45:40 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 1DD21CE4;
 Wed,  4 Mar 2015 23:45:40 +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 08B936D1;
 Wed,  4 Mar 2015 23:45:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t24Njdhj060575;
 Wed, 4 Mar 2015 23:45:39 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t24NjdPo060574;
 Wed, 4 Mar 2015 23:45:39 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201503042345.t24NjdPo060574@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: Wed, 4 Mar 2015 23:45:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r279605 - 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: Wed, 04 Mar 2015 23:45:40 -0000

Author: bapt
Date: Wed Mar  4 23:45:39 2015
New Revision: 279605
URL: https://svnweb.freebsd.org/changeset/base/279605

Log:
  Improve mtree to plist converter
  
  1/ Analyse the fields from mtree lines to extract:
   - owner,
   - group,
   - mode,
   - flags,
   - tags,
  2/ Ignore non tagged entries
  3/ For now concat tags to form a futur package name

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	Wed Mar  4 23:01:03 2015	(r279604)
+++ projects/release-pkg/release/scripts/mtree-to-plist.awk	Wed Mar  4 23:45:39 2015	(r279605)
@@ -1,15 +1,39 @@
 #!/usr/bin/awk
 /^[^#]/ {
 	gsub(/^\./,"", $1)
-	tags=$NF
-	gsub(/tags=/,"", tags)
-	output=tags".plist"
-	uname=$3
-	gname=$4
-	mode=$5
-	gsub(/uname=/, "", uname);
-	gsub(/gname=/, "", gname);
-	gsub(/mode=/, "", mode);
+	uname=""
+	gname=""
+	mode=""
+	flags=""
+	tags=""
+	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);
+		}
+	}
+	if (length(tags) == 0)
+		next
+	if (tags ~ /package=/) {
+		gsub(/package=/,"",tags);
+		gsub(/,/, "-", tags);
+		pkg=tags
+	} else {
+		pkg=tags
+	}
+	output=pkg".plist"
 
-	print "@("uname","gname","mode") " $1 > output
+	print "@("uname","gname","mode","flags") " $1 > output
 }