<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/04e842b9e294fdd83ff392bae78f3288358401b4">https://github.com/macports/macports-ports/commit/04e842b9e294fdd83ff392bae78f3288358401b4</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 04e842b9e29 lua51: convert to subport
</span>04e842b9e29 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 04e842b9e294fdd83ff392bae78f3288358401b4
</span>Author: harens <12570877+harens@users.noreply.github.com>
AuthorDate: Tue Jan 3 12:42:35 2023 +0000
<span style='display:block; white-space:pre;color:#404040;'> lua51: convert to subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fix livecheck for branched lua
</span>---
lang/lua/Portfile | 52 +++++++------
lang/lua/files/5.2/COPYRIGHT | 32 --------
lang/lua/files/5.2/lua.pc | 25 -------
.../files/patch-Makefile-51.diff} | 15 +---
.../files/patch-src-Makefile-51.diff} | 12 +--
lang/lua/files/patch-src-luaconf.h-51.diff | 11 +++
lang/lua51/Portfile | 85 ----------------------
lang/lua51/files/patch-etc_lua.pc.diff | 33 ---------
8 files changed, 50 insertions(+), 215 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 a9b7afaff5d..79dce7731a7 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;'>@@ -26,17 +26,13 @@ patchfiles patch-Makefile.diff \
</span> patch-src-Makefile.diff \
patch-src-luaconf.h.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: fixme (a different livecheck is needed for different subports)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${master_sites}
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: also add lua50 and lua51 here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: also add lua50 here
</span> subport lua52 {
version 5.2.4
revision 2
checksums rmd160 3bad2da85f354132da6a53b45882006f0a451b5c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 252651
</span>
patchfiles patch-Makefile-52.diff \
patch-src-Makefile-52.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +43,18 @@ subport lua52 {
</span> patchfiles-append \
patch-src-liolib-tiger.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</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;'>+subport lua51 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.1.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b0c2234675335a8bf158a125b6778cf800c754a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 221213
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-Makefile-51.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-Makefile-51.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-luaconf.h-51.diff
</span> }
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +65,10 @@ build.target macosx
</span> test.run yes
test.env DYLD_LIBRARY_PATH=./lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${filespath} COPYRIGHT lua.pc ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/lua.pc ${worksrcpath}/Makefile ${worksrcpath}/src/Makefile ${worksrcpath}/src/luaconf.h
reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/lua.pc ${worksrcpath}/Makefile ${worksrcpath}/src/Makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,22 +92,10 @@ post-destroot {
</span> foreach html [glob ${worksrcpath}/doc/*.html ${worksrcpath}/doc/*.css ${worksrcpath}/doc/*.gif ${worksrcpath}/doc/*.png] {
xinstall -m 0644 ${html} ${destroot}${docdir}/html
}
<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;'>-if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${filespath} COPYRIGHT lua.pc ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq $name} {
</span> xinstall -W ${worksrcpath} -m 0644 lua.pc ${destroot}${prefix}/lib/pkgconfig/
<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-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${filespath}/${branch} COPYRIGHT lua.pc ${worksrcpath}
</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;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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;'>@@ -110,3 +109,12 @@ if {$subport eq $name} {
</span> xinstall -m 0644 ${worksrcpath}/lua.pc ${destroot}${prefix}/lib/pkgconfig/lua-${branch}.pc
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${master_sites}
</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 eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {lua-(\d+(?:\.\d+)*)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex lua-(${branch}\.\[0-9]+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua/files/5.2/COPYRIGHT b/lang/lua/files/5.2/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/5.2/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/5.2/lua.pc b/lang/lua/files/5.2/lua.pc
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3885d2f06fe..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/lua/files/5.2/lua.pc
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# lua.pc -- pkg-config data for Lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-V= @BRANCH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-R= @VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-prefix= @PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALL_BIN= ${prefix}/bin
</span><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:#ffe0e0;'>-INSTALL_MAN= ${prefix}/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALL_LMOD= ${prefix}/share/lua/${V}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALL_CMOD= ${prefix}/lib/lua/${V}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# canonical vars
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-exec_prefix=${prefix}
</span><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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Name: Lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Description: An Extensible Extension Language
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Version: ${R}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Requires:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Libs: -L${libdir} -llua-${V} -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua51/files/patch-Makefile.diff b/lang/lua/files/patch-Makefile-51.diff
</span>old mode 100644
new mode 100755
similarity index 72%
rename from lang/lua51/files/patch-Makefile.diff
rename to lang/lua/files/patch-Makefile-51.diff
<span style='display:block; white-space:pre;color:#808080;'>index 520f277b065..37a93e89c84
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/lua51/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/lua/files/patch-Makefile-51.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +10,8 @@
</span> -INSTALL_INC= $(INSTALL_TOP)/include
-INSTALL_LIB= $(INSTALL_TOP)/lib
-INSTALL_MAN= $(INSTALL_TOP)/man/man1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALL_INC= $(INSTALL_TOP)/include/lua-${V}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALL_LIB= $(INSTALL_TOP)/lib/lua-${V}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INSTALL_INC= $(INSTALL_TOP)/include/lua-@BRANCH@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INSTALL_LIB= $(INSTALL_TOP)/lib/lua-@BRANCH@
</span> +INSTALL_MAN= $(INSTALL_TOP)/share/man/man1
#
# You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,16 +21,7 @@
</span> TO_BIN= lua luac
TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
-TO_LIB= liblua.a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+TO_LIB= liblua-${V}.a liblua-${V}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TO_LIB= liblua-@BRANCH@.a liblua-@BRANCH@.dylib
</span> TO_MAN= lua.1 luac.1
# Lua version and release.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: $(PLAT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(PLATS) clean:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd src && $(MAKE) $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd src && $(MAKE) $@ V=${V} R=${R} INSTALL_LIB=${INSTALL_LIB}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test: dummy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/lua test/hello.lua
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua51/files/patch-src_Makefile.diff b/lang/lua/files/patch-src-Makefile-51.diff
</span>old mode 100644
new mode 100755
similarity index 80%
rename from lang/lua51/files/patch-src_Makefile.diff
rename to lang/lua/files/patch-src-Makefile-51.diff
<span style='display:block; white-space:pre;color:#808080;'>index c5eccc8b6b0..7ddc8940a64
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/lua51/files/patch-src_Makefile.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;'>@@ -5,8 +5,8 @@
</span> PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-LUA_A= liblua.a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+LUA_A= liblua-${V}.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LUA_DYLIB= liblua-${V}.dylib
</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;'>++LUA_DYLIB= liblua-@BRANCH@.dylib
</span> CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \
lundump.o lvm.o lzio.o
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,10 +29,10 @@
</span> $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
$(RANLIB) $@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(LUA_DYLIB): $(CORE_O) $(LIB_O)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @echo "Building dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -o $@ $(MYLDFLAGS) -dynamiclib -install_name ${INSTALL_LIB}/$@ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -compatibility_version ${V} -current_version ${R} $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$(LUA_DYLIB): $(BASE_O)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @echo "Building dynamic library (dylib)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -o $@ $(MYLDFLAGS) -dynamiclib -install_name @PREFIX@/lib/lua-@BRANCH@/liblua-@BRANCH@.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -compatibility_version @BRANCH@ -current_version @VERSION@ $^
</span> +
$(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua/files/patch-src-luaconf.h-51.diff b/lang/lua/files/patch-src-luaconf.h-51.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c66d2caadf2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/lua/files/patch-src-luaconf.h-51.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/luaconf.h.original 2008-02-11 16:25:08.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/luaconf.h 2022-12-29 10:32:44.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,7 +94,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define LUA_ROOT "/usr/local/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LUA_ROOT "@PREFIX@/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LUA_LDIR LUA_ROOT "share/lua/5.1/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LUA_PATH_DEFAULT \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua51/Portfile b/lang/lua51/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0909b30cad7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/lua51/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,85 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name lua51
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.1.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set abi [join [lrange [split $version "."] 0 end-1] "."]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories lang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description powerful, lightweight programming language
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Lua is a powerful, light-weight programming language designed for \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extending applications. Lua is also frequently used as a general-purpose, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- standalone language.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.lua.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname lua-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}/ftp/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 b3882111ad02ecc6b972f8c1241647905cb2e3fc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b0c2234675335a8bf158a125b6778cf800c754a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:readline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.env DYLD_LIBRARY_PATH=./lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-etc_lua.pc.diff
</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;'>- reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/src/luaconf.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # reinplace %PREFIX% to fix @executable_path, cf. ticket no. 28726
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%PREFIX%|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/Makefile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/etc/lua.pc
</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;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append V=${abi} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- R=${version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} ${configure.cppflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.post_args-append INSTALL_TOP=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} COPYRIGHT HISTORY README \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob ${worksrcpath}/doc/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 $f ${destroot}${prefix}/share/doc/${name}
</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;'>- # install test and etc stuff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/test ${destroot}${prefix}/share/examples/${name}/test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/etc ${destroot}${prefix}/share/examples/${name}/etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # version executable and man pages files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob ${destroot}${prefix}/bin/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move $f ${f}${abi}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob ${destroot}${prefix}/share/man/man1/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move $f [file rootname $f]-${abi}[file extension $f]
</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;'>- # install versioned pkgconfig file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/etc/lua.pc ${destroot}${prefix}/lib/pkgconfig/lua-${abi}.pc
</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;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${master_sites}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {lua-(\d+(?:\.\d+)*)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/lua51/files/patch-etc_lua.pc.diff b/lang/lua51/files/patch-etc_lua.pc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2c22a30aba9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/lua51/files/patch-etc_lua.pc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- etc/lua.pc.orig 2014-04-02 16:29:34.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ etc/lua.pc 2014-04-02 16:35:23.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,24 +8,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- R= 5.1.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--prefix= /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+prefix= %PREFIX%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_BIN= ${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INSTALL_INC= ${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INSTALL_LIB= ${prefix}/lib
</span><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:#ffe0e0;'>- INSTALL_MAN= ${prefix}/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_LMOD= ${prefix}/share/lua/${V}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_CMOD= ${prefix}/lib/lua/${V}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # canonical vars
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec_prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libdir=${exec_prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--includedir=${prefix}/include
</span><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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Name: Lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Description: An Extensible Extension Language
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: ${R}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Requires:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Libs: -L${libdir} -llua -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs: -L${libdir} -llua-${V} -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (end of lua.pc)
</span></pre><pre style='margin:0'>
</pre>