3 files changed, 211 insertions, 179 deletions

diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile
index 6f9ec9ea5ac1..6f6429fef2e6 100644
--- a/textproc/dblatex/Makefile
+++ b/textproc/dblatex/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dblatex
-PORTVERSION=	0.2.5
-PORTREVISION=	1
+PORTVERSION=	0.2.7
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/dblatex/distinfo b/textproc/dblatex/distinfo
index 4d094b815d8a..a7b294228f17 100644
--- a/textproc/dblatex/distinfo
+++ b/textproc/dblatex/distinfo
@@ -1,3 +1,3 @@
-MD5 (dblatex-0.2.5.tar.bz2) = d4cb999d179b792b085660bb4d7ddc57
-SHA256 (dblatex-0.2.5.tar.bz2) = 68e97da9ca5ba7437faea8e9c2dda196224b8117b17ac92089803be399a03e34
-SIZE (dblatex-0.2.5.tar.bz2) = 669340
+MD5 (dblatex-0.2.7.tar.bz2) = f59bc018bc7f5c159a5c726ae66abbfc
+SHA256 (dblatex-0.2.7.tar.bz2) = b9561d7bc10304833416ecefec1ca1c72efa0f15d080eb40c05eb1ac44769a71
+SIZE (dblatex-0.2.7.tar.bz2) = 785233
diff --git a/textproc/dblatex/pkg-plist b/textproc/dblatex/pkg-plist
index f90256172009..37865716aa4e 100644
--- a/textproc/dblatex/pkg-plist
+++ b/textproc/dblatex/pkg-plist
@@ -1,164 +1,197 @@
 @comment $FreeBSD$
 bin/dblatex
