From owner-svn-src-user@FreeBSD.ORG  Mon Nov  9 17:47:49 2009
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 EECA1106568B;
	Mon,  9 Nov 2009 17:47:49 +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 DEFF48FC1B;
	Mon,  9 Nov 2009 17:47:49 +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 nA9HlnMn028798;
	Mon, 9 Nov 2009 17:47:49 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9HlnuB028796;
	Mon, 9 Nov 2009 17:47:49 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200911091747.nA9HlnuB028796@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 9 Nov 2009 17:47:49 +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: r199093 - 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, 09 Nov 2009 17:47:50 -0000

Author: dougb
Date: Mon Nov  9 17:47:49 2009
New Revision: 199093
URL: http://svn.freebsd.org/changeset/base/199093

Log:
  pkg_add generally requires that the user add "/Latest" to the end
  of PACKAGESITE if the user specifies it, but we don't want that so
  strip it off.
  
  Submitted by:	beat

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Nov  9 17:26:16 2009	(r199092)
+++ user/dougb/portmaster/portmaster	Mon Nov  9 17:47:49 2009	(r199093)
@@ -2283,7 +2283,8 @@ if [ -n "$PM_PACKAGES" ]; then
 		sitepath="${PACKAGEROOT:-"http://ftp.freebsd.org"}/pub/FreeBSD/ports/`uname -p`/${release}/"
 		unset release
 	else
-		sitepath="$PACKAGESITE"
+		sitepath="${PACKAGESITE%/}"
+		sitepath="${sitepath%Latest}"
 	fi
 
 	sitepath="${sitepath%/}/${portdir%/*}/"