From owner-svn-src-user@FreeBSD.ORG Mon Sep 12 03:31:16 2011 Return-Path: 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 A0BA3106566B; Mon, 12 Sep 2011 03:31:16 +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 8F9638FC17; Mon, 12 Sep 2011 03:31:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8C3VGjS008316; Mon, 12 Sep 2011 03:31:16 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8C3VG1g008314; Mon, 12 Sep 2011 03:31:16 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201109120331.p8C3VG1g008314@svn.freebsd.org> From: Doug Barton Date: Mon, 12 Sep 2011 03:31:16 +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: r225501 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Sep 2011 03:31:16 -0000 Author: dougb Date: Mon Sep 12 03:31:16 2011 New Revision: 225501 URL: http://svn.freebsd.org/changeset/base/225501 Log: In the code that derives the proper value of PACKAGESITE remove 6.x and add 9.x. Also add a 10-current entry. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Sep 12 02:00:52 2011 (r225500) +++ user/dougb/portmaster/portmaster Mon Sep 12 03:31:16 2011 (r225501) @@ -3393,11 +3393,12 @@ fetch_package () { release=`uname -r` case "$release" in - [678]\.[0-9]-STABLE|[678]\.[0-9]-PRERELEASE) + [789]\.[0-9]-STABLE|[789]\.[0-9]-PRERELEASE) release=packages-${release%%\.*}-stable ;; - [678]\.[0-9]-RELEASE*) + [789]\.[0-9]-RELEASE*) release=packages-${release%-RELEASE*}-release ;; 9\.0-CURRENT*) release=packages-9-current ;; + 10\.0-CURRENT*) release=packages-10-current ;; *RC[0-9]*) release=${release%-RC[0-9]} release=packages-${release}-release ;; *BETA[0-9]*) release=${release%-BETA[0-9]}