[119917] trunk/dports/lang/ruby21

[kimuraw at macports.org]

Revision: 119917
          https://trac.macports.org/changeset/119917
Author:   kimuraw at macports.org
Date:     2014-05-09 17:51:35 -0700 (Fri, 09 May 2014)
Log Message:
-----------
lang/ruby21: upgrade to 2.1.2

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

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

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

Modified: trunk/dports/lang/ruby21/Portfile
===================================================================
--- trunk/dports/lang/ruby21/Portfile	2014-05-09 22:12:59 UTC (rev 119916)
+++ trunk/dports/lang/ruby21/Portfile	2014-05-10 00:51:35 UTC (rev 119917)
@@ -5,8 +5,8 @@
 PortGroup           select 1.0
 
 name                ruby21
-version             2.1.1
-revision            1
+version             2.1.2
+revision            0
 
 categories          lang ruby
 maintainers         kimuraw openmaintainer
@@ -26,10 +26,10 @@
 use_bzip2           yes
 distname            ruby-${version}
 
-checksums           md5 53edc33b2f590ecdd9f6a344b9d92d0d \
-                    rmd160 b200bb8d1542f79306c5cd0760781ec9dc759998 \
-                    sha1 a7fd539f64864bc00fc64444d2d814df6c19fd4a \
-                    sha256 96aabab4dd4a2e57dd0d28052650e6fcdc8f133fa8980d9b936814b1e93f6cfc
+checksums           md5 ed9b8565bdeccb401d628ec8d54a0774 \
+                    rmd160 0bae9f1f62c0df44840355a880eb1907892f2b38 \
+                    sha1 29a615966c7feb6554be736e7dcd590c770ee692 \
+                    sha256 6948b02570cdfb89a8313675d4aa665405900e27423db408401473f30fc6e901
 use_parallel_build  no
 
 depends_lib         port:readline \
@@ -55,9 +55,6 @@
                     --program-suffix=2.1 \
                     --with-rubylibprefix="${prefix}/lib/ruby2.1"
 
-# patch-readline63.diff: support readline-6.3 (#43296) from ruby-trunk r45540
-patchfiles          patch-readline63.diff
-
 # Ignore minor version for archdir, like i686-darwin9.
 # Port "ruby" and "ruby19" does the same.
 configure.env-append UNAME_RELEASE=${os.major}
@@ -115,6 +112,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://cache.ruby-lang.org/pub/ruby/2.1/
 livecheck.regex ruby-(${version})${extract.suffix}

Deleted: trunk/dports/lang/ruby21/files/patch-readline63.diff
===================================================================
--- trunk/dports/lang/ruby21/files/patch-readline63.diff	2014-05-09 22:12:59 UTC (rev 119916)
+++ trunk/dports/lang/ruby21/files/patch-readline63.diff	2014-05-10 00:51:35 UTC (rev 119917)
@@ -1,40 +0,0 @@
-Index: ext/readline/extconf.rb
-===================================================================
---- ext/readline/extconf.rb	(revision 45540)
-+++ 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')
-@@ -94,4 +98,11 @@
- readline.have_func("rl_redisplay")
- readline.have_func("rl_insert_text")
- readline.have_func("rl_delete_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 45540)
-+++ ext/readline/readline.c	(working copy)
-@@ -1974,7 +1974,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/2373ece5/attachment.html>