commit 870ef94
Randy Palamar
·
2024-01-02 21:15:31 +0000 UTC
parent 2bfd0b1
less: update to version 643
7 files changed,
+15,
-66
+1,
-1
1@@ -1,2 +1,2 @@
2-/less-590.tar.gz
3+/less-643.tar.gz
4 /src
+8,
-8
1@@ -1,4 +1,3 @@
2-#define BINDIR "/bin"
3 #define SYSDIR "/etc"
4
5 #define SECURE SECURE_COMPILE
6@@ -57,6 +56,7 @@
7 #define TAGLINE_SIZE 1024 /* Max size of line in tags file */
8 #define TABSTOP_MAX 128 /* Max number of custom tab stops */
9 #endif
10+#define RETSIGTYPE void
11 #define EDIT_PGM "vi"
12 #define HAVE_CONST 1
13 #define HAVE_CTYPE_H 1
14@@ -65,20 +65,22 @@
15 #define HAVE_FCHMOD 1
16 #define HAVE_FCNTL_H 1
17 #define HAVE_FILENO 1
18-#define HAVE_FLOAT 1
19 #define HAVE_FSYNC 1
20 /* #undef HAVE_GNU_REGEX */
21 #define HAVE_INTTYPES_H 1
22 #define HAVE_LIMITS_H 1
23+/* #undef HAVE_LINUX_MAGIC_H */
24 #define HAVE_LOCALE 1
25-#define HAVE_MEMORY_H 1
26 #define HAVE_NANOSLEEP 1
27+/* #undef HAVE_NCURSESW_TERMCAP_H */
28+/* #undef HAVE_NCURSES_TERMCAP_H */
29 #define HAVE_OSPEED 1
30 /* #undef HAVE_PCRE */
31 /* #undef HAVE_PCRE2 */
32 #define HAVE_POLL 1
33 #define HAVE_POPEN 1
34 #define HAVE_POSIX_REGCOMP 1
35+/* #undef HAVE_PROCFS */
36 #define HAVE_REALPATH 1
37 /* #undef HAVE_REGCMP */
38 /* #undef HAVE_REGEXEC2 */
39@@ -90,18 +92,21 @@
40 #define HAVE_SNPRINTF 1
41 #define HAVE_STAT 1
42 #define HAVE_STAT_INO 1
43+/* #undef HAVE_STDCKDINT_H */
44 #define HAVE_STDINT_H 1
45 #define HAVE_STDIO_H 1
46 #define HAVE_STDLIB_H 1
47 #define HAVE_STRERROR 1
48 #define HAVE_STRINGS_H 1
49 #define HAVE_STRING_H 1
50+#define HAVE_STRSIGNAL 1
51 #define HAVE_SYSTEM 1
52 #define HAVE_SYS_ERRLIST 1
53 #define HAVE_SYS_IOCTL_H 1
54 #define HAVE_SYS_STAT_H 1
55 /* #undef HAVE_SYS_STREAM_H */
56 #define HAVE_SYS_TYPES_H 1
57+#define HAVE_SYS_WAIT_H 1
58 #define HAVE_TERMCAP_H 1
59 #define HAVE_TERMIOS_FUNCS 1
60 #define HAVE_TERMIOS_H 1
61@@ -127,14 +132,9 @@
62 #define PACKAGE_TARNAME "less"
63 #define PACKAGE_URL ""
64 #define PACKAGE_VERSION "1"
65-#define RETSIGTYPE void
66 #define SECURE_COMPILE 0
67 /* #undef STAT_MACROS_BROKEN */
68 #define STDC_HEADERS 1
69-#define TIME_WITH_SYS_TIME 1
70-#ifndef _DARWIN_USE_64_BIT_INODE
71-# define _DARWIN_USE_64_BIT_INODE 1
72-#endif
73 /* #undef _FILE_OFFSET_BITS */
74 /* #undef _LARGE_FILES */
75 /* #undef const */
+3,
-5
1@@ -12,7 +12,8 @@ objects[[
2 exe('less', [[
3 main.c screen.c brac.c ch.c charset.c cmdbuf.c
4 command.c cvt.c decode.c edit.c filename.c forwback.c
5- help.c ifile.c input.c jump.c line.c linenum.c
6+ help.c ifile.c input.c jump.c
7+ line.c linenum.c
8 lsystem.c mark.c optfunc.c option.c opttbl.c os.c
9 output.c pattern.c position.c prompt.c search.c signal.c
10 tags.c ttyin.c version.c.o xbuf.c.o
11@@ -27,10 +28,7 @@ file('bin/lessecho', '755', '$outdir/lessecho')
12 exe('lesskey', {'lesskey.c', 'lesskey_parse.c.o', 'xbuf.c.o', 'version.c.o'})
13 file('bin/lesskey', '755', '$outdir/lesskey')
14
15-for _, cmd in ipairs{'less', 'lessecho', 'lesskey'} do
16- build('gzip', '$outdir/'..cmd..'.1.gz', '$srcdir/'..cmd..'.nro')
17- file('share/man/man1/'..cmd..'.1.gz', '644', '$outdir/'..cmd..'.1.gz')
18-end
19+man({'less.nro', 'lessecho.nro', 'lesskey.nro'}, '1')
20
21 sym('bin/more', 'less')
22
1@@ -1,49 +0,0 @@
2-From a13b37473388ed731c2dc96c6bf2b053a4de26c3 Mon Sep 17 00:00:00 2001
3-From: Mark Nudelman <markn@greenwoodsoftware.com>
4-Date: Tue, 27 Jul 2021 10:33:14 -0700
5-Subject: [PATCH] Fix compiler warning.
6-
7----
8- funcs.h | 2 +-
9- xbuf.c | 2 +-
10- xbuf.h | 2 +-
11- 3 files changed, 3 insertions(+), 3 deletions(-)
12-
13-diff --git a/funcs.h b/funcs.h
14-index 330540a..29de5d3 100644
15---- a/funcs.h
16-+++ b/funcs.h
17-@@ -351,4 +351,4 @@ public int getchr LESSPARAMS ((VOID_PARAM));
18- public void xbuf_init LESSPARAMS ((struct xbuffer *xbuf));
19- public void xbuf_deinit LESSPARAMS ((struct xbuffer *xbuf));
20- public void xbuf_reset LESSPARAMS ((struct xbuffer *xbuf));
21--public void xbuf_add LESSPARAMS ((struct xbuffer *xbuf, char ch));
22-+public void xbuf_add LESSPARAMS ((struct xbuffer *xbuf, int ch));
23-diff --git a/xbuf.c b/xbuf.c
24-index f20dfae..cc6ec47 100644
25---- a/xbuf.c
26-+++ b/xbuf.c
27-@@ -34,7 +34,7 @@ xbuf_reset(xbuf)
28- public void
29- xbuf_add(xbuf, ch)
30- struct xbuffer *xbuf;
31-- char ch;
32-+ int ch;
33- {
34- if (xbuf->end >= xbuf->size)
35- {
36-diff --git a/xbuf.h b/xbuf.h
37-index ba62ef1..b6bd160 100644
38---- a/xbuf.h
39-+++ b/xbuf.h
40-@@ -10,6 +10,6 @@ struct xbuffer
41-
42- void xbuf_init(struct xbuffer *xbuf);
43- void xbuf_reset(struct xbuffer *xbuf);
44--void xbuf_add(struct xbuffer *xbuf, char ch);
45-+void xbuf_add(struct xbuffer *xbuf, int ch);
46-
47- #endif
48---
49-2.32.0
50-
+1,
-1
1@@ -1 +1 @@
2-6aadf54be8bf57d0e2999a3c5d67b1de63808bb90deb8f77b028eafae3a08e10 less-590.tar.gz
3+2911b5432c836fa084c8a2e68f6cd6312372c026a58faaa98862731c8b6052e8 less-643.tar.gz
+1,
-1
1@@ -1 +1 @@
2-url = "http://www.greenwoodsoftware.com/less/less-590.tar.gz"
3+url = "http://www.greenwoodsoftware.com/less/less-643.tar.gz"
+1,
-1
1@@ -1 +1 @@
2-590 r0
3+643 r0