From owner-svn-src-user@FreeBSD.ORG  Mon Aug 16 04:22:29 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 819111065696;
	Mon, 16 Aug 2010 04:22:29 +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 723F48FC0A;
	Mon, 16 Aug 2010 04:22:29 +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 o7G4MTQe084795;
	Mon, 16 Aug 2010 04:22:29 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7G4MT8l084793;
	Mon, 16 Aug 2010 04:22:29 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201008160422.o7G4MT8l084793@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 16 Aug 2010 04:22:29 +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: r211389 - 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: Mon, 16 Aug 2010 04:22:29 -0000

Author: dougb
Date: Mon Aug 16 04:22:29 2010
New Revision: 211389
URL: http://svn.freebsd.org/changeset/base/211389

Log:
  Dramatic (9-10 times) speedup in iport_from_origin() by making an
  intelligent guess about what director{y|ies] to search in based on
  the origin directory name. This algorithm only misses on 2 out of
  my 489 currently installed ports which means we're almost always
  looking in either exactly the right directory the first time, or
  at worst (such as the py-* ports) a dramatically smaller subset.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Aug 15 23:58:21 2010	(r211388)
+++ user/dougb/portmaster/portmaster	Mon Aug 16 04:22:29 2010	(r211389)
@@ -625,10 +625,14 @@ unset var newopts
 #=============== Begin functions relevant to --features and main ===============
 
 iport_from_origin () {
-	local dir
+	local sn dir
+
+	sn=${1#*/} ; sn=${sn%-*} ; sn=${sn%%[0-9]*}
 
-	if ! dir=`grep -l "@comment ORIGIN:${1}$" $pdb/*/+CONTENTS 2>/dev/null`; then
-		dir=`pkg_info -q -O $1` || return 1
+	if ! dir=`grep -l "@comment ORIGIN:${1}$" $pdb/${sn}*/+CONTENTS 2>/dev/null`; then
+		if ! dir=`grep -l "@comment ORIGIN:${1}$" $pdb/*/+CONTENTS 2>/dev/null`; then
+			dir=`pkg_info -q -O $1` || return 1
+		fi
 	fi
 
 	# It should not happen that more than one port meets this