Date: Fri, 31 Aug 2012 18:40:40 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r303442 - head/Tools/scripts Message-ID: <201208311840.q7VIeelC077284@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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";
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208311840.q7VIeelC077284>