From owner-svn-ports-all@freebsd.org  Thu Sep  8 12:49:03 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE2BCBD11F8;
 Thu,  8 Sep 2016 12:49:03 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 AE5FB1A3;
 Thu,  8 Sep 2016 12:49:03 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u88Cn2md033506;
 Thu, 8 Sep 2016 12:49:02 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u88Cn22A033505;
 Thu, 8 Sep 2016 12:49:02 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201609081249.u88Cn22A033505@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 8 Sep 2016 12:49:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421545 - 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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Sep 2016 12:49:04 -0000

Author: mat
Date: Thu Sep  8 12:49:02 2016
New Revision: 421545
URL: https://svnweb.freebsd.org/changeset/ports/421545

Log:
  Use make(1) to extract variables from a Makefile, not grep.
  
  PR:		212486
  Submitted by:	mat
  Approved by:	crees (maintainer)
  Sponsored by:	Absolight

Modified:
  head/Tools/scripts/addport

Modified: head/Tools/scripts/addport
==============================================================================
--- head/Tools/scripts/addport	Thu Sep  8 12:41:02 2016	(r421544)
+++ head/Tools/scripts/addport	Thu Sep  8 12:49:02 2016	(r421545)
@@ -276,14 +276,14 @@ foreach my $thisdir (@dirs) {
 			$pkgcomment = `cat pkg-descr`;
 			$pkgcomment .= "\n" if ($autofill != -1);
 		}
+		chomp($maintaineraddr = `$make $passenv -V MAINTAINER`);
+		chomp($portversion = `$make $passenv -V PORTVERSION`);
 		# Read Makefile to find necessary variables.
 		open(MAKEFILE, "Makefile") or die("Can't open Makefile for reading: $!");
 		while(<MAKEFILE>) {
 			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);