|
@@ -161,6 +161,7 @@ foreach my $i (@osdep) {
|
|
|
|
|
|
# The PORTSDIR environment variable overrides our defaults.
|
|
|
$portsdir = $ENV{PORTSDIR} if ( defined $ENV{'PORTSDIR'} );
|
|
|
+$ENV{'PL_SVN_IGNORE'} //= '';
|
|
|
my $mfile_moved = "${portsdir}/MOVED";
|
|
|
my $mfile_uids = "${portsdir}/UIDs";
|
|
|
my $mfile_gids = "${portsdir}/GIDs";
|
|
@@ -367,6 +368,8 @@ if ($committer) {
|
|
|
} elsif ($_ eq '.svn' && -d) {
|
|
|
&perror("FATAL", $fullname, -1, "for safety, be sure to cleanup ".
|
|
|
"Subversion files before committing the port.");
|
|
|
+
|
|
|
+ $File::Find::prune = 1;
|
|
|
} elsif ($_ eq 'CVS' && -d) {
|
|
|
if ($newport) {
|
|
|
&perror("FATAL", $fullname, -1, "for safety, be sure to cleanup ".
|
|
@@ -374,6 +377,16 @@ if ($committer) {
|
|
|
}
|
|
|
|
|
|
$File::Find::prune = 1;
|
|
|
+ } elsif (-f) {
|
|
|
+ my $fullpath = $makevar{'.CURDIR'}.'/'.$fullname;
|
|
|
+ my $result = `svn status $fullpath`;
|
|
|
+
|
|
|
+ chomp $result;
|
|
|
+ if (substr($result, 0, 1) eq '?') {
|
|
|
+ &perror("FATAL", "", -1, "$fullname not under SVN.")
|
|
|
+ unless (eval { /$ENV{'PL_SVN_IGNORE'}/, 1 } &&
|
|
|
+ /$ENV{'PL_SVN_IGNORE'}/);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|