diff options
| author | sobomax <sobomax@FreeBSD.org> | 2008-10-22 05:32:08 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2008-10-22 05:32:08 +0800 |
| commit | 0c4510494ef176a06681c21d6154cf9643aecc43 (patch) | |
| tree | 03aea7512d00509be1e3b75268d7c1196d73007b /Tools/scripts | |
| parent | 8ff08b88d527274e03767b09534459d21bdab65e (diff) | |
| download | freebsd-ports-gnome-0c4510494ef176a06681c21d6154cf9643aecc43.tar.gz freebsd-ports-gnome-0c4510494ef176a06681c21d6154cf9643aecc43.tar.zst freebsd-ports-gnome-0c4510494ef176a06681c21d6154cf9643aecc43.zip | |
Make sure we don't add ${WRKDIR}.
Diffstat (limited to 'Tools/scripts')
| -rwxr-xr-x | Tools/scripts/addport | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Tools/scripts/addport b/Tools/scripts/addport index 70c95ad3a595..6ab5e35b2d09 100755 --- a/Tools/scripts/addport +++ b/Tools/scripts/addport @@ -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 |