From 6518b0c675f8c39ba31286cab524fa79c069b6e0 Mon Sep 17 00:00:00 2001
From: joerg <joerg@NetBSD.org>
Date: Wed, 12 Jan 2011 23:03:24 +0000
Subject: [PATCH] mandoc now supports tbl(1) formatting, so adjust rules. Use
 -Wstop in lintmanpages.

---
 share/mk/bsd.man.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index bf0216626cdb..2c126500b716 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.man.mk,v 1.105 2010/12/02 23:08:04 wiz Exp $
+#	$NetBSD: bsd.man.mk,v 1.106 2011/01/12 23:03:24 joerg Exp $
 #	@(#)bsd.man.mk	8.1 (Berkeley) 6/8/93
 
 .include <bsd.init.mk>
@@ -128,10 +128,7 @@ realall:	${CATPAGES}
 
 ${_MNUMBERS:@N@.$N.cat$N${MANSUFFIX}@}: ${CATDEPS}	# build rule
 	${_MKTARGET_FORMAT}
-.if defined(USETBL)
-	${TOOL_TBL} ${.IMPSRC} | ${TOOL_ROFF_ASCII} -mandoc ${MANCOMPRESS} \
-	    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
-.elif ${MKMANDOC} == yes && !defined(NOMANDOC)
+.if ${MKMANDOC} == yes && !defined(NOMANDOC)
 	if test ""${NOMANDOC.${.IMPSRC:T}:tl:Q} != "yes"; then \
 		${TOOL_MANDOC_ASCII} ${.IMPSRC} ${MANCOMPRESS} \
 		    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}; \
@@ -139,6 +136,9 @@ ${_MNUMBERS:@N@.$N.cat$N${MANSUFFIX}@}: ${CATDEPS}	# build rule
 		${TOOL_ROFF_ASCII} -mandoc ${.IMPSRC} ${MANCOMPRESS} \
 		    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}; \
 	fi
+.elif defined(USETBL)
+	${TOOL_TBL} ${.IMPSRC} | ${TOOL_ROFF_ASCII} -mandoc ${MANCOMPRESS} \
+	    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
 .else
 	${TOOL_ROFF_ASCII} -mandoc ${.IMPSRC} ${MANCOMPRESS} \
 	    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
@@ -262,7 +262,7 @@ cleanman: .PHONY
 
 .if !empty(MANPAGES)
 lintmanpages: ${MANPAGES}
-	${TOOL_MANDOC_LINT} -Tlint -fstrict -Wall ${.ALLSRC}
+	${TOOL_MANDOC_LINT} -Tlint -fstrict -Wall,stop ${.ALLSRC}
 .endif
 
 ##### Pull in related .mk logic