<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/1111b59e1553db48a84bf957169f8b6d4eb01805">https://github.com/macports/macports-ports/commit/1111b59e1553db48a84bf957169f8b6d4eb01805</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1111b59e1553db48a84bf957169f8b6d4eb01805
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Mar 19 08:14:55 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> lua-md5: update version & use lua & makefile PGs
</span>---
lua/lua-md5/Portfile | 106 ++++++++++++----------
lua/lua-md5/files/patch-config.diff | 36 --------
lua/lua-md5/files/patch-tests-DES56-Makefile.diff | 27 ------
3 files changed, 56 insertions(+), 113 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-md5/Portfile b/lua/lua-md5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d57e9eccd9..b94263b89a6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-md5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-md5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,64 +1,70 @@
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup lua 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name lua-md5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories lua devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description basic cryptographic facilities for Lua 5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description MD5 offers basic cryptographic facilities for Lua 5.1: a hash (digest) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function, a pair crypt/decrypt based on MD5 and CFB, and a pair \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- crypt/decrypt based on DES with 56-bit keys.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name lua-md5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup lunarmodules md5 1.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories lua devel
</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 checksum facilities for Lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description MD5 offers {*}${description}.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.keplerproject.org/md5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://luaforge.net/frs/download.php/3355/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname md5-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0dc23c466d41eed97e73db9e7d010719202835a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1451ed5d289c695fc94b4fbeb0f4fcc0c72c69fe5c42dfc042e56d02c3ef572e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 31393
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 68874cff64547f2157d5ecdc3572b544 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 f6c2ee21faf94c6ee95fc767ef2fdf0cf0382dc9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bd74bc5eddf3167ff0d64b72be0ad428331399a7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+makefile.override-append PREFIX \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+makefile.has_destdir no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-config.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tests-DES56-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append LIB_OPTION="-bundle -undefined dynamic_lookup \$LDFLAGS"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy {*}[glob -directory ${worksrcpath}/src des56.{h,c}] ${worksrcpath}/tests/DES56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach branch ${lua.branches} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set subname md5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set branch_no_dot [join [split ${branch} .] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set subport_name lua${branch_no_dot}-${subname}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # clang doesn't support -O6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $xcodeversion 4.1] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s| -O6||" ${worksrcpath}/tests/DES56/Makefile
</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:#e0ffe0;'>+ subport ${subport_name} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq ${subport_name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua.version ${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append LUA_SYS_VER=${lua.version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/lua/${lua.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://luarocks.org/manifests/tomasguisasola/md5-${version}-1.rockspec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set luarocks_dir ${prefix}/lib/luarocks/rocks-${lua.version}/md5/${version}-1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure script is not from autotools, it only searches for lua binary prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# it is needed to manually set flags env variable in build phase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld] -llua -lm"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fdemo example is broken, it's using libcrypt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append fdemo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.dir ${worksrcpath}/tests/DES56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command_exec build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${luarocks_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/doc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${luarocks_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/tests \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${luarocks_dir}
</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:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/README {*}[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 -d ${destroot}${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/tests/DES56/fdemo \
</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;'>- xinstall -m 644 -W ${worksrcpath}/tests DES56/fdemo.c test.lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.rename no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach deptype {depends_extract depends_patch depends_lib depends_build depends_run depends_test} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${deptype}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc lua::callback {} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f [open "${docdir}/README" w 0644]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${f} "[option subport] is a stub port"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-md5/files/patch-config.diff b/lua/lua-md5/files/patch-config.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ee61ede9adf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-md5/files/patch-config.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.orig 2007-10-29 18:00:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config 2012-02-13 10:29:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,17 +4,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX = /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # System's libraries directory (where binary libraries are installed)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LUA_LIBDIR= $(DESTDIR)$(PREFIX)/lib/lua/5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # System's lua directory (where Lua libraries are installed)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LUA_DIR= $(PREFIX)/share/lua/5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LUA_DIR= $(DESTDIR)$(PREFIX)/share/lua/5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Lua includes directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUA_INC= $(PREFIX)/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # OS dependent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIB_OPTION= -shared #for Linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#LIB_OPTION= -shared #for Linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIB_OPTION= $(LDFLAGS) -bundle -undefined dynamic_lookup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Lua version number
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (according to Lua 5.1 definition:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,9 +24,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMPAT_DIR= ../compat/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Compilation directives
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -Wpointer-arith
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+WARN= -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -Wpointer-arith
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCS= -I$(LUA_INC) -I$(COMPAT_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS= $(WARN) $(INCS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS+= $(WARN) $(INCS)
</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;'>- # $Id: config,v 1.6 2007/10/29 23:00:23 carregal Exp $
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-md5/files/patch-tests-DES56-Makefile.diff b/lua/lua-md5/files/patch-tests-DES56-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c0176dc2686..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-md5/files/patch-tests-DES56-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,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/DES56/Makefile.orig 2007-11-28 13:38:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/DES56/Makefile 2012-02-13 10:33:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS= -O6 -DUSG=0 -DBSD=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS+= -O6 -DUSG=0 -DBSD=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILES= Makefile des56.h des56.c fdemo.c ftest.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./fdemo -demo -c 1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fdemo: fdemo.o des56.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CC} -o $@ $@.o des56.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${CC} ${LDFLAGS} -o $@ $@.o des56.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # test -- evaluates DES, compares with UNIX crypt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./ftest 1.21280ac -c 5000000 -k 1000000 -C 100000 -K 100000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftest: ftest.o des56.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CC} -o $@ $@.o des56.o -lcrypt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${CC} ${LDFLAGS} -o $@ $@.o des56.o -lcrypt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dist:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @tar cvf - ${FILES}
</span></pre><pre style='margin:0'>
</pre>