<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/5de4474f33e198ca6e84724dd646e77277d7dfd4">https://github.com/macports/macports-ports/commit/5de4474f33e198ca6e84724dd646e77277d7dfd4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5de4474f33e198ca6e84724dd646e77277d7dfd4
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Mar 18 10:15:22 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> lua-lua-gd: use luarocks_org PG
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The epoch must be increased since the version scheme changed.
</span>---
lua/lua-lua-gd/Portfile | 80 ++++++++++++------------------
lua/lua-lua-gd/files/patch-Makefile.diff | 53 +++++++++-----------
lua/lua-lua-gd/files/patch-lua-gd.rockspec | 16 ++++++
3 files changed, 71 insertions(+), 78 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-lua-gd/Portfile b/lua/lua-lua-gd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6108903e7b4..cbeb9a21717 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-lua-gd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-lua-gd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +1,32 @@
</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-lua-gd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.33r2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories lua devel graphics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Lua interface to the gd library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Lua-GD is a set of Lua bindings to the Thomas Boutell's gd library that \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allows your code to quickly draw complete images with lines, polygons, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arcs, text, multiple colors, cut and paste from other images, flood \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fills, read in or write out images in the PNG, JPEG or GIF format. It is \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- not a kitchen-sink graphics package, but it does include most frequently \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- requested features, including both truecolor and palette images, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- resampling (smooth resizing of truecolor images) and so forth.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://lua-gd.luaforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/lua-gd/lua-gd/lua-gd-${version}%20%28for%20Lua%205.1%29/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 69e9c07ce208ce13d4373177c2e24df0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 5e7a4e3a62c005de6d243e891411175957ff087e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 806cd4210a6eb6d4da40167c5b1225fdaf786f71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname lua-gd-${version}
</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 port:gd2
</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;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This needs to be updated when lua's version goes past 5.1.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${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;'>-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;'>- ${destroot}${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy {*}[glob ${worksrcpath}/doc/*] ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} COPYING README \
</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;'>- copy {*}[glob ${worksrcpath}/demos/*] \
</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;'>+# -*- 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_org 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name lua-lua-gd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.rock lua-gd-${version}-6.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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description an image manipulation library for the Lua Programming Language, based on Thomas Boutell's GD library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Lua-GD is {*}${description}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3cdcc4ace18b658819b1c52be9812ea2561affa8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 46d4ad3f82b1cfd93846af00be444d59e2f8d1b8ad58e2d4dd436112f64cb260 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1429038
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.branches 5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.dir [file dirname ${worksrcpath}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-lua-gd.rockspec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:gd2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -DGD_XPM -DGD_JPEG -DGD_FONTCONFIG -DGD_FREETYPE -DGD_PNG -DGD_GIF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.build_type make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+luarocks.uploader zhengsu
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-lua-gd/files/patch-Makefile.diff b/lua/lua-lua-gd/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 37683a1b16c..8205e81a78d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-lua-gd/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-lua-gd/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +1,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2006-05-03 19:03:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2009-03-27 02:05:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,11 +33,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # change the next ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lua-gd/Makefile.orig 1979-12-31 00:00:00
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lua-gd/Makefile 2023-03-18 09:03:10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,13 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-all: gd lua-gd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# see https://github.com/luarocks/luarocks/wiki/Creating-a-Makefile-that-plays-nice-with-LuaRocks
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Name of .pc file. "lua5.1" on Debian/Ubuntu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LUAPKG=lua5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LUAPKG=lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OUTFILE=gd.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=`gdlib-config --cflags` `pkg-config $(LUAPKG) --cflags` -O3 -Wall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GDFEATURES=`gdlib-config --features |sed -e "s/GD_/-DGD_/g"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LFLAGS=-shared `gdlib-config --ldflags` `gdlib-config --libs` \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LFLAGS=-bundle `gdlib-config --ldflags` `gdlib-config --libs` \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- `pkg-config $(LUAPKG) --libs` -lgd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_PATH=`pkg-config $(LUAPKG) --variable=INSTALL_CMOD`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gd:lib-gd/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd ./lib-gd && pwd && chmod +x ./configure && ./configure && make -i clean && make && make install && cd ..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++all: lib-lua-gd/libgd.so
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,6 +63,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #INSTALL_PATH="C:/Program Files/lua/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-lua-gd:lib-lua-gd/luagd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd ./lib-lua-gd && pwd && make -i clean && make && cd ..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++lib-lua-gd/libgd.so: lib-lua-gd/libgd.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -o $@ -L$(LUA_LIBDIR) $(LIBFLAG) `pkg-config --libs gdlib` $<
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+DESTDIR=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: $(OUTFILE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,7 +72,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua test_features.lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: $(OUTFILE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -s $(OUTFILE) $(INSTALL_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install $(OUTFILE) $(DESTDIR)$(INSTALL_PATH)
</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 $(OUTFILE) *.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install:lib-gd/.libs/libgd.so.2.0.0 lib-lua-gd/gd.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp lib-gd/.libs/libgd.so.2.0.0 /usr/lib64/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -f /usr/lib64/libgd.so.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ln -s /usr/lib64/libgd.so.2.0.0 /usr/lib64/libgd.so.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ./lib-lua-gd/gd.so /usr/local/lib/lua/5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++lib-lua-gd/libgd.o: lib-lua-gd/luagd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -c -I$(LUA_INCDIR) $(CPPFLAGS) $(CFLAGS) $< -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install: lib-lua-gd/libgd.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL) -m 0755 lib-lua-gd/libgd.so $(LIBDIR)/gd.so
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-lua-gd/files/patch-lua-gd.rockspec b/lua/lua-lua-gd/files/patch-lua-gd.rockspec
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5d0d7317997
</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-lua-gd/files/patch-lua-gd.rockspec
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lua-gd-1.0-6.rockspec.orig 1979-12-31 00:00:00
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lua-gd-1.0-6.rockspec 2023-03-18 09:24:12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,4 +12,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies = {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type = "make",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ build_variables = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LUA_INCDIR = '$(LUA_INCDIR)',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LUA_LIBDIR = '$(LUA_LIBDIR)',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBFLAG = '$(LIBFLAG)',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install_variables = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBDIR = '$(LIBDIR)'
</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;'>+\ No newline at end of file
</span></pre><pre style='margin:0'>
</pre>