From owner-svn-ports-head@FreeBSD.ORG  Tue May 28 14:46:02 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BE72043E;
 Tue, 28 May 2013 14:46:02 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B16CAFA2;
 Tue, 28 May 2013 14:46:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4SEk2Ph009874;
 Tue, 28 May 2013 14:46:02 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4SEk2Xv009873;
 Tue, 28 May 2013 14:46:02 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201305281446.r4SEk2Xv009873@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Tue, 28 May 2013 14:46:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319315 - head
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 May 2013 14:46:02 -0000

Author: swills
Date: Tue May 28 14:46:02 2013
New Revision: 319315
URL: http://svnweb.freebsd.org/changeset/ports/319315

Log:
  - Try again to fix the UPDATING entry for ruby. Thanks to bdrewery for the help.

Modified:
  head/UPDATING

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Tue May 28 14:23:29 2013	(r319314)
+++ head/UPDATING	Tue May 28 14:46:02 2013	(r319315)
@@ -12,10 +12,23 @@ you update your ports collection, before
   The default ruby version has been updated from 1.8 to 1.9. You'll need to
   rebuild all ports that depend on ruby:
 
-  # portmaster -r ruby19
-    or
-  # portupgrade -fr lang/ruby19
-    or
+  If you use portmaster:
+  # portmaster -o lang/ruby19 lang/ruby18
+  # portmaster -R -r ruby-1.9
+
+  If you use portupgrade:
+  # portupgrade -f lang/ruby18
+  # portupgrade -f lang/ruby19 # if you have it installed
+  # make -C /usr/ports/ports-mgmt/portupgrade build deinstall install clean
+  # rm -f /var/db/pkg/pkgdb.db /usr/ports/INDEX*.db
+  # pkgdb -uf
+  # portsdb -uf
+  # portupgrade -x ruby-1.8.\* -fr lang/ruby18
+
+  After these steps are complete, you can pkg_delete ruby 1.8 if you
+  no longer need it.
+
+  If you use pkgng:
   # pkg set -o lang/ruby18:lang/ruby19
   # pkg install -fR lang/ruby19