From owner-svn-src-user@FreeBSD.ORG  Thu Dec 10 20:06:38 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 00D44106566B;
	Thu, 10 Dec 2009 20:06:38 +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 E4E6D8FC15;
	Thu, 10 Dec 2009 20:06:37 +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 nBAK6bOY073591;
	Thu, 10 Dec 2009 20:06:37 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBAK6bLq073589;
	Thu, 10 Dec 2009 20:06:37 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200912102006.nBAK6bLq073589@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 10 Dec 2009 20:06:37 +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: r200363 - 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: Thu, 10 Dec 2009 20:06:38 -0000

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