diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2008-01-04 10:29:57 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2008-01-04 10:29:57 +0000 |
| commit | 35c962ef45340d6829d1c5d2961444dde32407cc (patch) | |
| tree | 988d3e596098eeea4f638257bdf7f7bbe5ed4cc3 /ports-mgmt | |
| parent | a262eeb758886c90440490b8589ae6ee25f0982a (diff) | |
| download | ports-35c962ef45340d6829d1c5d2961444dde32407cc.tar.gz ports-35c962ef45340d6829d1c5d2961444dde32407cc.zip | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmaster/files/portmaster.sh.in | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/ports-mgmt/portmaster/files/portmaster.sh.in b/ports-mgmt/portmaster/files/portmaster.sh.in index 6c673257fb81..a6c4518d03b3 100644 --- a/ports-mgmt/portmaster/files/portmaster.sh.in +++ b/ports-mgmt/portmaster/files/portmaster.sh.in @@ -1773,9 +1773,17 @@ fi # In case we went elsewhere to create a backup package cd $pd/$portdir -# Do the install here in case a run dependency has a build dependency on us. +if [ -z "$RECURSE_THOROUGH" -a ! -e "$NO_DEP_UPDATES" ]; then + echo '' + echo "===>>> Starting check for runtime dependencies" + dependency_check run-depends-list +fi + +# In case we went elsewhere in the dependency check +cd $pd/$portdir + # Defining NO_DEPENDS ensures that we will control the installation of the -# run depends, not bsd.port.mk. +# depends, not bsd.port.mk. make -DNO_DEPENDS $PM_MAKE_ARGS install || { if [ -z "$NO_BACKUP" -a -n "$upg_port" ]; then echo '' @@ -1812,15 +1820,6 @@ if [ ! "$allfiles" = ' ' ]; then done fi -if [ -z "$RECURSE_THOROUGH" -a ! -e "$NO_DEP_UPDATES" ]; then - echo '' - echo "===>>> Starting check for runtime dependencies" - dependency_check run-depends-list -fi - -# In case we went elsewhere in the dependency check -cd $pd/$portdir - if [ -n "$MAKE_PACKAGE" ]; then echo "===>>> Creating a package for new version $new_port" make $PM_MAKE_ARGS package || fail 'Package creation of new port failed' |