Date: Mon, 18 Apr 2011 22:01:37 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@FreeBSD.org> To: current@FreeBSD.org Cc: Gordon Tetlow <gordon@tetlows.org> Subject: RFC: let man(1) depend on users PATH? Message-ID: <20110418200137.GK85668@acme.spoerlein.net>
next in thread | raw e-mail | index | archive | help
--gw4vLALk08fVJy3V
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Greetings,
the following patch is required to let man(1) continue to work if the
user build WITHOUT_GROFF and has textproc/groff installed. I personally
think relying on a sane $PATH while calling groff and co is ok to do.
If there are good reasons against this, please speak your mind. The idea
is to be able to switch back and forth between base/ports groff-suite
without having to alter any configuration files.
Cheers,
Uli
--gw4vLALk08fVJy3V
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment; filename="man_groff.diff"
Content-Transfer-Encoding: 8bit
commit 4f1cfe61ede418f795095c2d3c021db64c860e20
Author: Ulrich Spörlein <uqs@spoerlein.net>
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'
--gw4vLALk08fVJy3V--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110418200137.GK85668>