<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/991b09e44bb650d472c26f1a9c1cfd4238f12c73">https://github.com/macports/macports-ports/commit/991b09e44bb650d472c26f1a9c1cfd4238f12c73</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 991b09e44bb vis: update to 0.9
</span>991b09e44bb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 991b09e44bb650d472c26f1a9c1cfd4238f12c73
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Wed May 1 18:48:14 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> vis: update to 0.9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Force use of Lua 5.4
</span>---
editors/vis/Portfile | 35 +++++++++++++++++----------
editors/vis/files/patch-Makefile.diff | 34 +++++++++++++++++---------
editors/vis/files/patch-configure-luaver.diff | 20 +++++++++++++++
3 files changed, 65 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vis/Portfile b/editors/vis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 68c7c92ed20..d18732b3fa3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,8 @@ PortSystem 1.0
</span>
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup martanne vis 0.8 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup martanne vis 0.9 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span> revision 0
categories editors
maintainers {en.sent.com:macports @Raimondi} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,25 +14,33 @@ description a highly efficient text editor
</span> long_description vis is a highly efficient screen-oriented text editor \
combining the strengths of both vi(m) and sam.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 149911902424170c332e9273e19c6d1cdd582229 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 db3448b706e59b9c9056023216f6556065c4326f1658d11e6bbe54bbc981928c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 404642
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 69fbbd09844573ec110f52d0b6d7ac575f480f16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bd37ffba5535e665c1e883c25ba5f4e3307569b6d392c60f3c7d5dedd2efcfca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 456713
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set lua_version 5.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set lua_shortver [string replace ${lua_version} 1 1]
</span>
depends_lib-append port:ncurses \
port:libtermkey \
port:tre \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lua-lpeg
</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;'>- patch-man-vis-clipboard.1.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-man-vis-complete.1.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-man-vis-digraph.1.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-man-vis-menu.1.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-man-vis-open.1.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lua${lua_shortver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lua${lua_shortver}-lpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-configure-luaver.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-man-vis-clipboard.1.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-man-vis-complete.1.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-man-vis-digraph.1.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-man-vis-menu.1.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-man-vis-open.1.diff \
</span> patch-man-vis.1.diff \
patch-vis-lua.c.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|@@LUA_VERSION@@|${lua_version}|g" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace -W ${worksrcpath} "s|@VISEXEC@|vis-editor|g" Makefile
reinplace -W ${worksrcpath}/man "s|@VISEXEC@|vis-editor|g" vis-clipboard.1 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vis/files/patch-Makefile.diff b/editors/vis/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a5a21f8374..f7800e42483 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vis/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vis/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,15 @@
</span> --- Makefile
+++ Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vis-text-objects.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,7 +30,7 @@
</span> $(REGEX_SRC)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJ = $(SRC:%.c=obj/%.o)
</span>
-ELF = vis vis-menu vis-digraph
+ELF = @VISEXEC@ vis-menu vis-digraph
EXECUTABLES = $(ELF) vis-clipboard vis-complete vis-open
MANUALS = $(EXECUTABLES:=.1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@
</span> $(CFLAGS_SELINUX) $(CFLAGS_TRE) $(CFLAGS_LUA) $(CFLAGS_LPEG) $(CFLAGS_STD) \
$(CFLAGS_LIBC)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,25 +18,37 @@
</span> CFLAGS_VIS += -DCONFIG_HELP=${CONFIG_HELP}
CFLAGS_VIS += -DCONFIG_CURSES=${CONFIG_CURSES}
CFLAGS_VIS += -DCONFIG_LUA=${CONFIG_LUA}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,7 +79,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.mk:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @touch $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--vis: config.h config.mk *.c *.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@VISEXEC@: config.h config.mk *.c *.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CC} ${CFLAGS} ${CFLAGS_VIS} ${CFLAGS_EXTRA} ${SRC} ${LDFLAGS} ${LDFLAGS_VIS} -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -include obj/*.d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-vis: ${OBJ}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@VISEXEC@: ${OBJ}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CC} -o $@ ${OBJ} ${LDFLAGS} ${LDFLAGS_VIS} ${LDFLAGS_EXTRA}
</span>
vis-menu: vis-menu.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -181,9 +181,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,10 +195,10 @@
</span> chmod 755 ${DESTDIR}${PREFIX}/bin/"$$e"; \
done
@test ${CONFIG_LUA} -eq 0 || { \
- echo installing support files to ${DESTDIR}${SHAREPREFIX}/vis; \
- mkdir -p ${DESTDIR}${SHAREPREFIX}/vis; \
- cp -r lua/* ${DESTDIR}${SHAREPREFIX}/vis; \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -rf "${DESTDIR}${SHAREPREFIX}/vis/doc"; \
</span> + echo installing support files to ${DESTDIR}${SHAREPREFIX}/@VISDIR@; \
+ mkdir -p ${DESTDIR}${SHAREPREFIX}/@VISDIR@; \
+ cp -r lua/* ${DESTDIR}${SHAREPREFIX}/@VISDIR@; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -rf "${DESTDIR}${SHAREPREFIX}/vis/doc"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -rf "${DESTDIR}${SHAREPREFIX}/@VISDIR@/doc"; \
</span> }
@echo installing documentation to ${DESTDIR}${DOCPREFIX}/vis
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ @mkdir -p ${DESTDIR}${DOCPREFIX}/vis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -232,7 +232,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @for m in ${MANUALS}; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f ${DESTDIR}${MANPREFIX}/man1/"$$m"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo removing support files from ${DESTDIR}${SHAREPREFIX}/vis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @rm -rf ${DESTDIR}${SHAREPREFIX}/vis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @echo removing support files from ${DESTDIR}${SHAREPREFIX}/@VISDIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @rm -rf ${DESTDIR}${SHAREPREFIX}/@VISDIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: all clean testclean dist distclean install install-strip uninstall debug profile coverage test test-update luadoc luadoc-all luacheck man docker-kill docker docker-clean
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vis/files/patch-configure-luaver.diff b/editors/vis/files/patch-configure-luaver.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..23d56e4fe19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vis/files/patch-configure-luaver.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./configure 2024-05-10 20:53:39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./configure 2024-05-10 20:55:58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -444,7 +444,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for liblua in lua lua5.4 lua5.3 lua5.2 lua-5.4 lua-5.3 lua-5.2 lua54 lua53 lua52; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for liblua in lua@@LUA_VERSION@@ ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf " checking for %s... " "$liblua"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$have_pkgconfig" = "yes" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -505,7 +505,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for liblpeg in lpeg lua5.3-lpeg lua5.2-lpeg; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for liblpeg in lua@@LUA_VERSION@@-lpeg lpeg; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf " checking for static %s... " "$liblpeg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$have_pkgconfig" = "yes" ; then
</span></pre><pre style='margin:0'>
</pre>