|
@@ -161,7 +161,6 @@ foreach my $i (@osdep) {
|
|
|
|
|
|
# The PORTSDIR environment variable overrides our defaults.
|
|
|
$portsdir = $ENV{PORTSDIR} if ( defined $ENV{'PORTSDIR'} );
|
|
|
-$ENV{'PL_CVS_IGNORE'} //= '';
|
|
|
my $mfile_moved = "${portsdir}/MOVED";
|
|
|
my $mfile_uids = "${portsdir}/UIDs";
|
|
|
my $mfile_gids = "${portsdir}/GIDs";
|
|
@@ -499,8 +498,12 @@ sub checkdescr {
|
|
|
"returns. Strip all carriage returns (e.g. run dos2unix) ".
|
|
|
"in $file.");
|
|
|
}
|
|
|
- if (/^WWW:\s+(\S*)/) {
|
|
|
- my $wwwurl = $1;
|
|
|
+ if (/^WWW:(\s+)(\S*)/) {
|
|
|
+ my $wwwurl = $2;
|
|
|
+ if ($1 ne ' ') {
|
|
|
+ &perror("WARN", $file, -1, "use WWW: with a single space, ".
|
|
|
+ "then $wwwurl");
|
|
|
+ }
|
|
|
if ($wwwurl !~ m|^https?://|) {
|
|
|
&perror("WARN", $file, -1, "WWW URL, $wwwurl should begin ".
|
|
|
"with \"http://\" or \"https://\".");
|
|
@@ -1341,7 +1344,7 @@ sub checkmakefile {
|
|
|
}
|
|
|
} elsif ($lines[1] !~ /^# \$$rcsidstr[:\$]/ or $lines[2] !~ /^$/) {
|
|
|
&perror("FATAL", $file, 1, "incorrect header; ".
|
|
|
- "use Created by: with a space, then \$$rcsidstr\$.");
|
|
|
+ "use Created by: with a single space, then \$$rcsidstr\$.");
|
|
|
}
|
|
|
|
|
|
#
|
|
@@ -1431,7 +1434,9 @@ sub checkmakefile {
|
|
|
OPTIONS_DEFAULT
|
|
|
OPTIONS_DEFINE
|
|
|
OPTIONS_EXCLUDE
|
|
|
+ OPTIONS_GROUP.*?
|
|
|
OPTIONS_MULTI.*?
|
|
|
+ OPTIONS_RADIO.*?
|
|
|
OPTIONS_SINGLE.*?
|
|
|
);
|
|
|
|