View | Details | Raw Unified | Return to bug 212486
Collapse All | Expand All

(-)b/Tools/scripts/addport (-2 / +2 lines)
Lines 276-289 foreach my $thisdir (@dirs) { Link Here
276
			$pkgcomment = `cat pkg-descr`;
276
			$pkgcomment = `cat pkg-descr`;
277
			$pkgcomment .= "\n" if ($autofill != -1);
277
			$pkgcomment .= "\n" if ($autofill != -1);
278
		}
278
		}
279
		chomp($maintaineraddr = `$make $passenv -V MAINTAINER`);
280
		chomp($portversion = `$make $passenv -V PORTVERSION`);
279
		# Read Makefile to find necessary variables.
281
		# Read Makefile to find necessary variables.
280
		open(MAKEFILE, "Makefile") or die("Can't open Makefile for reading: $!");
282
		open(MAKEFILE, "Makefile") or die("Can't open Makefile for reading: $!");
281
		while(<MAKEFILE>) {
283
		while(<MAKEFILE>) {
282
			chomp;
284
			chomp;
283
			die ("Old style Makefile headers detected") if (/^# (?:[Nn]ew )?[Pp]orts collection [Mm]akefile/);
285
			die ("Old style Makefile headers detected") if (/^# (?:[Nn]ew )?[Pp]orts collection [Mm]akefile/);
284
			($maintainer) = (m/^# Created by:\s+(\w.*)$/) if (/^# Created by/);
286
			($maintainer) = (m/^# Created by:\s+(\w.*)$/) if (/^# Created by/);
285
			($maintaineraddr) = (m/^MAINTAINER=\s+(\w.*)$/) if (/^MAINTAINER=/);
286
			($portversion) = (m/^PORTVERSION=\s+(\w.*)$/) if (/^PORTVERSION=/);
287
		}
287
		}
288
		close(MAKEFILE);
288
		close(MAKEFILE);
289
		$maintainer = $maintaineraddr unless ($maintainer);
289
		$maintainer = $maintaineraddr unless ($maintainer);

Return to bug 212486