From owner-svn-src-user@FreeBSD.ORG  Wed Nov 24 06:22:09 2010
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 CAFB9106564A;
	Wed, 24 Nov 2010 06:22:09 +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 BA7958FC17;
	Wed, 24 Nov 2010 06:22:09 +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 oAO6M9BO057888;
	Wed, 24 Nov 2010 06:22:09 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAO6M9rI057886;
	Wed, 24 Nov 2010 06:22:09 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201011240622.oAO6M9rI057886@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 24 Nov 2010 06:22:09 +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: r215793 - 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: Wed, 24 Nov 2010 06:22:09 -0000

Author: dougb
Date: Wed Nov 24 06:22:09 2010
New Revision: 215793
URL: http://svn.freebsd.org/changeset/base/215793

Log:
  Handle the multiport() case when a port that is a dependency
  of an earlier port is up to date, and listed by PKGNAME.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Wed Nov 24 05:50:19 2010	(r215792)
+++ user/dougb/portmaster/portmaster	Wed Nov 24 06:22:09 2010	(r215793)
@@ -2611,17 +2611,21 @@ multiport () {
 	num=0
 	for port in $worklist; do
 		case "$port" in
-		*/*)	case "$PM_NEEDS_UPDATE" in
-			*\ $port\ *)	;;		# Ok to proceed
-			*)		continue ;;	# Already updated as a dependency
-			esac ;;
+		*/*)	origin=$port ;;
 		*)	# If an installed version does not exist at this
 			# point it probably got updated as a dependency
 			if [ ! -d "$pdb/$port" ]; then
 				numports=$(( $numports - 1 ))
 				continue
-			fi ;;
+			fi
+			origin=`origin_from_pdb $port` ;;
 		esac
+
+		case "$PM_NEEDS_UPDATE" in
+		*\ $origin\ *)	;;		# Ok to proceed
+		*)		continue ;;	# Already updated as a dependency
+		esac
+
 		num=$(( $num + 1 ))
 		init_term_printf "$port ${num}/${numports}"
 		($0 $ARGS $port) || fail "Update for $port failed"