From owner-svn-ports-all@FreeBSD.ORG  Sat Dec 15 15:16:16 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8EDFFDC;
 Sat, 15 Dec 2012 15:16:16 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 726478FC12;
 Sat, 15 Dec 2012 15:16:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBFFGGio085579;
 Sat, 15 Dec 2012 15:16:16 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBFFGGIB085578;
 Sat, 15 Dec 2012 15:16:16 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212151516.qBFFGGIB085578@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 15 Dec 2012 15:16:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308950 - head/Tools/scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Dec 2012 15:16:16 -0000

Author: eadler
Date: Sat Dec 15 15:16:15 2012
New Revision: 308950
URL: http://svnweb.freebsd.org/changeset/ports/308950

Log:
  Teach convert-makefile-header about the mcom header line.
  Don't remove this when doing the conversion.

Modified:
  head/Tools/scripts/convert-makefile-header.pl

Modified: head/Tools/scripts/convert-makefile-header.pl
==============================================================================
--- head/Tools/scripts/convert-makefile-header.pl	Sat Dec 15 14:29:38 2012	(r308949)
+++ head/Tools/scripts/convert-makefile-header.pl	Sat Dec 15 15:16:15 2012	(r308950)
@@ -41,6 +41,17 @@ sub get_creator($) {
 	return $creator;
 }
 
+sub get_mcom($) {
+	my $header=shift;
+	my $mcom;
+	for my $line (@$header) {
+		if ($line=~m'\$MCom:'i) {
+			return $line;
+		}
+	}
+	return "";
+}
+
 MAIN: {
 	# get options
 	my $opt={};
@@ -86,12 +97,14 @@ MAIN: {
 				print $outh "# \$FreeBSD\$\n";
 			} elsif(defined($opt->{createdby}) || !defined($opt->{rcsonly})) {
 				my $creator=get_creator(\@header);
+				my $mcom=get_mcom(\@header);
 				if(defined($creator)) {
 					print $outh "# Created by: $creator\n";
 				} else {
 					print STDERR "$mf creator not found. Reverting to RCS string only.\n";
 				}
 				print $outh "# \$FreeBSD\$\n";
+				print $outh $mcom;
 			}
 		
 			for my $line (@makefile) {