From owner-svn-src-user@FreeBSD.ORG  Mon Oct 25 19:56:02 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 E60EE106564A;
	Mon, 25 Oct 2010 19:56:02 +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 D5EB28FC08;
	Mon, 25 Oct 2010 19:56:02 +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 o9PJu2mA075763;
	Mon, 25 Oct 2010 19:56:02 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9PJu2TA075761;
	Mon, 25 Oct 2010 19:56:02 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201010251956.o9PJu2TA075761@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 25 Oct 2010 19:56:02 +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: r214356 - 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, 25 Oct 2010 19:56:03 -0000

Author: dougb
Date: Mon Oct 25 19:56:02 2010
New Revision: 214356
URL: http://svn.freebsd.org/changeset/base/214356

Log:
  The BEFOREPORTMK trick no longer works to list MASTER_SITES for all ports
  so switch to the slightly slower but more reliable pm_make without it. This
  will solve the problem of portmaster not fetching all distfiles in the
  background.
  
  In the case statement to select the appropriate release for package
  fetching glob 9.0-CURRENT to handle snapshots as well.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Oct 25 19:43:22 2010	(r214355)
+++ user/dougb/portmaster/portmaster	Mon Oct 25 19:56:02 2010	(r214356)
@@ -3006,7 +3006,7 @@ if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUIL
 	[ "$$" -eq "$PM_PARENT_PID" -a -n "$DI_FILES" ] && (read_distinfos)&
 
 	# Handle the problem of manual fetching
-	[ -z "$PM_PACKAGES" ] && master_sites=`pm_make_b -V MASTER_SITES`
+	[ -z "$PM_PACKAGES" ] && master_sites=`pm_make -V MASTER_SITES`
 
 	if [ -n "$master_sites" ]; then
 		# PATCHFILES may get added after the first pass, but we want to
@@ -3225,7 +3225,7 @@ fetch_package () {
 				release=packages-${release%%\.*}-stable ;;
 		[678]\.[0-9]-RELEASE*)
 				release=packages-${release%-RELEASE*}-release ;;
-		9\.0-CURRENT)	release=packages-9-current ;;
+		9\.0-CURRENT*)	release=packages-9-current ;;
 		*RC[0-9]*)	release=${release%-RC[0-9]}
 				release=packages-${release}-release ;;
 		*BETA[0-9]*)	release=${release%-BETA[0-9]}