svn commit: r400142 - in head/lang: ruby20 ruby20/files ruby21 ruby21/files ruby22 ruby22/files
Michael Moll
mmoll at FreeBSD.org
Sun Oct 25 00:21:25 UTC 2015
Author: mmoll
Date: Sun Oct 25 00:21:23 2015
New Revision: 400142
URL: https://svnweb.freebsd.org/changeset/ports/400142
Log:
lang/ruby2*: fix readline & libedit configure options
The fixed error(s) were only visible with LOCALBASE not set to /usr/local.
PR: 203988
Submitted by: John Hein <z7dr6ut7gs at snkmail.com>
Modified:
head/lang/ruby20/Makefile
head/lang/ruby20/files/patch-ext_readline_extconf.rb
head/lang/ruby21/Makefile
head/lang/ruby21/files/patch-ext_readline_extconf.rb
head/lang/ruby22/Makefile
head/lang/ruby22/files/patch-ext_readline_extconf.rb
Modified: head/lang/ruby20/Makefile
==============================================================================
--- head/lang/ruby20/Makefile Sun Oct 25 00:09:16 2015 (r400141)
+++ head/lang/ruby20/Makefile Sun Oct 25 00:21:23 2015 (r400142)
@@ -59,11 +59,11 @@ CAPIDOCS_BUILD_DEPENDS= doxygen>0:${PORT
dot:${PORTSDIR}/graphics/graphviz
CAPIDOCS_CONFIGURE_ENABLE= install-capi
LIBEDIT_BUILD_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit
-LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-prefix=${LOCALBASE}
+LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-dir=${LIBEDITPREFIX}
LIBEDIT_RUN_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit
RDOC_CONFIGURE_ENABLE= install-rdoc
READLINE_BUILD_DEPENDS= readline>=0:${PORTSDIR}/devel/readline
-READLINE_CONFIGURE_ON= --disable-libedit --with-readline-prefix=${LOCALBASE}
+READLINE_CONFIGURE_ON= --disable-libedit --with-readline-dir=${READLINEPREFIX}
READLINE_RUN_DEPENDS= readline>=0:${PORTSDIR}/devel/readline
CPE_VENDOR= ruby-lang
Modified: head/lang/ruby20/files/patch-ext_readline_extconf.rb
==============================================================================
--- head/lang/ruby20/files/patch-ext_readline_extconf.rb Sun Oct 25 00:09:16 2015 (r400141)
+++ head/lang/ruby20/files/patch-ext_readline_extconf.rb Sun Oct 25 00:21:23 2015 (r400142)
@@ -1,6 +1,14 @@
---- ext/readline/extconf.rb.orig 2014-04-30 07:39:45 UTC
-+++ ext/readline/extconf.rb
-@@ -62,7 +62,7 @@ else
+--- ext/readline/extconf.rb.orig 2014-05-01 11:59:37.000000000 +0000
++++ ext/readline/extconf.rb 2015-10-23 04:05:44.000000000 +0000
+@@ -37,6 +37,7 @@
+ case enable_libedit
+ when true
+ # --enable-libedit
++ dir_config("libedit")
+ unless (readline.have_header("editline/readline.h") ||
+ readline.have_header("readline/readline.h")) &&
+ have_library("edit", "readline")
+@@ -62,7 +63,7 @@ else
end
readline.have_func("rl_getc")
Modified: head/lang/ruby21/Makefile
==============================================================================
--- head/lang/ruby21/Makefile Sun Oct 25 00:09:16 2015 (r400141)
+++ head/lang/ruby21/Makefile Sun Oct 25 00:21:23 2015 (r400142)
@@ -62,11 +62,11 @@ CAPIDOCS_CONFIGURE_ENABLE= install-capi
GMP_CONFIGURE_WITH= gmp
GMP_LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp
LIBEDIT_BUILD_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit
-LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-prefix=${LOCALBASE}
+LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-dir=${LIBEDITPREFIX}
LIBEDIT_RUN_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit
RDOC_CONFIGURE_ENABLE= install-rdoc
READLINE_BUILD_DEPENDS= readline>=0:${PORTSDIR}/devel/readline
-READLINE_CONFIGURE_ON= --disable-libedit --with-readline-prefix=${LOCALBASE}
+READLINE_CONFIGURE_ON= --disable-libedit --with-readline-dir=${READLINEPREFIX}
READLINE_RUN_DEPENDS= readline>=0:${PORTSDIR}/devel/readline
CPE_VENDOR= ruby-lang
Modified: head/lang/ruby21/files/patch-ext_readline_extconf.rb
==============================================================================
--- head/lang/ruby21/files/patch-ext_readline_extconf.rb Sun Oct 25 00:09:16 2015 (r400141)
+++ head/lang/ruby21/files/patch-ext_readline_extconf.rb Sun Oct 25 00:21:23 2015 (r400142)
@@ -1,6 +1,14 @@
---- ext/readline/extconf.rb.orig 2015-01-23 15:37:01 UTC
-+++ ext/readline/extconf.rb
-@@ -62,7 +62,7 @@ else
+--- ext/readline/extconf.rb.orig 2014-05-01 11:59:37.000000000 +0000
++++ ext/readline/extconf.rb 2015-10-23 04:05:44.000000000 +0000
+@@ -37,6 +37,7 @@
+ case enable_libedit
+ when true
+ # --enable-libedit
++ dir_config("libedit")
+ unless (readline.have_header("editline/readline.h") ||
+ readline.have_header("readline/readline.h")) &&
+ have_library("edit", "readline")
+@@ -62,7 +63,7 @@ else
end
readline.have_func("rl_getc")
Modified: head/lang/ruby22/Makefile
==============================================================================
--- head/lang/ruby22/Makefile Sun Oct 25 00:09:16 2015 (r400141)
+++ head/lang/ruby22/Makefile Sun Oct 25 00:21:23 2015 (r400142)
@@ -62,11 +62,11 @@ CAPIDOCS_CONFIGURE_ENABLE= install-capi
GMP_CONFIGURE_WITH= gmp
GMP_LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp
LIBEDIT_BUILD_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit
-LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-prefix=${LOCALBASE}
+LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-dir=${LIBEDITPREFIX}
LIBEDIT_RUN_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit
RDOC_CONFIGURE_ENABLE= install-rdoc
READLINE_BUILD_DEPENDS= readline>=0:${PORTSDIR}/devel/readline
-READLINE_CONFIGURE_ON= --disable-libedit --with-readline-prefix=${LOCALBASE}
+READLINE_CONFIGURE_ON= --disable-libedit --with-readline-dir=${READLINEPREFIX}
READLINE_RUN_DEPENDS= readline>=0:${PORTSDIR}/devel/readline
CPE_VENDOR= ruby-lang
Modified: head/lang/ruby22/files/patch-ext_readline_extconf.rb
==============================================================================
--- head/lang/ruby22/files/patch-ext_readline_extconf.rb Sun Oct 25 00:09:16 2015 (r400141)
+++ head/lang/ruby22/files/patch-ext_readline_extconf.rb Sun Oct 25 00:21:23 2015 (r400142)
@@ -1,6 +1,14 @@
---- ext/readline/extconf.rb.orig 2015-01-16 23:05:12 UTC
-+++ ext/readline/extconf.rb
-@@ -62,7 +62,7 @@ else
+--- ext/readline/extconf.rb.orig 2014-05-01 11:59:37.000000000 +0000
++++ ext/readline/extconf.rb 2015-10-23 04:05:44.000000000 +0000
+@@ -37,6 +37,7 @@
+ case enable_libedit
+ when true
+ # --enable-libedit
++ dir_config("libedit")
+ unless (readline.have_header("editline/readline.h") ||
+ readline.have_header("readline/readline.h")) &&
+ have_library("edit", "readline")
+@@ -62,7 +63,7 @@ else
end
readline.have_func("rl_getc")
More information about the svn-ports-all
mailing list