From 9d7a60691558af7b2968ff2305b2fbf584e7f7a5 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Thu, 8 Sep 2016 12:49:02 +0000 Subject: Use make(1) to extract variables from a Makefile, not grep. PR: 212486 Submitted by: mat Approved by: crees (maintainer) Sponsored by: Absolight --- Tools/scripts/addport | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Tools') diff --git a/Tools/scripts/addport b/Tools/scripts/addport index d7e4eef88158..a53c19a0b8ab 100755 --- a/Tools/scripts/addport +++ b/Tools/scripts/addport @@ -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() { 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); -- cgit v1.2.3