svn commit: r236881 - user/dougb/portmaster

[Doug Barton]

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` "