Date: Sat, 5 Dec 2009 20:17:04 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r200159 - user/dougb/portmaster Message-ID: <200912052017.nB5KH4x9098796@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Sat Dec 5 20:17:04 2009 New Revision: 200159 URL: http://svn.freebsd.org/changeset/base/200159 Log: If we're installing a package update the pkgdep versions to match what is installed. Make the message about updating entries for dependencies on the new port more informative. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Dec 5 20:16:28 2009 (r200158) +++ user/dougb/portmaster/portmaster Sat Dec 5 20:17:04 2009 (r200159) @@ -2790,12 +2790,17 @@ if [ -n "$MAKE_PACKAGE" ]; then echo " ===>>> Package saved to $packages/All" ; echo '' fi -[ -z "$DONT_POST_CLEAN" -a -z "$use_package" ] && { - pm_make clean NOCLEANDEPENDS=ncd2 ; echo ''; } +if [ -z "$use_package" ]; then + [ -z "$DONT_POST_CLEAN" ] && { + pm_make clean NOCLEANDEPENDS=ncd2 ; echo ''; } +elif grep -q DEPORIGIN $pdb/$new_port/+CONTENTS; then +echo "===>>> Updating dependencies for $new_port to match installed versions" + update_contents $pdb/$new_port/+CONTENTS +fi check_dependency_files $portdir $new_port if [ -s "$grep_deps" ]; then - echo "===>>> Updating package dependency entry for each dependent port" +echo "===>>> Updating dependency entry for $new_port in each dependent port" [ -n "$PM_VERBOSE" ] && echo '' while read d_port; do [ -n "$PM_VERBOSE" ] && echo "===>>> $d_port"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912052017.nB5KH4x9098796>