Make sure we don't add ${WRKDIR}.

This commit is contained in:
Maxim Sobolev 2008-10-21 21:32:08 +00:00
parent e4ed8e4b2c
commit 3fe7e87724
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=221883

View file

@ -307,7 +307,7 @@ foreach my $thisdir (@dirs) {
}
chdir $category or err(1,"$category");
system("$cp -PRp $thisdir .");
system("$cvs $n add `find $portname -type d | grep -v CVS`") && errx(1, "cvs add for dirs failed, aborting.");
system("$cvs $n add `find $portname -type d | grep -v CVS | grep -v '^$portname/work'`") && errx(1, "cvs add for dirs failed, aborting.");
my $gotfiles = 0;
if ($binfiles) {
@ -320,10 +320,10 @@ foreach my $thisdir (@dirs) {
}
if ($binfiles && $gotfiles > 0) {
system("$cvs $n add `find $portname -type f | grep -v CVS | grep -v '^$portname/files/.*patch-.*'`") && errx(1, "cvs add for files failed, aborting.");
system("$cvs $n add -ko `find $portname -type f | grep -v CVS | grep '^$portname/files/.*patch-.*'`") && errx(1, "cvs add for files failed, aborting.");
system("$cvs $n add `find $portname -type f | grep -v CVS | grep -v '^$portname/files/.*patch-.*' | grep -v '^$portname/work'`") && errx(1, "cvs add for files failed, aborting.");
system("$cvs $n add -ko `find $portname -type f | grep -v CVS | grep -v '^$portname/work' | grep '^$portname/files/.*patch-.*'`") && errx(1, "cvs add for files failed, aborting.");
} else {
system("$cvs $n add `find $portname -type f | grep -v CVS`") && errx(1, "cvs add for files failed, aborting.");
system("$cvs $n add `find $portname -type f | grep -v CVS | grep -v '^$portname/work'`") && errx(1, "cvs add for files failed, aborting.");
}
# figure out where the port name belongs in category Makefile