-%%DATADIR%%/latex/contrib/db2latex/db2latex.sty
-%%DATADIR%%/latex/contrib/db2latex/graphics/caution.eps
-%%DATADIR%%/latex/contrib/db2latex/graphics/caution.pdf
-%%DATADIR%%/latex/contrib/db2latex/graphics/important.eps
-%%DATADIR%%/latex/contrib/db2latex/graphics/important.pdf
-%%DATADIR%%/latex/contrib/db2latex/graphics/note.eps
-%%DATADIR%%/latex/contrib/db2latex/graphics/note.pdf
-%%DATADIR%%/latex/contrib/db2latex/graphics/tip.eps
-%%DATADIR%%/latex/contrib/db2latex/graphics/tip.pdf
-%%DATADIR%%/latex/contrib/db2latex/graphics/warning.eps
-%%DATADIR%%/latex/contrib/db2latex/graphics/warning.pdf
-%%DATADIR%%/latex/contrib/db2latex/param.xsl
-%%DATADIR%%/latex/contrib/example/dbsimple.sty
-%%DATADIR%%/latex/graphics/dblatex.eps
-%%DATADIR%%/latex/graphics/dblatex.png
-%%DATADIR%%/latex/graphics/warning.eps
-%%DATADIR%%/latex/graphics/warning.fig
-%%DATADIR%%/latex/graphics/warning.pdf
-%%DATADIR%%/latex/misc/attachfile.sty
-%%DATADIR%%/latex/misc/bibtopic.sty
-%%DATADIR%%/latex/misc/enumitem.sty
-%%DATADIR%%/latex/misc/multirow2.sty
-%%DATADIR%%/latex/misc/passivetex/LICENSE
-%%DATADIR%%/latex/misc/passivetex/dummyels.sty
-%%DATADIR%%/latex/misc/passivetex/unicode.sty
-%%DATADIR%%/latex/misc/ragged2e.sty
-%%DATADIR%%/latex/scripts/doc.ist
-%%DATADIR%%/latex/specs/db2latex.specs
-%%DATADIR%%/latex/specs/native.specs
-%%DATADIR%%/latex/specs/simple.specs
-%%DATADIR%%/latex/style/dbk_admonition.sty
-%%DATADIR%%/latex/style/dbk_annot.sty
-%%DATADIR%%/latex/style/dbk_biblio.sty
-%%DATADIR%%/latex/style/dbk_callout.sty
-%%DATADIR%%/latex/style/dbk_changebar.sty
-%%DATADIR%%/latex/style/dbk_core.sty
-%%DATADIR%%/latex/style/dbk_fonts.sty
-%%DATADIR%%/latex/style/dbk_graphic.sty
-%%DATADIR%%/latex/style/dbk_headfoot.sty
-%%DATADIR%%/latex/style/dbk_hyper.sty
-%%DATADIR%%/latex/style/dbk_item.sty
-%%DATADIR%%/latex/style/dbk_locale.sty
-%%DATADIR%%/latex/style/dbk_revision.sty
-%%DATADIR%%/latex/style/dbk_table.sty
-%%DATADIR%%/latex/style/dbk_title.sty
-%%DATADIR%%/latex/style/dbk_verbatim.sty
-%%DATADIR%%/latex/style/docbook.sty
-%%DATADIR%%/xsl/abstract.xsl
-%%DATADIR%%/xsl/admon.xsl
-%%DATADIR%%/xsl/annotation.xsl
-%%DATADIR%%/xsl/appendix.xsl
-%%DATADIR%%/xsl/biblio.xsl
-%%DATADIR%%/xsl/bridgehead.xsl
-%%DATADIR%%/xsl/callout.xsl
-%%DATADIR%%/xsl/chapter.xsl
-%%DATADIR%%/xsl/chunker.xsl
-%%DATADIR%%/xsl/citation.xsl
-%%DATADIR%%/xsl/classsynopsis.xsl
-%%DATADIR%%/xsl/color.xsl
-%%DATADIR%%/xsl/common.xsl
-%%DATADIR%%/xsl/common/ca.xml
-%%DATADIR%%/xsl/common/common.xsl
-%%DATADIR%%/xsl/common/cs.xml
-%%DATADIR%%/xsl/common/da.xml
-%%DATADIR%%/xsl/common/de.xml
-%%DATADIR%%/xsl/common/el.xml
-%%DATADIR%%/xsl/common/en.xml
-%%DATADIR%%/xsl/common/es.xml
-%%DATADIR%%/xsl/common/et.xml
-%%DATADIR%%/xsl/common/fi.xml
-%%DATADIR%%/xsl/common/fr.xml
-%%DATADIR%%/xsl/common/gentext.xsl
-%%DATADIR%%/xsl/common/hu.xml
-%%DATADIR%%/xsl/common/id.xml
-%%DATADIR%%/xsl/common/it.xml
-%%DATADIR%%/xsl/common/ja.xml
-%%DATADIR%%/xsl/common/ko.xml
-%%DATADIR%%/xsl/common/l10n.dtd
-%%DATADIR%%/xsl/common/l10n.xml
-%%DATADIR%%/xsl/common/l10n.xsl
-%%DATADIR%%/xsl/common/labels.xsl
-%%DATADIR%%/xsl/common/mklistings.xsl
-%%DATADIR%%/xsl/common/nl.xml
-%%DATADIR%%/xsl/common/no.xml
-%%DATADIR%%/xsl/common/pl.xml
-%%DATADIR%%/xsl/common/pt.xml
-%%DATADIR%%/xsl/common/pt_br.xml
-%%DATADIR%%/xsl/common/ro.xml
-%%DATADIR%%/xsl/common/ru.xml
-%%DATADIR%%/xsl/common/sk.xml
-%%DATADIR%%/xsl/common/sl.xml
-%%DATADIR%%/xsl/common/subtitles.xsl
-%%DATADIR%%/xsl/common/sv.xml
-%%DATADIR%%/xsl/common/titles.xsl
-%%DATADIR%%/xsl/common/zh_cn.xml
-%%DATADIR%%/xsl/common/zh_tw.xml
-%%DATADIR%%/xsl/component.xsl
-%%DATADIR%%/xsl/dingbat.xsl
-%%DATADIR%%/xsl/docbook.xsl
-%%DATADIR%%/xsl/docbookng.xsl
-%%DATADIR%%/xsl/email.xsl
-%%DATADIR%%/xsl/equation.xsl
-%%DATADIR%%/xsl/errors.xsl
-%%DATADIR%%/xsl/example.xsl
-%%DATADIR%%/xsl/fasttext.xsl
-%%DATADIR%%/xsl/figure.xsl
-%%DATADIR%%/xsl/footnote.xsl
-%%DATADIR%%/xsl/format.xsl
-%%DATADIR%%/xsl/glossary.xsl
-%%DATADIR%%/xsl/graphic.xsl
-%%DATADIR%%/xsl/index.xsl
-%%DATADIR%%/xsl/inlined.xsl
-%%DATADIR%%/xsl/keyword.xsl
-%%DATADIR%%/xsl/labelid.xsl
-%%DATADIR%%/xsl/lang.xsl
-%%DATADIR%%/xsl/latex_book.xsl
-%%DATADIR%%/xsl/latex_book_fast.xsl
-%%DATADIR%%/xsl/legalnotice.xsl
-%%DATADIR%%/xsl/lists.xsl
-%%DATADIR%%/xsl/main.xsl
-%%DATADIR%%/xsl/mapping.dtd
-%%DATADIR%%/xsl/mathml2/README
-%%DATADIR%%/xsl/mathml2/cmarkup.xsl
-%%DATADIR%%/xsl/mathml2/entities.xsl
-%%DATADIR%%/xsl/mathml2/glayout.xsl
-%%DATADIR%%/xsl/mathml2/mapmmlent.xml
-%%DATADIR%%/xsl/mathml2/mathml.xsl
-%%DATADIR%%/xsl/mathml2/mmltex.xsl
-%%DATADIR%%/xsl/mathml2/scripts.xsl
-%%DATADIR%%/xsl/mathml2/tables.xsl
-%%DATADIR%%/xsl/mathml2/tokens.xsl
-%%DATADIR%%/xsl/mediaobject.xsl
-%%DATADIR%%/xsl/mediaobjectco.xsl
-%%DATADIR%%/xsl/msgset.xsl
-%%DATADIR%%/xsl/newtbl.xsl
-%%DATADIR%%/xsl/para.xsl
-%%DATADIR%%/xsl/param.xsl
-%%DATADIR%%/xsl/part.xsl
-%%DATADIR%%/xsl/pi.xsl
-%%DATADIR%%/xsl/preamble.xsl
-%%DATADIR%%/xsl/procedure.xsl
-%%DATADIR%%/xsl/qandaset.xsl
-%%DATADIR%%/xsl/quote.xsl
-%%DATADIR%%/xsl/refentry.xsl
-%%DATADIR%%/xsl/revision.xsl
-%%DATADIR%%/xsl/scape.xsl
-%%DATADIR%%/xsl/secmap.xml
-%%DATADIR%%/xsl/sections.xsl
-%%DATADIR%%/xsl/sgmltag.xsl
-%%DATADIR%%/xsl/sidebar.xsl
-%%DATADIR%%/xsl/synopsis.xsl
-%%DATADIR%%/xsl/tablen.xsl
-%%DATADIR%%/xsl/texmap.xml
-%%DATADIR%%/xsl/toc_lot.xsl
-%%DATADIR%%/xsl/url.xsl
-%%DATADIR%%/xsl/verbatim.xsl
-%%DATADIR%%/xsl/verbatimco.xsl
-%%DATADIR%%/xsl/version.xsl
-%%DATADIR%%/xsl/xref.xsl
+share/dblatex/latex/contrib/db2latex/db2latex.sty
+share/dblatex/latex/contrib/db2latex/graphics/caution.eps
+share/dblatex/latex/contrib/db2latex/graphics/caution.pdf
+share/dblatex/latex/contrib/db2latex/graphics/important.eps
+share/dblatex/latex/contrib/db2latex/graphics/important.pdf
+share/dblatex/latex/contrib/db2latex/graphics/note.eps
+share/dblatex/latex/contrib/db2latex/graphics/note.pdf
+share/dblatex/latex/contrib/db2latex/graphics/tip.eps
+share/dblatex/latex/contrib/db2latex/graphics/tip.pdf
+share/dblatex/latex/contrib/db2latex/graphics/warning.eps
+share/dblatex/latex/contrib/db2latex/graphics/warning.pdf
+share/dblatex/latex/contrib/db2latex/param.xsl
+share/dblatex/latex/contrib/example/dbsimple.sty
+share/dblatex/latex/graphics/dblatex.eps
+share/dblatex/latex/graphics/dblatex.png
+share/dblatex/latex/graphics/warning.eps
+share/dblatex/latex/graphics/warning.fig
+share/dblatex/latex/graphics/warning.pdf
+share/dblatex/latex/misc/attachfile.sty
+share/dblatex/latex/misc/bibtopic.sty
+share/dblatex/latex/misc/enumitem.sty
+share/dblatex/latex/misc/multirow2.sty
+share/dblatex/latex/misc/passivetex/LICENSE
+share/dblatex/latex/misc/passivetex/dummyels.sty
+share/dblatex/latex/misc/passivetex/unicode.sty
+share/dblatex/latex/misc/ragged2e.sty
+share/dblatex/latex/scripts/doc.ist
+share/dblatex/latex/specs/db2latex.specs
+share/dblatex/latex/specs/native.specs
+share/dblatex/latex/specs/simple.specs
+share/dblatex/latex/style/dbk_admonition.sty
+share/dblatex/latex/style/dbk_annot.sty
+share/dblatex/latex/style/dbk_biblio.sty
+share/dblatex/latex/style/dbk_callout.sty
+share/dblatex/latex/style/dbk_changebar.sty
+share/dblatex/latex/style/dbk_core.sty
+share/dblatex/latex/style/dbk_fonts.sty
+share/dblatex/latex/style/dbk_graphic.sty
+share/dblatex/latex/style/dbk_headfoot.sty
+share/dblatex/latex/style/dbk_hyper.sty
+share/dblatex/latex/style/dbk_item.sty
+share/dblatex/latex/style/dbk_locale.sty
+share/dblatex/latex/style/dbk_revision.sty
+share/dblatex/latex/style/dbk_table.sty
+share/dblatex/latex/style/dbk_title.sty
+share/dblatex/latex/style/dbk_verbatim.sty
+share/dblatex/latex/style/docbook.sty
+share/dblatex/xsl/abstract.xsl
+share/dblatex/xsl/admon.xsl
+share/dblatex/xsl/annotation.xsl
+share/dblatex/xsl/appendix.xsl
+share/dblatex/xsl/biblio.xsl
+share/dblatex/xsl/bridgehead.xsl
+share/dblatex/xsl/callout.xsl
+share/dblatex/xsl/chapter.xsl
+share/dblatex/xsl/chunker.xsl
+share/dblatex/xsl/citation.xsl
+share/dblatex/xsl/classsynopsis.xsl
+share/dblatex/xsl/color.xsl
+share/dblatex/xsl/common/af.xml
+share/dblatex/xsl/common/am.xml
+share/dblatex/xsl/common/ar.xml
+share/dblatex/xsl/common/az.xml
+share/dblatex/xsl/common/bg.xml
+share/dblatex/xsl/common/bn.xml
+share/dblatex/xsl/common/bs.xml
+share/dblatex/xsl/common/ca.xml
+share/dblatex/xsl/common/common.xsl
+share/dblatex/xsl/common/cs.xml
+share/dblatex/xsl/common/cy.xml
+share/dblatex/xsl/common/da.xml
+share/dblatex/xsl/common/de.xml
+share/dblatex/xsl/common/el.xml
+share/dblatex/xsl/common/en.xml
+share/dblatex/xsl/common/es.xml
+share/dblatex/xsl/common/et.xml
+share/dblatex/xsl/common/eu.xml
+share/dblatex/xsl/common/fa.xml
+share/dblatex/xsl/common/fi.xml
+share/dblatex/xsl/common/fr.xml
+share/dblatex/xsl/common/ga.xml
+share/dblatex/xsl/common/gentext.xsl
+share/dblatex/xsl/common/gu.xml
+share/dblatex/xsl/common/he.xml
+share/dblatex/xsl/common/hi.xml
+share/dblatex/xsl/common/hr.xml
+share/dblatex/xsl/common/hu.xml
+share/dblatex/xsl/common/id.xml
+share/dblatex/xsl/common/it.xml
+share/dblatex/xsl/common/ja.xml
+share/dblatex/xsl/common/kn.xml
+share/dblatex/xsl/common/ko.xml
+share/dblatex/xsl/common/l10n.dtd
+share/dblatex/xsl/common/l10n.xml
+share/dblatex/xsl/common/l10n.xsl
+share/dblatex/xsl/common/la.xml
+share/dblatex/xsl/common/labels.xsl
+share/dblatex/xsl/common/lib.xsl
+share/dblatex/xsl/common/lt.xml
+share/dblatex/xsl/common/mklistings.xsl
+share/dblatex/xsl/common/mn.xml
+share/dblatex/xsl/common/nl.xml
+share/dblatex/xsl/common/nn.xml
+share/dblatex/xsl/common/no.xml
+share/dblatex/xsl/common/olink.xsl
+share/dblatex/xsl/common/or.xml
+share/dblatex/xsl/common/pa.xml
+share/dblatex/xsl/common/pl.xml
+share/dblatex/xsl/common/pt.xml
+share/dblatex/xsl/common/pt_br.xml
+share/dblatex/xsl/common/ro.xml
+share/dblatex/xsl/common/ru.xml
+share/dblatex/xsl/common/sk.xml
+share/dblatex/xsl/common/sl.xml
+share/dblatex/xsl/common/sq.xml
+share/dblatex/xsl/common/sr.xml
+share/dblatex/xsl/common/sr_Latn.xml
+share/dblatex/xsl/common/subtitles.xsl
+share/dblatex/xsl/common/sv.xml
+share/dblatex/xsl/common/ta.xml
+share/dblatex/xsl/common/th.xml
+share/dblatex/xsl/common/titles.xsl
+share/dblatex/xsl/common/tl.xml
+share/dblatex/xsl/common/tr.xml
+share/dblatex/xsl/common/uk.xml
+share/dblatex/xsl/common/vi.xml
+share/dblatex/xsl/common/xh.xml
+share/dblatex/xsl/common/zh_cn.xml
+share/dblatex/xsl/common/zh_tw.xml
+share/dblatex/xsl/component.xsl
+share/dblatex/xsl/dingbat.xsl
+share/dblatex/xsl/docbook.xsl
+share/dblatex/xsl/docbookng.xsl
+share/dblatex/xsl/email.xsl
+share/dblatex/xsl/equation.xsl
+share/dblatex/xsl/errors.xsl
+share/dblatex/xsl/example.xsl
+share/dblatex/xsl/fasttext.xsl
+share/dblatex/xsl/figure.xsl
+share/dblatex/xsl/footnote.xsl
+share/dblatex/xsl/format.xsl
+share/dblatex/xsl/glossary.xsl
+share/dblatex/xsl/graphic.xsl
+share/dblatex/xsl/index.xsl
+share/dblatex/xsl/inlined.xsl
+share/dblatex/xsl/keyword.xsl
+share/dblatex/xsl/labelid.xsl
+share/dblatex/xsl/lang.xsl
+share/dblatex/xsl/latex_book.xsl
+share/dblatex/xsl/latex_book_fast.xsl
+share/dblatex/xsl/legalnotice.xsl
+share/dblatex/xsl/lists.xsl
+share/dblatex/xsl/main.xsl
+share/dblatex/xsl/mapping.dtd
+share/dblatex/xsl/mathml2/README
+share/dblatex/xsl/mathml2/cmarkup.xsl
+share/dblatex/xsl/mathml2/entities.xsl
+share/dblatex/xsl/mathml2/glayout.xsl
+share/dblatex/xsl/mathml2/mapmmlent.xml
+share/dblatex/xsl/mathml2/mathml.xsl
+share/dblatex/xsl/mathml2/mmltex.xsl
+share/dblatex/xsl/mathml2/scripts.xsl
+share/dblatex/xsl/mathml2/tables.xsl
+share/dblatex/xsl/mathml2/tokens.xsl
+share/dblatex/xsl/mediaobject.xsl
+share/dblatex/xsl/mediaobjectco.xsl
+share/dblatex/xsl/msgset.xsl
+share/dblatex/xsl/newtbl.xsl
+share/dblatex/xsl/para.xsl
+share/dblatex/xsl/param.xsl
+share/dblatex/xsl/part.xsl
+share/dblatex/xsl/pi.xsl
+share/dblatex/xsl/preamble.xsl
+share/dblatex/xsl/procedure.xsl
+share/dblatex/xsl/qandaset.xsl
+share/dblatex/xsl/quote.xsl
+share/dblatex/xsl/refentry.xsl
+share/dblatex/xsl/revision.xsl
+share/dblatex/xsl/scape.xsl
+share/dblatex/xsl/secmap.xml
+share/dblatex/xsl/sections.xsl
+share/dblatex/xsl/sgmltag.xsl
+share/dblatex/xsl/sidebar.xsl
+share/dblatex/xsl/synopsis.xsl
+share/dblatex/xsl/tablen.xsl
+share/dblatex/xsl/texmap.xml
+share/dblatex/xsl/toc_lot.xsl
+share/dblatex/xsl/url.xsl
+share/dblatex/xsl/verbatim.xsl
+share/dblatex/xsl/verbatimco.xsl
+share/dblatex/xsl/version.xsl
+share/dblatex/xsl/xref.xsl
 %%PYTHON_SITELIBDIR%%/dbtexmf/__init__.py
 %%PYTHON_SITELIBDIR%%/dbtexmf/__init__.pyc
 %%PYTHON_SITELIBDIR%%/dbtexmf/__init__.pyo
