From owner-svn-src-user@FreeBSD.ORG  Sun Apr 11 21:59:23 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 8C7671065670;
	Sun, 11 Apr 2010 21:59:23 +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 7C0EE8FC08;
	Sun, 11 Apr 2010 21:59:23 +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 o3BLxNv4023028;
	Sun, 11 Apr 2010 21:59:23 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3BLxNXT023026;
	Sun, 11 Apr 2010 21:59:23 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201004112159.o3BLxNXT023026@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 11 Apr 2010 21:59:23 +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: r206493 - 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, 11 Apr 2010 21:59:23 -0000

Author: dougb
Date: Sun Apr 11 21:59:23 2010
New Revision: 206493
URL: http://svn.freebsd.org/changeset/base/206493

Log:
  When NOT using --index-only the rundep list still needs to be parsed the
  old way. So only add spaces to the list if we're generating it from the
  INDEX, and let the case statement match with or without a space.
  
  Reported by:	avilla

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Apr 11 21:22:02 2010	(r206492)
+++ user/dougb/portmaster/portmaster	Sun Apr 11 21:59:23 2010	(r206493)
@@ -1998,6 +1998,8 @@ gen_dep_list () {
 		for l in $temp_list ; do
 			list="$list `grep -m1 ^${l}\| $PM_INDEX | cut -f 2 -d \|`"
 		done
+
+		list=" $list "
 	fi
 
 	echo "$list"
@@ -2031,11 +2033,11 @@ dependency_check () {
 	if [ "$PM_BUILD_ONLY_LIST" = pmp_doing_build_deps ]; then
 		local rundeps dep varname run_dl build_only_dl
 
-		rundeps=" `gen_dep_list run-depends-list` "
+		rundeps=`gen_dep_list run-depends-list`
 
 		for dep in $d_port_list; do
 			case "$rundeps" in
-			*" ${dep} "*)
+			*" ${dep} "*|*${dep}*)
 				varname=`echo ${dep#$pd/} | sed 's#[-+/\.]#_#g'`
 				rundep_list="$rundep_list $varname"
 				eval $varname=\"$portdir \$$varname\"