summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authoruqs <uqs@FreeBSD.org>2011-05-01 19:47:34 +0000
committeruqs <uqs@FreeBSD.org>2011-05-01 19:47:34 +0000
commit3ec54ea2452241be093edb0903cfd06fe39b6573 (patch)
treeb16d45a41a5aef38c8d25304cecc89b0052da8cb /usr.bin
parente16e83cd8d88d4b695684431a347258f4b80109f (diff)
downloadFreeBSD-src-3ec54ea2452241be093edb0903cfd06fe39b6573.zip
FreeBSD-src-3ec54ea2452241be093edb0903cfd06fe39b6573.tar.gz
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).
Diffstat (limited to 'usr.bin')
-rwxr-xr-xusr.bin/man/man.sh16
1 files changed, 9 insertions, 7 deletions
diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh
index 147ce58..f1c91ee 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 -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'
OpenPOWER on IntegriCloud