From owner-svn-src-projects@freebsd.org Sun Oct 9 01:19:58 2016 Return-Path: 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 AC69FA94FD9 for ; Sun, 9 Oct 2016 01:19:58 +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 6F4E5F2D; Sun, 9 Oct 2016 01:19:58 +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 u991JvxX059979; Sun, 9 Oct 2016 01:19:57 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u991JvZH059978; Sun, 9 Oct 2016 01:19:57 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610090119.u991JvZH059978@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 9 Oct 2016 01:19:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306892 - projects/doctools/share/mk 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Oct 2016 01:19:58 -0000 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