<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/f5a24d74822aa0918ab1802ec02776d24db8bbe0">https://github.com/macports/macports-ports/commit/f5a24d74822aa0918ab1802ec02776d24db8bbe0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f5a24d74822aa0918ab1802ec02776d24db8bbe0
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Mar 11 01:04:01 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> lua: refactor Portfile
</span>---
lang/lua/Portfile | 108 ++++++++++++----------
lang/lua/files/{lua-branched.pc => lua_branch.pc} | 0
2 files changed, 58 insertions(+), 50 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 811927c37f9..0f87e7b46a6 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,8 +15,8 @@ long_description Lua is a {*}${description} designed for \
</span> extending applications. Lua is also frequently used as a general-purpose, \
standalone language.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.lua.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}ftp/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.lua.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}/ftp
</span>
checksums rmd160 cc715df991bccaec75a022404902200d984b002e \
sha256 fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,6 +80,8 @@ subport lua51 {
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:readline
if {${os.platform} eq "darwin"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,42 +105,46 @@ test.args-append DYLD_LIBRARY_PATH=${worksrcpath}/src
</span> post-extract {
xinstall -m 0644 ${filespath}/COPYRIGHT \
${worksrcpath}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${filespath}/lua.pc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${filespath}/lua-branched.pc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/lua.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {var val} "@BRANCH@ ${branch} @VERSION@ ${version} @PREFIX@ ${prefix}" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${var}|${val}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/lua.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch { if {[file exists ${worksrcpath}/src/luaconf.h]} {
</span> reinplace "s|/usr/local|${prefix}|g" \
${worksrcpath}/src/luaconf.h
<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 {${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dylib_suffix dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dylib_suffix so
</span> }
build.args-append MACPORTS_PREFIX=${prefix} \
MYCFLAGS="\$CPPFLAGS \$CFLAGS" \
MYLDFLAGS="\$LDFLAGS" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MACPORTS_VERSION=${version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MACPORTS_BRANCH=${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACPORTS_VERSION=${version}
</span>
destroot.args-append INSTALL_TOP=${destroot}${prefix} \
MACPORTS_VERSION=${version} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MACPORTS_BRANCH=${branch} \
</span> INSTALL_MAN=${destroot}${prefix}/share/man/man1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${subport} ne ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append INSTALL_INC=${destroot}${prefix}/include/lua-${branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_LIB=${destroot}${prefix}/lib/lua-${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append MACPORTS_SHARED_LIB=liblua-${branch}.${dylib_suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACPORTS_BRANCH=${branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TO_LIB=liblua-${branch}.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LUA_A=liblua-${branch}.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append MACPORTS_SHARED_LIB=liblua-${branch}.${dylib_suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_INC=${destroot}${prefix}/include/lua-${branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TO_LIB=liblua-${branch}.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LUA_A=liblua-${branch}.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append MACPORTS_SHARED_LIB=liblua.${dylib_suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACPORTS_BRANCH=${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append MACPORTS_SHARED_LIB=liblua.${dylib_suffix}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append MACPORTS_SHARED_LIB=liblua.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append MACPORTS_SHARED_LIB=liblua.dylib
</span> post-destroot {
xinstall -m 0755 ${worksrcpath}/src/liblua.dylib \
${destroot}${prefix}/lib/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,20 +154,12 @@ if {${os.platform} eq "darwin" && ${subport} eq ${name}} {
</span> ${destroot}${prefix}/lib/liblua.${version}.dylib
}
} elseif {${os.platform} eq "darwin"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append MACPORTS_SHARED_LIB=liblua-${branch}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TO_LIB=liblua-${branch}.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUA_A=liblua-${branch}.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append MACPORTS_SHARED_LIB=liblua-${branch}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TO_LIB=liblua-${branch}.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUA_A=liblua-${branch}.a
</span> post-destroot {
xinstall -d -m 0755 ${destroot}${prefix}/lib/lua-${branch}
xinstall -m 0755 ${worksrcpath}/src/liblua-${branch}.dylib \
${destroot}${prefix}/lib/lua-${branch}
}
} elseif {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append MACPORTS_SHARED_LIB=liblua.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append MACPORTS_SHARED_LIB=liblua.so
</span> post-destroot {
xinstall -m 0755 ${worksrcpath}/src/liblua.so \
${destroot}${prefix}/lib/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,12 +169,6 @@ if {${os.platform} eq "darwin" && ${subport} eq ${name}} {
</span> ${destroot}${prefix}/lib/liblua-${version}.so
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append MACPORTS_SHARED_LIB=liblua-${branch}.so \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TO_LIB=liblua-${branch}.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUA_A=liblua-${branch}.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append MACPORTS_SHARED_LIB=liblua-${branch}.so \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TO_LIB=liblua-${branch}.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUA_A=liblua-${branch}.a
</span> post-destroot {
xinstall -d -m 0755 ${destroot}${prefix}/lib/lua-${branch}
xinstall -m 0755 ${worksrcpath}/src/liblua-${branch}.so \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,20 +176,39 @@ if {${os.platform} eq "darwin" && ${subport} eq ${name}} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
# documentation
set docdir ${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f {COPYRIGHT README} { if {[file exists ${worksrcpath}/${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/${f} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> xinstall -d -m 0755 ${destroot}${docdir}/html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} COPYRIGHT README ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach html [glob ${worksrcpath}/doc/*.html ${worksrcpath}/doc/*.css ${worksrcpath}/doc/*.gif ${worksrcpath}/doc/*.png] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${html} ${destroot}${docdir}/html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -directory ${worksrcpath}/doc *.html *.css *.gif *.png] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${f} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${docdir}/html
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -W ${worksrcpath} -m 0644 lua.pc ${destroot}${prefix}/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pcinfile lua_branch.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pcfile lua-${branch}.pc
</span> } else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pcinfile lua.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pcfile lua.pc
</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;'>+ # install pkgconfig file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${filespath}/${pcinfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/pkgconfig/${pcfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {var val} "@BRANCH@ ${branch} @VERSION@ ${version} @PREFIX@ ${prefix}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|${var}|${val}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/pkgconfig/${pcfile}
</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 {${subport} ne ${name}} {
</span> # version executable and man pages files
foreach f [glob ${destroot}${prefix}/bin/*] {
move $f ${f}${branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,17 +216,14 @@ post-destroot {
</span> foreach f [glob ${destroot}${prefix}/share/man/man1/*] {
move $f [file rootname $f]${branch}[file extension $f]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install versioned pkgconfig file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/lua.pc ${destroot}${prefix}/lib/pkgconfig/lua-${branch}.pc
</span> }
}
livecheck.type regex
livecheck.url ${master_sites}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Main lua port livecheck shouldn't be limited by the branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {lua-(\d+(?:\.\d+)*)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# main lua port livecheck shouldn't be limited by the branch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne ${name}} {
</span> livecheck.regex lua-(${branch}\.\[0-9]+)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {lua-(\d+(?:\.\d+)*)}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua/files/lua-branched.pc b/lang/lua/files/lua_branch.pc
</span>similarity index 100%
rename from lang/lua/files/lua-branched.pc
rename to lang/lua/files/lua_branch.pc
</pre><pre style='margin:0'>
</pre>