<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/ae4db014df882f7c0b2a4a7aac42e7cc30ad38a1">https://github.com/macports/macports-ports/commit/ae4db014df882f7c0b2a4a7aac42e7cc30ad38a1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ae4db014df882f7c0b2a4a7aac42e7cc30ad38a1
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Mar 16 04:07:25 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> lua-luasocket: use luarocks_org PG
</span>---
lua/lua-luasocket/Portfile | 72 ++++++-----------------------
lua/lua-luasocket/files/patch-makefile.diff | 60 ------------------------
2 files changed, 14 insertions(+), 118 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-luasocket/Portfile b/lua/lua-luasocket/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c60d3255bde..d4738df0ef1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-luasocket/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-luasocket/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,76 +1,32 @@
</span> # -*- 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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 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;'>+PortGroup luarocks_org 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup lunarmodules luasocket 3.1.0 v
</span> name lua-luasocket
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories lua devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.rock luasocket-${version}-1.src.rock
</span> license MIT
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description The luasocket library extends lua with TCP, UDP, and DNS support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description LuaSocket is a Lua extension library that is composed by two parts: \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a C core that provides support for the TCP and UDP transport layers, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and a set of Lua modules that add support for functionality commonly \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- needed by applications that deal with the Internet.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Network support for the Lua language
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description LuaSocket is a Lua extension library composed of two parts: a set of C \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modules that provide support for the TCP and UDP transport layers, and a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set of Lua modules that provide functions commonly needed by applications \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ that deal with the Internet.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://w3.impa.br/~diego/software/luasocket/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 abae0eace0d9112da54e6928c41235cfd3ea08b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f4a207f50a3f99ad65def8e29c54ac9aac668b216476f7fae3fae92413398ed2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 398081
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d8c5189ee2af41c0005e2a6e55f0c571f294d858 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3dfa42ea22c3f308dca269a8aff7f056419d2f6b3c4926368baf4305d57f8b90 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 336609
</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;'>-# Old luaforge livecheck. For now, use github-livecheck, but maybe luaforge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# will be more up to date some day or other.
</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 http://luaforge.net/frs/?group_id=23
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#livecheck.regex {luasocket-([0-9.]+)\.tar\.gz}
</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;'>-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;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/src/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@CFLAGS@|${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]|g" ${worksrcpath}/src/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@LDFLAGS@|${configure.ldflags} [get_canonical_archflags ld]|g" ${worksrcpath}/src/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.uploader lunarmodules
</span>
# ld: unknown option: -osocket-3.0.0.so
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *gcc-4.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist *gcc-4.*
</span>
platform darwin 10 powerpc {
# Rosetta pulls Xcode clang otherwise:
# clang: warning: not using the clang compiler for the 'powerpc' architecture
compiler.blacklist-append *clang*
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lua_version "[exec -- ${prefix}/bin/pkg-config --variable V lua]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && make DEBUG=DEBUG macosx LUAV=${lua_version}"
</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;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lua_version "[exec -- ${prefix}/bin/pkg-config --variable V lua]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && make DEBUG=DEBUG LUAV=${lua_version} DESTDIR=${destroot} PREFIX=${prefix} PLAT=macosx install-unix"
</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:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 {*}[glob ${worksrcpath}/docs/*] ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/LICENSE ${worksrcpath}/CHANGELOG.md \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/README.md ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/etc ${worksrcpath}/samples ${worksrcpath}/test \
</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;color:#808080;'>diff --git a/lua/lua-luasocket/files/patch-makefile.diff b/lua/lua-luasocket/files/patch-makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bba5667b32d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-luasocket/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,60 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/makefile.orig 2022-07-27 15:07:00.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/makefile 2022-12-04 07:13:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,10 +21,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUAV?=5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MYCFLAGS: to be set by user if needed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MYCFLAGS?=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MYCFLAGS?=@CFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MYLDFLAGS: to be set by user if needed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MYLDFLAGS?=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MYLDFLAGS?=@LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # DEBUG: NODEBUG DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # debug mode causes luasocket to collect and returns timing information useful
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,12 +34,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # where lua headers are found for macosx builds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # LUAINC_macosx:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /opt/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LUAINC_macosx_base?=/opt/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LUAINC_macosx?=$(LUAINC_macosx_base)/lua/$(LUAV) $(LUAINC_macosx_base)/lua$(LUAV) $(LUAINC_macosx_base)/lua-$(LUAV)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LUAINC_macosx_base?=@PREFIX@/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LUAINC_macosx?=$(LUAINC_macosx_base) $(LUAINC_macosx_base)/lua/$(LUAV) $(LUAINC_macosx_base)/lua$(LUAV) $(LUAINC_macosx_base)/lua-$(LUAV)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # FIXME default should this default to fink or to macports?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # What happens when more than one Lua version is installed?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LUAPREFIX_macosx?=/opt/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LUAPREFIX_macosx?=@PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CDIR_macosx?=lib/lua/$(LUAV)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDIR_macosx?=share/lua/$(LUAV)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -160,11 +160,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for Mac OS X
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SO_macosx=so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- O_macosx=o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CC_macosx=gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CC_macosx=@CC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LD_macosx=gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LD_macosx=@CC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOCKET_macosx=usocket.o
</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;'>-@@ -185,12 +185,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for FreeBSD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SO_freebsd=so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- O_freebsd=o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CC_freebsd=gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CC_freebsd=@CC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wimplicit -O2 -ggdb3 -fpic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_freebsd=-O -shared -fpic -o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LD_freebsd=gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LD_freebsd=@CC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOCKET_freebsd=usocket.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #------
</span></pre><pre style='margin:0'>
</pre>