From 672bd5e9d073bbfb836109ecdeb33eca5f1b6d87 Mon Sep 17 00:00:00 2001
From: Wolfgang Müller
Date: Mon, 29 Jul 2019 21:35:24 +0200
Subject: group-base: Patch openssh to add mandoc as a valid formatter

This (exact) patch has been upstreamed but is not part of a release yet.
---
 .../net-misc/openssh/add-mandoc-formatter.patch    | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 group-base/patches/net-misc/openssh/add-mandoc-formatter.patch

(limited to 'group-base/patches/net-misc')

diff --git a/group-base/patches/net-misc/openssh/add-mandoc-formatter.patch b/group-base/patches/net-misc/openssh/add-mandoc-formatter.patch
new file mode 100644
index 0000000..4263824
--- /dev/null
+++ b/group-base/patches/net-misc/openssh/add-mandoc-formatter.patch
@@ -0,0 +1,31 @@
+diff --git a/configure.ac b/configure.ac
+index 9022ee9c..17a11dee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,11 +41,11 @@ AC_PATH_PROG([TEST_MINUS_S_SH], [ksh])
+ AC_PATH_PROG([TEST_MINUS_S_SH], [sh])
+ AC_PATH_PROG([SH], [sh])
+ AC_PATH_PROG([GROFF], [groff])
+-AC_PATH_PROG([NROFF], [nroff])
++AC_PATH_PROG([NROFF], [nroff awf])
+ AC_PATH_PROG([MANDOC], [mandoc])
+ AC_SUBST([TEST_SHELL], [sh])
+ 
+-dnl select manpage formatter
++dnl select manpage formatter to be used to build "cat" format pages.
+ if test "x$MANDOC" != "x" ; then
+ 	MANFMT="$MANDOC"
+ elif test "x$NROFF" != "x" ; then
+@@ -4626,9 +4626,9 @@ AC_ARG_WITH([mantype],
+ 	]
+ )
+ if test -z "$MANTYPE"; then
+-	TestPath="/usr/bin${PATH_SEPARATOR}/usr/ucb"
+-	AC_PATH_PROGS([NROFF], [nroff awf], [/bin/false], [$TestPath])
+-	if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
++	if ${MANDOC} ${srcdir}/ssh.1 >/dev/null 2>&1; then
++		MANTYPE=doc
++	elif ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
+ 		MANTYPE=doc
+ 	elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then
+ 		MANTYPE=man
-- 
cgit v1.2.3-2-gb3c3