mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-25 00:51:21 +00:00
Code Issues Releases Activity

Change the EDIT option of ruby to use libedit by default now that libedit

Browse Source 
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)
This commit is contained in:
Baptiste Daroussin 2015-02-01 23:19:51 +00:00
parent ad2647235e
commit 167f82f839
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=378283
7 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mk/bsd.ruby.mk
View File

@ -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

2
lang/ruby19/Makefile
View File

@ -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

11
lang/ruby19/files/patch-ext_readline_extconf.rb Normal file
View File

@ -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")

2
lang/ruby20/Makefile
View File

@ -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

11
lang/ruby20/files/patch-ext_readline_extconf.rb Normal file
View File

@ -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")

2
lang/ruby21/Makefile
View File

@ -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

11
lang/ruby21/files/patch-ext_readline_extconf.rb Normal file
View File

@ -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")