head	1.2;
access;
symbols
	pkgsrc-2026Q2:1.1.0.68
	pkgsrc-2026Q2-base:1.1
	pkgsrc-2026Q1:1.1.0.66
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.64
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.62
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.60
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.58
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.56
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.54
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.52
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.50
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.48
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.46
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.44
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.42
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.40
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.38
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.36
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.34
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.32
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.30
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.28
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.26
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.24
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.22
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.20
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.16
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.18
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.14
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.12
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.10
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.8
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.6
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.4
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.2
	pkgsrc-2018Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2026.07.01.03.50.37;	author gutteridge;	state Exp;
branches;
next	1.1;
commitid	TrHFljFR6UZkZTLG;

1.1
date	2018.01.21.18.45.27;	author roy;	state Exp;
branches;
next	;
commitid	FIAEEcpAZvbB2MnA;


desc
@@


1.2
log
@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.
@
text
@$NetBSD: patch-xmlto_in,v 1.1 2018/01/21 18:45:27 roy Exp $

Avoid pointless bashisms.
Avoid use of non-POSIX local builtin.
Avoid non-portable "type -p" expression.

--- xmlto.in.orig	2026-07-01 03:19:00.575014754 +0000
+++ xmlto.in
@@@@ -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 () {
-  local dirflag="" prefix="@@PACKAGE@@"
+  dirflag="" prefix="@@PACKAGE@@"
   [ "$1" = "-d" ] && { dirflag="-d"; shift; }
   [ -n "$1" ] && prefix="@@PACKAGE@@-$1"
 
-  if eval $2='$(${MKTEMP} $dirflag "${TMPDIR:-/tmp}/${prefix}.XXXXXX")'
+  tmpnam=$(${MKTEMP} $dirflag "${TMPDIR:-/tmp}/${prefix}.XXXXXX")
+  if [ $? = 0 ]
   then
-    CLEANFILES="$CLEANFILES ${!2}"
+    eval $2="$tmpnam"
+    CLEANFILES="$CLEANFILES $tmpnam"
     return 0
   elif [ -z "$3" ]
   then
@@@@ -97,7 +99,7 @@@@ compute_searchpath () {
 }
 
 compute_searchpath () {
-  local oldIFS="${IFS}"
+  oldIFS="${IFS}"
   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
@


1.1
log
@Avoid pointless bashisms.
Avoid use of non POSIX local builtin.
Remove bash dependency.
@
text
@d1 1
a1 1
$NetBSD: $
d4 2
a5 1
Avoid use of non POSIX local builtin.
d7 1
a7 1
--- xmlto.in.orig	2015-11-16 14:07:10.000000000 +0000
d9 1
a9 1
@@@@ -78,13 +78,15 @@@@ EOF
d28 1
a28 1
@@@@ -97,7 +99,7 @@@@ make_temp () {
d37 9
@