From owner-svn-src-user@FreeBSD.ORG  Fri Jul 23 06:01:31 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 1950C106566B;
	Fri, 23 Jul 2010 06:01:31 +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 0842F8FC17;
	Fri, 23 Jul 2010 06:01:31 +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 o6N61UdG097465;
	Fri, 23 Jul 2010 06:01:30 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6N61U58097463;
	Fri, 23 Jul 2010 06:01:30 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201007230601.o6N61U58097463@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 23 Jul 2010 06:01:30 +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: r210400 - 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: Fri, 23 Jul 2010 06:01:31 -0000

Author: dougb
Date: Fri Jul 23 06:01:30 2010
New Revision: 210400
URL: http://svn.freebsd.org/changeset/base/210400

Log:
  If --local-packagedir and ${LOCAL_PACKAGEDIR}/All/${new_port}.tbz exists
  just use it, don't bother dereferencing $LATEST_LINK. This is faster,
  but it also solves the problem recenctly mentioned on -ports where
  packages/Latest/perl links to perl-5.10.x, even with 5.12.x installed and
  the 5.12.x package exists in packages/All

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Fri Jul 23 05:42:49 2010	(r210399)
+++ user/dougb/portmaster/portmaster	Fri Jul 23 06:01:30 2010	(r210400)
@@ -1031,7 +1031,6 @@ if [ -n "$CLEAN_DISTFILES" ]; then
 	safe_exit
 fi
 
-# XXX
 if [ -n "$CLEAN_PACKAGES" ]; then
 	init_packages_var
 
@@ -3175,7 +3174,11 @@ fetch_package () {
 	echo "===>>> Checking package repository for latest available version"
 
 	if [ -n "$LOCAL_PACKAGEDIR" ]; then
-		if [ -z "$PM_INDEX_ONLY" ]; then
+		if [ -r "${LOCAL_PACKAGEDIR}/All/${new_port}.tbz" ]; then
+			local_package=${LOCAL_PACKAGEDIR}/All/${new_port}.tbz
+			latest_pv=${local_package##*/}
+		fi
+		if [ -z "$latest_pv" -a  -z "$PM_INDEX_ONLY" ]; then
 			s=`pm_make -V LATEST_LINK`
 			if [ -r "${LOCAL_PACKAGEDIR}/Latest/${s}.tbz" ]; then
 				local_package=${LOCAL_PACKAGEDIR}/Latest/${s}.tbz
@@ -3185,11 +3188,6 @@ fetch_package () {
 				[ -n "$PM_VERBOSE" ] &&
 		echo "===>>> No local package for $new_port exists, attempting fetch"
 			fi
-		else
-			if [ -r "${LOCAL_PACKAGEDIR}/All/${new_port}.tbz" ]; then
-				local_package=${LOCAL_PACKAGEDIR}/All/${new_port}.tbz
-				latest_pv=${local_package##*/}
-			fi
 		fi
 	fi