diff --git a/packages/man/build.sh b/packages/man/build.sh index 6f2fbed31..728b4e3cc 100644 --- a/packages/man/build.sh +++ b/packages/man/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://mdocml.bsd.lv/ TERMUX_PKG_DESCRIPTION="Man page viewer from the mandoc toolset" TERMUX_PKG_LICENSE="BSD 3-Clause" -TERMUX_PKG_VERSION=1.14.4 -TERMUX_PKG_SHA256=24eb72103768987dcc63b53d27fdc085796330782f44b3b40c4660b1e1ee9b9c +TERMUX_PKG_VERSION=1.14.5 +TERMUX_PKG_SHA256=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7 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 diff --git a/packages/man/configure.patch b/packages/man/configure.patch index ecf4d3f05..87fc84c35 100644 --- a/packages/man/configure.patch +++ b/packages/man/configure.patch @@ -1,7 +1,7 @@ -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 @@ +diff -u -r ../mandoc-1.14.5/configure ./configure +--- ../mandoc-1.14.5/configure 2019-03-10 09:56:43.000000000 +0000 ++++ ./configure 2019-03-17 11:00:40.653234300 +0000 +@@ -35,16 +35,13 @@ SOURCEDIR=`dirname "$0"` @@ -9,6 +9,7 @@ diff -u -r ../mandoc-1.14.4/configure ./configure -MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man" +MANPATH_BASE="@TERMUX_PREFIX@/share/man" +MANPATH_DEFAULT="@TERMUX_PREFIX@/share/man" + OSENUM= OSNAME= UTF8_LOCALE= @@ -19,7 +20,7 @@ diff -u -r ../mandoc-1.14.4/configure ./configure LD_NANOSLEEP= LD_OHASH= LD_RECVMSG= -@@ -121,7 +118,7 @@ +@@ -126,7 +123,7 @@ INSTALL_LIB= INSTALL_MAN= INSTALL_DATA= @@ -28,7 +29,7 @@ diff -u -r ../mandoc-1.14.4/configure ./configure # --- manual settings from configure.local ----------------------------- -@@ -312,7 +309,7 @@ +@@ -367,7 +364,7 @@ elif singletest nanosleep NANOSLEEP; then : elif runtest nanosleep NANOSLEEP "-lrt"; then @@ -37,7 +38,7 @@ diff -u -r ../mandoc-1.14.4/configure ./configure fi if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then echo "FATAL: nanosleep: no" 1>&2 -@@ -398,7 +395,7 @@ +@@ -452,7 +449,7 @@ [ ${HAVE_GETLINE} -eq 0 ] && echo "#include " echo @@ -45,4 +46,4 @@ diff -u -r ../mandoc-1.14.4/configure ./configure +echo "#define MAN_CONF_FILE \"@TERMUX_PREFIX@/etc/${MANM_MANCONF}\"" echo "#define MANPATH_BASE \"${MANPATH_BASE}\"" echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\"" - [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\"" + echo "#define OSENUM ${OSENUM}" diff --git a/packages/man/main.c.patch b/packages/man/main.c.patch index 0e2e0faae..250a5aeff 100644 --- a/packages/man/main.c.patch +++ b/packages/man/main.c.patch @@ -1,15 +1,6 @@ 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 - #include - #include /* MACHINE */ --#include -+#include - #include - - #include @@ -1187,7 +1187,7 @@ if (pager == NULL || *pager == '\0') pager = getenv("PAGER"); diff --git a/packages/man/tag.h.patch b/packages/man/tag.h.patch index 3ade76bc1..fd8fdf8d5 100644 --- a/packages/man/tag.h.patch +++ b/packages/man/tag.h.patch @@ -1,6 +1,6 @@ -diff -u -r ../mdocml-1.13.4/tag.h ./tag.h ---- ../mdocml-1.13.4/tag.h 2016-07-14 07:13:40.000000000 -0400 -+++ ./tag.h 2016-07-16 19:06:53.419465442 -0400 +diff -u -r ../mandoc-1.14.5/tag.h ./tag.h +--- ../mandoc-1.14.5/tag.h 2019-03-10 09:56:43.000000000 +0000 ++++ ./tag.h 2019-03-17 11:02:57.271630396 +0000 @@ -16,8 +16,8 @@ */ @@ -9,6 +9,6 @@ diff -u -r ../mdocml-1.13.4/tag.h ./tag.h - char tfn[20]; + char ofn[127]; + char tfn[127]; + char *tagname; int ofd; int tfd; - pid_t tcpgid;