<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/45ec0bff91e7450c96d1c907e87a2aac20dcc5fb">https://github.com/macports/macports-ports/commit/45ec0bff91e7450c96d1c907e87a2aac20dcc5fb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 45ec0bff91e7450c96d1c907e87a2aac20dcc5fb
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Jan 5 14:01:28 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> ruby31: avoid unneccessary version number duplication
</span>---
lang/ruby31/Portfile | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby31/Portfile b/lang/ruby31/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 35a1c8b3459..b9338c56f7a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby31/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby31/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,11 @@ PortGroup select 1.0
</span> PortGroup openssl 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name ruby31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ruby_ver 3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ruby_patch 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ruby_ver_nodot [string map {. {}} ${ruby_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name ruby${ruby_ver_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version ${ruby_ver}.${ruby_patch}
</span> revision 1
categories lang ruby
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +26,9 @@ long_description Ruby is the interpreted scripting language for quick \
</span> homepage https://www.ruby-lang.org/
license {Ruby BSD}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ruby:3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ruby:${ruby_ver}
</span> distname ruby-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ruby31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ruby${ruby_ver_nodot}
</span>
checksums rmd160 4175d37483e03440a71a397cde94fd52f8582a4b \
sha256 50a0504c6edcb4d61ce6b8cfdbddaa95707195fab0ecd7b5e92654b2a9412854 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +49,7 @@ depends_build port:pkgconfig port:cctools
</span> depends_skip_archcheck pkgconfig
select.group ruby
<span style='display:block; white-space:pre;background:#ffe0e0;'>-select.file ${filespath}/ruby31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+select.file ${filespath}/ruby${ruby_ver_nodot}
</span>
#----------------------------------------------------------------------------------------
# Fix compilation on buildbots for 10.12 and earlier.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,9 +67,9 @@ configure.args --enable-shared \
</span> --enable-pthread \
--without-gmp \
--with-opt-dir="${prefix}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --program-suffix=3.1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-rubyhdrdir=${prefix}/include/ruby-3.1.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-rubylibprefix="${prefix}/lib/ruby3.1" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --program-suffix=${ruby_ver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-rubyhdrdir=${prefix}/include/ruby-${version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-rubylibprefix="${prefix}/lib/ruby${ruby_ver}" \
</span> --with-openssl-dir=[openssl::install_area] \
--without-baseruby
# prefer Apple cctools to GNU binutils, build with binutils may fail.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,17 +85,17 @@ if {[info exists build_arch] && ${build_arch} != ""} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # rewrite "gem" to "gem3.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rewrite "gem" to "gem${ruby_ver}"
</span> # def gem_command
# ENV["GEM_COMMAND"]&.shellsplit || ["gem"]
# end
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s/(shellsplit .. .)(\"gem\")/\\1\"gem3.1\"/g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s/(shellsplit .. .)(\"gem\")/\\1\"gem${ruby_ver}\"/g" \
</span> ${worksrcpath}/lib/bundler/gem_helper.rb
}
post-destroot {
foreach type {site vendor} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libdir ${destroot}${prefix}/lib/ruby3.1/${type}_ruby/3.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libdir ${destroot}${prefix}/lib/ruby${ruby_ver}/${type}_ruby/${version}
</span> xinstall -m 0755 -d ${libdir}
foreach subdir [exec find ${libdir} -type d -empty] {
destroot.keepdirs-append ${subdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,8 +103,8 @@ post-destroot {
</span> }
# install destination of commands from port:rb31*
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${destroot}${prefix}/libexec/ruby3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.keepdirs-append ${destroot}${prefix}/libexec/ruby3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${prefix}/libexec/ruby${ruby_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.keepdirs-append ${destroot}${prefix}/libexec/ruby${ruby_ver}
</span> }
notes-append "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,5 +150,5 @@ platform darwin {
</span>
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://cache.ruby-lang.org/pub/ruby/3.1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://cache.ruby-lang.org/pub/ruby/${ruby_ver}/
</span> livecheck.regex ruby-(3\\.0\\.\\d+)[quotemeta ${extract.suffix}]
</pre><pre style='margin:0'>
</pre>