From owner-svn-src-user@FreeBSD.ORG  Tue Dec  7 17:54:04 2010
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 CB626106566C;
	Tue,  7 Dec 2010 17:54:04 +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 BC04B8FC12;
	Tue,  7 Dec 2010 17:54:04 +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 oB7Hs42M075549;
	Tue, 7 Dec 2010 17:54:04 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB7Hs4uC075547;
	Tue, 7 Dec 2010 17:54:04 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201012071754.oB7Hs4uC075547@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 7 Dec 2010 17:54:04 +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: r216260 - user/dougb/portmaster/files
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: Tue, 07 Dec 2010 17:54:04 -0000

Author: dougb
Date: Tue Dec  7 17:54:04 2010
New Revision: 216260
URL: http://svn.freebsd.org/changeset/base/216260

Log:
  In the section about doing a complete version upgrade encourage users to
  back up critical files in /usr/local before completely blowing it away.
  Inspired by [1]
  
  While I'm here add -t to the recommended --clean-distfiles-all command.
  
  PR:		ports/152167
  Submitted by:	Ben Grimm <freebsd-pr@bengrimm.net>

Modified:
  user/dougb/portmaster/files/portmaster.8

Modified: user/dougb/portmaster/files/portmaster.8
==============================================================================
--- user/dougb/portmaster/files/portmaster.8	Tue Dec  7 17:36:17 2010	(r216259)
+++ user/dougb/portmaster/files/portmaster.8	Tue Dec  7 17:54:04 2010	(r216260)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 30, 2010
+.Dd December 7, 2010
 .Dt PORTMASTER 8
 .Os
 .Sh NAME
@@ -796,15 +796,17 @@ Using
 to do a complete reinstallation of all your ports:
 .Dl "1. portmaster --list-origins > ~/installed-port-list"
 .Dl "2. Update your ports tree"
-.Dl "3. portmaster --clean-distfiles-all"
+.Dl "3. portmaster -t --clean-distfiles-all"
 .Dl "4. portmaster --check-port-dbdir"
 .Dl "5. portmaster -Faf"
 .Dl "6. pkg_delete '*'"
 .Dl "7. rm -rf /usr/local/lib/compat/pkg"
-.Dl "8. Manually check /usr/local and /var/db/pkg"
+.Dl "8. Back up any files in /usr/local you wish to save,"
+.Dl "   such as configuration files in /usr/local/etc"
+.Dl "9. Manually check /usr/local and /var/db/pkg"
 .Dl "   to make sure that they are really empty"
-.Dl "9. Re-install portmaster"
-.Dl "10. portmaster `cat ~/installed-port-list`"
+.Dl "10. Re-install portmaster"
+.Dl "11. portmaster `cat ~/installed-port-list`"
 .Pp
 You probably want to use the -D option for the installation
 and then run --clean-distfiles[-all] again when you are done.