diff options
| author | Wolfgang Müller | 2019-07-29 21:35:24 +0200 |
|---|---|---|
| committer | Wolfgang Müller | 2019-07-29 21:35:24 +0200 |
| commit | 672bd5e9d073bbfb836109ecdeb33eca5f1b6d87 (patch) | |
| tree | f9e0cd26cbc8872e4a87cc53f861f690e224e583 /group-base | |
| parent | dda23c808ade09f4c8e3a665361b127b5562a72a (diff) | |
| download | portage-roles-672bd5e9d073bbfb836109ecdeb33eca5f1b6d87.tar.gz | |
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.
Diffstat (limited to 'group-base')
| -rw-r--r-- | group-base/patches/net-misc/openssh/add-mandoc-formatter.patch | 31 |
1 files changed, 31 insertions, 0 deletions
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 |