From owner-svn-ports-head@freebsd.org Sun Oct 25 00:21:25 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5FDD7A1E711; Sun, 25 Oct 2015 00:21:25 +0000 (UTC) (envelope-from mmoll@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2D24B8ED; Sun, 25 Oct 2015 00:21:25 +0000 (UTC) (envelope-from mmoll@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9P0LOb5021341; Sun, 25 Oct 2015 00:21:24 GMT (envelope-from mmoll@FreeBSD.org) Received: (from mmoll@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P0LNgW021335; Sun, 25 Oct 2015 00:21:23 GMT (envelope-from mmoll@FreeBSD.org) Message-Id: <201510250021.t9P0LNgW021335@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmoll set sender to mmoll@FreeBSD.org using -f From: Michael Moll Date: Sun, 25 Oct 2015 00:21:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400142 - in head/lang: ruby20 ruby20/files ruby21 ruby21/files ruby22 ruby22/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 00:21:25 -0000 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 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")