From owner-svn-src-projects@freebsd.org  Sun Oct  9 20:24:23 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
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 E90BBC0B92C
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun,  9 Oct 2016 20:24:23 +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 B9AAFE0B;
 Sun,  9 Oct 2016 20:24:23 +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 u99KOM63098277;
 Sun, 9 Oct 2016 20:24:22 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u99KOMqW098276;
 Sun, 9 Oct 2016 20:24:22 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201610092024.u99KOMqW098276@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 9 Oct 2016 20:24:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r306918 - 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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Oct 2016 20:24:24 -0000

Author: bapt
Date: Sun Oct  9 20:24:22 2016
New Revision: 306918
URL: https://svnweb.freebsd.org/changeset/base/306918

Log:
  Always use soelim first
  While here use MACROS where possible

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 20:18:19 2016	(r306917)
+++ projects/doctools/share/mk/bsd.doc.mk	Sun Oct  9 20:24:22 2016	(r306918)
@@ -48,13 +48,14 @@
 PRINTERDEVICE?=	ascii
 
 BIB?=		bib
+DHTML?=		dhtml
+DPOST?=		dpost
+EQN?=		eqn
 GREMLIN?=	grn
 GRIND?=		vgrind -f
 INDXBIB?=	indxbib
 PIC?=		pic
 REFER?=		refer
-DHTML?=		dhtml
-DPOST?=		dpost
 .for _dev in ${PRINTERDEVICE:Mascii}
 ROFF.ascii?=	nroff -Tlocale ${TRFLAGS} ${MACROS} ${PAGES:C/^/-o/1}
 .endfor
@@ -70,20 +71,20 @@ TBL?=		tbl
 DOC?=		paper
 LPR?=		lpr
 
+.if defined(USE_SOELIM)
+PRECMD+=	${SOELIM} -I${.CURDIR} |
+.endif
 .if defined(USE_EQN)
-PRECMD+=	eqn |
+PRECMD+=	${EQN} |
 .endif
 .if defined(USE_PIC)
-PRECMD+=	pic |
+PRECMD+=	${PIC} |
 .endif
 .if defined(USE_REFER)
-PRECMD+=	refer |
-.endif
-.if defined(USE_SOELIM)
-PRECMD+=	${SOELIM} -I${.CURDIR} |
+PRECMD+=	${REFER} |
 .endif
 .if defined(USE_TBL)
-PRECMD+=	tbl |
+PRECMD+=	${TBL} |
 .endif
 
 .if defined(NO_ROOT)