<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ed050111a6a466691c0284e78454dce64c87fbd4">https://github.com/macports/macports-ports/commit/ed050111a6a466691c0284e78454dce64c87fbd4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ed050111a6a466691c0284e78454dce64c87fbd4
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Fri May 28 13:31:59 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> lua-lpeg: use luarocks PortGroup
</span>---
devel/lua-lpeg/Portfile | 65 --------------------------------
devel/lua-lpeg/files/patch-makefile.diff | 22 -----------
lua/lua-lpeg/Portfile | 23 +++++++++++
3 files changed, 23 insertions(+), 87 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/lua-lpeg/Portfile b/devel/lua-lpeg/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f76c330f7f5..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/lua-lpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,65 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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 lua-lpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers gmail.com:andremm openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Parsing Expression Grammars for Lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description LPeg is a new pattern-matching library for Lua, based on \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Parsing Expression Grammars (PEGs).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.inf.puc-rio.br/~roberto/lpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname lpeg-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 af7afa406b604116f0bac77b8974751bff2b4e65 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 48d66576051b6c78388faad09b70493093264588fcd0f258ddaab1cdd4a15ffe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 71840
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:lua
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This should be done in post-patch, but lua is only available as a dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# in configure and later phases. Thus, using pkg-config to get the C and LDFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fails miserably in trace mode.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%%CFLAGS%%|${configure.cflags} [exec ${prefix}/bin/pkg-config lua --cflags]|" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%%LDFLAGS%%|${configure.ldflags} [exec ${prefix}/bin/pkg-config lua --libs]|" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env lua|${prefix}/bin/lua|" ${worksrcpath}/test.lua
</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;'>-variant universal {}
</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 CC="${configure.cc} [get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUADIR=${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lua_cmod [exec ${prefix}/bin/pkg-config lua --variable INSTALL_CMOD]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lua_lmod [exec ${prefix}/bin/pkg-config lua --variable INSTALL_LMOD]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lua_docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lua_exampledir ${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${lua_cmod} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${lua_lmod} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${lua_docdir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${lua_exampledir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${worksrcpath}/lpeg.so ${destroot}${lua_cmod}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${worksrcpath}/re.lua ${destroot}${lua_lmod}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} HISTORY lpeg-128.gif lpeg.html re.html ${destroot}${lua_docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/test.lua ${destroot}${lua_exampledir}
</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.regex "lpeg-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/lua-lpeg/files/patch-makefile.diff b/devel/lua-lpeg/files/patch-makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bdbab868999..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/lua-lpeg/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.orig 2019-03-11 14:08:29.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2021-05-15 11:51:27.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,8 +22,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -Wunreachable-code \
</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;'>--CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CC = gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC %%CFLAGS%%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#CC = gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For Mac OS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macosx:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup %%LDFLAGS%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lpeg.so: $(FILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-lpeg/Portfile b/lua/lua-lpeg/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..87e1aac26e9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-lpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup luarocks 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.branches 5.1 5.2 5.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.setup lpeg 1.0.2-1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories lua devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers gmail.com:andremm openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Parsing Expression Grammars For Lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.inf.puc-rio.br/~roberto/lpeg.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 459e9e52c88de576b8ef4c44dafc582d3d53814e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e0d0d687897f06588558168eeb1902ac41a11edd1b58f1aa61b99d0ea0abbfbc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 72725
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant universal {}
</span></pre><pre style='margin:0'>
</pre>