CVS commit: pkgsrc/textproc/dblatex

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jul  6 12:36:38 UTC 2026

Modified Files:
        pkgsrc/textproc/dblatex: Makefile PLIST distinfo
Added Files:
        pkgsrc/textproc/dblatex/patches: patch-setup.py
Removed Files:
        pkgsrc/textproc/dblatex/patches: patch-aa

Log Message:
dblatex: updated to 0.3.12

Release 0.3.12:

All the fixes have been provided by Petter Reinholdtsen. Thank you, Petter.
- Fix SF bug 118: fix 'nb' and 'nn' locales.
- Fix SF bug 119: use locale quotes in glossary.
- Fix SF bug 120: use locale quotes in bibliography.
- Fix SF bug 123: add 'se' locale.
- Fix SF bug 124: set default qandaset title markup in english.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/textproc/dblatex/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/dblatex/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/dblatex/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/textproc/dblatex/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/dblatex/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/dblatex/Makefile
diff -u pkgsrc/textproc/dblatex/Makefile:1.45 pkgsrc/textproc/dblatex/Makefile:1.46
--- pkgsrc/textproc/dblatex/Makefile:1.45       Mon Nov 17 11:01:29 2025
+++ pkgsrc/textproc/dblatex/Makefile    Mon Jul  6 12:36:37 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2025/11/17 11:01:29 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2026/07/06 12:36:37 adam Exp $
 
-DISTNAME=      dblatex-0.3.10
-PKGREVISION=   9
+DISTNAME=      dblatex3-0.3.12
+PKGNAME=       ${DISTNAME:S/tex3/tex/}
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dblatex/}
 EXTRACT_SUFX=  .tar.bz2
@@ -11,6 +11,8 @@ HOMEPAGE=     https://dblatex.sourceforge.ne
 COMMENT=       DocBook to LaTeX Publishing
 LICENSE=       gnu-gpl-v2
 
+EGG_NAME=      ${DISTNAME:S/tex3/tex/}
+
 DEPENDS+=      ImageMagick-[0-9]*:../../graphics/ImageMagick
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=      makeindexk-[0-9]*:../../textproc/makeindexk
@@ -41,12 +43,15 @@ DEPENDS+=   tex-rsfs-[0-9]*:../../fonts/te
 DEPENDS+=      tex-eepic-[0-9]*:../../graphics/tex-eepic
 
 USE_LANGUAGES= # none
-USE_TOOLS+=    gmake
+USE_TOOLS+=    gmake:test
+
+# As of 0.3.12, needs imp module which has been removed in Python 3.12.
+PYTHON_VERSIONS_ACCEPTED=      311 310
 
 .include "options.mk"
 
