<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/eacf600220c27a69fe7263282d589a8bf10f97f8">https://github.com/macports/macports-ports/commit/eacf600220c27a69fe7263282d589a8bf10f97f8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit eacf600220c27a69fe7263282d589a8bf10f97f8
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Mar 19 09:04:43 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> lua-numlua: use linear_algebra & luarocks_org PGs
</span>---
lua/lua-numlua/Portfile | 87 +++++++++++++-----------------
lua/lua-numlua/files/Makefile | 41 --------------
lua/lua-numlua/files/patch-hdf_compat.diff | 13 +++++
3 files changed, 51 insertions(+), 90 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-numlua/Portfile b/lua/lua-numlua/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 79e5181f18a..2e533d28e0d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-numlua/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-numlua/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,63 +1,52 @@
</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:#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 linear_algebra 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 carvalho numlua 0.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</span> name lua-numlua
<span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.rock numlua-${version}-1.src.rock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories-append math
</span> license MIT
<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> maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Numerical package for the Lua programming language.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description {*}${description} It includes support for complex numbers, multidimensional \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- matrices, random generation and special functions. Much of the routines are \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- simple wrappers for the stable and well-known libraries from Netlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_zip yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# stealth packaging update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites macports_distfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set archive_hash f05281e96030adb9c09a01b9d9be4fa9fa4c795e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${archive_hash}.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir numlua-${archive_hash}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 acfce2eb1c0c5f1942b3a9917893c17c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 2fe543baedc9e62112a2df7b0dfbf8e8b304658d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 df58135379ce8f01e0b454a8073257a01f23a03e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description numerical routines for Lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Numeric Lua is a numerical package for the Lua programming language.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 988975d312d0aa84041fbdfae2911af5221e7d50 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c9f05a76931026022d9e6367bddcc3bd33c2598e87a695bc76496e6acca2f048 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 234203
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# there used to be a dependency on a gccXX port due to the need for a fortran compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this has now been removed due to dependency on port atlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+linalg.setup noveclibfort
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:atlas \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib:fftw:fftw-3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib:hdf5:hdf5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${filespath}/Makefile ${worksrcpath} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.worksrcdir numlua-${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|%%PREFIX%%|${prefix}|" Makefile }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-hdf_compat.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS=${configure.cppflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=${configure.ldflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEPLOYMENT_TARGET=${macosx_deployment_target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:hdf5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append LUA_VERSION=[string range [lindex [lindex [registry_active lua] 0] 1] 0 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rockspec file searches for LAPACK via -lblas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${worksrcpath}/blas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset accelerate]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do nothing since -lblas will find Accelerate framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # trick linker so that -lblas finds the desired library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/lib[string range ${linalglib} 2 end].dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/blas/libblas.dylib
</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 -m 755 ${destroot}${prefix}/share/doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 ${destroot}${prefix}/share/examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://www.lua.org/manual/5.3/manual.html#8.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -DLUA_COMPAT_APIINTCASTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args-append FFTW3_INCDIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HDF5_INCDIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFTW3_LIBDIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HDF5_LIBDIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LAPACK_LIBDIR=${worksrcpath}/blas
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/examples ${destroot}${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/lhp ${destroot}${prefix}/share/doc/${name}/lhp }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.uploader luarocks
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-numlua/files/Makefile b/lua/lua-numlua/files/Makefile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8094bd225d9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-numlua/files/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Makefile for numlua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CC ?= /usr/bin/clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CFLAGS ?= -O2 -arch x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CPPFLAGS ?= -I%%PREFIX%%/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LDFLAGS ?= -L%%PREFIX%%/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-DEPLOYMENT_TARGET ?= 10.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PREFIX ?= /tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LUA_VERSION = 5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALL_ROOT = $(DESTDIR)$(PREFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALL_INC = $(INSTALL_ROOT)/include/lua$(LUA_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALL_LUA = $(INSTALL_ROOT)/share/lua/$(LUA_VERSION)/numlua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALL_LIB = $(INSTALL_ROOT)/lib/lua/$(LUA_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TO_INC = amos.h blas.h cdflib.h lapack.h numlua.h rng.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TO_LUA = matrix.lua seeall.lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TO_LIB = numlua.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OBJECTS = numlua.o complex.o fft.o msort.o lmatrix.o mt.o ranlib.o rng.o dcdflib.o ipmpar.o stat.o amos.o mathx.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-%.o : %.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export MACOSX_DEPLOYMENT_TARGET=$(DEPLOYMENT_TARGET); $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.PHONY : numlua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-numlua : numlua.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-numlua.so : $(OBJECTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export MACOSX_DEPLOYMENT_TARGET=$(DEPLOYMENT_TARGET); $(CC) -bundle -undefined dynamic_lookup -all_load -o numlua.so $(LDFLAGS) $(OBJECTS) -Wl,-rpath,$(PREFIX)/lib: -lhdf5 -lfftw3 -llapack -lblas
</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 -f $(OBJECTS) numlua.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-all : numlua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-install : all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p "$(INSTALL_ROOT)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_LUA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp $(TO_INC) $(INSTALL_INC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp $(TO_LIB) $(INSTALL_LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp $(TO_LUA) $(INSTALL_LUA)
</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-numlua/files/patch-hdf_compat.diff b/lua/lua-numlua/files/patch-hdf_compat.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..00ebcee83db
</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-numlua/files/patch-hdf_compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MacPorts HDF5 version > 1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numlua.h.orig 2011-08-18 18:25:02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numlua.h 2023-03-19 08:32:25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef numlua_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define numlua_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define H5_NO_DEPRECATED_SYMBOLS /* use HDF5 1.8 */
</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;'>+ #include <lua.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <lauxlib.h>
</span></pre><pre style='margin:0'>
</pre>