@@ -270,18 +303,18 @@ bin/dblatex
 @dirrm %%PYTHON_SITELIBDIR%%/dbtexmf/dblatex
 @dirrm %%PYTHON_SITELIBDIR%%/dbtexmf/core
 @dirrm %%PYTHON_SITELIBDIR%%/dbtexmf
-@dirrm %%DATADIR%%/xsl/mathml2
-@dirrm %%DATADIR%%/xsl/common
-@dirrm %%DATADIR%%/xsl
-@dirrm %%DATADIR%%/latex/style
-@dirrm %%DATADIR%%/latex/specs
-@dirrm %%DATADIR%%/latex/scripts
-@dirrm %%DATADIR%%/latex/misc/passivetex
-@dirrm %%DATADIR%%/latex/misc
-@dirrm %%DATADIR%%/latex/graphics
-@dirrm %%DATADIR%%/latex/contrib/db2latex/graphics
-@dirrm %%DATADIR%%/latex/contrib/db2latex
-@dirrm %%DATADIR%%/latex/contrib/example
-@dirrm %%DATADIR%%/latex/contrib
-@dirrm %%DATADIR%%/latex
-@dirrm %%DATADIR%%
+@dirrm share/dblatex/xsl/mathml2
+@dirrm share/dblatex/xsl/common
+@dirrm share/dblatex/xsl
+@dirrm share/dblatex/latex/style
+@dirrm share/dblatex/latex/specs
+@dirrm share/dblatex/latex/scripts
+@dirrm share/dblatex/latex/misc/passivetex
+@dirrm share/dblatex/latex/misc
+@dirrm share/dblatex/latex/graphics
+@dirrm share/dblatex/latex/contrib/db2latex/graphics
+@dirrm share/dblatex/latex/contrib/db2latex
+@dirrm share/dblatex/latex/contrib/example
+@dirrm share/dblatex/latex/contrib
+@dirrm share/dblatex/latex
+@dirrm share/dblatex