From owner-svn-ports-head@FreeBSD.ORG  Fri Aug 31 18:40:41 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1A2BD106564A;
	Fri, 31 Aug 2012 18:40:41 +0000 (UTC)
	(envelope-from crees@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 04EED8FC14;
	Fri, 31 Aug 2012 18:40:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7VIeeOS077286;
	Fri, 31 Aug 2012 18:40:40 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7VIeelC077284;
	Fri, 31 Aug 2012 18:40:40 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201208311840.q7VIeelC077284@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Fri, 31 Aug 2012 18:40:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303442 - head/Tools/scripts
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2012 18:40:41 -0000

Author: crees
Date: Fri Aug 31 18:40:40 2012
New Revision: 303442
URL: http://svn.freebsd.org/changeset/ports/303442

Log:
  Now that the headers have been removed, we no longer get the Whom line from
  which to acquire the Submitted by: line.
  
  It should be reasonable to simply use the MAINTAINER line; unfortunately we
  lose the real name and only get the email address.

Modified:
  head/Tools/scripts/addport

Modified: head/Tools/scripts/addport
==============================================================================
--- head/Tools/scripts/addport	Fri Aug 31 18:09:42 2012	(r303441)
+++ head/Tools/scripts/addport	Fri Aug 31 18:40:40 2012	(r303442)
@@ -106,7 +106,7 @@ my $rm = "rm";
 my $keyword = '\$FreeBSD\\\$';
 # vars required for commitfile
 my $descr; my $portversion; my $pkgcomment;
-my $tmp; my $pkgcommentlen; my $comment; my $orig;
+my $tmp; my $pkgcommentlen; my $comment; my $maintainer;
 my $tmp2; my $offset; my $commitfile = "";
 my $moved = "";
 $tmp = $tmp2 = $offset = 0;
@@ -271,7 +271,7 @@ foreach my $thisdir (@dirs) {
 		open(MAKEFILE, "Makefile") or die("Can't open Makefile for reading: $!");
 		while(<MAKEFILE>) {
 			chomp;
-			($orig) = (m/^# Whom:\s+(\w.*)$/) if (/^# Whom:/);
+			($maintainer) = (m/^MAINTAINER=\s+(\w.*)$/) if (/^MAINTAINER=/);
 			($portversion) = (m/^PORTVERSION=\s+(\w.*)$/) if (/^PORTVERSION=/);
 		}
 		close(MAKEFILE);
@@ -293,7 +293,7 @@ foreach my $thisdir (@dirs) {
 		}
 		print AUTOFILL $tmp;
 		print AUTOFILL "PR:		ports/$autofill\n" if ($autofill != -1);
-		print AUTOFILL "Submitted by:	$orig" if ($autofill != -1);
+		print AUTOFILL "Submitted by:	$maintainer" if ($autofill != -1);
 		close(AUTOFILL);
 		print "Okay, a commit log message was automatically generated for you.\n";
 		print "Now you will have a chance to edit it to make sure it's OK to use.\n";