From owner-svn-src-user@FreeBSD.ORG  Sat Jan  1 20:33:47 2011
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 3A392106566B;
	Sat,  1 Jan 2011 20:33:47 +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 2A8A98FC08;
	Sat,  1 Jan 2011 20:33:47 +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 p01KXlwt021057;
	Sat, 1 Jan 2011 20:33:47 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p01KXls9021055;
	Sat, 1 Jan 2011 20:33:47 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201101012033.p01KXls9021055@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 1 Jan 2011 20:33:47 +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: r216877 - 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: Sat, 01 Jan 2011 20:33:47 -0000

Author: dougb
Date: Sat Jan  1 20:33:46 2011
New Revision: 216877
URL: http://svn.freebsd.org/changeset/base/216877

Log:
  After checking for WRKDIRPREFIX do 'cd -' so that 'portmaster .' will work
  
  Update copyright date

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sat Jan  1 20:17:29 2011	(r216876)
+++ user/dougb/portmaster/portmaster	Sat Jan  1 20:33:46 2011	(r216877)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2005-2010 Douglas Barton, All rights reserved
+# Copyright (c) 2005-2011 Douglas Barton, All rights reserved
 # Please see detailed copyright below
 
 trap trap_exit INT
@@ -791,7 +791,7 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then
 	fi
 
 	if [ -n "$pd" ]; then
-		pm_cd_pd && PM_WRKDIRPREFIX=`pm_make_b -V WRKDIRPREFIX`
+		pm_cd_pd && PM_WRKDIRPREFIX=`pm_make_b -V WRKDIRPREFIX` && pm_cd -
 		export pd
 	else
 		if [ -n "$EXPUNGE" -o -n "$CLEAN_STALE" ]; then
@@ -3736,7 +3736,7 @@ safe_exit
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-#  Copyright (c) 2005-2010 Douglas Barton
+#  Copyright (c) 2005-2011 Douglas Barton
 #  All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without