<pre style='margin:0'>
kimura wataru (kimuraw) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c8d2262437141217990aa396fd1c98219915be43">https://github.com/macports/macports-ports/commit/c8d2262437141217990aa396fd1c98219915be43</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c8d22624371 lang/ruby25 .. ruby20, ruby19: fix build error of ruby extentions on macOS 11
</span>c8d22624371 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c8d2262437141217990aa396fd1c98219915be43
</span>Author: kimura wataru <kimuraw@macports.org>
AuthorDate: Thu Dec 31 09:28:25 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> lang/ruby25 .. ruby20, ruby19: fix build error of ruby extentions on macOS 11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - rewrite sdkroot in rbconfig.rb and ruby-*.pc to MacOSX.sdk from MacOS11.x.sdk
</span><span style='display:block; white-space:pre;color:#404040;'> see https://trac.macports.org/ticket/61899
</span><span style='display:block; white-space:pre;color:#404040;'> - fix ruby19 build error of ext/openssl
</span>---
lang/ruby19/Portfile | 27 ++++++-
.../files/patch-ext-openssl-openssl_missing.diff | 82 ++++++++++++++++++++++
.../files/patch-ext_openssl_ossl_x509ext.c.diff | 11 +++
lang/ruby20/Portfile | 18 ++++-
lang/ruby21/Portfile | 18 ++++-
lang/ruby22/Portfile | 18 ++++-
lang/ruby23/Portfile | 18 ++++-
lang/ruby24/Portfile | 18 ++++-
lang/ruby25/Portfile | 18 ++++-
9 files changed, 221 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby19/Portfile b/lang/ruby19/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c8bffa3aa2..147ec115bdf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby19/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby19/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ deprecated.upstream_support no
</span>
name ruby19
version 1.9.3-p551
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 13
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +59,15 @@ default_variants +doc
</span> # https://github.com/rubygems/rubygems/pull/196
patchfiles patch-lib-rubygems-specification.rb.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch-configure_cxx11.diff: fix "invalid suffix on literal" with C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# from RUBY_ARCH and RUBY_PLATFORM in config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/58255
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-configure_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix compile error against port:openssl10 @1.0.2u
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-ext-openssl-openssl_missing.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ext_openssl_ossl_x509ext.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # ruby-1.9.3 supports Xcode-4.2 clang and gcc-4.2.
# ruby built with llvm-gcc will be broken.
# http://svn.ruby-lang.org/repos/ruby/tags/v1_9_3_0/NEWS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,6 +89,22 @@ configure.args --enable-shared \
</span> # Port "ruby" does the same.
configure.env-append UNAME_RELEASE=${os.major}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (see ruby27)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rewrite MacOSX11.1.sdk -> MacOSX.sdk in rbconfig.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/rbconfig.rb ${worksrcpath}/rbconfig.rb.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?[[:blank:]])|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-1.9.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?)$|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-1.9.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Add the architecture flag as required
if {[info exists build_arch] && ${build_arch} ne ""} {
configure.args-append "--with-arch=${build_arch}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby19/files/patch-ext-openssl-openssl_missing.diff b/lang/ruby19/files/patch-ext-openssl-openssl_missing.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7b9333abddc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby19/files/patch-ext-openssl-openssl_missing.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,82 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/openssl/openssl_missing.c.orig 2020-12-31 07:47:48.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/openssl/openssl_missing.c 2020-12-31 07:54:05.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,15 +22,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "openssl_missing.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(HAVE_HMAC_CTX_COPY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!out || !in) return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!out || !in) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(out, in, sizeof(HMAC_CTX));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* HAVE_HMAC_CTX_COPY */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* NO_HMAC */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,7 +119,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * tested on 0.9.7d.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(out, in, sizeof(EVP_CIPHER_CTX));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -266,7 +267,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(HAVE_BN_RAND_RANGE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BN_rand_range(BIGNUM *r, BIGNUM *range)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BN_rand_range(BIGNUM *r, const const BIGNUM *range)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return bn_rand_range(0, r, range);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -274,7 +275,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BN_pseudo_rand_range(BIGNUM *r, const BIGNUM *range)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return bn_rand_range(1, r, range);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/openssl/openssl_missing.h.orig 2020-12-31 07:47:48.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/openssl/openssl_missing.h 2020-12-31 07:52:42.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +68,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(HAVE_HMAC_CTX_COPY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(HAVE_HMAC_CTX_CLEANUP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(HAVE_EVP_CIPHER_CTX_COPY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(HAVE_EVP_DIGESTINIT_EX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -170,11 +170,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(HAVE_BN_RAND_RANGE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int BN_rand_range(BIGNUM *r, BIGNUM *range);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int BN_rand_range(BIGNUM *r, const BIGNUM *range);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int BN_pseudo_rand_range(BIGNUM *r, const BIGNUM *range);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby19/files/patch-ext_openssl_ossl_x509ext.c.diff b/lang/ruby19/files/patch-ext_openssl_ossl_x509ext.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cbb9c310896
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby19/files/patch-ext_openssl_ossl_x509ext.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/openssl/ossl_x509ext.c.orig 2011-03-24 16:29:21.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/openssl/ossl_x509ext.c 2020-12-31 08:32:29.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,7 +222,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VALUE rconf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONF *conf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static LHASH *empty_lhash;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static _LHASH *empty_lhash;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rb_scan_args(argc, argv, "21", &oid, &value, &critical);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby20/Portfile b/lang/ruby20/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc71dfb7514..13ef5b19a85 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby20/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby20/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ deprecated.upstream_support no
</span>
name ruby20
version 2.0.0-p648
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 11
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +73,22 @@ patchfiles patch-ext-tk-extconf.rb.diff
</span> # https://trac.macports.org/ticket/58255
patchfiles-append patch-configure_cxx11.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (see ruby27)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rewrite MacOSX11.1.sdk -> MacOSX.sdk in rbconfig.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/rbconfig.rb ${worksrcpath}/rbconfig.rb.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?[[:blank:]])|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-2.0.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?)$|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-2.0.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Add the architecture flag as required
if {[info exists build_arch] && ${build_arch} ne ""} {
configure.args-append "--with-arch=${build_arch}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby21/Portfile b/lang/ruby21/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dad5b3d1cdd..fb5f7d84650 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby21/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby21/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ deprecated.upstream_support no
</span>
name ruby21
version 2.1.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 11
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +73,22 @@ configure.args --enable-shared \
</span> # Port "ruby" and "ruby19" does the same.
configure.env-append UNAME_RELEASE=${os.major}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (see ruby27)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rewrite MacOSX11.1.sdk -> MacOSX.sdk in rbconfig.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/rbconfig.rb ${worksrcpath}/rbconfig.rb.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?[[:blank:]])|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-2.1.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?)$|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-2.1.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Add the architecture flag as required
if {[info exists build_arch] && ${build_arch} != ""} {
configure.args-append "--with-arch=${build_arch}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby22/Portfile b/lang/ruby22/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c46cc607b50..d63c6f6d843 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ deprecated.upstream_support no
</span>
name ruby22
version 2.2.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 9
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,6 +82,22 @@ platform darwin {
</span> # Port "ruby" and "ruby19" does the same.
configure.env-append UNAME_RELEASE=${os.major}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (see ruby27)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rewrite MacOSX11.1.sdk -> MacOSX.sdk in rbconfig.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/rbconfig.rb ${worksrcpath}/rbconfig.rb.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?[[:blank:]])|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-2.2.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?)$|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-2.2.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Add the architecture flag as required
if {[info exists build_arch] && ${build_arch} != ""} {
configure.args-append "--with-arch=${build_arch}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby23/Portfile b/lang/ruby23/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 11c19544c48..c2732e0af7f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby23/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby23/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ deprecated.upstream_support no
</span>
name ruby23
version 2.3.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 8
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,6 +72,22 @@ configure.args --enable-shared \
</span> --program-suffix=2.3 \
--with-rubylibprefix="${prefix}/lib/ruby2.3"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (see ruby27)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rewrite MacOSX11.1.sdk -> MacOSX.sdk in rbconfig.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/rbconfig.rb ${worksrcpath}/rbconfig.rb.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?[[:blank:]])|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-2.3.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?)$|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-2.3.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Add the architecture flag as required
if {[info exists build_arch] && ${build_arch} != ""} {
configure.args-append "--with-arch=${build_arch}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby24/Portfile b/lang/ruby24/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fff3ca969a6..a4d52855704 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby24/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby24/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup select 1.0
</span>
name ruby24
version 2.4.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +73,22 @@ configure.args --enable-shared \
</span> --program-suffix=2.4 \
--with-rubylibprefix="${prefix}/lib/ruby2.4"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (see ruby27)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rewrite MacOSX11.1.sdk -> MacOSX.sdk in rbconfig.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/rbconfig.rb ${worksrcpath}/rbconfig.rb.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?[[:blank:]])|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-2.4.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?)$|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-2.4.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # https://github.com/ruby/ruby/commit/1961c786aab243b3eb60e7238224e87975d88056
# * configure.ac (LIBPATHENV): use DYLD_FALLBACK_LIBRARY_PATH instead of
# DYLD_LIBRARY_PATH on macOS, to honor runtime paths embedded in the
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby25/Portfile b/lang/ruby25/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 28db7089e32..b2ccfed8353 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby25/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby25/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup select 1.0
</span>
name ruby25
version 2.5.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +73,22 @@ configure.args --enable-shared \
</span> --program-suffix=2.5 \
--with-rubylibprefix="${prefix}/lib/ruby2.5"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (see ruby27)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rewrite MacOSX11.1.sdk -> MacOSX.sdk in rbconfig.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/rbconfig.rb ${worksrcpath}/rbconfig.rb.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?[[:blank:]])|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-2.5.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?)$|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ruby-2.5.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # https://github.com/ruby/ruby/commit/1961c786aab243b3eb60e7238224e87975d88056
# * configure.ac (LIBPATHENV): use DYLD_FALLBACK_LIBRARY_PATH instead of
# DYLD_LIBRARY_PATH on macOS, to honor runtime paths embedded in the
</pre><pre style='margin:0'>
</pre>