<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7c254def2129196a6d102a18cf14653aa73e4232">https://github.com/macports/macports-ports/commit/7c254def2129196a6d102a18cf14653aa73e4232</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7c254def2129196a6d102a18cf14653aa73e4232
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Mar 12 12:50:35 2023 -0700

<span style='display:block; white-space:pre;color:#404040;'>    luarocks-1.1: help port find versioned Lua directory
</span>---
 _resources/port1.0/group/luarocks-1.1.tcl | 44 ++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/luarocks-1.1.tcl b/_resources/port1.0/group/luarocks-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 051a5a01b56..8d92a47f701 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/luarocks-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/luarocks-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +49,11 @@ default luarocks.lua_path                       {?.lua ../?.lua ../src/?.lua}
</span> options luarocks.lua_cpath
 default luarocks.lua_cpath                      {?.so ../?.so}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# indicates that the rock requires information from the versioned Lua directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# e.g., lua.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options luarocks.search_lua_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default luarocks.search_lua_dir                 {no}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # set defaults appropriate for rocks downloaded from luarocks.org
 
 default build.cmd                               {${prefix}/bin/luarocks}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,7 +158,6 @@ proc luarocks::callback {} {
</span>     foreach branch [option luarocks.branches] {
         set branch_no_dot                       [join [split ${branch} .] ""]
         set subport_name                        lua${branch_no_dot}-${subname}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        set lua_dir                             [option prefix]/libexec/lua${branch_no_dot}
</span> 
         subport                                 ${subport_name} {}
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,6 +178,44 @@ proc luarocks::callback {} {
</span> 
             # do not run livecheck on subports
             livecheck.type                      none
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[option luarocks.search_lua_dir]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # attempt to have port find correct Lua version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set lua_dir                     [option prefix]/libexec/lua${branch_no_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                configure.cppflags-delete       -I${lua_dir}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                configure.cppflags-prepend      -I${lua_dir}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                configure.ldflags-delete        -L${lua_dir}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                configure.ldflags-prepend       -L${lua_dir}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                compiler.cpath-delete           ${lua_dir}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                compiler.cpath-prepend          ${lua_dir}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                compiler.library_path-delete    ${lua_dir}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                compiler.library_path-prepend   ${lua_dir}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                configure.pkg_config_path-delete    ${lua_dir}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                configure.pkg_config_path-prepend   ${lua_dir}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                foreach stage {configure build destroot test} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set path_save               ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {[exists ${stage}.env]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        foreach e [option ${stage}.env] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            if {[string range ${e} 0 4] eq "PATH="} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                set path_save   [string range ${e} 5 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {${path_save} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${stage}.env-replace    PATH=${path_save} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                                PATH=${lua_dir}/bin:${path_save}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${stage}.env-append     PATH=${lua_dir}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span>         }
     }
 
</pre><pre style='margin:0'>

</pre>