pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/xmlto Avoid pointless bashisms.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c520b8983928
branches:  trunk
changeset: 374356:c520b8983928
user:      roy <roy%pkgsrc.org@localhost>
date:      Sun Jan 21 18:45:27 2018 +0000

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

diffstat:

 textproc/xmlto/Makefile               |   8 ++++----
 textproc/xmlto/distinfo               |   3 ++-
 textproc/xmlto/patches/patch-xmlto_in |  35 +++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 5 deletions(-)

diffs (79 lines):

diff -r ef34f9c12166 -r c520b8983928 textproc/xmlto/Makefile
--- a/textproc/xmlto/Makefile   Sun Jan 21 18:45:08 2018 +0000
+++ b/textproc/xmlto/Makefile   Sun Jan 21 18:45:27 2018 +0000
@@ -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+=              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}
 
diff -r ef34f9c12166 -r c520b8983928 textproc/xmlto/distinfo
--- a/textproc/xmlto/distinfo   Sun Jan 21 18:45:08 2018 +0000
+++ b/textproc/xmlto/distinfo   Sun Jan 21 18:45:27 2018 +0000
@@ -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_fo_dvi) = 4f47dc2e0b3b94ed2ddf2701d27c8813d0d38465
 SHA1 (patch-format_fo_pdf) = 301b96bf0f8b711cc115306d1b47f04cc6cd2d79
 SHA1 (patch-format_xhtml1_txt) = 6025023e7700375adbabee96dab99e6260b6e707
+SHA1 (patch-xmlto_in) = 4064e13bd53ddfc9a18f618d171d8b26bf182943
diff -r ef34f9c12166 -r c520b8983928 textproc/xmlto/patches/patch-xmlto_in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/xmlto/patches/patch-xmlto_in     Sun Jan 21 18:45:27 2018 +0000
@@ -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



Home | Main Index | Thread Index | Old Index