Date: Fri, 23 Jul 2010 16:01:18 GMT From: Benjamin Fiedler <bfiedler@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 181376 for review Message-ID: <201007231601.o6NG1INJ075427@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007231601.o6NG1INJ075427>