<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/9cebc9fc44cd2ab85ad574666b438479e200025b">https://github.com/macports/macports-ports/commit/9cebc9fc44cd2ab85ad574666b438479e200025b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9cebc9fc44cd2ab85ad574666b438479e200025b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Mar 11 01:23:27 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> lua: overhaul library & directory naming conventions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The upstream Makefiles do not support shared libraries.
</span><span style='display:block; white-space:pre;color:#404040;'> Most package manages patch in support for shared libraries.
</span><span style='display:block; white-space:pre;color:#404040;'> Also, many package managers support legacy versions of Lua.
</span><span style='display:block; white-space:pre;color:#404040;'> Unfortunately, there is not consensus on what the naming conventions
</span><span style='display:block; white-space:pre;color:#404040;'> of these components should be.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> For example, FreeBSD installs
</span><span style='display:block; white-space:pre;color:#404040;'> include/lua51 and
</span><span style='display:block; white-space:pre;color:#404040;'> lib/liblua-5.1.so, while
</span><span style='display:block; white-space:pre;color:#404040;'> Ubuntu installs
</span><span style='display:block; white-space:pre;color:#404040;'> include/lua5.1 and
</span><span style='display:block; white-space:pre;color:#404040;'> lib/liblua5.1.so.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://repology.org/project/lua/versions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> We choose the Ubuntu convention in part because it simplifies code
</span><span style='display:block; white-space:pre;color:#404040;'> such as `lau${...}`, where the variable can be an empty string.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> For the time being, links maintain the old structure to
</span><span style='display:block; white-space:pre;color:#404040;'> maintain compatibility.
</span>---
lang/lua/Portfile | 110 ++++++++++++++++--------------
lang/lua/files/COPYRIGHT | 32 ---------
lang/lua/files/lua_branch.pc | 10 +--
lang/lua/files/patch-src-Makefile-51.diff | 2 +-
lang/lua/files/patch-src-Makefile-52.diff | 2 +-
lang/lua/files/patch-src-Makefile-53.diff | 2 +-
lang/lua/files/patch-src-Makefile-54.diff | 2 +-
7 files changed, 68 insertions(+), 92 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 0f87e7b46a6..92ecf603d21 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;'>@@ -6,7 +6,7 @@ PortGroup makefile 1.0
</span> name lua
conflicts lua50
version 5.3.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories lang
license MIT
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,8 @@ checksums rmd160 cc715df991bccaec75a022404902200d984b002e \
</span> subport ${name} {
patchfiles patch-src-Makefile.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for default value, see ${worksrcpath}src/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compat_branch 5.1
</span> # considering the myriad of compatibility subports, it is not clear this is desirable
# added in https://github.com/macports/macports-ports/commit/6fc7473672d8bdcb06b6726cb224b860b204757d
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +36,7 @@ subport ${name} {
</span>
subport lua54 {
version 5.4.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> checksums rmd160 fc2d63300da19e1c2cdb35011034d44cfd590b0e \
sha256 164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61 \
size 360876
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +46,7 @@ subport lua54 {
</span>
subport lua53 {
version 5.3.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> checksums rmd160 cc715df991bccaec75a022404902200d984b002e \
sha256 fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60 \
size 303770
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +56,7 @@ subport lua53 {
</span>
subport lua52 {
version 5.2.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 6
</span> checksums rmd160 3bad2da85f354132da6a53b45882006f0a451b5c \
sha256 b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b \
size 252651
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +70,7 @@ subport lua52 {
</span>
subport lua51 {
version 5.1.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 8
</span> checksums rmd160 b0c2234675335a8bf158a125b6778cf800c754a0 \
sha256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 \
size 221213
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,11 +104,6 @@ if {${os.platform} ne "darwin"} {
</span> test.run yes
test.args-append DYLD_LIBRARY_PATH=${worksrcpath}/src
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${filespath}/COPYRIGHT \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch { if {[file exists ${worksrcpath}/src/luaconf.h]} {
reinplace "s|/usr/local|${prefix}|g" \
${worksrcpath}/src/luaconf.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,54 +125,22 @@ destroot.args-append INSTALL_TOP=${destroot}${prefix} \
</span> INSTALL_MAN=${destroot}${prefix}/share/man/man1
if {${subport} ne ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append MACPORTS_SHARED_LIB=liblua-${branch}.${dylib_suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append MACPORTS_SHARED_LIB=liblua${branch}.${dylib_suffix} \
</span> MACPORTS_BRANCH=${branch} \
<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:#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:#ffe0e0;'>- destroot.args-append MACPORTS_SHARED_LIB=liblua-${branch}.${dylib_suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_INC=${destroot}${prefix}/include/lua-${branch} \
</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:#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> } else {
build.args-append MACPORTS_SHARED_LIB=liblua.${dylib_suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MACPORTS_BRANCH=${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACPORTS_BRANCH=${compat_branch}
</span>
destroot.args-append MACPORTS_SHARED_LIB=liblua.${dylib_suffix}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/src/liblua.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s liblua.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/liblua.${branch}.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s liblua.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/liblua.${version}.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/lib/lua-${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/src/liblua-${branch}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/lua-${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/src/liblua.so \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s liblua.so \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/liblua-${branch}.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s liblua.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/liblua-${version}.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/lib/lua-${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/src/liblua-${branch}.so \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/lua-${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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:#e0e0e0;'>@@ -194,10 +159,18 @@ post-destroot {
</span>
if {${subport} ne ${name}} {
set pcinfile lua_branch.pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set pcfile lua-${branch}.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pcfile lua${branch}.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libs ${worksrcpath}/src/liblua${branch}.${dylib_suffix}
</span> } else {
set pcinfile lua.pc
set pcfile lua.pc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libs ${worksrcpath}/src/liblua.${dylib_suffix}
</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 shared library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f ${libs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${f} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/
</span> }
# install pkgconfig file
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -209,6 +182,29 @@ post-destroot {
</span> }
if {${subport} ne ${name}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in case port needs all lua files in one directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/libexec/${subport}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -tail -directory ${destroot}${prefix}/include/lua${branch} *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/include/lua${branch}/${f} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/libexec/${subport}/include/${f}
</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;'>+ xinstall -d -m 0755 ${destroot}${prefix}/libexec/${subport}/lib/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -tail -directory ${destroot}${prefix}/lib *.${dylib_suffix} *.a] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/${f} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/libexec/${subport}/lib/[string map "${branch} {}" ${f}]
</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;'>+ xinstall -d -m 0755 ${destroot}${prefix}/libexec/${subport}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/pkgconfig/lua${branch}.pc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/libexec/${subport}/lib/pkgconfig/lua.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/libexec/${subport}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -tail -directory ${destroot}${prefix}/bin *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/bin/${f}${branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/libexec/${subport}/bin/[string map "${branch} {}" ${f}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>@@ -216,6 +212,18 @@ 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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this is for compatibly only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # once all ports have been successfully moved to the new structure, this can be removed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/lua-${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ../liblua${branch}.${dylib_suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/lua-${branch}/liblua-${branch}.${dylib_suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s lua${branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/include/lua-${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s lua${branch}.pc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/pkgconfig/lua-${branch}.pc
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua/files/COPYRIGHT b/lang/lua/files/COPYRIGHT
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5214f885fbb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/lua/files/COPYRIGHT
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Lua License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Lua is licensed under the terms of the MIT license reproduced below.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This means that Lua is free software and can be used for both academic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and commercial purposes at absolutely no cost.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-For details and rationale, see http://www.lua.org/license.html .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===============================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Copyright (C) 1994-2013 Lua.org, PUC-Rio.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Permission is hereby granted, free of charge, to any person obtaining a copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-of this software and associated documentation files (the "Software"), to deal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-in the Software without restriction, including without limitation the rights
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-copies of the Software, and to permit persons to whom the Software is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-furnished to do so, subject to the following conditions:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The above copyright notice and this permission notice shall be included in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-all copies or substantial portions of the Software.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-THE SOFTWARE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===============================================================================
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua/files/lua_branch.pc b/lang/lua/files/lua_branch.pc
</span><span style='display:block; white-space:pre;color:#808080;'>index 3885d2f06fe..4f4028f67d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/lua/files/lua_branch.pc
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/lua/files/lua_branch.pc
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,20 +6,20 @@ R= @VERSION@
</span> # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
prefix= @PREFIX@
INSTALL_BIN= ${prefix}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALL_INC= ${prefix}/include/lua-${V}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALL_LIB= ${prefix}/lib/lua-${V}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALL_INC= ${prefix}/include/lua${V}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALL_LIB= ${prefix}/lib
</span> INSTALL_MAN= ${prefix}/man/man1
INSTALL_LMOD= ${prefix}/share/lua/${V}
INSTALL_CMOD= ${prefix}/lib/lua/${V}
# canonical vars
exec_prefix=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-libdir=${exec_prefix}/lib/lua-${V}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-includedir=${prefix}/include/lua-${V}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libdir=${exec_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+includedir=${prefix}/include/lua${V}
</span>
Name: Lua
Description: An Extensible Extension Language
Version: ${R}
Requires:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Libs: -L${libdir} -llua-${V} -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Libs: -L${libdir} -llua${V} -lm
</span> Cflags: -I${includedir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua/files/patch-src-Makefile-51.diff b/lang/lua/files/patch-src-Makefile-51.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1985e845c1e..e19a36d54c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/lua/files/patch-src-Makefile-51.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/lua/files/patch-src-Makefile-51.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span> a: $(ALL_A)
+%.dylib: $(CORE_O) $(LIB_O)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -o $@ -dynamiclib $(LDFLAGS) $^ -install_name $(MACPORTS_PREFIX)/lib/lua-$(MACPORTS_BRANCH)/$(MACPORTS_SHARED_LIB) -compatibility_version $(MACPORTS_BRANCH) -current_version $(MACPORTS_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -o $@ -dynamiclib $(LDFLAGS) $^ -install_name $(MACPORTS_PREFIX)/lib/$(MACPORTS_SHARED_LIB) -compatibility_version $(MACPORTS_BRANCH) -current_version $(MACPORTS_VERSION)
</span> +
+%.so: $(CORE_O) $(LIB_O)
+ $(CC) -o $@ -shared $(LDFLAGS) $^ -ldl -lm -Wl,-soname,$(MACPORTS_SHARED_LIB)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua/files/patch-src-Makefile-52.diff b/lang/lua/files/patch-src-Makefile-52.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3be9074ef21..a50f818ccdf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/lua/files/patch-src-Makefile-52.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/lua/files/patch-src-Makefile-52.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span> a: $(ALL_A)
+%.dylib: $(BASE_O)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -o $@ -dynamiclib $(LDFLAGS) $^ -install_name $(MACPORTS_PREFIX)/lib/lua-$(MACPORTS_BRANCH)/$(MACPORTS_SHARED_LIB) -compatibility_version $(MACPORTS_BRANCH) -current_version $(MACPORTS_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -o $@ -dynamiclib $(LDFLAGS) $^ -install_name $(MACPORTS_PREFIX)/lib/$(MACPORTS_SHARED_LIB) -compatibility_version $(MACPORTS_BRANCH) -current_version $(MACPORTS_VERSION)
</span> +
+%.so: $(BASE_O)
+ $(CC) -o $@ -shared $(LDFLAGS) $^ -ldl -lm -Wl,-soname,$(MACPORTS_SHARED_LIB)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua/files/patch-src-Makefile-53.diff b/lang/lua/files/patch-src-Makefile-53.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d6731bb8fda..6def6909829 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/lua/files/patch-src-Makefile-53.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/lua/files/patch-src-Makefile-53.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span> a: $(ALL_A)
+%.dylib: $(BASE_O)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -o $@ -dynamiclib $(LDFLAGS) $^ -install_name $(MACPORTS_PREFIX)/lib/lua-$(MACPORTS_BRANCH)/$(MACPORTS_SHARED_LIB) -compatibility_version $(MACPORTS_BRANCH) -current_version $(MACPORTS_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -o $@ -dynamiclib $(LDFLAGS) $^ -install_name $(MACPORTS_PREFIX)/lib/$(MACPORTS_SHARED_LIB) -compatibility_version $(MACPORTS_BRANCH) -current_version $(MACPORTS_VERSION)
</span> +
+%.so: $(BASE_O)
+ $(CC) -o $@ -shared $(LDFLAGS) $^ -ldl -lm -Wl,-soname,$(MACPORTS_SHARED_LIB)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua/files/patch-src-Makefile-54.diff b/lang/lua/files/patch-src-Makefile-54.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 89fd99c6c39..729a14fcbe7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/lua/files/patch-src-Makefile-54.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/lua/files/patch-src-Makefile-54.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span> a: $(ALL_A)
+%.dylib: $(BASE_O)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -o $@ -dynamiclib $(LDFLAGS) $^ -install_name $(MACPORTS_PREFIX)/lib/lua-$(MACPORTS_BRANCH)/$(MACPORTS_SHARED_LIB) -compatibility_version $(MACPORTS_BRANCH) -current_version $(MACPORTS_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -o $@ -dynamiclib $(LDFLAGS) $^ -install_name $(MACPORTS_PREFIX)/lib/$(MACPORTS_SHARED_LIB) -compatibility_version $(MACPORTS_BRANCH) -current_version $(MACPORTS_VERSION)
</span> +
+%.so: $(BASE_O)
+ $(CC) -o $@ -shared $(LDFLAGS) $^ -ldl -lm -Wl,-soname,$(MACPORTS_SHARED_LIB)
</pre><pre style='margin:0'>
</pre>