Date: Sun, 9 Oct 2016 01:19:57 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306892 - projects/doctools/share/mk Message-ID: <201610090119.u991JvZH059978@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Oct 9 01:19:57 2016 New Revision: 306892 URL: https://svnweb.freebsd.org/changeset/base/306892 Log: Modify bsd.doc.mk to only use heirloom doctools Small fixes are still needed on the way doctools is integrated for the refer(1) tool Modified: projects/doctools/share/mk/bsd.doc.mk Modified: projects/doctools/share/mk/bsd.doc.mk ============================================================================== --- projects/doctools/share/mk/bsd.doc.mk Sun Oct 9 01:01:16 2016 (r306891) +++ projects/doctools/share/mk/bsd.doc.mk Sun Oct 9 01:19:57 2016 (r306892) @@ -53,11 +53,16 @@ GRIND?= vgrind -f INDXBIB?= indxbib PIC?= pic REFER?= refer +DHTML?= dhtml +DPOST?= dpost .for _dev in ${PRINTERDEVICE:Mascii} -ROFF.ascii?= groff -Tascii -P-c ${TRFLAGS} -mtty-char ${MACROS} ${PAGES:C/^/-o/1} +ROFF.ascii?= nroff -Tlocale ${TRFLAGS} ${MACROS} ${PAGES:C/^/-o/1} .endfor -.for _dev in ${PRINTERDEVICE:Nascii} -ROFF.${_dev}?= groff -T${_dev} ${TRFLAGS} ${MACROS} ${PAGES:C/^/-o/1} +.for _dev in ${PRINTERDEVICE:Mhtml} +ROFF.${_dev}?= troff -T${_dev} ${TRFLAGS} ${MACROS} ${PAGES:C/^/-o/1} | ${DHTML} +.endfor +.for _dev in ${PRINTERDEVICE:Mps} +ROFF.${_dev}?= troff -T${_dev} ${TRFLAGS} ${MACROS} ${PAGES:C/^/-o/1} | ${DPOST} .endfor SOELIM?= soelim TBL?= tbl @@ -66,19 +71,19 @@ DOC?= paper LPR?= lpr .if defined(USE_EQN) -TRFLAGS+= -e +PRECMD+= eqn | .endif .if defined(USE_PIC) -TRFLAGS+= -p +PRECMD+= pic | .endif .if defined(USE_REFER) -TRFLAGS+= -R +PRECMD+= refer | .endif .if defined(USE_SOELIM) -TRFLAGS+= -I${.CURDIR} +PRECMD+= ${SOELIM} -I${.CURDIR} | .endif .if defined(USE_TBL) -TRFLAGS+= -t +PRECMD+= tbl | .endif .if defined(NO_ROOT) @@ -101,13 +106,6 @@ DFILE.${_dev}= ${DOC}.${_dev}${DCOMPRESS .endif .endfor -UNROFF?= unroff -HTML_SPLIT?= yes -UNROFFFLAGS?= -fhtml -.if ${HTML_SPLIT} == "yes" -UNROFFFLAGS+= split=1 -.endif - # Compatibility mode flag for groff. Use this when formatting documents with # Berkeley me macros (orig_me(7)). COMPAT?= -C @@ -167,7 +165,7 @@ _stamp.extra: ${EXTRA} .endif CLEANFILES+= _stamp.extra -.for _dev in ${PRINTERDEVICE:Nhtml} +.for _dev in ${PRINTERDEVICE} .if !target(${DFILE.${_dev}}) .if target(_stamp.extra) ${DFILE.${_dev}}: _stamp.extra @@ -176,23 +174,7 @@ ${DFILE.${_dev}}: ${SRCS} .if ${MK_DOCCOMPRESS} == "no" ${ROFF.${_dev}} ${.ALLSRC:N_stamp.extra} > ${.TARGET} .else - ${ROFF.${_dev}} ${.ALLSRC:N_stamp.extra} | ${DCOMPRESS_CMD} > ${.TARGET} -.endif -.endif -.endfor - -.for _dev in ${PRINTERDEVICE:Mhtml} -.if !target(${DFILE.html}) -.if target(_stamp.extra) -${DFILE.html}: _stamp.extra -.endif -${DFILE.html}: ${SRCS} -.if defined(MACROS) && !empty(MACROS) - cd ${SRCDIR}; ${UNROFF} ${MACROS} ${UNROFFFLAGS} \ - document=${DOC} ${SRCS} -.else # unroff(1) requires a macro package as an argument - cd ${SRCDIR}; ${UNROFF} -ms ${UNROFFFLAGS} \ - document=${DOC} ${SRCS} + cat ${.ALLSRC:N_stamp.extra} | ${PRECMD} ${ROFF.${_dev}} | ${DCOMPRESS_CMD} > ${.TARGET} .endif .endif .endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610090119.u991JvZH059978>