<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cbf02f422c28b2c277b6f021058bfff2769248e4">https://github.com/macports/macports-ports/commit/cbf02f422c28b2c277b6f021058bfff2769248e4</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 cbf02f422c2 rb-cocoa: Update to 1.2.0
</span>cbf02f422c2 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit cbf02f422c28b2c277b6f021058bfff2769248e4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Aug 2 01:14:21 2021 -0500

<span style='display:block; white-space:pre;color:#404040;'>    rb-cocoa: Update to 1.2.0
</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/56299
</span>---
 ruby/rb-cocoa/Portfile                             | 43 ++++++++++++----------
 .../files/patch-ext-rubycocoa-extconf.rb.in.diff   |  8 ++--
 ruby/rb-cocoa/files/patch-install.rb.diff          | 14 -------
 ruby/rb-cocoa/files/patch-pre-config.rb.diff       | 35 ++++++++++++++++++
 4 files changed, 61 insertions(+), 39 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-cocoa/Portfile b/ruby/rb-cocoa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bbd236dfd97..44781066b41 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ruby/rb-cocoa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ruby/rb-cocoa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,12 @@
</span> PortSystem                1.0
 PortGroup              ruby 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ruby.setup              {cocoa rubycocoa} 1.0.6 install.rb {ChangeLog ReadMe.html}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ruby.setup         {cocoa rubycocoa} 1.2.0 install.rb {ChangeLog ReadMe.md}
</span> revision          0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums               rmd160  8c0c6e89e6ec5893466717d22952bf8d3f463af2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           sha256  fc8dc7cc130a87c9f45b039381f974e52aaff23bfdbfa71b250040d7672653e9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           size    1966211
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> maintainers               {kimuraw @kimuraw}
 description            Ruby bindings for writing cocoa programs
 long_description       RubyCocoa is a Ruby library for using Cocoa Objects \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,35 +16,34 @@ long_description     RubyCocoa is a Ruby library for using Cocoa Objects \
</span>                                   develop small scale simple Cocoa applications and \
                                        such.
 categories-append      devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage                http://${ruby.project}.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage           https://${ruby.project}.github.io
</span> license                   {LGPL Ruby}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites    sourceforge:${ruby.project}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites       sourceforge:project/${ruby.project}/RubyCocoa/${version}/
</span> distname          RubyCocoa-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums               md5 ddc0b4e033e70bbdd8d59901e9631d23 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           rmd160 6dff7373e73924e266d1f760650db97d321d23dc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           sha1 5ab73bceaec2b36955f49f405a9d6001dc01ce15
</span> platforms         darwin
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           port:libffi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           port:libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # fix #16928: allow non Mac OS X's make, like gmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append       patch-ext-rubycocoa-extconf.rb.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append  patch-ext-rubycocoa-extconf.rb.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                   patch-pre-config.rb.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/pre-config.rb
</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;'>+use_xcode          yes
</span> 
 configure.args         --install-prefix=${destroot}${prefix} \
                                        --install-root=${destroot}${prefix} \
                                        --documentation=/share/doc/${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                        --examples=/share/doc/${name}/examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                   --examples=/share/doc/${name}/examples \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                   --sdkroot=${configure.sdkroot}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# apply universal_archs or build_arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   if {[info exists configure.universal_archs] && ${configure.universal_archs} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           configure.args-append --target-archs="${configure.universal_archs}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   if {[info exists configure.build_arch] && ${configure.build_arch} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           configure.args-append --target-archs="${configure.build_arch}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   configure.args-append --target-archs="[get_canonical_archs]"
</span> }
 
 #test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-cocoa/files/patch-ext-rubycocoa-extconf.rb.in.diff b/ruby/rb-cocoa/files/patch-ext-rubycocoa-extconf.rb.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c80f5fccb05..05f6a8d7a06 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ruby/rb-cocoa/files/patch-ext-rubycocoa-extconf.rb.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ruby/rb-cocoa/files/patch-ext-rubycocoa-extconf.rb.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: ext/rubycocoa/extconf.rb.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/rubycocoa/extconf.rb.in    (revision 2219)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/rubycocoa/extconf.rb.in    (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,3 +21,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/rubycocoa/extconf.rb.in.orig       2013-10-12 14:05:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/rubycocoa/extconf.rb.in    2021-08-02 00:35:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,3 +37,13 @@
</span>  create_makefile('rubycocoa')
  command "mv -f Makefile Makefile.bak"
  command "sed -e 's/-no-cpp-precomp//' -e 's/-no-precomp//' Makefile.bak > Makefile"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-cocoa/files/patch-install.rb.diff b/ruby/rb-cocoa/files/patch-install.rb.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index abfd558d01b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ruby/rb-cocoa/files/patch-install.rb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- install.rb.orig        2009-09-21 00:15:47.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ install.rb     2011-08-07 15:23:54.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -649,8 +649,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       sys_version = `uname -r`.to_f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       if sys_version < 8.0 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         xcode_version = 0 # <= Xcode 1.5 on MacOS X 10.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+      elsif sys_version >= 11.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        xcode_version = 620 # Lion uses Xcode 4.1 or later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       elsif /DevToolsCore-(\d+)/.match(`#{buildcommand} -version`)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        xcode_version = $1.to_i
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        xcode_version = $1.to_i # Xcode 2.x or 3.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         xcode_version = 0 # unknown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       end
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-cocoa/files/patch-pre-config.rb.diff b/ruby/rb-cocoa/files/patch-pre-config.rb.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b35a1599228
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ruby/rb-cocoa/files/patch-pre-config.rb.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use MacPorts libffi and libxml2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pre-config.rb.orig     2014-07-18 09:41:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pre-config.rb  2021-08-02 00:58:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,9 +51,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   File.exist?(File.join(sdkroot, path))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if lib_exist?('/usr/include/libxml2') and lib_exist?('/usr/lib/libxml2.dylib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if File.exist?('@PREFIX@/include/libxml2') and File.exist?('@PREFIX@/lib/libxml2.dylib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   cflags << ' -DHAS_LIBXML2 '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  other_header_search_paths << '/usr/include/libxml2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  other_header_search_paths << '@PREFIX@/include/libxml2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ldflags << ' -lxml2 '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   raise "ERROR: libxml2 not found!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,15 +62,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ raise 'ERROR: ruby must be built as a shared library' if RbConfig::CONFIG["ENABLE_SHARED"] != 'yes'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add the libffi library to the build process.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if !lib_exist?('/usr/lib/libffi.a') and !lib_exist?('/usr/lib/libffi.dylib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  if lib_exist?('/usr/local/lib/libffi.a') and lib_exist?('/usr/local/include/ffi')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    cflags << ' -I/usr/local/include/ffi '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    ldflags << ' -L/usr/local/lib '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    raise "ERROR: libffi not found!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if File.exist?('@PREFIX@/lib/libffi.dylib') and File.exist?('@PREFIX@/include/ffi.h')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  cflags << ' -I@PREFIX@/include '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  ldflags << ' -L@PREFIX@/lib '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  other_header_search_paths << '/usr/include/ffi'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  raise "ERROR: libffi not found!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cflags << ' -DMACOSX '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ldflags << ' -lffi '
</span></pre><pre style='margin:0'>

</pre>