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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/787715cff1ad421ccc0e2a242ebacff2a56ee0a8">https://github.com/macports/macports-ports/commit/787715cff1ad421ccc0e2a242ebacff2a56ee0a8</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 787715cff1a nginx-devel-lua: fix build of dynamic module
</span>787715cff1a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 787715cff1ad421ccc0e2a242ebacff2a56ee0a8
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Tue May 23 16:12:48 2023 -0500

<span style='display:block; white-space:pre;color:#404040;'>    nginx-devel-lua: fix build of dynamic module
</span>---
 www/nginx-devel/Portfile                    | 16 +++++++++++++++-
 www/nginx-devel/files/patch-lua_config.diff | 16 ++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nginx-devel/Portfile b/www/nginx-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1074ef37b52..907bd16f2da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nginx-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nginx-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +55,8 @@ proc nginx_set_portfile_var {var_name new_value} {
</span>     set portfile_var   $new_value
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# portfile-scoped vars for variant routines to re-def and use in port-stages (post-extract, pre-patch, etc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set nginx_lua_mod_dirname      ""
</span> 
 configure.args-append \
                     --with-cc-opt=\"${configure.cppflags} ${configure.cflags}\" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,7 +178,7 @@ subport ${name}-lua {
</span>     depends_lib-append      port:luajit-openresty
     set ngx_lua_filename    lua-nginx-module
     set ngx_lua_version     0.10.24
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision                1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision                2
</span>     set ngx_lua_distname    ${ngx_lua_filename}-${ngx_lua_version}
     distfiles-append        v${ngx_lua_version}.tar.gz:lua_module
     checksums-append        v${ngx_lua_version}.tar.gz \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,6 +191,18 @@ subport ${name}-lua {
</span>     configure.env           LUAJIT_LIB=${prefix}/lib
     configure.args-append   --add-dynamic-module=${workpath}/${ngx_lua_distname}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    nginx_set_portfile_var  nginx_lua_mod_dirname    "${ngx_lua_distname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append       patch-lua_config.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # patch routine balks on file names with "../", but rel-paths in patchfiles start from $worksrcpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    pre-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ln -s   "${workpath}/${nginx_lua_mod_dirname}" "${worksrcpath}/ngx_lua_distname.tmp"
</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;'>+        file delete   "${worksrcpath}/ngx_lua_distname.tmp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     destroot {
         xinstall -d -m 0755 ${destroot}${nginx_moduledir}
         move ${worksrcpath}/objs/ngx_http_lua_module.so ${destroot}${nginx_moduledir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nginx-devel/files/patch-lua_config.diff b/www/nginx-devel/files/patch-lua_config.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d0ee9e94a9b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nginx-devel/files/patch-lua_config.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;'>+--- ngx_lua_distname.tmp/config.orig       2023-03-21 08:51:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ngx_lua_distname.tmp/config    2023-05-23 16:01:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,10 +94,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     case "$NGX_PLATFORM" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         Darwin:*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             case "$NGX_MACHINE" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                amd64 | x86_64 | i386)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                amd64 | arm64 | x86_64 | i386)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     echo "adding extra linking options needed by LuaJIT on $NGX_MACHINE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    luajit_ld_opt="$luajit_ld_opt -pagezero_size 10000 -image_base 100000000"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    ngx_feature_libs="$ngx_feature_libs -pagezero_size 10000 -image_base 100000000"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                    #luajit_ld_opt="$luajit_ld_opt -pagezero_size 10000 -image_base 100000000"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                    #ngx_feature_libs="$ngx_feature_libs -pagezero_size 10000 -image_base 100000000"
</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>