From owner-svn-src-projects@freebsd.org  Sat Oct  8 23:18:42 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA3F8C06A79
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat,  8 Oct 2016 23:18:42 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 AC8541D3;
 Sat,  8 Oct 2016 23:18:42 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98NIfdD014316;
 Sat, 8 Oct 2016 23:18:41 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98NIfxu014315;
 Sat, 8 Oct 2016 23:18:41 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201610082318.u98NIfxu014315@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 8 Oct 2016 23:18:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r306885 - projects/doctools/usr.bin/man
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Oct 2016 23:18:42 -0000

Author: bapt
Date: Sat Oct  8 23:18:41 2016
New Revision: 306885
URL: https://svnweb.freebsd.org/changeset/base/306885

Log:
  When a manpage cannot be rendered with mandoc(1) fallback on heirloom-doctools
  then groff(1)

Modified:
  projects/doctools/usr.bin/man/man.sh

Modified: projects/doctools/usr.bin/man/man.sh
==============================================================================
--- projects/doctools/usr.bin/man/man.sh	Sat Oct  8 23:10:57 2016	(r306884)
+++ projects/doctools/usr.bin/man/man.sh	Sat Oct  8 23:18:41 2016	(r306885)
@@ -322,15 +322,23 @@ man_display_page() {
 	fi
 
 	if ! eval "$cattool $manpage | $testline" ;then
-		if which -s groff; then
+		if which -s picpack; then
+			pipeline="soelim | tbl | eqn | nroff -u1 -Tlocale -man - | col -x"
+			if [ -z "$tflags" ]; then
+				pipeline="${pipeline} | $MANPAGER"
+			fi
+		elif which -s groff; then
 			man_display_page_groff
+			return
 		else
-			echo "This manpage needs groff(1) to be rendered" >&2
-			echo "First install groff(1): " >&2
+			echo "This manpage needs heirloom-doctools or groff(1) to be rendered" >&2
+			echo "First install heirloom doctools or groff(1): " >&2
+			echo "pkg install heirloom-doctools " >&2
+			echo "or" >&2
 			echo "pkg install groff " >&2
 			ret=1
+			return
 		fi
-		return
 	fi
 
 	if [ $debug -gt 0 ]; then