<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/bf80dad3ce605bd1ba19e553b3745cfb7827252b">https://github.com/macports/macports-ports/commit/bf80dad3ce605bd1ba19e553b3745cfb7827252b</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 bf80dad3ce6 nginx: Make variants work again
</span>bf80dad3ce6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bf80dad3ce605bd1ba19e553b3745cfb7827252b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu May 12 02:15:29 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> nginx: Make variants work again
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The fix for https://trac.macports.org/ticket/65150 had the unintended
</span><span style='display:block; white-space:pre;color:#404040;'> consequence that the configure arguments from all variants were ignored.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In Tcl, "#" only starts a comment at the beginning of a line, so the "#
</span><span style='display:block; white-space:pre;color:#404040;'> pcre2 breaks the lua module" comment was added to the configure args
</span><span style='display:block; white-space:pre;color:#404040;'> literally. Configure args for the variants were added after that, but
</span><span style='display:block; white-space:pre;color:#404040;'> because the shell recognizes "#" as a comment character anywhere in the
</span><span style='display:block; white-space:pre;color:#404040;'> line, all those added configure args were ignored.
</span>---
www/nginx/Portfile | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nginx/Portfile b/www/nginx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 909b5fe164d..4483e116686 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nginx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nginx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,9 +4,8 @@ PortSystem 1.0
</span>
name nginx
version 1.21.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories www mail
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license BSD
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +77,10 @@ configure.args-append \
</span> --http-proxy-temp-path=${nginx_rundir}/proxy_temp \
--http-fastcgi-temp-path=${nginx_rundir}/fastcgi_temp \
--http-uwsgi-temp-path=${nginx_rundir}/uwsgi_temp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-pcre2 # pcre2 breaks the lua module (#65150)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pcre2 breaks the lua module (https://trac.macports.org/ticket/65150)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-pcre2
</span>
# remove --disable-dependency-tracking
configure.universal_args-delete --disable-dependency-tracking
</pre><pre style='margin:0'>
</pre>