From cbeb8a51a3e4d6881671ad8c9c69b08cc54db052 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Tue, 28 Nov 2023 23:44:23 -0500
Subject: [PATCH] some macOS doc updates

Allow 'make USE_MANDOC=1 distrib' to be used for generating
the doc/*.txt files for systems that have mandoc and may not have groff.
(macOS Ventura doesn't include groff in the OS).
USE_MANDOC=1 is not restricted only to macOS.

Have hints/macOS.370 specify the /usr/share/man/man6 directory for the macOS
man pages, so that 'make manpages' will target the correct directory on
that platform.
---
 sys/unix/Makefile.doc           | 3 ++-
 sys/unix/hints/include/misc.370 | 6 ++++++
 sys/unix/hints/macOS.370        | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/sys/unix/Makefile.doc b/sys/unix/Makefile.doc
index bfe6a7981..8125d49a7 100644
--- a/sys/unix/Makefile.doc
+++ b/sys/unix/Makefile.doc
@@ -83,6 +83,7 @@ $(MAKEDEFS)	: ../util/makedefs.c ../include/config.h ../src/mdlib.c \
 GAME	= nethack
 MANDIR	?= /usr/man/man6
 MANEXT	= 6
+NROFF ?= nroff
 
 # manual installation for most BSD-style systems
 GAMEMANCREATE = cat nethack.6 | $(NHGREP) >
@@ -119,7 +120,7 @@ Guidebook.dat	: Gbk-1pg-pfx.mn Gbk-1pg-sfx.mn $(GUIDEBOOK_MN) tmac.n tmac.nh \
 # MAN2TXTPRE and MAN2TXTPOST are included so that a hints file can alter
 # both of them as required
 MAN2TXTPOST ?= | col -b
-MAN2TXT = $(NHGREP) | nroff -man $(MAN2TXTPRE) $(MAN2TXTPOST)
+MAN2TXT = $(NHGREP) | $(NROFF) -man $(MAN2TXTPRE) $(MAN2TXTPOST)
 # If you aren't using a hints file, you can uncomment the following
 # line if you have groff 1.23 or greater.
 #MAN2TXT = $(NHGREP) | groff -man -Tascii -P -cbou
diff --git a/sys/unix/hints/include/misc.370 b/sys/unix/hints/include/misc.370
index 1fc313a8a..b66ec6e10 100644
--- a/sys/unix/hints/include/misc.370
+++ b/sys/unix/hints/include/misc.370
@@ -65,6 +65,11 @@ CPLUSPLUS_NEEDED = 1
 endif
 endif
 
+ifdef USE_MANDOC
+NROFF = mandoc
+MAN2TXTPRE=
+MAN2TXTPOST=
+else
 #detection of groff
 NROFFISGROFF := $(shell echo `nroff --version | grep "GNU groff version"`)
 #$(info NROFFISGROFF=$(NROFFISGROFF))
@@ -86,6 +91,7 @@ MAN2TXTPRE += -c
 # groff less than 1.23
 endif
 endif  # end groff-specific
+endif  # not USE_MANDOC
 
 #end of hints/include/misc.370
 #------------------------------------------------------------------------------
diff --git a/sys/unix/hints/macOS.370 b/sys/unix/hints/macOS.370
index a0266938e..840e816b7 100755
--- a/sys/unix/hints/macOS.370
+++ b/sys/unix/hints/macOS.370
@@ -88,6 +88,9 @@ endif   # WANT_WIN_QT
 
 #-INCLUDE misc.370
 
+# manpages directory
+MANDIR=/usr/share/man/man6
+
 ifeq "$(USE_ASAN)" "1"
 CFLAGS +=-fsanitize=address
 LFLAGS +=-fsanitize=address