Index: head/Mk/bsd.ruby.mk
===================================================================
--- head/Mk/bsd.ruby.mk
+++ head/Mk/bsd.ruby.mk
@@ -177,7 +177,7 @@
 # Ruby 1.9
 #
 RUBY_RELVERSION=	1.9.3
-RUBY_PORTREVISION=	1
+RUBY_PORTREVISION=	2
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	551
 
@@ -193,7 +193,7 @@
 # Ruby 2.0
 #
 RUBY_RELVERSION=	2.0.0
-RUBY_PORTREVISION=	1
+RUBY_PORTREVISION=	2
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	598
 
@@ -209,7 +209,7 @@
 # Ruby 2.1
 #
 RUBY_RELVERSION=	2.1.5
-RUBY_PORTREVISION=	1
+RUBY_PORTREVISION=	2
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	0
 
Index: head/lang/ruby19/Makefile
===================================================================
--- head/lang/ruby19/Makefile
+++ head/lang/ruby19/Makefile
@@ -52,7 +52,7 @@
 NO_LATEST_LINK=	yes
 
 OPTIONS_DEFINE=		CAPIDOCS DEBUG DOCS EXAMPLES RDOC
-OPTIONS_DEFAULT=	RDOC READLINE
+OPTIONS_DEFAULT=	RDOC LIBEDIT
 OPTIONS_SINGLE=		EDIT
 OPTIONS_SINGLE_EDIT=	LIBEDIT READLINE
 OPTIONS_SUB=		yes
Index: head/lang/ruby19/files/patch-ext_readline_extconf.rb
===================================================================
--- head/lang/ruby19/files/patch-ext_readline_extconf.rb
+++ head/lang/ruby19/files/patch-ext_readline_extconf.rb
@@ -0,0 +1,11 @@
+--- ext/readline/extconf.rb.orig	2012-09-09 06:44:20 UTC
++++ ext/readline/extconf.rb
+@@ -62,7 +62,7 @@ else
+ end
+ 
+ have_readline_func("rl_getc")
+-have_readline_func("rl_getc_function")
++#have_readline_func("rl_getc_function")
+ have_readline_func("rl_filename_completion_function")
+ have_readline_func("rl_username_completion_function")
+ have_readline_func("rl_completion_matches")
Index: head/lang/ruby20/Makefile
===================================================================
--- head/lang/ruby20/Makefile
+++ head/lang/ruby20/Makefile
@@ -49,7 +49,7 @@
 NO_LATEST_LINK=	yes
 
 OPTIONS_DEFINE=		CAPIDOCS DEBUG DOCS EXAMPLES RDOC
-OPTIONS_DEFAULT=	RDOC READLINE
+OPTIONS_DEFAULT=	RDOC LIBEDIT
 OPTIONS_SINGLE=		EDIT
 OPTIONS_SINGLE_EDIT=	LIBEDIT READLINE
 OPTIONS_SUB=		yes
Index: head/lang/ruby20/files/patch-ext_readline_extconf.rb
===================================================================
--- head/lang/ruby20/files/patch-ext_readline_extconf.rb
+++ head/lang/ruby20/files/patch-ext_readline_extconf.rb
@@ -0,0 +1,11 @@
+--- ext/readline/extconf.rb.orig	2014-04-30 07:39:45 UTC
++++ ext/readline/extconf.rb
+@@ -62,7 +62,7 @@ else
+ end
+ 
+ readline.have_func("rl_getc")
+-readline.have_func("rl_getc_function")
++#readline.have_func("rl_getc_function")
+ readline.have_func("rl_filename_completion_function")
+ readline.have_func("rl_username_completion_function")
+ readline.have_func("rl_completion_matches")
Index: head/lang/ruby21/Makefile
===================================================================
--- head/lang/ruby21/Makefile
+++ head/lang/ruby21/Makefile
@@ -48,7 +48,7 @@
 NO_LATEST_LINK=		yes
 
 OPTIONS_DEFINE=		CAPIDOCS DEBUG DOCS EXAMPLES RDOC
-OPTIONS_DEFAULT=	RDOC READLINE
+OPTIONS_DEFAULT=	RDOC LIBEDIT
 OPTIONS_SINGLE=		EDIT
 OPTIONS_SINGLE_EDIT=	LIBEDIT READLINE
 OPTIONS_SUB=		yes
Index: head/lang/ruby21/files/patch-ext_readline_extconf.rb
===================================================================
--- head/lang/ruby21/files/patch-ext_readline_extconf.rb
+++ head/lang/ruby21/files/patch-ext_readline_extconf.rb
@@ -0,0 +1,11 @@
+--- ext/readline/extconf.rb.orig	2015-01-23 15:37:01 UTC
++++ ext/readline/extconf.rb
+@@ -62,7 +62,7 @@ else
+ end
+ 
+ readline.have_func("rl_getc")
+-readline.have_func("rl_getc_function")
++#readline.have_func("rl_getc_function")
+ readline.have_func("rl_filename_completion_function")
+ readline.have_func("rl_username_completion_function")
+ readline.have_func("rl_completion_matches")