From owner-svn-src-stable-8@FreeBSD.ORG  Wed Nov 23 18:15:50 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0FCDD1065672;
	Wed, 23 Nov 2011 18:15:50 +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 F29EA8FC19;
	Wed, 23 Nov 2011 18:15:49 +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 pANIFnXx057269;
	Wed, 23 Nov 2011 18:15:49 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pANIFnAn057267;
	Wed, 23 Nov 2011 18:15:49 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201111231815.pANIFnAn057267@svn.freebsd.org>
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Wed, 23 Nov 2011 18:15:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227900 - stable/8/usr.bin/catman
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Nov 2011 18:15:50 -0000

Author: uqs
Date: Wed Nov 23 18:15:49 2011
New Revision: 227900
URL: http://svn.freebsd.org/changeset/base/227900

Log:
  MFH r224639, r224657: Disable generation of SGR sequences.
  
  This is a no-op when using base groff, as it hasn't been changed in stable.
  This helps when using the ports groff, though.

Modified:
  stable/8/usr.bin/catman/catman.c
Directory Properties:
  stable/8/usr.bin/catman/   (props changed)

Modified: stable/8/usr.bin/catman/catman.c
==============================================================================
--- stable/8/usr.bin/catman/catman.c	Wed Nov 23 18:11:10 2011	(r227899)
+++ stable/8/usr.bin/catman/catman.c	Wed Nov 23 18:15:49 2011	(r227900)
@@ -432,7 +432,7 @@ process_page(char *mandir, char *src, ch
 	}
 	snprintf(tmp_file, sizeof tmp_file, "%s.tmp", cat);
 	snprintf(cmd, sizeof cmd,
-	    "%scat %s | tbl | nroff -T%s -man | col | %s > %s.tmp",
+	    "%scat %s | tbl | nroff -c -T%s -man | %s > %s.tmp",
 	    zipped == BZIP ? BZ2CAT_CMD : zipped == GZIP ? GZCAT_CMD : "",
 	    src, nroff_device,
 	    zipped == BZIP ? BZ2_CMD : zipped == GZIP ? GZ_CMD : "cat",