diff --git a/gnu/usr.bin/man/Makefile.inc b/gnu/usr.bin/man/Makefile.inc index 26f194d2f50d..5793e15384b8 100644 --- a/gnu/usr.bin/man/Makefile.inc +++ b/gnu/usr.bin/man/Makefile.inc @@ -9,7 +9,7 @@ pager= more -s manpath_config_file= /etc/manpath.config troff= /usr/bin/groff -S -man # -Tascii or localized encoding added automatically -nroff= /usr/bin/groff -P-c -S -Wall -mtty-char -man +nroff= /usr/bin/groff -S -Wall -mtty-char -man apropos= /usr/bin/apropos whatis= /usr/bin/whatis eqn= /usr/bin/eqn diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 584f2ff303b6..9cac378e61e8 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -57,7 +57,7 @@ MINSTALL?= ${INSTALL} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} CATDIR= ${MANDIR:H:S/$/\/cat/} CATEXT= .cat -MROFF_CMD?= groff -P-c -Tascii -mtty-char -man -t +MROFF_CMD?= groff -Tascii -mtty-char -man -t MCOMPRESS_CMD?= ${COMPRESS_CMD} MCOMPRESS_EXT?= ${COMPRESS_EXT} diff --git a/usr.bin/catman/catman.c b/usr.bin/catman/catman.c index 486204dec0e6..ff536663840e 100644 --- a/usr.bin/catman/catman.c +++ b/usr.bin/catman/catman.c @@ -446,7 +446,7 @@ process_page(char *mandir, char *src, char *cat, int src_gzipped) } snprintf(tmp_file, sizeof tmp_file, "%s.tmp", cat); snprintf(cmd, sizeof cmd, - "%scat %s | tbl | nroff -c -T%s -man | col | gzip -cn > %s.tmp", + "%scat %s | tbl | nroff -T%s -man | col | gzip -cn > %s.tmp", src_gzipped ? "z" : "", src, nroff_device, cat); if (system(cmd) != 0) err(1, "formatting pipeline");