man: Update from 1.14.3 to 1.14.4

This commit is contained in:
Fredrik Fornwall 2018-08-11 19:37:08 +02:00
parent cce121f91b
commit cd671b2c3e
4 changed files with 27 additions and 55 deletions

View File

@ -1,8 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://mdocml.bsd.lv/
TERMUX_PKG_DESCRIPTION="Man page viewer from the mandoc toolset"
TERMUX_PKG_VERSION=1.14.3
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=0b0c8f67958c1569ead4b690680c337984b879dfd2ad4648d96924332fd99528
TERMUX_PKG_VERSION=1.14.4
TERMUX_PKG_SHA256=24eb72103768987dcc63b53d27fdc085796330782f44b3b40c4660b1e1ee9b9c
TERMUX_PKG_SRCURL=http://mdocml.bsd.lv/snapshots/mandoc-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_DEPENDS="less,libandroid-glob"
TERMUX_PKG_BUILD_IN_SRC=yes

View File

@ -1,7 +1,7 @@
diff -u -r ../mandoc-1.14.3/configure ./configure
--- ../mandoc-1.14.3/configure 2017-08-05 14:40:21.000000000 +0200
+++ ./configure 2017-08-17 16:00:24.385570649 +0200
@@ -35,12 +35,11 @@
diff -u -r ../mandoc-1.14.4/configure ./configure
--- ../mandoc-1.14.4/configure 2018-08-08 14:51:51.000000000 +0000
+++ ./configure 2018-08-11 09:56:21.090800759 +0000
@@ -35,15 +35,12 @@
SOURCEDIR=`dirname "$0"`
@ -13,10 +13,13 @@ diff -u -r ../mandoc-1.14.3/configure ./configure
UTF8_LOCALE=
-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
CFLAGS="-g -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings"
CFLAGS="${CFLAGS} -Wno-unused-parameter"
-CFLAGS=
LDADD=
@@ -121,7 +120,7 @@
-LDFLAGS=
LD_NANOSLEEP=
LD_OHASH=
LD_RECVMSG=
@@ -121,7 +118,7 @@
INSTALL_LIB=
INSTALL_MAN=
INSTALL_DATA=
@ -25,7 +28,7 @@ diff -u -r ../mandoc-1.14.3/configure ./configure
# --- manual settings from configure.local -----------------------------
@@ -274,7 +273,7 @@
@@ -312,7 +309,7 @@
elif singletest nanosleep NANOSLEEP; then
:
elif runtest nanosleep NANOSLEEP "-lrt"; then
@ -34,7 +37,7 @@ diff -u -r ../mandoc-1.14.3/configure ./configure
fi
if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then
echo "FATAL: nanosleep: no" 1>&2
@@ -359,7 +358,7 @@
@@ -398,7 +395,7 @@
[ ${HAVE_GETLINE} -eq 0 ] && echo "#include <stdio.h>"
echo

View File

@ -1,7 +1,16 @@
diff -u -r ../mdocml-1.13.4/main.c ./main.c
--- ../mdocml-1.13.4/main.c 2016-07-14 07:13:40.000000000 -0400
+++ ./main.c 2016-07-16 19:02:14.979817917 -0400
@@ -1042,7 +1044,7 @@
diff -u -r ../mandoc-1.14.4/main.c ./main.c
--- ../mandoc-1.14.4/main.c 2018-08-08 14:51:51.000000000 +0000
+++ ./main.c 2018-08-11 09:58:01.245684598 +0000
@@ -21,7 +21,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/param.h> /* MACHINE */
-#include <sys/termios.h>
+#include <termios.h>
#include <sys/wait.h>
#include <assert.h>
@@ -1187,7 +1187,7 @@
if (pager == NULL || *pager == '\0')
pager = getenv("PAGER");
if (pager == NULL || *pager == '\0')

View File

@ -1,39 +0,0 @@
diff -u -r ../mandoc-1.14.3/term_ascii.c ./term_ascii.c
--- ../mandoc-1.14.3/term_ascii.c 2017-08-05 14:40:22.000000000 +0200
+++ ./term_ascii.c 2017-08-17 15:58:09.579116114 +0200
@@ -18,8 +18,10 @@
#include "config.h"
#include <sys/types.h>
+#include <sys/ioctl.h>
#include <assert.h>
+#include <fcntl.h>
#if HAVE_WCHAR
#include <locale.h>
#endif
@@ -64,6 +66,8 @@
char *v;
#endif
struct termp *p;
+ struct winsize ws;
+ int tfd;
p = mandoc_calloc(1, sizeof(*p));
p->tcol = p->tcols = mandoc_calloc(1, sizeof(*p->tcol));
@@ -71,6 +75,15 @@
p->line = 1;
p->defrmargin = p->lastrmargin = 78;
+
+ if ((tfd = open("/dev/tty", O_RDWR, 0)) != -1) {
+ if (ioctl(tfd, TIOCGWINSZ, &ws) != -1) {
+ if (ws.ws_col < 80)
+ p->defrmargin = p->lastrmargin = ws.ws_col - 2;
+ }
+ close(tfd);
+ }
+
p->fontq = mandoc_reallocarray(NULL,
(p->fontsz = 8), sizeof(*p->fontq));
p->fontq[0] = p->fontl = TERMFONT_NONE;