diff --git a/utils/mandoc/Makefile b/utils/mandoc/Makefile index a6a13267c9..00b505ebbe 100644 --- a/utils/mandoc/Makefile +++ b/utils/mandoc/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mandoc -PKG_VERSION:=1.14.5 +PKG_VERSION:=1.14.6 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://mandoc.bsd.lv/snapshots/ -PKG_HASH:=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7 +PKG_HASH:=8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=BSD-3-Clause BSD-2-Clause diff --git a/utils/mandoc/patches/010-mandoc-1.14.5-fix-gnu-make.patch b/utils/mandoc/patches/010-mandoc-1.14.5-fix-gnu-make.patch index b88cab2561..45ccb96a46 100644 --- a/utils/mandoc/patches/010-mandoc-1.14.5-fix-gnu-make.patch +++ b/utils/mandoc/patches/010-mandoc-1.14.5-fix-gnu-make.patch @@ -1,17 +1,6 @@ -Only in mandoc-1.14.5/: config.h -Only in mandoc-1.14.5/: config.log -Only in mandoc-1.14.5/: config.log.old --- a/configure +++ b/configure -@@ -41,7 +41,6 @@ OSENUM= - OSNAME= - UTF8_LOCALE= - --CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -` - CFLAGS= - LDADD= - LDFLAGS= -@@ -60,7 +59,7 @@ HAVE_DIRENT_NAMLEN= +@@ -62,7 +62,7 @@ HAVE_DIRENT_NAMLEN= HAVE_EFTYPE= HAVE_ENDIAN= HAVE_ERR= @@ -20,7 +9,7 @@ Only in mandoc-1.14.5/: config.log.old HAVE_FTS_COMPARE_CONST= HAVE_GETLINE= HAVE_GETSUBOPT= -@@ -74,7 +73,7 @@ HAVE_OHASH= +@@ -77,7 +77,7 @@ HAVE_OHASH= HAVE_PATH_MAX= HAVE_PLEDGE= HAVE_PROGNAME= @@ -29,21 +18,12 @@ Only in mandoc-1.14.5/: config.log.old HAVE_RECALLOCARRAY= HAVE_RECVMSG= HAVE_REWB_BSD= -@@ -95,7 +94,7 @@ HAVE_WCHAR= - NEED_GNU_SOURCE=0 - NEED_OPENBSD_SOURCE=0 +@@ -102,7 +102,7 @@ NEED_XPG4_2=0 + MANDOC_COBJS= + SOELIM_COBJS= -PREFIX="/usr/local" +PREFIX="/usr" BINDIR= SBINDIR= BIN_FROM_SBIN= -@@ -299,8 +298,6 @@ runtest PATH_MAX PATH_MAX || true - runtest pledge PLEDGE || true - runtest sandbox_init SANDBOX_INIT || true - runtest progname PROGNAME || true --singletest reallocarray REALLOCARRAY || \ -- runtest reallocarray REALLOCARRAY -D_OPENBSD_SOURCE || true - singletest recallocarray RECALLOCARRAY || \ - runtest recallocarray RECALLOCARRAY -D_OPENBSD_SOURCE || true - runtest rewb-bsd REWB_BSD || true diff --git a/utils/mandoc/patches/020-gcc10.patch b/utils/mandoc/patches/020-gcc10.patch deleted file mode 100644 index fc72324524..0000000000 --- a/utils/mandoc/patches/020-gcc10.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/compat_getline.c -+++ b/compat_getline.c -@@ -2,7 +2,7 @@ - - #if HAVE_GETLINE - --int dummy; -+extern int dummy; - - #else -