commit 4f1cfe61ede418f795095c2d3c021db64c860e20 Author: Ulrich Spörlein Date: Sat Mar 12 12:40:21 2011 +0100 Let users' PATH decide which groff suite to pick up. Let groff pass the -c flag to grotty, which will turn off ANSI sequences. While these are not a problem for our more/less, they get mangled by col(1) and this will result in garbage output. This makes man(1) work together with textproc/groff, in case the user decided to delete the old groff from base (-DWITHOUT_GROFF). diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 147ce58..58373a4 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -889,16 +889,18 @@ do_whatis() { search_whatis whatis "$@" } -EQN=/usr/bin/eqn +# User's PATH setting decides on the groff-suite to pick up. +EQN=eqn +NROFF='groff -P-c -Wall -mtty-char -man' +PIC=pic +REFER=refer +TBL=tbl +TROFF='groff -P-c -man' +VGRIND=vgrind + COL=/usr/bin/col LOCALE=/usr/bin/locale -NROFF='/usr/bin/groff -S -Wall -mtty-char -man' -PIC=/usr/bin/pic SYSCTL=/sbin/sysctl -TBL=/usr/bin/tbl -TROFF='/usr/bin/groff -S -man' -REFER=/usr/bin/refer -VGRIND=/usr/bin/vgrind debug=0 man_default_sections='1:1aout:8:2:3:n:4:5:6:7:9:l'