From owner-svn-ports-head@FreeBSD.ORG  Sun May 12 16:13:13 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 000C42D4;
 Sun, 12 May 2013 16:13:12 +0000 (UTC)
 (envelope-from crees@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 E6C2118A;
 Sun, 12 May 2013 16:13:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CGDC3s073341;
 Sun, 12 May 2013 16:13:12 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CGDCxG073340;
 Sun, 12 May 2013 16:13:12 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201305121613.r4CGDCxG073340@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Sun, 12 May 2013 16:13:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r317966 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 12 May 2013 16:13:13 -0000

Author: crees
Date: Sun May 12 16:13:12 2013
New Revision: 317966
URL: http://svnweb.freebsd.org/changeset/ports/317966

Log:
  Use MAINTAINER line for Submitted by: if Created by: does not exist.
  
  Still prefer Created by because we still don't use real
  names in MAINTAINER lines (oh please let that change....)
  
  Submitted by:	jgh (based on)

Modified:
  head/Tools/scripts/addport

Modified: head/Tools/scripts/addport
==============================================================================
--- head/Tools/scripts/addport	Sun May 12 16:05:10 2013	(r317965)
+++ head/Tools/scripts/addport	Sun May 12 16:13:12 2013	(r317966)
@@ -104,8 +104,8 @@ my $rm = "rm";
 my $keyword = '\$FreeBSD\\\$';
 # vars required for commitfile
 my $descr; my $portversion; my $pkgcomment;
-my $tmp; my $pkgcommentlen; my $comment; my $maintainer;
-my $tmp2; my $offset; my $commitfile = "";
+my $tmp; my $pkgcommentlen; my $comment; my $maintainer = "";
+my $maintaineraddr; my $tmp2; my $offset; my $commitfile = "";
 my $moved = "";
 $tmp = $tmp2 = $offset = 0;
 
@@ -276,9 +276,11 @@ foreach my $thisdir (@dirs) {
 			chomp;
 			die ("Old style Makefile headers detected") if (/^# (?:[Nn]ew )?[Pp]orts collection [Mm]akefile/);
 			($maintainer) = (m/^# Created by:\s+(\w.*)$/) if (/^# Created by/);
+			($maintaineraddr) = (m/^MAINTAINER=\s+(\w.*)$/) if (/^MAINTAINER=/);
 			($portversion) = (m/^PORTVERSION=\s+(\w.*)$/) if (/^PORTVERSION=/);
 		}
 		close(MAKEFILE);
+		$maintainer = $maintaineraddr unless ($maintainer);
 		# Write out the data to the comment file.
 		open(AUTOFILL, "> $tmpdir/commitfile") or die("Can't open $tmpdir/commitfile for writing: $!");
 		if ($autofill_l) {