groups.d/221.native_packages_dev.group: mandoc: bump to v1.14.6

Signed-off-by: Ørjan Malde <red@foxi.me>

3 files changed, 114 insertions, 113 deletions

diff --git a/groups.d/221.native_packages_dev.group b/groups.d/221.native_packages_dev.group
index 3093d52e..044fb062 100644
--- a/groups.d/221.native_packages_dev.group
+++ b/groups.d/221.native_packages_dev.group
@@ -111,11 +111,12 @@ M4_cv_func_rename_open_file_works=yes"};
 ac_cv_func_gettimeofday=yes
 make_cv_synchronous_posix_spawn=yes"};
 : ${PKG_MANDOC_DEPENDS:="libz musl_fts"};
-: ${PKG_MANDOC_SHA256SUM:=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7};
-: ${PKG_MANDOC_VERSION:=1.14.5};
+: ${PKG_MANDOC_SHA256SUM:=8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c};
+: ${PKG_MANDOC_VERSION:=1.14.6};
 : ${PKG_MANDOC_URL:=https://mandoc.bsd.lv/snapshots/mandoc-${PKG_MANDOC_VERSION}.tar.gz};
-: ${PKG_MANDOC_MAKEFLAGS_BUILD_EXTRA_LIST:="CC=${DEFAULT_NATIVE_CC}:CFLAGS=--sysroot=${PREFIX_NATIVE}:LDFLAGS=-L${PREFIX_NATIVE}/lib:LDADD=-Wl,-lz,-lfts:HAVE_REALLOCARRAY=0"};
-: ${PKG_MANDOC_CFLAGS_BUILD_EXTRA:="-g3 -O0"};
+: ${PKG_MANDOC_MAKEFLAGS_BUILD_EXTRA_LIST:="CC=${DEFAULT_NATIVE_CC}:LDADD=-Wl,-lz,-lfts"};
+: ${PKG_MANDOC_CFLAGS_BUILD_EXTRA:="-D_GNU_SOURCE -g3 -O0"};
+: ${PKG_MANDOC_BUILD_STEPS_DISABLE:="configure"};
 : ${PKG_MANDOC_IN_TREE:=1};
 : ${PKG_NASM_SHA256SUM:=c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558};
 : ${PKG_NASM_VERSION:=2.16.01};
diff --git a/patches/mandoc-1.14.5_pre.local.patch b/patches/mandoc-1.14.5_pre.local.patch
deleted file mode 100644
index 1d193e6f..00000000
--- a/patches/mandoc-1.14.5_pre.local.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -Nru mandoc-1.14.5.orig/configure mandoc-1.14.5/configure
---- mandoc-1.14.5.orig/configure	2020-06-02 12:36:34.215963438 +0200
-+++ mandoc-1.14.5/configure	2020-06-02 13:35:04.100931431 +0200
-@@ -41,7 +41,7 @@
- OSNAME=
- UTF8_LOCALE=
- 
--CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
-+CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i PATH="${PATH}" make -sf -`
- CFLAGS=
- LDADD=
- LDFLAGS=
-@@ -289,8 +289,6 @@
- runtest EFTYPE		EFTYPE		|| true
- runtest err		ERR		|| true
- runtest getline		GETLINE		|| true
--singletest getsubopt	GETSUBOPT	|| \
--   runtest getsubopt	GETSUBOPT	-D_GNU_SOURCE || true
- runtest isblank		ISBLANK		|| true
- runtest mkdtemp		MKDTEMP		|| true
- runtest ntohl		NTOHL		|| true
-@@ -299,8 +297,6 @@
- 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
-@@ -361,20 +357,6 @@
- 	echo 1>&3
- fi
- 
--# --- nanosleep ---
--if [ -n "${LD_NANOSLEEP}" ]; then
--	runtest nanosleep NANOSLEEP "${LD_NANOSLEEP}" || true
--elif singletest nanosleep NANOSLEEP; then
--	:
--elif runtest nanosleep NANOSLEEP "-lrt"; then
--	LD_NANOSLEEP="-lrt"
--fi
--if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then
--	echo "FATAL: nanosleep: no" 1>&2
--	echo "FATAL: nanosleep: no" 1>&3
--	exit 1
--fi
--
- if [ ${BUILD_CATMAN} -gt 0 ]; then
- 	# --- recvmsg ---
- 	if [ -n "${LD_RECVMSG}" ]; then
-diff -Nru mandoc-1.14.5.orig/configure.local mandoc-1.14.5/configure.local
---- mandoc-1.14.5.orig/configure.local	1970-01-01 01:00:00.000000000 +0100
-+++ mandoc-1.14.5/configure.local	2020-06-02 13:35:25.328930766 +0200
-@@ -0,0 +1,54 @@
-+PREFIX=
-+MANDIR=/share/man
-+LIBDIR=/lib
-+UTF8_LOCALE="en_US.UTF-8"
-+MANPATH_DEFAULT="/share/man"
-+LN="ln -sf"
-+
-+# no gnu man, so this is fine.
-+BINM_MAN=man
-+BINM_APROPOS=apropos
-+BINM_WHATIS=whatis
-+BINM_MAKEWHATIS=makewhatis
-+BINM_SOELIM=soelim
-+MANM_MANCONF="man.conf"
-+
-+# *sigh*
-+HAVE_DIRENT_NAMLEN=0
-+HAVE_ISBLANK=1
-+HAVE_ENDIAN=1
-+HAVE_EFTYPE=0
-+HAVE_ERR=1
-+HAVE_FTS=1
-+HAVE_FTS_COMPARE_CONST=1
-+HAVE_GETLINE=1
-+HAVE_GETSUBOPT=1
-+HAVE_ISBLANK=1
-+HAVE_LESS_T=0
-+HAVE_MKDTEMP=1
-+HAVE_NTOHL=1
-+HAVE_O_DIRECTORY=1
-+HAVE_OHASH=0
-+HAVE_PATH_MAX=1
-+HAVE_PLEDGE=0
-+HAVE_PROGNAME=0
-+HAVE_REALLOCARRAY=0
-+HAVE_RECALLOCARRAY=0
-+HAVE_REWB_BSD=0
-+HAVE_REWB_SYSV=1
-+HAVE_STRCASESTR=1
-+HAVE_STRINGLIST=0
-+HAVE_STRLCAT=1
-+HAVE_STRLCPY=1
-+HAVE_STRPTIME=1
-+HAVE_STRSEP=1
-+HAVE_STRTONUM=0
-+HAVE_SYS_ENDIAN=0
-+HAVE_VASPRINTF=1
-+HAVE_WCHAR=1
-+HAVE_STRNDUP=1
-+HAVE_SANDBOX_INIT=0
-+
-+# *sigh x2* 
-+OSENUM=MANDOC_OS_OTHER
-+OSNAME="Midipix"
diff --git a/patches/mandoc-1.14.6.local.patch b/patches/mandoc-1.14.6.local.patch
new file mode 100644
index 00000000..ebd3dace
--- /dev/null
+++ b/patches/mandoc-1.14.6.local.patch
@@ -0,0 +1,109 @@
+diff -ru mandoc-1.14.6.orig/Makefile mandoc-1.14.6/Makefile
+--- mandoc-1.14.6.orig/Makefile 2021-09-23 20:03:23.000000000 +0200
++++ mandoc-1.14.6/Makefile      2024-02-26 15:20:48.758788836 +0100
+@@ -369,11 +369,40 @@
+
+ # === USER CONFIGURATION ===============================================
+
+-include Makefile.local
++MANDOC_COBJS    =  compat_fts.o compat_ohash.o compat_progname.o compat_recallocarray.o compat_strtonum.o
++SOELIM_COBJS    =  compat_progname.o compat_stringlist.o
++PREFIX      = 
++BINDIR      = /bin
++SBINDIR     = /sbin
++BIN_FROM_SBIN   = ../bin
++INCLUDEDIR  = /include/mandoc
++LIBDIR      = /lib/mandoc
++MANDIR      = /man
++WWWPREFIX   = /var/www
++HTDOCDIR    = /var/www/htdocs
++CGIBINDIR   = /var/www/cgi-bin
++BINM_APROPOS    = apropos
++BINM_CATMAN = catman
++BINM_MAKEWHATIS = makewhatis
++BINM_MAN    = man
++BINM_SOELIM = soelim
++BINM_WHATIS = whatis
++MANM_MAN    = man
++MANM_MANCONF    = man.conf
++MANM_MDOC   = mdoc
++MANM_ROFF   = roff
++MANM_EQN    = eqn
++MANM_TBL    = tbl
++INSTALL     = install
++INSTALL_PROGRAM = install -m 0555
++INSTALL_LIB = install -m 0444
++INSTALL_MAN = install -m 0444
++INSTALL_DATA    = install -m 0444
++LN = ln -f
+
+ # === DEPENDENCY HANDLING ==============================================
+
+-all: mandoc man demandoc soelim $(BUILD_TARGETS) Makefile.local
++all: mandoc man demandoc soelim $(BUILD_TARGETS)
+
+ install: base-install $(INSTALL_TARGETS)
+
+diff -ruN mandoc-1.14.6.orig/config.h mandoc-1.14.6/config.h
+--- mandoc-1.14.6.orig/config.h	1970-01-01 01:00:00.000000000 +0100
++++ mandoc-1.14.6/config.h	2024-02-26 14:41:39.744045181 +0100
+@@ -0,0 +1,59 @@
++#ifdef __cplusplus
++#error "Do not use C++.  See the INSTALL file."
++#endif
++
++#include <sys/types.h>
++
++#define MAN_CONF_FILE "/etc/man.conf"
++#define MANPATH_BASE "/usr/share/man:/usr/X11R6/man"
++#define MANPATH_DEFAULT "/share/man"
++#define OSENUM MANDOC_OS_OTHER
++#define OSNAME "Midipix"
++#define UTF8_LOCALE "en_US.UTF-8"
++#define EFTYPE EINVAL
++
++#define HAVE_DIRENT_NAMLEN 0
++#define HAVE_ENDIAN 1
++#define HAVE_ERR 1
++#define HAVE_FTS 1
++#define HAVE_FTS_COMPARE_CONST 0
++#define HAVE_GETLINE 1
++#define HAVE_GETSUBOPT 1
++#define HAVE_ISBLANK 1
++#define HAVE_LESS_T 0
++#define HAVE_MKDTEMP 1
++#define HAVE_MKSTEMPS 1
++#define HAVE_NTOHL 1
++#define HAVE_PLEDGE 0
++#define HAVE_PROGNAME 0
++#define HAVE_REALLOCARRAY 1
++#define HAVE_RECALLOCARRAY 0
++#define HAVE_REWB_BSD 0
++#define HAVE_REWB_SYSV 1
++#define HAVE_SANDBOX_INIT 0
++#define HAVE_STRCASESTR 1
++#define HAVE_STRINGLIST 0
++#define HAVE_STRLCAT 1
++#define HAVE_STRLCPY 1
++#define HAVE_STRNDUP 1
++#define HAVE_STRPTIME 1
++#define HAVE_STRSEP 1
++#define HAVE_STRTONUM 0
++#define HAVE_SYS_ENDIAN 0
++#define HAVE_VASPRINTF 1
++#define HAVE_WCHAR 1
++#define HAVE_OHASH 0
++#define NEED_XPG4_2 0
++
++#define BINM_APROPOS "apropos"
++#define BINM_CATMAN "catman"
++#define BINM_MAKEWHATIS "makewhatis"
++#define BINM_MAN "man"
++#define BINM_SOELIM "soelim"
++#define BINM_WHATIS "whatis"
++#define BINM_PAGER "less"
++
++extern	const char *getprogname(void);
++extern	void	  setprogname(const char *);
++extern	void	 *recallocarray(void *, size_t, size_t, size_t);
++extern	long long strtonum(const char *, long long, long long, const char **);