- Revert change of default Ruby version from 1.9 back to 1.8 due to

  unforseen issues.

Discussed with:		stas

2 files changed, 28 insertions, 3 deletions

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index e37f4f33a685..0cd7a5e72b38 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -136,7 +136,7 @@ Ruby_Include_MAINTAINER=	stas@FreeBSD.org
 # RUBY_ELISPDIR		- Installation path for emacs lisp files.
 #
 
-RUBY_DEFAULT_VER?=	1.9
+RUBY_DEFAULT_VER?=	1.8
 RAKE_VER=	0.9.2
 
 RUBY_VER?=		${RUBY_DEFAULT_VER}
@@ -171,7 +171,7 @@ RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 # Ruby 1.8
 #
 RUBY_RELVERSION=	1.8.7
-RUBY_PORTREVISION=	1
+RUBY_PORTREVISION=	2
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	352
 
@@ -199,7 +199,7 @@ RUBY19=			"@comment "
 # Ruby 1.9
 #
 RUBY_RELVERSION=	1.9.2
-RUBY_PORTREVISION=	0
+RUBY_PORTREVISION=	1
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	290
 
diff --git a/UPDATING b/UPDATING
index 261ad01d23e2..3c9f092a5842 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,31 @@ You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
 20110823:
+  AFFECTS: users of lang/ruby
+  AUTHOR: swills@FreeBSD.org
+
+  The default ruby version has been reverted from 1.9 to 1.8. If you followed
+  the procedure in the 20110822 entry, you may need to follow these steps:
+
+  If you use portmaster:
+  # portmaster -o lang/ruby18 lang/ruby19
+  # portmaster -R -r ruby-1.8
+
+  If you use portupgrade:
+  # portupgrade -f lang/ruby19
+  # portupgrade -f lang/ruby18 # if you have it installed
+  # portupgrade -f ports-mgmt/portupgrade
+  # portupgrade -x ruby-1.9.\* -fr lang/ruby19
+
+  If you wish to keep the 1.9 version as default, add the following lines
+  to your /etc/make.conf file:
+
+  #
+  # Keep ruby 1.9 as default version.
+  #
+  RUBY_DEFAULT_VER=1.9
+
+20110823:
   AFFECTS: users of devel/libnotify and net/libproxy
   AUTHOR: gnome@FreeBSD.org