From owner-svn-src-head@FreeBSD.ORG  Fri May 15 15:56:28 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D8F50752;
 Fri, 15 May 2015 15:56:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C6AAE1DE4;
 Fri, 15 May 2015 15:56:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4FFuSL5018766;
 Fri, 15 May 2015 15:56:28 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4FFuSrW018765;
 Fri, 15 May 2015 15:56:28 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201505151556.t4FFuSrW018765@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 15 May 2015 15:56:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282980 - head/usr.bin/man
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 May 2015 15:56:29 -0000

Author: bapt
Date: Fri May 15 15:56:28 2015
New Revision: 282980
URL: https://svnweb.freebsd.org/changeset/base/282980

Log:
  Allow MANWIDTH to work with mandoc(1)
  
  Reported by:	bdrewery

Modified:
  head/usr.bin/man/man.sh

Modified: head/usr.bin/man/man.sh
==============================================================================
--- head/usr.bin/man/man.sh	Fri May 15 15:49:24 2015	(r282979)
+++ head/usr.bin/man/man.sh	Fri May 15 15:56:28 2015	(r282980)
@@ -311,8 +311,11 @@ man_display_page() {
 		return
 	fi
 
+	if [ -n "$use_width" ]; then
+		mandoc_args="-O width=${use_width}"
+	fi
 	testline="mandoc -Tlint -Wunsupp 2>/dev/null"
-	pipeline="mandoc | $MANPAGER"
+	pipeline="mandoc $mandoc_args | $MANPAGER"
 
 	if ! eval "$cattool $manpage | $testline" ;then
 		if which -s groff; then