[119918] trunk/dports/lang/ruby20

[kimuraw at macports.org]

Revision: 119918
          https://trac.macports.org/changeset/119918
Author:   kimuraw at macports.org
Date:     2014-05-09 17:52:49 -0700 (Fri, 09 May 2014)
Log Message:
-----------
lang/ruby20: upgrade to 2.0.0-p481

- add a variant "relative" (#43514)
- remove readline63 patch (upstream fixed)

Modified Paths:
--------------
    trunk/dports/lang/ruby20/Portfile

Removed Paths:
-------------
    trunk/dports/lang/ruby20/files/patch-readline63.diff

Modified: trunk/dports/lang/ruby20/Portfile
===================================================================
--- trunk/dports/lang/ruby20/Portfile	2014-05-10 00:51:35 UTC (rev 119917)
+++ trunk/dports/lang/ruby20/Portfile	2014-05-10 00:52:49 UTC (rev 119918)
@@ -5,8 +5,8 @@
 PortGroup           select 1.0
 
 name                ruby20
-version             2.0.0-p451
-revision            1
+version             2.0.0-p481
+revision            0
 
 categories          lang ruby
 maintainers         kimuraw openmaintainer
@@ -26,10 +26,10 @@
 use_bzip2           yes
 distname            ruby-${version}
 
-checksums           md5 908e4d1dbfe7362b15892f16af05adf8 \
-                    rmd160 c7e7efd5c8e081f69c91618c72187e7f66174cc2 \
-                    sha1 22b76e421fedba99267601702af74cf396110229 \
-                    sha256 5bf8a1c7616286b9dbc962912c3f58e67bc3a70306ca90b0882ef0bd442e02f5
+checksums           md5 ea406a8d415a1a5d8365596d4288f3da \
+                    rmd160 7a2d527975f57e2700552b06082cc93589fa34a1 \
+                    sha1 08f0cedbaf3bc45b0681973aa7b19aa3be2e1184 \
+                    sha256 0762dad7e96d8091bdf33b3e3176c2066fbf3dc09dfe85fbf40e74e83c63d8e2
 use_parallel_build  no
 
 depends_lib         port:readline \
@@ -60,9 +60,7 @@
 configure.env-append UNAME_RELEASE=${os.major}
 
 # ext/tk/extconf.rb: fix build error with tk variant
-# patch-readline63.diff: support readline-6.3 (#43296) from ruby-trunk r45540
-patchfiles          patch-readline63.diff \
-                    patch-ext-tk-extconf.rb.diff
+patchfiles          patch-ext-tk-extconf.rb.diff
 
 # Add the architecture flag as required
 if {[info exists build_arch] && ${build_arch} ne ""} {
@@ -110,6 +108,11 @@
         configure.universal_ldflags
 }
 
+variant relative description "Enable relative loading of libraries to allow for relocation of binaries." {
+        #enable relative loading
+        configure.args-append  --enable-load-relative
+}
+
 livecheck.type  regex
 livecheck.url   http://ftp.ruby-lang.org/pub/ruby/2.0/
 livecheck.regex ruby-(${version})${extract.suffix}

Deleted: trunk/dports/lang/ruby20/files/patch-readline63.diff
===================================================================
--- trunk/dports/lang/ruby20/files/patch-readline63.diff	2014-05-10 00:51:35 UTC (rev 119917)
+++ trunk/dports/lang/ruby20/files/patch-readline63.diff	2014-05-10 00:52:49 UTC (rev 119918)
@@ -1,39 +0,0 @@
-Index: ext/readline/extconf.rb
-===================================================================
---- ext/readline/extconf.rb	(revision 45167)
-+++ ext/readline/extconf.rb	(working copy)
-@@ -19,6 +19,10 @@
-   return super(func, headers)
- end
- 
-+def readline.have_type(type)
-+  return super(type, headers)
-+end
-+
- dir_config('curses')
- dir_config('ncurses')
- dir_config('termcap')
-@@ -93,4 +97,10 @@
- readline.have_func("clear_history")
- readline.have_func("rl_redisplay")
- readline.have_func("rl_insert_text")
-+unless readline.have_type("rl_hook_func_t*")
-+  # rl_hook_func_t is available since readline-4.2 (2001).
-+  # Function is removed at readline-6.3 (2014).
-+  # However, editline (NetBSD 6.1.3, 2014) doesn't have rl_hook_func_t.
-+  $defs << "-Drl_hook_func_t=Function"
-+end
- create_makefile("readline")
-Index: ext/readline/readline.c
-===================================================================
---- ext/readline/readline.c	(revision 45167)
-+++ ext/readline/readline.c	(working copy)
-@@ -1883,7 +1883,7 @@
- 
-     rl_attempted_completion_function = readline_attempted_completion_function;
- #if defined(HAVE_RL_PRE_INPUT_HOOK)
--    rl_pre_input_hook = (Function *)readline_pre_input_hook;
-+    rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
- #endif
- #ifdef HAVE_RL_CATCH_SIGNALS
-     rl_catch_signals = 0;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140509/56a8e19b/attachment.html>