FreeBSD Bugzilla – Attachment 174527 Details for
Bug 212486
Change how addport gets variables from the Makefile.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v1
addport.diff (text/plain), 960 bytes, created by
Mathieu Arnold
on 2016-09-08 12:23:05 UTC
(
hide
)
Description:
v1
Filename:
MIME Type:
Creator:
Mathieu Arnold
Created:
2016-09-08 12:23:05 UTC
Size:
960 bytes
patch
obsolete
>diff --git a/Tools/scripts/addport b/Tools/scripts/addport >index d7e4eef..a53c19a 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(<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);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=174527">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 212486
: 174527