From owner-svn-doc-projects@FreeBSD.ORG  Wed Jul  3 15:22:20 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 718D1D49;
 Wed,  3 Jul 2013 15:22:20 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4BF891294;
 Wed,  3 Jul 2013 15:22:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63FMK0f012916;
 Wed, 3 Jul 2013 15:22:20 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63FMJ2u012914;
 Wed, 3 Jul 2013 15:22:19 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307031522.r63FMJ2u012914@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 3 Jul 2013 15:22:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42139 - projects/db5/share/mk
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jul 2013 15:22:20 -0000

Author: gabor
Date: Wed Jul  3 15:22:19 2013
New Revision: 42139
URL: http://svnweb.freebsd.org/changeset/doc/42139

Log:
  - Add experimental support for dblatex

Modified:
  projects/db5/share/mk/doc.commands.mk
  projects/db5/share/mk/doc.docbook.mk

Modified: projects/db5/share/mk/doc.commands.mk
==============================================================================
--- projects/db5/share/mk/doc.commands.mk	Wed Jul  3 15:12:52 2013	(r42138)
+++ projects/db5/share/mk/doc.commands.mk	Wed Jul  3 15:22:19 2013	(r42139)
@@ -53,6 +53,8 @@ ZIPOPTS?=	-9X
 # Rendering and format conversion
 #
 
+DBLATEX?=	${PREFIX}/bin/dblatex
+
 DVIPS?=		${PREFIX}/bin/dvips
 .if defined(PAPERSIZE)
 DVIPSOPTS?=	-t ${PAPERSIZE:L}

Modified: projects/db5/share/mk/doc.docbook.mk
==============================================================================
--- projects/db5/share/mk/doc.docbook.mk	Wed Jul  3 15:12:52 2013	(r42138)
+++ projects/db5/share/mk/doc.docbook.mk	Wed Jul  3 15:22:19 2013	(r42139)
@@ -50,6 +50,9 @@
 #                      provides better compression, but requires longer
 #                      time and utilizes more CPU resources than gzip(1).
 
+# Either dblatex or fop
+RENDERENGINE?=	dblatex
+
 #
 # Documents should use the += format to access these.
 #
@@ -72,6 +75,8 @@ IMAGES_LIB?=
 SCHEMATRONS?=	${DOC_PREFIX}/share/xml/freebsd.sch
 XSLTPROCOPTS?=	--nonet
 
+DBLATEXOPTS?=	-I ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -T simple -d
+
 KNOWN_FORMATS=	html html.tar html-split html-split.tar \
 		epub txt rtf ps pdf tex dvi tar pdb
 
@@ -337,6 +342,7 @@ ${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb
 ${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${DOC}.parsed.xml
 	${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.print.xml > ${.TARGET}
 
+.if ${RENDERENGINE} == "fop"
 ${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
 	${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
 
@@ -345,6 +351,15 @@ ${DOC}.ps: ${DOC}.fo ${LOCAL_IMAGES_LIB}
 
 ${DOC}.rtf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
 	${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+.else
+# Default is dblatex
+${DOC}.pdf: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+	${DBLATEX} ${DOC}.parsed.print.xml ${DBLATEXOPTS} -o ${.TARGET}
+
+${DOC}.ps: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+	${DBLATEX} ${DOC}.parsed.print.xml ${DBLATEXOPTS} -o ${.TARGET}
+.endif
+	
 
 ${DOC}.tar: ${SRCS} ${LOCAL_IMAGES} ${LOCAL_CSS_SHEET}
 	${TAR} cf ${.TARGET} -C ${.CURDIR} ${SRCS} \