From owner-svn-src-user@FreeBSD.ORG Sat Jan 1 06:54:22 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57AF6106566B; Sat, 1 Jan 2011 06:54:22 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 47A898FC0A; Sat, 1 Jan 2011 06:54:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p016sMLj002078; Sat, 1 Jan 2011 06:54:22 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p016sMCK002076; Sat, 1 Jan 2011 06:54:22 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201101010654.p016sMCK002076@svn.freebsd.org> From: Doug Barton Date: Sat, 1 Jan 2011 06:54:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216867 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 06:54:22 -0000 Author: dougb Date: Sat Jan 1 06:54:21 2011 New Revision: 216867 URL: http://svn.freebsd.org/changeset/base/216867 Log: If PM_PACKAGES is set, don't bother with build depends Reminded by: ale Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Jan 1 01:31:45 2011 (r216866) +++ user/dougb/portmaster/portmaster Sat Jan 1 06:54:21 2011 (r216867) @@ -3113,10 +3113,15 @@ if [ -n "$PM_FIRST_PASS" ]; then [ "$$" -eq "$PM_PARENT_PID" -a -n "$PM_BUILD_ONLY_LIST" ] && PM_BUILD_ONLY_LIST=pmp_doing_build_deps - [ -z "$PM_PACKAGES" -a -z "$PM_NO_MAKE_CONFIG" ] && make_config + if [ -z "$PM_PACKAGES" ]; then + [ -z "$PM_NO_MAKE_CONFIG" ] && make_config + + dep_check_type='build-depends-list run-depends-list' + [ -n "$RECURSE_THOROUGH" ] && dep_check_type=all-depends-list + else + dep_check_type=run-depends-list + fi - dep_check_type='build-depends-list run-depends-list' - [ -n "$RECURSE_THOROUGH" ] && dep_check_type=all-depends-list dependency_check "$dep_check_type" [ -n "$UPDATE_REQ_BYS" -o -n "$URB_YES" ] && @@ -3199,7 +3204,12 @@ if [ -z "$NO_DEP_UPDATES" ]; then fi else echo "===>>> Starting check for all dependencies" - dependency_check all-depends-list + + if [ -z "$PM_PACKAGES" ]; then + dependency_check all-depends-list + else + dependency_check run-depends-list + fi fi pm_cd_pd $portdir elif [ "$$" -eq "$PM_PARENT_PID" ]; then