Date: Sun, 1 Feb 2015 23:19:51 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378283 - in head: Mk lang/ruby19 lang/ruby19/files lang/ruby20 lang/ruby20/files lang/ruby21 lang/ruby21/files Message-ID: <201502012319.t11NJpqD066585@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Feb 1 23:19:51 2015 New Revision: 378283 URL: https://svnweb.freebsd.org/changeset/ports/378283 QAT: https://qat.redports.org/buildarchive/r378283/ Log: Change the EDIT option of ruby to use libedit by default now that libedit from ports is able to handle unicode. Make sure that ruby does not provides its own function to read the input but let libedit do it itself. This allows the binary package to by default not be "tainted" by the readline license. Differential Revision: https://reviews.freebsd.org/D1547 Reviewed by: swills Approved by: ruby (swills) Added: head/lang/ruby19/files/patch-ext_readline_extconf.rb (contents, props changed) head/lang/ruby20/files/patch-ext_readline_extconf.rb (contents, props changed) head/lang/ruby21/files/patch-ext_readline_extconf.rb (contents, props changed) Modified: head/Mk/bsd.ruby.mk head/lang/ruby19/Makefile head/lang/ruby20/Makefile head/lang/ruby21/Makefile Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Sun Feb 1 22:25:50 2015 (r378282) +++ head/Mk/bsd.ruby.mk Sun Feb 1 23:19:51 2015 (r378283) @@ -177,7 +177,7 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} # Ruby 1.9 # RUBY_RELVERSION= 1.9.3 -RUBY_PORTREVISION= 1 +RUBY_PORTREVISION= 2 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 551 @@ -193,7 +193,7 @@ RUBY21= "@comment " # Ruby 2.0 # RUBY_RELVERSION= 2.0.0 -RUBY_PORTREVISION= 1 +RUBY_PORTREVISION= 2 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 598 @@ -209,7 +209,7 @@ RUBY21= "@comment " # Ruby 2.1 # RUBY_RELVERSION= 2.1.5 -RUBY_PORTREVISION= 1 +RUBY_PORTREVISION= 2 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 Modified: head/lang/ruby19/Makefile ============================================================================== --- head/lang/ruby19/Makefile Sun Feb 1 22:25:50 2015 (r378282) +++ head/lang/ruby19/Makefile Sun Feb 1 23:19:51 2015 (r378283) @@ -52,7 +52,7 @@ MAKE_JOBS_UNSAFE= yes 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 Added: head/lang/ruby19/files/patch-ext_readline_extconf.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ruby19/files/patch-ext_readline_extconf.rb Sun Feb 1 23:19:51 2015 (r378283) @@ -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") Modified: head/lang/ruby20/Makefile ============================================================================== --- head/lang/ruby20/Makefile Sun Feb 1 22:25:50 2015 (r378282) +++ head/lang/ruby20/Makefile Sun Feb 1 23:19:51 2015 (r378283) @@ -49,7 +49,7 @@ RUBY_NO_RUN_DEPENDS= yes 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 Added: head/lang/ruby20/files/patch-ext_readline_extconf.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ruby20/files/patch-ext_readline_extconf.rb Sun Feb 1 23:19:51 2015 (r378283) @@ -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") Modified: head/lang/ruby21/Makefile ============================================================================== --- head/lang/ruby21/Makefile Sun Feb 1 22:25:50 2015 (r378282) +++ head/lang/ruby21/Makefile Sun Feb 1 23:19:51 2015 (r378283) @@ -48,7 +48,7 @@ RUBY_NO_RUN_DEPENDS= yes 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 Added: head/lang/ruby21/files/patch-ext_readline_extconf.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ruby21/files/patch-ext_readline_extconf.rb Sun Feb 1 23:19:51 2015 (r378283) @@ -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")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502012319.t11NJpqD066585>