CVS commit: pkgsrc/textproc/xmlto

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Sun Jan 21 18:45:27 UTC 2018

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

Log Message:
Avoid pointless bashisms.
Avoid use of non POSIX local builtin.
Remove bash dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/textproc/xmlto/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/xmlto/distinfo
cvs rdiff -u -r0 -r1.1 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.31 pkgsrc/textproc/xmlto/Makefile:1.32
--- pkgsrc/textproc/xmlto/Makefile:1.31 Wed Nov  1 06:41:23 2017
+++ pkgsrc/textproc/xmlto/Makefile      Sun Jan 21 18:45:27 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2017/11/01 06:41:23 maya Exp $
+# $NetBSD: Makefile,v 1.32 2018/01/21 18:45:27 roy Exp $
 
 DISTNAME=      xmlto-0.0.28
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc
 MASTER_SITES=  https://releases.pagure.org/xmlto/
 EXTRACT_SUFX=  .tar.bz2
@@ -16,10 +16,10 @@ DEPENDS+=           docbook-xsl>=1.67.0nb1:../../
 DEPENDS+=              libxml2>=2.6.2:../../textproc/libxml2
 
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            bash:run mktemp
+USE_TOOLS+=            mktemp
 GNU_CONFIGURE=         yes
 CONFIGURE_ENV+=                GETOPT=${PREFIX}/bin/getopt
-CONFIGURE_ENV+=                BASH=${TOOLS_PATH.bash}
+CONFIGURE_ENV+=                BASH=${TOOLS_PATH.sh}
 CONFIGURE_ENV+=                GCP=${TOOLS_PATH.cp}
 CONFIGURE_ENV+=                TAIL=${TOOLS_PATH.tail}
 

Index: pkgsrc/textproc/xmlto/distinfo
diff -u pkgsrc/textproc/xmlto/distinfo:1.13 pkgsrc/textproc/xmlto/distinfo:1.14
--- pkgsrc/textproc/xmlto/distinfo:1.13 Fri Dec 11 23:31:09 2015
+++ pkgsrc/textproc/xmlto/distinfo      Sun Jan 21 18:45:27 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/12/11 23:31:09 joerg Exp $
+$NetBSD: distinfo,v 1.14 2018/01/21 18:45:27 roy Exp $
 
 SHA1 (xmlto-0.0.28.tar.bz2) = aa63af9a86ab6ed0c92ea8b177dc808c18902c73
 RMD160 (xmlto-0.0.28.tar.bz2) = acba3cc9ff46505ae49b91108c611646aeac2b5d
@@ -9,3 +9,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

Added files:

Index: pkgsrc/textproc/xmlto/patches/patch-xmlto_in
diff -u /dev/null pkgsrc/textproc/xmlto/patches/patch-xmlto_in:1.1
--- /dev/null   Sun Jan 21 18:45:27 2018
+++ pkgsrc/textproc/xmlto/patches/patch-xmlto_in        Sun Jan 21 18:45:27 2018
@@ -0,0 +1,35 @@
+$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.
+
+--- xmlto.in.orig      2015-11-16 14:07:10.000000000 +0000
++++ xmlto.in
+@@ -78,13 +78,15 @@ EOF
+ #  * 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 @@ make_temp () {
+ }
+ 
+ compute_searchpath () {
+-  local oldIFS="${IFS}"
++  oldIFS="${IFS}"
+   IFS=":"
+   for asearchpath in "$1"; do
+     # wrangle relative paths into absolute ones so that the user