svn commit: r221303 - head/usr.bin/man
Ulrich Spoerlein
uqs at FreeBSD.org
Sun May 1 19:47:35 UTC 2011
Author: uqs
Date: Sun May 1 19:47:34 2011
New Revision: 221303
URL: http://svn.freebsd.org/changeset/base/221303
Log:
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).
Modified:
head/usr.bin/man/man.sh
Modified: head/usr.bin/man/man.sh
==============================================================================
--- head/usr.bin/man/man.sh Sun May 1 19:24:51 2011 (r221302)
+++ head/usr.bin/man/man.sh Sun May 1 19:47:34 2011 (r221303)
@@ -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 -S -P-c -Wall -mtty-char -man'
+PIC=pic
+REFER=refer
+TBL=tbl
+TROFF='groff -S -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'
More information about the svn-src-all
mailing list