From owner-p4-projects@FreeBSD.ORG  Fri Jul 23 16:01:19 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 77E3C1065670; Fri, 23 Jul 2010 16:01:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F98F1065673
	for <perforce@FreeBSD.org>; Fri, 23 Jul 2010 16:01:19 +0000 (UTC)
	(envelope-from bfiedler@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D66F8FC16
	for <perforce@FreeBSD.org>; Fri, 23 Jul 2010 16:01:19 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6NG1JmQ075429
	for <perforce@FreeBSD.org>; Fri, 23 Jul 2010 16:01:19 GMT
	(envelope-from bfiedler@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6NG1INJ075427
	for perforce@freebsd.org; Fri, 23 Jul 2010 16:01:18 GMT
	(envelope-from bfiedler@FreeBSD.org)
Date: Fri, 23 Jul 2010 16:01:18 GMT
Message-Id: <201007231601.o6NG1INJ075427@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bfiedler@FreeBSD.org using -f
From: Benjamin Fiedler <bfiedler@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181376 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jul 2010 16:01:19 -0000

http://p4web.freebsd.org/@@181376?ac=10

Change 181376 by bfiedler@freebsd-home on 2010/07/23 16:00:38

	Create patch system for resolving mandoc-incompatible pages

Affected files ...

.. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/patches/patch-ippool.5#1 add
.. //depot/projects/soc2010/bsdtextproc/src/share/mk/bsd.man.mk#3 edit

Differences ...

==== //depot/projects/soc2010/bsdtextproc/src/share/mk/bsd.man.mk#3 (text+ko) ====

@@ -57,8 +57,40 @@
 
 CATDIR=		${MANDIR:H:S/$/\/cat/}
 CATEXT=		.cat
+
+.if defined(WITH_MANDOC)
 # XXX tbl support?
 MROFF_CMD?=	mandoc -Tascii -mandoc #-fstrict
+PATCH_DIST_ARGS=	
+
+.else
+MROFF_CMD?=	groff -Tascii -mtty-char -man -t
+PATCH_DIST_ARGS=	-R
+.endif
+
+do-patch:
+.if defined(PATCHFILES)
+        @${ECHO_MSG} "===>  Applying mandoc patches"
+        @(cd ${_DISTDIR}; \
+          for i in ${_PATCHFILES}; do \
+                if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+                        ${ECHO_MSG} "===>   Applying mandoc patch $$i" ; \
+                fi; \
+                case $$i in \
+                        *.Z|*.gz) \
+                                ${GZCAT} $$i | ${PATCH} ${PATCH_DIST_ARGS}; \
+                                ;; \
+                        *.bz2) \
+                                ${BZCAT} $$i | ${PATCH} ${PATCH_DIST_ARGS}; \
+                                ;; \
+                        *) \
+                                ${PATCH} ${PATCH_DIST_ARGS} < $$i; \
+                                ;; \
+                esac; \
+          done)
+.endif
+
+
 
 MCOMPRESS_CMD?=	${COMPRESS_CMD}
 MCOMPRESS_EXT?=	${COMPRESS_EXT}
@@ -138,7 +170,7 @@
 _manpages: ${__target}
 ${__target}: ${__page}
 .if defined(MANFILTER)
-	${MANFILTER} < ${.ALLSRC} | ${MCOMPRESS_CMD} > ${.TARGET}
+		${MANFILTER} < ${.ALLSRC} | ${MCOMPRESS_CMD} > ${.TARGET}
 .else
 	${MCOMPRESS_CMD} ${.ALLSRC} > ${.TARGET}
 .endif
@@ -243,9 +275,17 @@
 manlint: ${__page}lint
 ${__page}lint: ${__page}
 .if defined(MANFILTER)
-	${MANFILTER} < ${.ALLSRC} | ${MROFF_CMD} -Tlint -Wall -fign-errors || true
+	.if defined(WITH_MANDOC)
+		${MANFILTER} < ${.ALLSRC} | ${MROFF_CMD} -Tlint -Wall -fign-errors || true
+	.else
+		${MANFILTER} < ${.ALLSRC} | ${MROFF_CMD} -ww -z
+	.endif
 .else
-	${MROFF_CMD} -Tlint -Wall -fign-errors ${.ALLSRC} || true
+	.if defined(WITH_MANDOC)
+		${MROFF_CMD} -Tlint -Wall -fign-errors ${.ALLSRC} || true
+	.else 
+		${MROFF_CMD} -ww -z ${.ALLSRC}
+	.endif
 .endif
 .endfor
 .endif