|
@@ -139,7 +139,6 @@ my $mfile_gids = "${portsdir}/GIDs";
|
|
|
|
|
|
if ($verbose) {
|
|
|
print "OK: config: portsdir: \"$portsdir\" ".
|
|
|
- "rcsidstr: \"$rcsidstr\" ".
|
|
|
"localbase: $localbase ".
|
|
|
"\n";
|
|
|
}
|
|
@@ -728,6 +727,7 @@ sub checkplist {
|
|
|
}
|
|
|
} elsif ($_ =~ /^\@(comment)/) {
|
|
|
$rcsidseen++ if (/\$$rcsidstr[:\$]/);
|
|
|
+ &perror("FATAL", $file, $., "\$$rcsidstr\$ is deprecated in Git.");
|
|
|
} elsif ($_ =~ m!^\@(dirrm|dirrmtry)\s+/!) {
|
|
|
&perror("WARN", $file, $., "Using \@$1 with absolute path ".
|
|
|
"will not work as you expected in most cases. Use ".
|
|
@@ -1444,20 +1444,19 @@ sub checkmakefile {
|
|
|
print "OK: checking header in $file.\n" if ($verbose);
|
|
|
if ($lines[1] =~ /^# (?:New )?[Pp]orts collection [mM]akefile/) {
|
|
|
&perror("FATAL", $file, 1, "old style headers found.");
|
|
|
+ } elsif ($lines[1] =~ /^# \$$rcsidstr[:\$]/) {
|
|
|
+ &perror("FATAL", $file, 1, "\$$rcsidstr\$ is deprecated in Git.");
|
|
|
} elsif ($lines[1] =~ /^# Created by: \S/) {
|
|
|
- if ($lines[2] !~ /^# \$$rcsidstr[:\$]/) {
|
|
|
- &perror("FATAL", $file, 2, "header should be ".
|
|
|
- "followed by \$$rcsidstr\$.");
|
|
|
- } elsif ($lines[3] !~ /^$/) {
|
|
|
- #&perror("FATAL", $file, 3, "do not add extra ".
|
|
|
+ if ($lines[2] =~ /^# \$$rcsidstr[:\$]/) {
|
|
|
+ &perror("FATAL", $file, 2, "\$$rcsidstr\$ is deprecated in Git.");
|
|
|
+ }
|
|
|
+ if ($lines[2] !~ /^$/) {
|
|
|
+ #&perror("FATAL", $file, 2, "do not add extra ".
|
|
|
# "empty comments after header.");
|
|
|
}
|
|
|
# special case for $rcsidsrt\nMCom:
|
|
|
- } elsif ($lines[1] =~ /^# \$$rcsidstr[:\$]/ and $lines[2] =~ /^#\s+\$MCom[:\$]/ and $lines[3] =~ /^$/) {
|
|
|
+ } elsif ($lines[1] =~ /^#\s+\$MCom[:\$]/ and $lines[2] =~ /^$/) {
|
|
|
# DO NOTHING
|
|
|
- } elsif ($lines[1] !~ /^# \$$rcsidstr[:\$]/ or $lines[2] !~ /^$/) {
|
|
|
- &perror("FATAL", $file, 1, "incorrect header; ".
|
|
|
- "simply use \$$rcsidstr\$.");
|
|
|
}
|
|
|
|
|
|
#
|
|
@@ -2686,30 +2685,6 @@ EOF
|
|
|
if ($tmp =~ m/Version [rR]equired/) {
|
|
|
&perror("WARN", $file, -1, "Version required is no longer needed in the comment section.");
|
|
|
}
|
|
|
- my $tmp2 = "";
|
|
|
- for (split(/\n/, $tmp)) {
|
|
|
- $tmp2 .= $_ if (m/\$$rcsidstr/);
|
|
|
- }
|
|
|
- if ($tmp2 !~ /#(\s+)\$$rcsidstr([^\$]*)\$$/) {
|
|
|
-
|
|
|
- &perror("FATAL", $file, -1, "no \$$rcsidstr\$ line in comment ".
|
|
|
- "section.");
|
|
|
- } else {
|
|
|
- print "OK: \$$rcsidstr\$ seen in $file.\n" if ($verbose);
|
|
|
- if ($1 ne ' ') {
|
|
|
- &perror("WARN", $file, -1, "please use single whitespace ".
|
|
|
- "right before \$$rcsidstr\$ tag.");
|
|
|
- }
|
|
|
- if ($2 ne '') {
|
|
|
- if ($verbose || $newport) { # XXX
|
|
|
- &perror("WARN", $file, -1,
|
|
|
- ($newport ? 'for new port, '
|
|
|
- : 'is it a new port? if so, ').
|
|
|
- "make \$$rcsidstr\$ tag in comment ".
|
|
|
- "section empty, to make SVN happy.");
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
#
|
|
|
# for the rest of the checks, comment lines are not important.
|