From owner-svn-src-user@FreeBSD.ORG  Sun Oct 30 23:31:03 2011
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 B3B941065670;
	Sun, 30 Oct 2011 23:31:03 +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 919308FC0A;
	Sun, 30 Oct 2011 23:31:03 +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 p9UNV3w6089559;
	Sun, 30 Oct 2011 23:31:03 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9UNV3TI089557;
	Sun, 30 Oct 2011 23:31:03 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201110302331.p9UNV3TI089557@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 30 Oct 2011 23:31:03 +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: r226953 - 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: Sun, 30 Oct 2011 23:31:03 -0000

Author: dougb
Date: Sun Oct 30 23:31:03 2011
New Revision: 226953
URL: http://svn.freebsd.org/changeset/base/226953

Log:
  For multiple -r, don't add a port to the list of dependents to rebuild if
  it was itself specified as a -r port.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Oct 30 22:57:42 2011	(r226952)
+++ user/dougb/portmaster/portmaster	Sun Oct 30 23:31:03 2011	(r226953)
@@ -2641,6 +2641,10 @@ urb_update () {
 		for req_by in `grep -l DEPORIGIN:${origin}$ $pdb/*/+CONTENTS`; do
 			req_by="${req_by%/+CONTENTS}"
 			req_by="${req_by##*/}"
+
+			case " $PM_URB_IPORTS" in *" $req_by "*) continue ;; esac
+			case " $PM_URB_ORIGINS" in *" `origin_from_pdb $req_by` "*) continue ;; esac
+
 			PM_URB_LIST="${PM_URB_LIST} ${req_by}"
 		done
 	done