From owner-svn-src-all@FreeBSD.ORG  Sun May  1 19:47:34 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E179F1065672;
	Sun,  1 May 2011 19:47:34 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D23658FC18;
	Sun,  1 May 2011 19:47:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p41JlYYN005257;
	Sun, 1 May 2011 19:47:34 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p41JlYps005255;
	Sun, 1 May 2011 19:47:34 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201105011947.p41JlYps005255@svn.freebsd.org>
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Sun, 1 May 2011 19:47:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221303 - head/usr.bin/man
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 May 2011 19:47:35 -0000

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'