svn commit: r302222 - head

[Bryan Drewery]

Author: bdrewery
Date: Tue Aug  7 04:31:22 2012
New Revision: 302222
URL: http://svn.freebsd.org/changeset/ports/302222

Log:
  - Update 20120804 [1] and 20120801 for portupgrade
    and pkgng
  
  Submitted by:	Sayetsky Anton <vsjcfm at gmail.com> [1]
  PR:		ports/170384 [1]
  Approved by:	eadler (mentor)

Modified:
  head/UPDATING

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Tue Aug  7 04:14:43 2012	(r302221)
+++ head/UPDATING	Tue Aug  7 04:31:22 2012	(r302222)
@@ -13,8 +13,14 @@ you update your ports collection, before
   Due to shlib version bump all glut users should be rebuild.
   Please follow the instructions below to upgrade.
 
-  portmaster -o graphics/freeglut graphics/libglut
-  portmaster -r freeglut
+  # portmaster -o graphics/freeglut graphics/libglut
+  # portmaster -r freeglut
+  or
+  # env DISABLE_CONFLICTS=1 portupgrade -fo graphics/freeglut graphics/libglut
+  # portupgrade -frx freeglut freeglut
+  or
+  # pkg set -o graphics/libglut:graphics/freeglut
+  # pkg install -Rf graphics/freeglut
 
 20120801:
   AFFECTS: users of editors/emacs
@@ -26,6 +32,10 @@ you update your ports collection, before
   in /etc/make.conf, and do:
 
   # portmaster -o editors/emacs23 editors/emacs
+  or
+  # env DISABLE_CONFLICTS=1 portupgrade -fo editors/emacs23 editors/emacs
+  or
+  # pkg set -o editors/emacs:editors/emacs23
 
 20120726:
   AFFECTS: users of www/firefox, www/seamonkey, mail/thunderbird, www/libxul