kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Restore the canonical order of installing run-depends before the parent

Browse source
This commit is contained in:
Doug Barton 2008-01-04 10:29:57 +00:00
parent a262eeb758
commit 35c962ef45
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=204976
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ports-mgmt/portmaster/files/portmaster.sh.in
View file

@ -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'