From owner-svn-src-user@FreeBSD.ORG  Mon Jun 11 08:03:14 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id F267510656D6;
	Mon, 11 Jun 2012 08:03:14 +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 DEF688FC14;
	Mon, 11 Jun 2012 08:03:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5B83ENt051869;
	Mon, 11 Jun 2012 08:03:14 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5B83ET8051867;
	Mon, 11 Jun 2012 08:03:14 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201206110803.q5B83ET8051867@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 11 Jun 2012 08:03:14 +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: r236881 - 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 &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jun 2012 08:03:15 -0000

Author: dougb
Date: Mon Jun 11 08:03:14 2012
New Revision: 236881
URL: http://svn.freebsd.org/changeset/base/236881

Log:
  Move the test for installed ports on the build-only dep list to a better
  location, after the code that checks to see if any ports on the list are
  depended on. Also, we only want to disqualify an installed port if we're
  doing --delete-build-only. If the port is already installed and needs an
  update, --packages-build still applies.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Jun 11 07:44:16 2012	(r236880)
+++ user/dougb/portmaster/portmaster	Mon Jun 11 08:03:14 2012	(r236881)
@@ -2351,15 +2351,6 @@ clean_build_only_list () {
 	done
 
 	build_only_dl_g=" `uniquify_list $temp_bodlg` "
-	unset temp_bodlg
-
-	# We do not want already installed ports to end up on this list
-	for dep in $build_only_dl_g; do
-		iport_from_origin ${dep#$pd/} >/dev/null && continue
-		temp_bodlg="$temp_bodlg $dep"
-	done
-
-	build_only_dl_g="$temp_bodlg "
 }
 
 gen_dep_list () {
@@ -2625,8 +2616,10 @@ post_first_pass () {
 		done
 
 		for dep in $build_only_dl_g; do
-			grep -q "@comment DEPORIGIN:${dep#$pd/}$" $pdb/*/+CONTENTS ||
-				temp_bodlg="$temp_bodlg $dep"
+			grep -q "@comment DEPORIGIN:${dep#$pd/}$" $pdb/*/+CONTENTS && continue
+			[ -n "$PM_DEL_BUILD_ONLY" ] &&
+				iport_from_origin ${dep#$pd/} >/dev/null && continue
+			temp_bodlg="$temp_bodlg $dep"
 		done
 
 		build_only_dl_g=" `uniquify_list $temp_bodlg` "