From owner-svn-src-user@FreeBSD.ORG  Sun Oct 18 23:39:00 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 848CE106566C;
	Sun, 18 Oct 2009 23:39:00 +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 6D36B8FC0A;
	Sun, 18 Oct 2009 23:39:00 +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 n9INd0m8081869;
	Sun, 18 Oct 2009 23:39:00 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9INd05Z081867;
	Sun, 18 Oct 2009 23:39:00 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200910182339.n9INd05Z081867@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 18 Oct 2009 23:39:00 +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: r198222 - 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: Sun, 18 Oct 2009 23:39:00 -0000

Author: dougb
Date: Sun Oct 18 23:38:59 2009
New Revision: 198222
URL: http://svn.freebsd.org/changeset/base/198222

Log:
  Make --version work with a subversion $Id string

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Oct 18 23:30:23 2009	(r198221)
+++ user/dougb/portmaster/portmaster	Sun Oct 18 23:38:59 2009	(r198222)
@@ -46,7 +46,7 @@ version () {
 	cvs='$FreeBSD$'
 
 	rcs="${rcs#*,v }" ; rcs="${rcs%% *}"
-	cvs="${cvs#*,v }" ; cvs="${cvs%% *}"
+	cvs="${cvs#*,v }" ; cvs="${cvs#*/portmaster }" ; cvs="${cvs%% *}"
 
 	echo ''
 	[ "${cvs#$}" != 'FreeBSD$' ] &&