From owner-svn-src-projects@FreeBSD.ORG Wed Mar 18 11:27:13 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD11937E; Wed, 18 Mar 2015 11:27:13 +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 9871993A; Wed, 18 Mar 2015 11:27:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2IBRDuR014875; Wed, 18 Mar 2015 11:27:13 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2IBRCYr014871; Wed, 18 Mar 2015 11:27:12 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503181127.t2IBRCYr014871@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 18 Mar 2015 11:27:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280215 - in projects/release-pkg/release: packages 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Mar 2015 11:27:13 -0000 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@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@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@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