<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/b5cdf65240aee3a151601292cf269e27717f22f0">https://github.com/macports/macports-ports/commit/b5cdf65240aee3a151601292cf269e27717f22f0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b5cdf65240aee3a151601292cf269e27717f22f0
</span>Author: kimura wataru <kimuraw@macports.org>
AuthorDate: Wed Dec 30 19:44:30 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> lang/ruby26 .. ruby19: fix "invalid suffix on literal" with C++11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> insert spaces between literal and identifier in config.h.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> // before
</span><span style='display:block; white-space:pre;color:#404040;'> #define RUBY_ARCH "universal-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;color:#404040;'> #define RUBY_PLATFORM "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> // after
</span><span style='display:block; white-space:pre;color:#404040;'> #define RUBY_ARCH "universal-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;color:#404040;'> #define RUBY_PLATFORM "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> note: ruby-2.5 or earlier, `configure` does not accept "--with-arch=arm64"
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58255
</span>---
lang/ruby19/Portfile | 4 +++-
lang/ruby19/files/patch-configure_cxx11.diff | 16 ++++++++++++++++
lang/ruby20/Portfile | 8 +++++++-
lang/ruby20/files/patch-configure_cxx11.diff | 16 ++++++++++++++++
lang/ruby21/Portfile | 8 +++++++-
lang/ruby21/files/patch-configure_cxx11.diff | 16 ++++++++++++++++
lang/ruby22/Portfile | 8 +++++++-
lang/ruby22/files/patch-configure_cxx11.diff | 16 ++++++++++++++++
lang/ruby23/Portfile | 8 +++++++-
lang/ruby23/files/patch-configure_cxx11.diff | 16 ++++++++++++++++
lang/ruby24/Portfile | 8 +++++++-
lang/ruby24/files/patch-configure_cxx11.diff | 16 ++++++++++++++++
lang/ruby25/Portfile | 8 +++++++-
lang/ruby25/files/patch-configure_cxx11.diff | 16 ++++++++++++++++
lang/ruby26/Portfile | 7 ++++++-
lang/ruby26/files/patch-configure_cxx11.diff | 16 ++++++++++++++++
16 files changed, 179 insertions(+), 8 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 9b78d2bcf0f..167452f6804 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 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;'>@@ -26,6 +26,8 @@ long_description Ruby is the interpreted scripting language for quick \
</span>
homepage http://www.ruby-lang.org/
license {Ruby BSD}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure does not accept darwin arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64 i386 ppc
</span>
master_sites ruby:1.9
use_bzip2 yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby19/files/patch-configure_cxx11.diff b/lang/ruby19/files/patch-configure_cxx11.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2895f372170
</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-configure_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2014-11-13 22:42:20.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-12-30 17:13:04.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17826,11 +17826,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_ARCH "universal-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_ARCH "universal-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_PLATFORM "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_PLATFORM "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</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 b17ccdf39ae..fad18cb1d44 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 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;'>@@ -24,6 +24,8 @@ long_description Ruby is the interpreted scripting language for quick \
</span>
homepage http://www.ruby-lang.org/
license {Ruby BSD}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure does not accept darwin arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64 i386 ppc
</span>
master_sites ruby:2.0
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +68,10 @@ configure.env-append UNAME_RELEASE=${os.major}
</span>
# ext/tk/extconf.rb: fix build error with tk variant
patchfiles patch-ext-tk-extconf.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>
# Add the architecture flag as required
if {[info exists build_arch] && ${build_arch} ne ""} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby20/files/patch-configure_cxx11.diff b/lang/ruby20/files/patch-configure_cxx11.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fa2763e4621
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby20/files/patch-configure_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2015-12-16 21:32:46.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-12-30 16:47:31.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19691,11 +19691,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_ARCH "universal-"RUBY_PLATFORM_OS !<verconf>!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_ARCH "universal-" RUBY_PLATFORM_OS !<verconf>!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_PLATFORM "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS !<verconf>!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_PLATFORM "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS !<verconf>!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><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 bd1c2331f9b..17c4b950706 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 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;'>@@ -24,6 +24,8 @@ long_description Ruby is the interpreted scripting language for quick \
</span>
homepage http://www.ruby-lang.org/
license {Ruby BSD}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure does not accept darwin arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64 i386 ppc
</span>
master_sites ruby:2.1
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +52,10 @@ select.file ${filespath}/ruby21
</span>
# ext/openssl/ossl.h: <openssl/asn1_mac.h> was deprecated (#58123)
patchfiles patch-ext_openssl_ossl.h.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>
configure.args --enable-shared \
--disable-install-doc \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby21/files/patch-configure_cxx11.diff b/lang/ruby21/files/patch-configure_cxx11.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4e4c5ac1336
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby21/files/patch-configure_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2016-03-30 18:48:57.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-12-30 16:41:14.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22207,11 +22207,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_ARCH "universal-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_ARCH "universal-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_PLATFORM "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_PLATFORM "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><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 1fe45e8142c..a6e06848b5a 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 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,8 @@ long_description Ruby is the interpreted scripting language for quick \
</span>
homepage http://www.ruby-lang.org/
license {Ruby BSD}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure does not accept darwin arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64 i386 ppc
</span>
master_sites ruby:2.2
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +55,10 @@ select.file ${filespath}/ruby22
</span> patchfiles patch-ext_openssl_ossl.h.diff
patchfiles-append patch-internal.h.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>
configure.args --enable-shared \
--disable-install-doc \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby22/files/patch-configure_cxx11.diff b/lang/ruby22/files/patch-configure_cxx11.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f2583293fdc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby22/files/patch-configure_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-03-28 23:54:21.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-12-30 16:35:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23792,11 +23792,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_ARCH "universal-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_ARCH "universal-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_PLATFORM "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_PLATFORM "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><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 65a75bc0b21..12ac7e7f615 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 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +24,8 @@ long_description Ruby is the interpreted scripting language for quick \
</span>
homepage http://www.ruby-lang.org/
license {Ruby BSD}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure does not accept darwin arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64 i386 ppc
</span>
master_sites ruby:2.3
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +55,10 @@ select.file ${filespath}/ruby23
</span> patchfiles patch-ext_openssl_ossl.h.diff
# Fix build on 10.4 i386
patchfiles-append patch-tiger.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>
configure.args --enable-shared \
--disable-install-doc \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby23/files/patch-configure_cxx11.diff b/lang/ruby23/files/patch-configure_cxx11.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7be8f142972
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby23/files/patch-configure_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-10-18 00:37:54.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-12-30 12:11:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24961,11 +24961,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_ARCH "universal-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_ARCH "universal-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_PLATFORM "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_PLATFORM "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><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 e06dc842eef..8734368b1b1 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 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,6 +20,8 @@ long_description Ruby is the interpreted scripting language for quick \
</span>
homepage http://www.ruby-lang.org/
license {Ruby BSD}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure does not accept darwin arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64 i386 ppc
</span>
master_sites ruby:2.4
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +38,10 @@ patchfiles patch-configure.diff
</span> patchfiles-append patch-tiger.diff
# Fix build on < 10.6
patchfiles-append patch-osversions.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>
checksums md5 b10a7d2fcaf218c98edbaf57efc36e58 \
rmd160 0249650b9da5f11b52533827af5db809e1fa6277 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby24/files/patch-configure_cxx11.diff b/lang/ruby24/files/patch-configure_cxx11.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b44dd66fbf4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby24/files/patch-configure_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-12-30 11:55:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-12-30 11:58:46.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27018,11 +27018,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_ARCH "universal-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_ARCH "universal-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_PLATFORM "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_PLATFORM "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><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 5c336de17d5..85364ef903e 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 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,6 +20,8 @@ long_description Ruby is the interpreted scripting language for quick \
</span>
homepage http://www.ruby-lang.org/
license {Ruby BSD}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure does not accept darwin arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64 i386 ppc
</span>
master_sites ruby:2.5
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +58,10 @@ select.file ${filespath}/ruby25
</span> patchfiles patch-tiger.diff
# Fix build on < 10.6
patchfiles-append patch-osversions.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>
configure.args --enable-shared \
--enable-install-static-library \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby25/files/patch-configure_cxx11.diff b/lang/ruby25/files/patch-configure_cxx11.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9e4f3126f1c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby25/files/patch-configure_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-03-31 21:15:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-12-30 08:55:14.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27747,11 +27747,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_ARCH "universal-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_ARCH "universal-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_PLATFORM "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_PLATFORM "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</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;color:#808080;'>diff --git a/lang/ruby26/Portfile b/lang/ruby26/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b328f757bc9..7520d6ed70a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby26/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby26/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup select 1.0
</span>
name ruby26
version 2.6.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +56,11 @@ configure.args --enable-shared \
</span> --program-suffix=2.6 \
--with-rubylibprefix="${prefix}/lib/ruby2.6"
<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 patch-configure_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
# (see ruby27)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/files/patch-configure_cxx11.diff b/lang/ruby26/files/patch-configure_cxx11.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..29ffa58f534
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby26/files/patch-configure_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-03-31 20:23:15.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-12-30 08:41:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29570,11 +29570,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_ARCH "universal-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_ARCH "universal-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_PLATFORM "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_PLATFORM "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>