-REPLACE_PYTHON+=               scripts/dblatex lib/dbtexmf/dblatex/xetex/*.py
-PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 0.3.2
+REPLACE_PYTHON+=       lib/dbtexmf/dblatex/xetex/*.py
+REPLACE_PYTHON+=       scripts/dblatex
 
 SUBST_CLASSES+=                man
 SUBST_MESSAGE.man=     Fixing man page installation path.
@@ -56,8 +61,9 @@ SUBST_SED.man+=               -e 's,share/man/man1,${
 SUBST_SED.man+=                -e "s,'python','${PYTHONBIN}',"
 
 do-test:
-       cd ${WRKSRC}/tests/mathml && gmake
+       cd ${WRKSRC}/tests/mathml && ${GMAKE}
 
 .include "../../lang/python/application.mk"
+# wheel.mk doesn't install "dblatex" script
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/dblatex/PLIST
diff -u pkgsrc/textproc/dblatex/PLIST:1.13 pkgsrc/textproc/dblatex/PLIST:1.14
--- pkgsrc/textproc/dblatex/PLIST:1.13  Wed Aug 16 11:35:20 2017
+++ pkgsrc/textproc/dblatex/PLIST       Mon Jul  6 12:36:37 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2017/08/16 11:35:20 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.14 2026/07/06 12:36:37 adam Exp $
 bin/dblatex
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -99,6 +99,9 @@ ${PYSITELIB}/dbtexmf/dblatex/grubber/xin
 ${PYSITELIB}/dbtexmf/dblatex/grubber/xr-hyper.py
 ${PYSITELIB}/dbtexmf/dblatex/grubber/xr-hyper.pyc
 ${PYSITELIB}/dbtexmf/dblatex/grubber/xr-hyper.pyo
+${PYSITELIB}/dbtexmf/dblatex/rawlabel.py
+${PYSITELIB}/dbtexmf/dblatex/rawlabel.pyc
+${PYSITELIB}/dbtexmf/dblatex/rawlabel.pyo
 ${PYSITELIB}/dbtexmf/dblatex/rawparse.py
 ${PYSITELIB}/dbtexmf/dblatex/rawparse.pyc
 ${PYSITELIB}/dbtexmf/dblatex/rawparse.pyo
@@ -273,7 +276,6 @@ share/dblatex/xsl/common/mn.xml
 share/dblatex/xsl/common/nb.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
@@ -282,6 +284,7 @@ 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/se.xml
 share/dblatex/xsl/common/sk.xml
 share/dblatex/xsl/common/sl.xml
 share/dblatex/xsl/common/sq.xml
@@ -553,6 +556,7 @@ share/doc/dblatex/xhtml/manual/images/co
 share/doc/dblatex/xhtml/manual/images/colorsvg/up.svg
 share/doc/dblatex/xhtml/manual/images/colorsvg/warning.svg
 share/doc/dblatex/xhtml/manual/images/draft.png
+share/doc/dblatex/xhtml/manual/images/draft.svg
 share/doc/dblatex/xhtml/manual/images/home.gif
 share/doc/dblatex/xhtml/manual/images/home.png
 share/doc/dblatex/xhtml/manual/images/home.svg
@@ -641,7 +645,7 @@ share/doc/dblatex/xhtml/manual/page.marg
 share/doc/dblatex/xhtml/manual/page.margin.outer.html
 share/doc/dblatex/xhtml/manual/page.margin.top.html
 share/doc/dblatex/xhtml/manual/page.width.html
-share/doc/dblatex/xhtml/manual/pagesetup2.png
+share/doc/dblatex/xhtml/manual/pagesetup2.svg
 share/doc/dblatex/xhtml/manual/paper.type.html
 share/doc/dblatex/xhtml/manual/pdf.annot.options.html
 share/doc/dblatex/xhtml/manual/pi-bibtex.html
@@ -655,7 +659,7 @@ share/doc/dblatex/xhtml/manual/pi-dblate
 share/doc/dblatex/xhtml/manual/pi-latex.html
 share/doc/dblatex/xhtml/manual/pi-texmath_delimiters.html
 share/doc/dblatex/xhtml/manual/preface.tocdepth.html
-share/doc/dblatex/xhtml/manual/processus.png
+share/doc/dblatex/xhtml/manual/processus.svg
 share/doc/dblatex/xhtml/manual/qanda.defaultlabel.html
 share/doc/dblatex/xhtml/manual/ref-dblatex.html
 share/doc/dblatex/xhtml/manual/refclass.suppress.html
@@ -740,6 +744,9 @@ share/doc/dblatex/xhtml/release-notes/se
 share/doc/dblatex/xhtml/release-notes/sec-changes-03.html
 share/doc/dblatex/xhtml/release-notes/sec-changes-031.html
 share/doc/dblatex/xhtml/release-notes/sec-changes-0310.html
+share/doc/dblatex/xhtml/release-notes/sec-changes-0311.html
+share/doc/dblatex/xhtml/release-notes/sec-changes-0311py3.html
+share/doc/dblatex/xhtml/release-notes/sec-changes-0312.html
 share/doc/dblatex/xhtml/release-notes/sec-changes-032.html
 share/doc/dblatex/xhtml/release-notes/sec-changes-033.html
 share/doc/dblatex/xhtml/release-notes/sec-changes-034.html

Index: pkgsrc/textproc/dblatex/distinfo
diff -u pkgsrc/textproc/dblatex/distinfo:1.12 pkgsrc/textproc/dblatex/distinfo:1.13
--- pkgsrc/textproc/dblatex/distinfo:1.12       Tue Oct 26 11:21:48 2021
+++ pkgsrc/textproc/dblatex/distinfo    Mon Jul  6 12:36:37 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:21:48 nia Exp $
+$NetBSD: distinfo,v 1.13 2026/07/06 12:36:37 adam Exp $
 
-BLAKE2s (dblatex-0.3.10.tar.bz2) = 606eecfe3832c8fb0182c863d7dd2a3f8ff2e05a8a503816680c11021cd7bf7c
-SHA512 (dblatex-0.3.10.tar.bz2) = 33a5ee3d23d3b9a1576be248a312ca741ea7cb629334a98fb6cb49e0f0f932334506ea934312de04ec645c86ec52699687bd2574b1802d3c23815b44c8514b7b
-Size (dblatex-0.3.10.tar.bz2) = 1668202 bytes
-SHA1 (patch-aa) = 31713727ed0501f22fb571b25013b377e668e226
+BLAKE2s (dblatex3-0.3.12.tar.bz2) = 4c67e62a03a6735f89689756c125f827cb33f00106fbecbaef6b2c460d8d964d
+SHA512 (dblatex3-0.3.12.tar.bz2) = 5bfa774c8dbe362775f6bbb5e1196e5a2bb1af239778133c12ddc725406ced67f3ff422433a2a1aa02d4431e9be58ba12e918379deb81fcd5b96533d2bdf029a
+Size (dblatex3-0.3.12.tar.bz2) = 1693272 bytes
+SHA1 (patch-setup.py) = 5091a3f4b41fb30f1e85f4656b700553832197ca

Added files:

Index: pkgsrc/textproc/dblatex/patches/patch-setup.py
diff -u /dev/null pkgsrc/textproc/dblatex/patches/patch-setup.py:1.1
--- /dev/null   Mon Jul  6 12:36:38 2026
+++ pkgsrc/textproc/dblatex/patches/patch-setup.py      Mon Jul  6 12:36:38 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup.py,v 1.1 2026/07/06 12:36:38 adam Exp $
+
+Use Python absolute path directly in the script.
+
+--- setup.py.orig      2020-11-29 17:50:08.000000000 +0000
++++ setup.py
+@@ -109,7 +109,7 @@ os.environ["SGML_CATALOG_FILES"] = cat
+         ENV_BIN = '/usr/bin/env'
+         env_args = ''
+         py_exec_bname = os.path.basename(sys.executable)
+-        if self._use_py_path:
++        if True:
+             env_exec = ''
+             py_exec = sys.executable
+         elif os.name == 'posix':