pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/textproc
Module Name: pkgsrc
Committed By: bsiegert
Date: Sat Jan 3 18:05:45 UTC 2026
Modified Files:
pkgsrc/textproc: Makefile
Added Files:
pkgsrc/textproc/docbook-utils: DESCR Makefile PLIST buildlink3.mk
distinfo
pkgsrc/textproc/docbook-utils/patches: patch-backends_man.in
patch-backends_texi.in patch-bin_jw.in patch-bin_sgmldiff.in
patch-configure.ac patch-doc_HTML_Makefile.am
patch-doc_man_Makefile.am patch-helpers_docbook2man-spec.pl
Log Message:
New package, docbook-utils.
The docbook-utils is a set of a few small programs intended to ease
everyday's use of technical documentation software and more generally
use of SGML and XML. They are released under the GPL licence.
Tasks they currently accomplish are:
- jw: convert SGML files to other formats (HTML, RTF, Postscript, PDF)
- sgmldiff: detect the differerences in markup between two SGML files
To generate a diff of this commit:
cvs rdiff -u -r1.1561 -r1.1562 pkgsrc/textproc/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/docbook-utils/DESCR \
pkgsrc/textproc/docbook-utils/Makefile \
pkgsrc/textproc/docbook-utils/PLIST \
pkgsrc/textproc/docbook-utils/buildlink3.mk \
pkgsrc/textproc/docbook-utils/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/textproc/docbook-utils/patches/patch-backends_man.in \
pkgsrc/textproc/docbook-utils/patches/patch-backends_texi.in \
pkgsrc/textproc/docbook-utils/patches/patch-bin_jw.in \
pkgsrc/textproc/docbook-utils/patches/patch-bin_sgmldiff.in \
pkgsrc/textproc/docbook-utils/patches/patch-configure.ac \
pkgsrc/textproc/docbook-utils/patches/patch-doc_HTML_Makefile.am \
pkgsrc/textproc/docbook-utils/patches/patch-doc_man_Makefile.am \
pkgsrc/textproc/docbook-utils/patches/patch-helpers_docbook2man-spec.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/textproc/Makefile
diff -u pkgsrc/textproc/Makefile:1.1561 pkgsrc/textproc/Makefile:1.1562
--- pkgsrc/textproc/Makefile:1.1561 Fri Dec 26 21:44:20 2025
+++ pkgsrc/textproc/Makefile Sat Jan 3 18:05:44 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1561 2025/12/26 21:44:20 adam Exp $
+# $NetBSD: Makefile,v 1.1562 2026/01/03 18:05:44 bsiegert Exp $
#
COMMENT= Text processing utilities (does not include desktop publishing)
@@ -215,6 +215,7 @@ SUBDIR+= dikt
SUBDIR+= discount
SUBDIR+= docbook
SUBDIR+= docbook-simple
+SUBDIR+= docbook-utils
SUBDIR+= docbook-website
SUBDIR+= docbook-xml
SUBDIR+= docbook-xsl
Added files:
Index: pkgsrc/textproc/docbook-utils/DESCR
diff -u /dev/null pkgsrc/textproc/docbook-utils/DESCR:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/DESCR Sat Jan 3 18:05:45 2026
@@ -0,0 +1,7 @@
+The docbook-utils is a set of a few small programs intended to ease
+everyday's use of technical documentation software and more generally
+use of SGML and XML. They are released under the GPL licence.
+
+Tasks they currently accomplish are:
+ - jw: convert SGML files to other formats (HTML, RTF, Postscript, PDF)
+ - sgmldiff: detect the differerences in markup between two SGML files
Index: pkgsrc/textproc/docbook-utils/Makefile
diff -u /dev/null pkgsrc/textproc/docbook-utils/Makefile:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/Makefile Sat Jan 3 18:05:45 2026
@@ -0,0 +1,39 @@
+# $NetBSD: Makefile,v 1.1 2026/01/03 18:05:45 bsiegert Exp $
+
+DISTNAME= docbook-utils-0.6.15
+CATEGORIES= textproc
+MASTER_SITES= ${MASTER_SITE_GITHUB:=devexp-db/}
+GITHUB_RELEASE= v${PKGVERSION_NOREV}
+EXTRACT_SUFX= .tar.xz
+
+MAINTAINER= bsiegert%NetBSD.org@localhost
+HOMEPAGE= https://github.com/devexp-db/docbook-utils/
+COMMENT= Shell scripts for managing DocBook documents
+LICENSE= gnu-gpl-v2
+
+GNU_CONFIGURE= yes
+USE_LANGUAGES= # none
+USE_TOOLS= autoreconf autoconf automake gmake
+
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_MESSAGE.paths= Substituting /etc with PKG_SYSCONFDIR
+SUBST_SED.paths= -e 's|/etc|${PKG_SYSCONFDIR}|g'
+SUBST_FILES.paths= bin/jw.in
+SUBST_FILES.paths+= doc/refentry/frontend-spec.sgml doc/refentry/jw.sgml
+
+DEPENDS+= html-[0-9]*:../../textproc/html
+DEPENDS+= dsssl-docbook-modular-[0-9]*:../../textproc/dsssl-docbook-modular
+DEPENDS+= openjade-[0-9]*:../../textproc/openjade
+DEPENDS+= p5-SGMLS-[0-9]*:../../textproc/p5-SGMLS
+
+#CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc
+
+MAKE_ENV= SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+
+pre-configure:
+ cd ${WRKSRC} && autoreconf -vi
+
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../textproc/opensp/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/docbook-utils/PLIST
diff -u /dev/null pkgsrc/textproc/docbook-utils/PLIST:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/PLIST Sat Jan 3 18:05:45 2026
@@ -0,0 +1,52 @@
+@comment $NetBSD: PLIST,v 1.1 2026/01/03 18:05:45 bsiegert Exp $
+bin/docbook2dvi
+bin/docbook2html
+bin/docbook2man
+bin/docbook2pdf
+bin/docbook2ps
+bin/docbook2rtf
+bin/docbook2tex
+bin/docbook2texi
+bin/docbook2txt
+bin/jw
+bin/sgmldiff
+man/man1/docbook2dvi.1
+man/man1/docbook2html.1
+man/man1/docbook2man-spec.pl.1
+man/man1/docbook2man.1
+man/man1/docbook2pdf.1
+man/man1/docbook2ps.1
+man/man1/docbook2rtf.1
+man/man1/docbook2tex.1
+man/man1/docbook2texi-spec.pl.1
+man/man1/docbook2texi.1
+man/man1/jw.1
+man/man1/sgmldiff.1
+man/man7/backend-spec.7
+man/man7/frontend-spec.7
+share/doc/docbook-utils/html/${PKGNAME}/api.html
+share/doc/docbook-utils/html/${PKGNAME}/backend-spec.html
+share/doc/docbook-utils/html/${PKGNAME}/docbook2man.html
+share/doc/docbook-utils/html/${PKGNAME}/docbook2texi.html
+share/doc/docbook-utils/html/${PKGNAME}/fdl.html
+share/doc/docbook-utils/html/${PKGNAME}/frontend-spec.html
+share/doc/docbook-utils/html/${PKGNAME}/helpers.html
+share/doc/docbook-utils/html/${PKGNAME}/index.html
+share/doc/docbook-utils/html/${PKGNAME}/intro-jw.html
+share/doc/docbook-utils/html/${PKGNAME}/intro-sgmldiff.html
+share/doc/docbook-utils/html/${PKGNAME}/introduction.html
+share/doc/docbook-utils/html/${PKGNAME}/jw.html
+share/doc/docbook-utils/html/${PKGNAME}/sgmldiff.html
+share/sgml/docbook/utils-${PKGVERSION}/backends/dvi
+share/sgml/docbook/utils-${PKGVERSION}/backends/html
+share/sgml/docbook/utils-${PKGVERSION}/backends/man
+share/sgml/docbook/utils-${PKGVERSION}/backends/pdf
+share/sgml/docbook/utils-${PKGVERSION}/backends/ps
+share/sgml/docbook/utils-${PKGVERSION}/backends/rtf
+share/sgml/docbook/utils-${PKGVERSION}/backends/tex
+share/sgml/docbook/utils-${PKGVERSION}/backends/texi
+share/sgml/docbook/utils-${PKGVERSION}/backends/txt
+share/sgml/docbook/utils-${PKGVERSION}/docbook-utils.dsl
+share/sgml/docbook/utils-${PKGVERSION}/frontends/docbook
+share/sgml/docbook/utils-${PKGVERSION}/helpers/docbook2man-spec.pl
+share/sgml/docbook/utils-${PKGVERSION}/helpers/docbook2texi-spec.pl
Index: pkgsrc/textproc/docbook-utils/buildlink3.mk
diff -u /dev/null pkgsrc/textproc/docbook-utils/buildlink3.mk:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/buildlink3.mk Sat Jan 3 18:05:45 2026
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2026/01/03 18:05:45 bsiegert Exp $
+
+BUILDLINK_TREE+= docbook-utils
+
+.if !defined(DOCBOOK_UTILS_BUILDLINK3_MK)
+DOCBOOK_UTILS_BUILDLINK3_MK:=
+
+BUILDLINK_DEPMETHOD.docbook-utils?= build
+
+BUILDLINK_API_DEPENDS.docbook-utils+= docbook-utils>=0.6.15
+BUILDLINK_PKGSRCDIR.docbook-utils?= ../../textproc/docbook-utils
+
+.include "../../textproc/opensp/buildlink3.mk"
+.endif # DOCBOOK_UTILS_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -docbook-utils
Index: pkgsrc/textproc/docbook-utils/distinfo
diff -u /dev/null pkgsrc/textproc/docbook-utils/distinfo:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/distinfo Sat Jan 3 18:05:45 2026
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.1 2026/01/03 18:05:45 bsiegert Exp $
+
+BLAKE2s (docbook-utils-0.6.15.tar.xz) = 3d0eb2df36603ece430f3a72f4d236466bfb7aa6dc58d4e8bc89520000eef83e
+SHA512 (docbook-utils-0.6.15.tar.xz) = f75168d50d03cb7f06450792118425504691b0da0b369afc323b13cbee6fb8016d75faf11c508d2cd6004f6c00680efbe4755b856b7790e81bac41c8ec2a5ac6
+Size (docbook-utils-0.6.15.tar.xz) = 95852 bytes
+SHA1 (patch-backends_man.in) = 33965177f7a2e110501298ba2a3084d615e1ffd0
+SHA1 (patch-backends_texi.in) = 472c6a4fab27e71737ea54f079c5184155d8e271
+SHA1 (patch-bin_jw.in) = 072320fa4e4887af87645e231b5f7b9ecf6aa9df
+SHA1 (patch-bin_sgmldiff.in) = e5ea33093afb54f348c0d6ee229396ea14745fac
+SHA1 (patch-configure.ac) = 899d7b960416cfe5a750219208c189ad13994890
+SHA1 (patch-doc_HTML_Makefile.am) = e482efbd87923ef48b56a4ed1375bb990636505d
+SHA1 (patch-doc_man_Makefile.am) = da860adc35f9795fa21636dbe6cb6f1664abecd5
+SHA1 (patch-helpers_docbook2man-spec.pl) = 8a8c98c7e61e877601646080d4b9cbd6178dbeee
Index: pkgsrc/textproc/docbook-utils/patches/patch-backends_man.in
diff -u /dev/null pkgsrc/textproc/docbook-utils/patches/patch-backends_man.in:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/patches/patch-backends_man.in Sat Jan 3 18:05:45 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-backends_man.in,v 1.1 2026/01/03 18:05:45 bsiegert Exp $
+
+Use onsgmls from openjade.
+
+--- backends/man.in.orig 2026-01-02 20:15:42.172989031 +0000
++++ backends/man.in
+@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils-@VER
+ TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
+ { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
+ trap 'rm -rf "${TMPDIR}"' EXIT
+-nsgmls ${SGML_INCLUDE} "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
++onsgmls ${SGML_INCLUDE} "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
+ sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
+ if [ $? -ne 0 ]
+ then
Index: pkgsrc/textproc/docbook-utils/patches/patch-backends_texi.in
diff -u /dev/null pkgsrc/textproc/docbook-utils/patches/patch-backends_texi.in:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/patches/patch-backends_texi.in Sat Jan 3 18:05:45 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-backends_texi.in,v 1.1 2026/01/03 18:05:45 bsiegert Exp $
+
+Use onsgmls from openjade.
+
+--- backends/texi.in.orig 2026-01-02 20:15:42.173989032 +0000
++++ backends/texi.in
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+
+ # Convert to texinfo
+-nsgmls "$SGML_FILE" | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
++onsgmls "$SGML_FILE" | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
Index: pkgsrc/textproc/docbook-utils/patches/patch-bin_jw.in
diff -u /dev/null pkgsrc/textproc/docbook-utils/patches/patch-bin_jw.in:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/patches/patch-bin_jw.in Sat Jan 3 18:05:45 2026
@@ -0,0 +1,22 @@
+$NetBSD: patch-bin_jw.in,v 1.1 2026/01/03 18:05:45 bsiegert Exp $
+
+Remove usage of sgmlwhich; otherwise, on Linux, this uses the system SGML
+catalog instead of the pkgsrc one.
+
+--- bin/jw.in.orig 2026-01-03 15:55:25.213037949 +0000
++++ bin/jw.in
+@@ -58,13 +58,7 @@ SGML_ERRORS_LIST="\n\
+ \040 no-valid \t Do not require the document to be type-valid"
+
+ # Get name of main SGML configuration file
+-which sgmlwhich >/dev/null 2>/dev/null
+-if [ $? -eq 0 ]
+-then
+- SGML_CONF=`sgmlwhich`
+-else
+- SGML_CONF="/etc/sgml/sgml.conf"
+-fi
++SGML_CONF="/etc/sgml/sgml.conf"
+
+ # Set version message
+ SGML_VERSION_MESSAGE="DocBook-utils version @VERSION@ (jw version 1.1)"
Index: pkgsrc/textproc/docbook-utils/patches/patch-bin_sgmldiff.in
diff -u /dev/null pkgsrc/textproc/docbook-utils/patches/patch-bin_sgmldiff.in:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/patches/patch-bin_sgmldiff.in Sat Jan 3 18:05:45 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-bin_sgmldiff.in,v 1.1 2026/01/03 18:05:45 bsiegert Exp $
+
+Use onsgmls from openjade.
+
+--- bin/sgmldiff.in.orig 2026-01-02 20:15:42.175989032 +0000
++++ bin/sgmldiff.in
+@@ -28,7 +28,7 @@ use Getopt::Long 2.01;
+ $VERSION = 1.03;
+
+ my $nsgmls;
+-$nsgmls = "@jade_bindir@/nsgmls";
++$nsgmls = "@jade_bindir@/onsgmls";
+
+ #----------------------------------------------------------------------
+ # TODO:
Index: pkgsrc/textproc/docbook-utils/patches/patch-configure.ac
diff -u /dev/null pkgsrc/textproc/docbook-utils/patches/patch-configure.ac:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/patches/patch-configure.ac Sat Jan 3 18:05:45 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure.ac,v 1.1 2026/01/03 18:05:45 bsiegert Exp $
+
+Use onsgmls from openjade. Do not overwrite docdir with nonsense.
+
+--- configure.ac.orig 2024-10-09 12:46:46.000000000 +0000
++++ configure.ac
+@@ -17,12 +17,11 @@ done
+
+ AM_INIT_AUTOMAKE
+
+-docdir='$(prefix)/doc'
+ AC_SUBST(docdir)
+
+ dnl Checks for programs.
+ jade_bindirs="/usr/bin /usr/local/bin"
+-AC_FIND_PROGRAM(nsgmls, $jade_bindirs, jade_bindir)
++AC_FIND_PROGRAM(onsgmls, $jade_bindirs, jade_bindir)
+ AC_SUBST(jade_bindir)
+
+ perl_bindirs="/usr/bin /usr/local/bin"
Index: pkgsrc/textproc/docbook-utils/patches/patch-doc_HTML_Makefile.am
diff -u /dev/null pkgsrc/textproc/docbook-utils/patches/patch-doc_HTML_Makefile.am:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/patches/patch-doc_HTML_Makefile.am Sat Jan 3 18:05:45 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-doc_HTML_Makefile.am,v 1.1 2026/01/03 18:05:45 bsiegert Exp $
+
+Use openjade instead of jade; correct SGML catalog file location.
+
+--- doc/HTML/Makefile.am.orig 2024-10-09 12:46:46.000000000 +0000
++++ doc/HTML/Makefile.am
+@@ -23,8 +23,8 @@ $(html_DATA): $(top_srcdir)/doc/docbook-
+ $(top_srcdir)/doc/refentry/docbook2texi-spec.pl.sgml \
+ $(top_srcdir)/doc/refentry/frontend-spec.sgml \
+ $(top_srcdir)/doc/refentry/sgmldiff.sgml
+- SGML_CATALOG_FILES=/etc/sgml/catalog \
++ SGML_CATALOG_FILES=$(SYSCONFDIR)/sgml/catalog \
+ SGML_SEARCH_PATH=$(top_srcdir):$(top_srcdir)/doc:.. \
+- jade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \
++ openjade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \
+ -V '%use-id-as-filename%' $<
+
Index: pkgsrc/textproc/docbook-utils/patches/patch-doc_man_Makefile.am
diff -u /dev/null pkgsrc/textproc/docbook-utils/patches/patch-doc_man_Makefile.am:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/patches/patch-doc_man_Makefile.am Sat Jan 3 18:05:45 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-doc_man_Makefile.am,v 1.1 2026/01/03 18:05:45 bsiegert Exp $
+
+Use onsgmls from openjade; correct SGML catalog location.
+
+--- doc/man/Makefile.am.orig 2024-10-09 12:46:46.000000000 +0000
++++ doc/man/Makefile.am
+@@ -10,7 +10,7 @@ CLEANFILES=$(man1_MANS) $(man7_MANS) man
+
+ $(man1_MANS) $(man7_MANS): $(top_srcdir)/doc/docbook-utils.sgml \
+ $(top_srcdir)/helpers/docbook2man-spec.pl
+- SGML_CATALOG_FILES=/etc/sgml/catalog \
++ SGML_CATALOG_FILES=$(SYSCONFDIR)/sgml/catalog \
+ SGML_SEARCH_PATH=$(top_srcdir)/doc:.. \
+- nsgmls $< | \
++ onsgmls $< | \
+ sgmlspl $(top_srcdir)/helpers/docbook2man-spec.pl
Index: pkgsrc/textproc/docbook-utils/patches/patch-helpers_docbook2man-spec.pl
diff -u /dev/null pkgsrc/textproc/docbook-utils/patches/patch-helpers_docbook2man-spec.pl:1.1
--- /dev/null Sat Jan 3 18:05:45 2026
+++ pkgsrc/textproc/docbook-utils/patches/patch-helpers_docbook2man-spec.pl Sat Jan 3 18:05:45 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-helpers_docbook2man-spec.pl,v 1.1 2026/01/03 18:05:45 bsiegert Exp $
+
+Use onsgmls from openjade.
+
+--- helpers/docbook2man-spec.pl.orig 2026-01-02 20:15:42.180989033 +0000
++++ helpers/docbook2man-spec.pl
+@@ -7,7 +7,7 @@ docbook2man-spec - convert DocBook RefEn
+ The SGMLSpm package from CPAN. This contains the sgmlspl script which
+ is used to grok this file. Use it like this:
+
+-nsgmls some-docbook-document.sgml | sgmlspl docbook2man-spec.pl
++onsgmls some-docbook-document.sgml | sgmlspl docbook2man-spec.pl
+
+ =head1 DESCRIPTION
+
Home |
Main Index |
Thread Index |
Old Index