<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/8f164f90e9af3632793c1b8c3c09807150c2d462">https://github.com/macports/macports-ports/commit/8f164f90e9af3632793c1b8c3c09807150c2d462</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 8f164f90e9a ruby23-25: Fix build on 10.4, 10.5 (#8550)
</span>8f164f90e9a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8f164f90e9af3632793c1b8c3c09807150c2d462
</span>Author: Fred Wright <fhgwright@users.noreply.github.com>
AuthorDate: Mon Sep 28 05:46:18 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> ruby23-25: Fix build on 10.4, 10.5 (#8550)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ruby23: Fix build on 10.4 i386.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The build was failing on 10.4 i386 due to attempts to access undefined
</span><span style='display:block; white-space:pre;color:#404040;'> context fields in the signal handler context struct. This isn't
</span><span style='display:block; white-space:pre;color:#404040;'> supported on PPC, so the build succeeded. The relevant fields weren't
</span><span style='display:block; white-space:pre;color:#404040;'> defined until 10.5, so the fix is to add an OS version check to the
</span><span style='display:block; white-space:pre;color:#404040;'> __APPLE__ case.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This happened in two places - one in check_stack_overflow(), and one
</span><span style='display:block; white-space:pre;color:#404040;'> in rb_dump_machine_register().
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Using __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ avoids the need to
</span><span style='display:block; white-space:pre;color:#404040;'> include AvailabilityMacros.h.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The OS version conditional in dln.c is comparing an undefined macro to
</span><span style='display:block; white-space:pre;color:#404040;'> a sometimes undefined (and essentially useless) macro. However, the
</span><span style='display:block; white-space:pre;color:#404040;'> relevant code doesn't seem to be built for any OS version, making the
</span><span style='display:block; white-space:pre;color:#404040;'> bug irrelevant. This is left alone.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also corrects a small typo in the description.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since this only fixes broken builds, there is no need for a revbump.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Built on 10.4-10.5 ppc, 10.4-10.6 i386, and 10.6-10.15 x86_64.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ruby24: Fix builds on 10.4, 10.5.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The build was failing on 10.4 i386 due to attempts to access undefined
</span><span style='display:block; white-space:pre;color:#404040;'> context fields in the signal handler context struct. This isn't
</span><span style='display:block; white-space:pre;color:#404040;'> supported on PPC, so the build succeeded. The relevant fields weren't
</span><span style='display:block; white-space:pre;color:#404040;'> defined until 10.5, so the fix is to add an OS version check to the
</span><span style='display:block; white-space:pre;color:#404040;'> __APPLE__ case.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This happened in two places - one in check_stack_overflow(), and one
</span><span style='display:block; white-space:pre;color:#404040;'> in rb_dump_machine_register().
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Using __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ avoids the need to
</span><span style='display:block; white-space:pre;color:#404040;'> include AvailabilityMacros.h.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The OS version conditional in dln.c is comparing an undefined macro to
</span><span style='display:block; white-space:pre;color:#404040;'> a sometimes undefined (and essentially useless) macro. However, the
</span><span style='display:block; white-space:pre;color:#404040;'> relevant code doesn't seem to be built for any OS version, making the
</span><span style='display:block; white-space:pre;color:#404040;'> bug irrelevant. Nevertheless, it's now fixed, since another, similar
</span><span style='display:block; white-space:pre;color:#404040;'> fix was needed, anyway, and it might become relevant if something else
</span><span style='display:block; white-space:pre;color:#404040;'> changes.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The OS version conditionals in error.c were using another useless
</span><span style='display:block; white-space:pre;color:#404040;'> macro for the comparison, this time with a real effect, though only in
</span><span style='display:block; white-space:pre;color:#404040;'> a couple of messages related to crash reports on < 10.6. This is now
</span><span style='display:block; white-space:pre;color:#404040;'> fixed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also corrects a small typo in the description.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since this affects the installed code for < 10.6, it includes a
</span><span style='display:block; white-space:pre;color:#404040;'> revbump.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Built on 10.4-10.5 ppc, 10.4-10.6 i386, and 10.6-10.15 x86_64.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ruby25: Fix builds on 10.4, 10.5.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The build was failing on 10.4 i386 due to attempts to access undefined
</span><span style='display:block; white-space:pre;color:#404040;'> context fields in the signal handler context struct. This isn't
</span><span style='display:block; white-space:pre;color:#404040;'> supported on PPC, so the build succeeded. The relevant fields weren't
</span><span style='display:block; white-space:pre;color:#404040;'> defined until 10.5, so the fix is to add an OS version check to the
</span><span style='display:block; white-space:pre;color:#404040;'> __APPLE__ case.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This happened in two places - one in check_stack_overflow(), and one
</span><span style='display:block; white-space:pre;color:#404040;'> in rb_dump_machine_register().
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Using __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ avoids the need to
</span><span style='display:block; white-space:pre;color:#404040;'> include AvailabilityMacros.h.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The OS version conditional in dln.c is comparing an undefined macro to
</span><span style='display:block; white-space:pre;color:#404040;'> a sometimes undefined (and essentially useless) macro. However, the
</span><span style='display:block; white-space:pre;color:#404040;'> relevant code doesn't seem to be built for any OS version, making the
</span><span style='display:block; white-space:pre;color:#404040;'> bug irrelevant. Nevertheless, it's now fixed, since another, similar
</span><span style='display:block; white-space:pre;color:#404040;'> fix was needed, anyway, and it might become relevant if something else
</span><span style='display:block; white-space:pre;color:#404040;'> changes.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The OS version conditionals in error.c were using another useless
</span><span style='display:block; white-space:pre;color:#404040;'> macro for the comparison, this time with a real effect, though only in
</span><span style='display:block; white-space:pre;color:#404040;'> a couple of messages related to crash reports on < 10.6. This is now
</span><span style='display:block; white-space:pre;color:#404040;'> fixed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also corrects a small typo in the description.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since this affects the installed code for < 10.6, it includes a
</span><span style='display:block; white-space:pre;color:#404040;'> revbump.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Built on 10.4-10.5 ppc, 10.4-10.6 i386, and 10.6-10.15 x86_64.
</span>---
lang/ruby23/Portfile | 4 +++-
lang/ruby23/files/patch-tiger.diff | 22 ++++++++++++++++++++++
lang/ruby24/Portfile | 6 +++++-
lang/ruby24/files/patch-osversions.diff | 32 ++++++++++++++++++++++++++++++++
lang/ruby24/files/patch-tiger.diff | 22 ++++++++++++++++++++++
lang/ruby25/Portfile | 7 ++++++-
lang/ruby25/files/patch-osversions.diff | 32 ++++++++++++++++++++++++++++++++
lang/ruby25/files/patch-tiger.diff | 22 ++++++++++++++++++++++
8 files changed, 144 insertions(+), 3 deletions(-)
<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 d338db32b59..65a75bc0b21 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;'>@@ -20,7 +20,7 @@ long_description Ruby is the interpreted scripting language for quick \
</span> and easy object-oriented programming. It has many \
features to process text files and to do system \
management tasks (as in Perl). It is simple, \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- straight-forward, extensible, and portable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ straightforward, extensible, and portable.
</span>
homepage http://www.ruby-lang.org/
license {Ruby BSD}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,6 +51,8 @@ select.file ${filespath}/ruby23
</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;'>+# Fix build on 10.4 i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-tiger.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-tiger.diff b/lang/ruby23/files/patch-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cfdf2bcbe6e
</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-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./signal.c.orig 2015-11-23 16:17:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./signal.c 2020-08-27 15:24:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -760,7 +760,7 @@ NORETURN(void ruby_thread_stack_overflow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # elif !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__ || defined __amd64__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # elif defined __linux__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define USE_UCONTEXT_REG 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif defined __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define USE_UCONTEXT_REG 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # elif defined __FreeBSD__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define USE_UCONTEXT_REG 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./vm_dump.c.orig 2018-03-18 07:27:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./vm_dump.c 2020-08-27 15:24:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -919,7 +919,7 @@ rb_dump_machine_register(const ucontext_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_machine_register(SS);
</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;'>+-# elif defined __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const mcontext_t mctx = ctx->uc_mcontext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined __x86_64__
</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 bb776173b6a..e06dc842eef 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;'>@@ -16,7 +16,7 @@ long_description Ruby is the interpreted scripting language for quick \
</span> and easy object-oriented programming. It has many \
features to process text files and to do system \
management tasks (as in Perl). It is simple, \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- straight-forward, extensible, and portable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ straightforward, extensible, and portable.
</span>
homepage http://www.ruby-lang.org/
license {Ruby BSD}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +32,10 @@ dist_subdir ruby24
</span> # /opt/local/lib/libruby.2.4.3.dylib:
# /opt/local/lib/libruby.2.4.dylib
patchfiles patch-configure.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix build on 10.4 i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix build on < 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-osversions.diff
</span>
checksums md5 b10a7d2fcaf218c98edbaf57efc36e58 \
rmd160 0249650b9da5f11b52533827af5db809e1fa6277 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby24/files/patch-osversions.diff b/lang/ruby24/files/patch-osversions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..196d6374203
</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-osversions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./dln.c.orig 2020-03-31 04:42:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./dln.c 2020-08-29 16:46:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1334,8 +1334,7 @@ dln_load(const char *file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ex && ex != ruby_xmalloc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined __APPLE__ && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* dlclose() segfaults */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rb_fatal("%s - %s", incompatible, file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./error.c.orig 2020-03-31 04:42:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./error.c 2020-08-29 16:48:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -379,7 +379,7 @@ preface_dump(FILE *out)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-- Crash Report log information "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "--------------------------------------------\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " See Crash Report log file under the one of following:\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " * ~/Library/Logs/CrashReporter\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " * /Library/Logs/CrashReporter\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -404,7 +404,7 @@ postscript_dump(FILE *out)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "[IMPORTANT]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*" ------------------------------------------------"*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\n""Don't forget to include the Crash Report log file under\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CrashReporter or "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "DiagnosticReports directory in bug reports.\n"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby24/files/patch-tiger.diff b/lang/ruby24/files/patch-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3640d923660
</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-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- signal.c.orig 2020-03-31 04:42:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ signal.c 2020-08-26 19:07:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -767,7 +767,7 @@ NORETURN(void ruby_thread_stack_overflow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # elif !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__ || defined __amd64__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # elif defined __linux__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define USE_UCONTEXT_REG 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif defined __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define USE_UCONTEXT_REG 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # elif defined __FreeBSD__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define USE_UCONTEXT_REG 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vm_dump.c.orig 2020-03-31 04:42:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm_dump.c 2020-08-27 14:31:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -911,7 +911,7 @@ rb_dump_machine_register(const ucontext_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_machine_register(SS);
</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;'>+-# elif defined __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const mcontext_t mctx = ctx->uc_mcontext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined __x86_64__
</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 5bc090abd3a..5c336de17d5 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;'>@@ -16,7 +16,7 @@ long_description Ruby is the interpreted scripting language for quick \
</span> and easy object-oriented programming. It has many \
features to process text files and to do system \
management tasks (as in Perl). It is simple, \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- straight-forward, extensible, and portable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ straightforward, extensible, and portable.
</span>
homepage http://www.ruby-lang.org/
license {Ruby BSD}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +52,11 @@ if {${os.major} < 10} {
</span> select.group ruby
select.file ${filespath}/ruby25
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix build on 10.4 i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix build on < 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-osversions.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --enable-shared \
--enable-install-static-library \
--disable-install-doc \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby25/files/patch-osversions.diff b/lang/ruby25/files/patch-osversions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0527da6aeac
</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-osversions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./dln.c.orig 2020-03-31 05:15:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./dln.c 2020-08-29 18:03:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1333,8 +1333,7 @@ dln_load(const char *file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ex && ex != ruby_xmalloc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined __APPLE__ && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* dlclose() segfaults */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rb_fatal("%s - %s", incompatible, file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./error.c.orig 2020-03-31 05:15:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./error.c 2020-08-29 18:03:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -458,7 +458,7 @@ preface_dump(FILE *out)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-- Crash Report log information "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "--------------------------------------------\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " See Crash Report log file under the one of following:\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " * ~/Library/Logs/CrashReporter\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " * /Library/Logs/CrashReporter\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -483,7 +483,7 @@ postscript_dump(FILE *out)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "[IMPORTANT]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*" ------------------------------------------------"*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\n""Don't forget to include the Crash Report log file under\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CrashReporter or "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "DiagnosticReports directory in bug reports.\n"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby25/files/patch-tiger.diff b/lang/ruby25/files/patch-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..223ed884e0c
</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-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./signal.c.orig 2020-03-31 05:15:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./signal.c 2020-08-27 15:31:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -765,7 +765,7 @@ NORETURN(void rb_ec_stack_overflow(rb_ex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # elif !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__ || defined __amd64__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # elif defined __linux__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define USE_UCONTEXT_REG 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif defined __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define USE_UCONTEXT_REG 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # elif defined __FreeBSD__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define USE_UCONTEXT_REG 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./vm_dump.c.orig 2020-03-31 05:15:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./vm_dump.c 2020-08-27 15:31:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -898,7 +898,7 @@ rb_dump_machine_register(const ucontext_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dump_machine_register(SS);
</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;'>+-# elif defined __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const mcontext_t mctx = ctx->uc_mcontext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined __x86_64__
</span></pre><pre style='margin:0'>
</pre>