commit: 3cc6dca7638116c39f50e79dd4f01f00aa3ba57b
parent e63c2f974fbdf495bb4f144d72fb80ca430f6268
Author: Michael Forney <mforney@mforney.org>
Date: Tue, 16 Nov 2021 01:16:21 -0800
less: Update to 590
Diffstat:
7 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/pkg/less/.gitignore b/pkg/less/.gitignore
@@ -1,2 +1,2 @@
-/less-563.tar.gz
+/less-590.tar.gz
/src
diff --git a/pkg/less/defines.h b/pkg/less/defines.h
@@ -11,13 +11,14 @@
#define TAGS (!SECURE)
#define USERFILE (!SECURE)
#define GLOB (!SECURE)
-#define PIPEC (!SECURE)
+#define PIPEC (!SECURE && HAVE_POPEN)
#define LOGFILE (!SECURE)
#define GNU_OPTIONS 1
#define ONLY_RETURN 0
#define LESSKEYFILE ".less"
#define LESSKEYFILE_SYS SYSDIR "/sysless"
#define DEF_LESSKEYINFILE ".lesskey"
+#define LESSKEYINFILE_SYS SYSDIR "/syslesskey"
#define LESSHISTFILE ".lesshst"
#define MSDOS_COMPILER 0
#define PATHNAME_SEP "/"
@@ -34,6 +35,7 @@
#define HAVE_MEMCPY 1
#define HAVE_STRCHR 1
#define HAVE_STRSTR 1
+#define HAVE_LESSKEYSRC 1
#if 0 /* old sizes for small memory machines */
#define CMDBUF_SIZE 512 /* Buffer for multichar commands */
#define UNGOT_SIZE 100 /* Max chars to unget() */
@@ -70,9 +72,11 @@
#define HAVE_LIMITS_H 1
#define HAVE_LOCALE 1
#define HAVE_MEMORY_H 1
+#define HAVE_NANOSLEEP 1
#define HAVE_OSPEED 1
/* #undef HAVE_PCRE */
/* #undef HAVE_PCRE2 */
+#define HAVE_POLL 1
#define HAVE_POPEN 1
#define HAVE_POSIX_REGCOMP 1
#define HAVE_REALPATH 1
@@ -104,8 +108,10 @@
/* #undef HAVE_TERMIO_H */
#define HAVE_TIME_H 1
#define HAVE_TIME_T 1
+#define HAVE_TTYNAME 1
#define HAVE_UNISTD_H 1
#define HAVE_UPPER_LOWER 1
+#define HAVE_USLEEP 1
/* #undef HAVE_V8_REGCOMP */
#define HAVE_VALUES_H 1
#define HAVE_VOID 1
diff --git a/pkg/less/gen.lua b/pkg/less/gen.lua
@@ -3,7 +3,11 @@ cflags{
'-isystem $builddir/pkg/netbsd-curses/include',
}
-cc('version.c')
+objects[[
+ lesskey_parse.c
+ version.c
+ xbuf.c
+]]
exe('less', [[
main.c screen.c brac.c ch.c charset.c cmdbuf.c
@@ -11,7 +15,8 @@ exe('less', [[
help.c ifile.c input.c jump.c line.c linenum.c
lsystem.c mark.c optfunc.c option.c opttbl.c os.c
output.c pattern.c position.c prompt.c search.c signal.c
- tags.c ttyin.c version.c.o
+ tags.c ttyin.c version.c.o xbuf.c.o
+ lesskey_parse.c.o
$builddir/pkg/netbsd-curses/libcurses.a.d
]], {'pkg/netbsd-curses/headers'})
file('bin/less', '755', '$outdir/less')
@@ -19,7 +24,7 @@ file('bin/less', '755', '$outdir/less')
exe('lessecho', {'lessecho.c', 'version.c.o'})
file('bin/lessecho', '755', '$outdir/lessecho')
-exe('lesskey', {'lesskey.c', 'version.c.o'})
+exe('lesskey', {'lesskey.c', 'lesskey_parse.c.o', 'xbuf.c.o', 'version.c.o'})
file('bin/lesskey', '755', '$outdir/lesskey')
for _, cmd in ipairs{'less', 'lessecho', 'lesskey'} do
diff --git a/pkg/less/patch/0001-Fix-compiler-warning.patch b/pkg/less/patch/0001-Fix-compiler-warning.patch
@@ -0,0 +1,49 @@
+From a13b37473388ed731c2dc96c6bf2b053a4de26c3 Mon Sep 17 00:00:00 2001
+From: Mark Nudelman <markn@greenwoodsoftware.com>
+Date: Tue, 27 Jul 2021 10:33:14 -0700
+Subject: [PATCH] Fix compiler warning.
+
+---
+ funcs.h | 2 +-
+ xbuf.c | 2 +-
+ xbuf.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/funcs.h b/funcs.h
+index 330540a..29de5d3 100644
+--- a/funcs.h
++++ b/funcs.h
+@@ -351,4 +351,4 @@ public int getchr LESSPARAMS ((VOID_PARAM));
+ public void xbuf_init LESSPARAMS ((struct xbuffer *xbuf));
+ public void xbuf_deinit LESSPARAMS ((struct xbuffer *xbuf));
+ public void xbuf_reset LESSPARAMS ((struct xbuffer *xbuf));
+-public void xbuf_add LESSPARAMS ((struct xbuffer *xbuf, char ch));
++public void xbuf_add LESSPARAMS ((struct xbuffer *xbuf, int ch));
+diff --git a/xbuf.c b/xbuf.c
+index f20dfae..cc6ec47 100644
+--- a/xbuf.c
++++ b/xbuf.c
+@@ -34,7 +34,7 @@ xbuf_reset(xbuf)
+ public void
+ xbuf_add(xbuf, ch)
+ struct xbuffer *xbuf;
+- char ch;
++ int ch;
+ {
+ if (xbuf->end >= xbuf->size)
+ {
+diff --git a/xbuf.h b/xbuf.h
+index ba62ef1..b6bd160 100644
+--- a/xbuf.h
++++ b/xbuf.h
+@@ -10,6 +10,6 @@ struct xbuffer
+
+ void xbuf_init(struct xbuffer *xbuf);
+ void xbuf_reset(struct xbuffer *xbuf);
+-void xbuf_add(struct xbuffer *xbuf, char ch);
++void xbuf_add(struct xbuffer *xbuf, int ch);
+
+ #endif
+--
+2.32.0
+
diff --git a/pkg/less/sha256 b/pkg/less/sha256
@@ -1 +1 @@
-ce5b6d2b9fc4442d7a07c93ab128d2dff2ce09a1d4f2d055b95cf28dd0dc9a9a less-563.tar.gz
+6aadf54be8bf57d0e2999a3c5d67b1de63808bb90deb8f77b028eafae3a08e10 less-590.tar.gz
diff --git a/pkg/less/url b/pkg/less/url
@@ -1 +1 @@
-url = "http://www.greenwoodsoftware.com/less/less-563.tar.gz"
+url = "http://www.greenwoodsoftware.com/less/less-590.tar.gz"
diff --git a/pkg/less/ver b/pkg/less/ver
@@ -1 +1 @@
-563 r0
+590 r0
