From owner-svn-src-user@FreeBSD.ORG Fri Oct 29 21:29:44 2010 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 3BAEB106566B; Fri, 29 Oct 2010 21:29:44 +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 2AC3D8FC14; Fri, 29 Oct 2010 21:29:44 +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 o9TLTihK059287; Fri, 29 Oct 2010 21:29:44 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9TLTiC8059285; Fri, 29 Oct 2010 21:29:44 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201010292129.o9TLTiC8059285@svn.freebsd.org> From: Doug Barton Date: Fri, 29 Oct 2010 21:29:44 +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: r214537 - 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: Fri, 29 Oct 2010 21:29:44 -0000 Author: dougb Date: Fri Oct 29 21:29:43 2010 New Revision: 214537 URL: http://svn.freebsd.org/changeset/base/214537 Log: Get brave and remove the commented out code in -a. We're now totally dependent on PM_NEEDS_UPDATE. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Oct 29 21:24:56 2010 (r214536) +++ user/dougb/portmaster/portmaster Fri Oct 29 21:29:43 2010 (r214537) @@ -2805,33 +2805,6 @@ all_first_pass () { export PM_BUILDING=pmbuildingall -if ! : ; then - for iport in $roots $trunks $branches $leaves; do - # Probably got updated as a dependency for something else - [ -d "$pdb/$iport" ] || continue - case "$CUR_DEPS" in *:${iport}:*) continue ;; esac - check_exclude $iport || continue - - case "$iport" in bsdpan-*) continue ;; esac - - PM_DEPTH= - if [ -n "$PM_FORCE" ]; then - if ! check_restart_and_udf $iport; then - echo "===>>> Forcing update for $iport" - update_port $iport - else - CUR_DEPS="${CUR_DEPS}${iport}:" - fi - continue - fi - - check_interactive $iport || continue - - # We got here, so we know we have to build it - update_port $iport - done -fi - unset roots trunks branches leaves for origin in $PM_NEEDS_UPDATE; do update_port $origin; done