<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/b665d82079bc84ea2eaaff1938ecef414d028009">https://github.com/macports/macports-ports/commit/b665d82079bc84ea2eaaff1938ecef414d028009</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b665d82079bc84ea2eaaff1938ecef414d028009
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Mar 19 09:24:40 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> lua-wsapi: update version && use luarocks_org PG
</span>---
lua/lua-wsapi/Portfile | 67 +++++++---------------
lua/lua-wsapi/files/patch-Makefile.diff | 37 ------------
lua/lua-wsapi/files/patch-configure.diff | 11 ----
lua/lua-wsapi/files/patch-src-fastcgi-lfcgi.c.diff | 16 ------
4 files changed, 20 insertions(+), 111 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-wsapi/Portfile b/lua/lua-wsapi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf71b0ff351..e4f61fcbaa4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-wsapi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-wsapi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +1,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</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:#ffe0e0;'>-github.setup keplerproject wsapi 1.5 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name lua-${github.project}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories lua devel
</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 Lua Web Server API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description WSAPI is an API that abstracts the web server from Lua web applications. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- By coding against WSAPI your application can run on any of the supported \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- servers and interfaces (currently CGI, FastCGI and Xavante, on Windows \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and UNIX-based systems).
</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_org 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from downloads
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 5c983a1db3659ed73e28c473ffd4f4d5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 8c9c86f4cb45f94afb110390c6af808ed8238fe4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a675f92700b588771f9da977912fb0171a28e0bf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name lua-wsapi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.rock wsapi-${version}-1.src.rock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Lua Web Server API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description WSAPI is an API that abstracts the web server from Lua web applications. This is the rock \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ that contains the base WSAPI libraries plus the CGI adapters.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lua-luafilesystem \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lua-rings \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fcgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d61aa0330c88bdd61f78d508979cf2728c9d4b2e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1a0829dffd6bdbf99f5c4278d504cda5ede9344d5089bdcf5216c9eb2999ae22 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 129835
</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-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-fastcgi-lfcgi.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.dependencies luafilesystem \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rings \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ coxpcall
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\x0D||g" ${worksrcpath}/src/launcher/wsapi.cgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|#!/usr/bin/lua|#!/usr/bin/env lua|" ${worksrcpath}/src/launcher/wsapi.cgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|#!/usr/bin/lua|#!/usr/bin/env lua|" ${worksrcpath}/src/launcher/wsapi.fcgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|lua51|lua|" ${worksrcpath}/samples/cgi-example.lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|lua51|lua|" ${worksrcpath}/samples/fastcgi-example.lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.pure_lua yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target-append install-fcgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.post_args-append PREFIX=${prefix}
</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:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/README \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${worksrcpath}/doc/us/*] \
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/samples \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/tests \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.uploader mascarenhas
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-wsapi/files/patch-Makefile.diff b/lua/lua-wsapi/files/patch-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e75b5713f43..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-wsapi/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,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2011-03-30 11:57:13.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2011-03-30 11:59:06.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,22 +14,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fcgi: fastcgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/fastcgi/lfcgi.so: src/fastcgi/lfcgi.o src/fastcgi/lfcgi.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) $(CFLAGS) $(LIB_OPTION) -o src/fastcgi/lfcgi.so src/fastcgi/lfcgi.o -lfcgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(CFLAGS) $(LIB_OPTION) -o src/fastcgi/lfcgi.so src/fastcgi/lfcgi.o -lfcgi -llua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mkdir -p $(LUA_DIR)/wsapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp src/wsapi/*.lua $(LUA_DIR)/wsapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp src/launcher/wsapi.cgi $(BIN_DIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp src/launcher/wsapi.fcgi $(BIN_DIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mkdir -p $(DESTDIR)$(LUA_DIR)/wsapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp src/wsapi/*.lua $(DESTDIR)$(LUA_DIR)/wsapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp src/launcher/wsapi $(DESTDIR)$(BIN_DIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp src/launcher/wsapi.cgi $(DESTDIR)$(BIN_DIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp src/launcher/wsapi.fcgi $(DESTDIR)$(BIN_DIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-fcgi:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp src/fastcgi/lfcgi.so $(LUA_LIBDIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mkdir -p $(DESTDIR)$(LUA_LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp src/fastcgi/lfcgi.so $(DESTDIR)$(LUA_LIBDIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-rocks: install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mkdir -p $(PREFIX)/samples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -r samples/* $(PREFIX)/samples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mkdir -p $(PREFIX)/doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -r doc/* $(PREFIX)/doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mkdir -p $(DESTDIR)$(PREFIX)/share/examples/lua-wsapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -r samples/* $(DESTDIR)$(PREFIX)/share/examples/lua-wsapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mkdir -p $(DESTDIR)$(PREFIX)/share/doc/lua-wsapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -r doc/us/* $(DESTDIR)$(PREFIX)/share/doc/lua-wsapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clean:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm src/fastcgi/lfcgi.o src/fastcgi/lfcgi.so
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-wsapi/files/patch-configure.diff b/lua/lua-wsapi/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 265c2c88f6c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-wsapi/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2009-09-18 19:51:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2009-09-18 19:55:23.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_share=$lua_root/share/lua/5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_lib=$lua_root/lib/lua/5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin_dir=$lua_root/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "LIB_OPTION= -shared" > config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "LIB_OPTION= -dynamiclib" > config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "LUA_DIR= $lua_share" >> config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "BIN_DIR= $bin_dir" >> config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "LUA_LIBDIR= $lua_lib" >> config
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-wsapi/files/patch-src-fastcgi-lfcgi.c.diff b/lua/lua-wsapi/files/patch-src-fastcgi-lfcgi.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8881667aeb3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-wsapi/files/patch-src-fastcgi-lfcgi.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/fastcgi/lfcgi.c.orig 2009-09-19 15:40:19.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/fastcgi/lfcgi.c 2009-09-19 15:46:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,8 +76,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define IO_INPUT "_input"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define IO_OUTPUT "_output"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern char **environ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define environ (*_NSGetEnviron())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern char **environ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char **old_env;
</span></pre><pre style='margin:0'>
</pre>