From owner-svn-src-user@FreeBSD.ORG  Mon Nov  9 07:19:25 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 740011065670;
	Mon,  9 Nov 2009 07:19:25 +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 63D948FC15;
	Mon,  9 Nov 2009 07:19:25 +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 nA97JPdD011733;
	Mon, 9 Nov 2009 07:19:25 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA97JPdF011731;
	Mon, 9 Nov 2009 07:19:25 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200911090719.nA97JPdF011731@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 9 Nov 2009 07:19:25 +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: r199068 - 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 07:19:25 -0000

Author: dougb
Date: Mon Nov  9 07:19:25 2009
New Revision: 199068
URL: http://svn.freebsd.org/changeset/base/199068

Log:
  Pick the latest version of the package from a different spot in the
  HTML. This should avoid the problem of the web server truncating
  the file name, but adds the tiny cost of needing to sub out the
  URL encoding for the ',' character if it's present.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Nov  9 02:54:16 2009	(r199067)
+++ user/dougb/portmaster/portmaster	Mon Nov  9 07:19:25 2009	(r199068)
@@ -2288,7 +2288,9 @@ if [ -n "$PM_PACKAGES" ]; then
 
 	sitepath="${sitepath%/}/${portdir%/*}/"
 
+#echo ''
 #echo "Debug> sitepath: $sitepath"
+#echo ''
 
 	[ -n "$PM_VERBOSE" ] && echo "===>>> Checking package repository"
 	latest_link=`pm_make -V LATEST_LINK`
@@ -2303,10 +2305,15 @@ if [ -n "$PM_PACKAGES" ]; then
 		echo "       on setting the PACKAGESITE environment variable"
 		fail 'No package archive found'
 	fi
-	latest_pv=${latest_pv#*tbz\">}
+	latest_pv=${latest_pv#*href=\"}
 	latest_pv=${latest_pv%%\.tbz*}
+	case "$latest_pv" in
+	*%2[cC]*)	latest_pv=`echo $latest_pv | sed s#%2[cC]#,#` ;;
+	esac
 
+#echo ''
 #echo "Debug> new_port: $new_port latest_pv: $latest_pv"
+#echo ''
 
 notnewer () {
 	echo ''