diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2003-01-24 04:39:02 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2003-01-24 04:39:02 +0000 |
commit | 13c6a42331b96af428732c20938655bdd6e4d60f (patch) | |
tree | 7b406f96b5d3b3f9fc33a91dba989ab96ffb1da6 /Tools/portbuild | |
parent | Sync with bento: (diff) |
Use pkg_add instead of pkg_add -f
Notes
Notes:
svn path=/head/; revision=73905
Diffstat (limited to 'Tools/portbuild')
-rwxr-xr-x | Tools/portbuild/scripts/buildscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/portbuild/scripts/buildscript b/Tools/portbuild/scripts/buildscript index 8f842e1dd534..1a5e90e25f92 100755 --- a/Tools/portbuild/scripts/buildscript +++ b/Tools/portbuild/scripts/buildscript @@ -17,13 +17,13 @@ if [ $phase = 1 ]; then if [ "$(echo $(/bin/ls | wc -c))" != 0 ]; then echo "adding dependencies" for i in *.t[bg]z; do - echo "pkg_add -f $i" + echo "pkg_add $i" base=$(basename $i .tgz) base=$(basename $base .tbz) if pkg_info -q -e $base; then echo "skipping $base, already added" else - if ! pkg_add -f $i; then + if ! pkg_add $i; then echo "error in dependency $i, exiting" echo "1" > /tmp/status exit 1 @@ -60,7 +60,7 @@ else DISPLAY=:${pid} export DISPLAY fi - + cd $dir || exit 1 pkgname=$(make package-name) if /pnohang $TIMEOUT /tmp/make.log2 ${pkgname} make package; then |