<pre style='margin:0'>
Haren S (harens) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b6a025676f284b091cce551a9340257301413385">https://github.com/macports/macports-ports/commit/b6a025676f284b091cce551a9340257301413385</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 b6a025676f2 lua: fix branched man page and reinplace warning
</span>b6a025676f2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b6a025676f284b091cce551a9340257301413385
</span>Author: harens <12570877+harens@users.noreply.github.com>
AuthorDate: Tue Jan 3 16:20:44 2023 +0000
<span style='display:block; white-space:pre;color:#404040;'> lua: fix branched man page and reinplace warning
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Branched lua executables are in the form luaBRANCH, not lua-BRANCH.
</span><span style='display:block; white-space:pre;color:#404040;'> - reinplace version number in makefile for non-branched versions only.
</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/53708
</span>---
lang/lua/Portfile | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua/Portfile b/lang/lua/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33bd34aa44a..7985b870639 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/lua/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/lua/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ long_description Lua is a powerful, light-weight programming language designe
</span> extending applications. Lua is also frequently used as a general-purpose, \
standalone language.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.lua.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.lua.org/
</span> master_sites ${homepage}ftp/
checksums rmd160 cc715df991bccaec75a022404902200d984b002e \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ patchfiles patch-Makefile.diff \
</span> # TODO: also add lua50 here
subport lua52 {
version 5.2.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span> checksums rmd160 3bad2da85f354132da6a53b45882006f0a451b5c \
sha256 b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b \
size 252651
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ subport lua52 {
</span>
subport lua51 {
version 5.1.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 5
</span> checksums rmd160 b0c2234675335a8bf158a125b6778cf800c754a0 \
sha256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 \
size 221213
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,8 +71,13 @@ post-extract {
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/lua.pc ${worksrcpath}/Makefile ${worksrcpath}/src/Makefile ${worksrcpath}/src/luaconf.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/lua.pc ${worksrcpath}/Makefile ${worksrcpath}/src/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/lua.pc ${worksrcpath}/src/Makefile
</span> reinplace "s|@BRANCH@|${branch}|g" ${worksrcpath}/lua.pc ${worksrcpath}/Makefile ${worksrcpath}/src/Makefile
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://trac.macports.org/ticket/53708
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +106,8 @@ post-destroot {
</span> move $f ${f}${branch}
}
foreach f [glob ${destroot}${prefix}/share/man/man1/*] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move $f [file rootname $f]-${branch}[file extension $f]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Executables are in the form luaBRANCH rather than lua-BRANCH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move $f [file rootname $f]${branch}[file extension $f]
</span> }
# install versioned pkgconfig file
</pre><pre style='margin:0'>
</pre>