CVS commit: pkgsrc/textproc/xmlto

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Jul  1 03:50:37 UTC 2026

Modified Files:
        pkgsrc/textproc/xmlto: Makefile distinfo
        pkgsrc/textproc/xmlto/patches: patch-xmlto_in

Log Message:
xmlto: apply two shell-related tweaks

First, make shell code used in the "-o" option parsing more portable.
"type -p" hasn't been supported by NetBSD's sh since 8.0 (and also
isn't universally supported elsewhere by other shells). This addresses
PR pkg/60388 from Andrew Cagney. (Really here we're suppressing a
warning rather than a failure, one that happens to show up in build
logs.)

(We could substitute "command -v" instead (recommended over bare "type"
by a NetBSD shell guru), but since both the existing upstream code and
a bunch of our patches are already using "type" in many places, I kept
it consistent here.)

Next, Makefile r. 1.32 removed bash as a runtime dependency, but didn't
account for REPLACE_BASH still being defined, which results in a broken
(though effectively harmless) substitution to "#!". (Here perhaps the
pkgsrc replacement mechanism could be improved so it generates an error
when the replacement path is empty.) This is only relevant for the test
target.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/textproc/xmlto/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/xmlto/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/xmlto/patches/patch-xmlto_in

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

Modified files:

Index: pkgsrc/textproc/xmlto/Makefile
diff -u pkgsrc/textproc/xmlto/Makefile:1.50 pkgsrc/textproc/xmlto/Makefile:1.51
--- pkgsrc/textproc/xmlto/Makefile:1.50 Wed Jan  7 08:49:10 2026
+++ pkgsrc/textproc/xmlto/Makefile      Wed Jul  1 03:50:37 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2026/01/07 08:49:10 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2026/07/01 03:50:37 gutteridge Exp $
 
 DISTNAME=      xmlto-0.0.29
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc
 MASTER_SITES=  https://releases.pagure.org/xmlto/
 EXTRACT_SUFX=  .tar.bz2
@@ -35,7 +35,7 @@ SUBST_FILES.fix-paths=                format/docbook/*
 SUBST_SED.fix-paths=           -e 's,http://docbook.sourceforge.net/release/xsl/current/,file://${PREFIX}/share/xsl/docbook/,g'
 
 MAKE_ENV+=             SGML_CATALOG_FILES=${PREFIX}/share/xml/catalog
-REPLACE_BASH+=         xmlif/test/run-test
+REPLACE_SH+=           xmlif/test/run-test
 TEST_TARGET=           check
 
 INSTALLATION_DIRS=     share/xmlto/format/docbook share/xmlto/format/fo

Index: pkgsrc/textproc/xmlto/distinfo
diff -u pkgsrc/textproc/xmlto/distinfo:1.18 pkgsrc/textproc/xmlto/distinfo:1.19
--- pkgsrc/textproc/xmlto/distinfo:1.18 Tue Aug 26 18:52:09 2025
+++ pkgsrc/textproc/xmlto/distinfo      Wed Jul  1 03:50:37 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2025/08/26 18:52:09 adam Exp $
+$NetBSD: distinfo,v 1.19 2026/07/01 03:50:37 gutteridge Exp $
 
 BLAKE2s (xmlto-0.0.29.tar.bz2) = 59469536684dee613dab19564594137acb451662218f48d93898a81317c485ae
 SHA512 (xmlto-0.0.29.tar.bz2) = fcf76a4cbe22d09126924d3e4a735ad5e448c22aa3b553e54766ecc7579f5b0d467b52e79301e495201fdc955de411a2a26081b8089643851f3794efa8b55158
@@ -8,4 +8,4 @@ SHA1 (patch-format_docbook_txt) = 8d4502
 SHA1 (patch-format_fo_dvi) = 4f47dc2e0b3b94ed2ddf2701d27c8813d0d38465
 SHA1 (patch-format_fo_pdf) = 301b96bf0f8b711cc115306d1b47f04cc6cd2d79
 SHA1 (patch-format_xhtml1_txt) = 6025023e7700375adbabee96dab99e6260b6e707
-SHA1 (patch-xmlto_in) = 4064e13bd53ddfc9a18f618d171d8b26bf182943
+SHA1 (patch-xmlto_in) = a9ee35f69ce669ee12a3f3c13bf9a2dd0b0127f3

Index: pkgsrc/textproc/xmlto/patches/patch-xmlto_in
diff -u pkgsrc/textproc/xmlto/patches/patch-xmlto_in:1.1 pkgsrc/textproc/xmlto/patches/patch-xmlto_in:1.2
--- pkgsrc/textproc/xmlto/patches/patch-xmlto_in:1.1    Sun Jan 21 18:45:27 2018
+++ pkgsrc/textproc/xmlto/patches/patch-xmlto_in        Wed Jul  1 03:50:37 2026
@@ -1,11 +1,12 @@
-$NetBSD: patch-xmlto_in,v 1.1 2018/01/21 18:45:27 roy Exp $
+$NetBSD: patch-xmlto_in,v 1.2 2026/07/01 03:50:37 gutteridge Exp $
 
 Avoid pointless bashisms.
-Avoid use of non POSIX local builtin.
+Avoid use of non-POSIX local builtin.
+Avoid non-portable "type -p" expression.
 
---- xmlto.in.orig      2015-11-16 14:07:10.000000000 +0000
+--- xmlto.in.orig      2026-07-01 03:19:00.575014754 +0000
 +++ xmlto.in
-@@ -78,13 +78,15 @@ EOF
+@@ -78,13 +78,15 @@ make_temp () {
  #  * Remembers the temporary file's name so it can be deleted on exit
  #  * If the failure message is empty or missing, exits on failure
  make_temp () {
@@ -24,7 +25,7 @@ Avoid use of non POSIX local builtin.
      return 0
    elif [ -z "$3" ]
    then
-@@ -97,7 +99,7 @@ make_temp () {
+@@ -97,7 +99,7 @@ compute_searchpath () {
  }
  
  compute_searchpath () {
@@ -33,3 +34,12 @@ Avoid use of non POSIX local builtin.
    IFS=":"
    for asearchpath in "$1"; do
      # wrangle relative paths into absolute ones so that the user
+@@ -315,7 +317,7 @@ while [ "$#" -gt "0" ]; do
+       ;;
+   -o)
+       OUTPUT_DIR="$2"
+-      if type -p cygpath >/dev/null; then
++      if type cygpath >/dev/null 2>&1; then
+               OUTPUT_DIR=$(cygpath "$OUTPUT_DIR")
+       fi
+       case "$OUTPUT_DIR" in