svn commit: r200363 - user/dougb/portmaster

[Doug Barton]

Author: dougb
Date: Thu Dec 10 20:06:37 2009
New Revision: 200363
URL: http://svn.freebsd.org/changeset/base/200363

Log:
  In the test for -PP being alone on the command line I forgot the
  -dash at the beginning of the second test so it was falsely picking
  up ports with names like p5-Devel-PPPort.
  
  If you are building more than one port on the command line, and you
  use --packages-build and/or --delete-build-only, and one of the ports
  on the command line would otherwise qualfiy as a build-only dep, it was
  falsely being treated as such. Solve this problem by adding all ports
  on the command line to the run_dl_g list in multiport().

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Thu Dec 10 18:38:40 2009	(r200362)
+++ user/dougb/portmaster/portmaster	Thu Dec 10 20:06:37 2009	(r200363)
@@ -414,7 +414,7 @@ e2="The --packages-build option and the 
 
 for var in "$@" ; do
 	case "$var" in
-	-PP[A-Za-z0-9]*|*[A-Za-z0-9]PP*)
+	-PP[A-Za-z0-9]*|-*[A-Za-z0-9]PP*)
 				fail "The -PP option must stand alone" ;;
 	--packages)		packages_init first
 				PM_PACKAGES=first ; export PM_PACKAGES ;;
@@ -1912,7 +1912,14 @@ multiport () {
 	if [ -n "$CONFIG_ONLY" ]; then
 		if [ -n "$PM_BUILD_ONLY_LIST" ]; then
 			PM_BUILD_ONLY_LIST=pmp_doing_build_deps
-			run_dl_g='' ; build_only_dl_g=''
+			for port in $worklist; do
+				case "$port" in
+				*/*)	run_dl_g="$run_dl_g ${pd}/${port} " ;;
+				*)
+			run_dl_g="$run_dl_g ${pd}/`origin_from_pdb $port` " ;;
+				esac
+			done
+			build_only_dl_g=''
 			export run_dl_g build_only_dl_g
 		fi
 		if [ -n "$PM_DEL_BUILD_ONLY" ]; then