From owner-svn-src-user@FreeBSD.ORG  Sat Jun 12 06:00:48 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 BCD1B106564A;
	Sat, 12 Jun 2010 06:00:48 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AD50D8FC14;
	Sat, 12 Jun 2010 06:00:48 +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 o5C60mTT009096;
	Sat, 12 Jun 2010 06:00:48 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5C60mxr009094;
	Sat, 12 Jun 2010 06:00:48 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201006120600.o5C60mxr009094@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 12 Jun 2010 06:00:48 +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: r209091 - 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: Sat, 12 Jun 2010 06:00:48 -0000

Author: dougb
Date: Sat Jun 12 06:00:48 2010
New Revision: 209091
URL: http://svn.freebsd.org/changeset/base/209091

Log:
  There is no reason for uniquify_list() to reverse the entries
  
  Add code to post_config() to make sure that things in the
  build_only_dl_g are not listed as run dependencies for something
  already installed.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sat Jun 12 05:22:55 2010	(r209090)
+++ user/dougb/portmaster/portmaster	Sat Jun 12 06:00:48 2010	(r209091)
@@ -2033,7 +2033,7 @@ uniquify_list () {
 	for item in "$@"; do
 		case "$temp_list" in
 		*" $item "*) ;;
-		*)	temp_list=" $item $temp_list" ;;
+		*)	temp_list=" $temp_list $item " ;;
 		esac
 	done
 
@@ -2314,7 +2314,7 @@ echo "       all of the above try adding
 	dep_of_deps=0
 
 	if [ -n "$PM_BUILD_ONLY_LIST" ]; then
-		local var real_rundep deplist dep
+		local var real_rundep deplist dep temp_bodlg
 
 		for var in $rundep_list ; do
 			real_rundep=no
@@ -2332,6 +2332,13 @@ echo "       all of the above try adding
 			eval unset $var ${var}_p
 		done
 
+		for dep in $build_only_dl_g; do
+			grep -q "@comment DEPORIGIN:${dep#$pd/}$" $pdb/*/+CONTENTS ||
+				temp_bodlg="$temp_bodlg $dep"
+		done
+
+		build_only_dl_g=" `uniquify_list $temp_bodlg` "
+
 		unset run_dl_g rundep_list
 		PM_BUILD_ONLY_LIST=pm_bol
 	fi