zbar: Remove bash dependency

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Dec 3 15:27:04 2019 +0100
Changeset:	4c11346b00f984e8e63ec1258c13d4abf08d8682

Modified Files:
	zbar/Makefile
	zbar/distinfo
	zbar/patches/patch-configure

Log Message:
zbar: Remove bash dependency

Instead of `${parameter/pattern/string}' bash-ism, sed(1) could be used
instead (it's already done in other parts and doing that once it's
probably not performance critical).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4c11346b00f984e8e63ec1258c13d4abf08d8682

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

diffstat:
 zbar/Makefile                |  5 +----
 zbar/distinfo                |  2 +-
 zbar/patches/patch-configure | 41 ++++++++++++++++++++++++++---------------
 3 files changed, 28 insertions(+), 20 deletions(-)

diffs:
diff --git a/zbar/Makefile b/zbar/Makefile
index 5867c6eee1..594a988aa1 100644
--- a/zbar/Makefile
+++ b/zbar/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config bash
+USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++	# c++ needed only for test
 
 CONFIGURE_ARGS+=	--with-jpeg
@@ -22,9 +22,6 @@ CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-java
 CONFIGURE_ARGS+=	--without-qt
 
-# \todo: JAVAC=${JAVAC/ecj/ecj -1.5} is a bashim: ${parm/?/pat[/str]}
-CONFIG_SHELL=		${TOOLS_PATH.bash}
-
 PKGCONFIG_OVERRIDE+=	zbar-gtk.pc.in
 PKGCONFIG_OVERRIDE+=	zbar-qt.pc.in
 PKGCONFIG_OVERRIDE+=	zbar.pc.in
diff --git a/zbar/distinfo b/zbar/distinfo
index 92765c4ca6..fc4a286dbb 100644
--- a/zbar/distinfo
+++ b/zbar/distinfo
@@ -4,5 +4,5 @@ SHA1 (zbar-0.23.tar.bz2) = 11a1d3f1aa8ef905fe16d88347a191909705d7ab
 RMD160 (zbar-0.23.tar.bz2) = 59ecd5c78fa91f6951a129377b4fa477307676bb
 SHA512 (zbar-0.23.tar.bz2) = 7eef2ee99760edd693ecc12a36e04b71a156b93b4c1977ca4f6da103a955284cf640b55adb185477e1d4cc65345bb01608ed9528f6518abb514ccbc58e5d350b
 Size (zbar-0.23.tar.bz2) = 1168183 bytes
-SHA1 (patch-configure) = e9ff600a699c271216d11105d716d9eb26a84885
+SHA1 (patch-configure) = 66dea87487c7daec3a95e4787a8d10cd061543bb
 SHA1 (patch-gtk_Makefile.in) = bf32ac312d0d00ed7ac152ddd849dae0fc681e74
diff --git a/zbar/patches/patch-configure b/zbar/patches/patch-configure
index 949468eeb5..54838130b1 100644
--- a/zbar/patches/patch-configure
+++ b/zbar/patches/patch-configure
@@ -1,12 +1,14 @@
 # $NetBSD$
 
-Avoid unportable `==' test(1) operator.
+Avoid unportable `==' test(1) operator and a
+`${parameter/pattern/string}' bash-ism.
 
-Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
+`==' unportable test(1) operator commited upstream as
+f326730fff1cb3ea7c98d30f67fc94481468d468.
 
---- configure.orig	2019-12-03 00:20:34.563193890 +0000
+--- configure.orig	2019-05-23 21:12:06.000000000 +0000
 +++ configure
-@@ -21590,7 +21590,7 @@
+@@ -21590,7 +21590,7 @@ fi
  
  
  
@@ -15,7 +17,7 @@ Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
  
  pkg_failed=no
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK3" >&5
-@@ -21693,7 +21693,7 @@
+@@ -21693,7 +21693,7 @@ fi
  
  fi
  
@@ -24,7 +26,7 @@ Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
  
  pkg_failed=no
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5
-@@ -21845,7 +21845,7 @@
+@@ -21845,7 +21845,7 @@ fi
  
  
  if test -z "$PYTHON"; then :
@@ -33,7 +35,7 @@ Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
    for ac_prog in python3 python2 python
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -21893,7 +21893,7 @@
+@@ -21893,7 +21893,7 @@ done
  test -n "$PYTHON" || PYTHON=":"
  
  else
@@ -42,7 +44,7 @@ Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
    for ac_prog in python3 python
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -21941,7 +21941,7 @@
+@@ -21941,7 +21941,7 @@ done
  test -n "$PYTHON" || PYTHON=":"
  
  else
@@ -51,7 +53,7 @@ Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
    for ac_prog in python2 python
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -22450,7 +22450,7 @@
+@@ -22450,7 +22450,7 @@ fi
  
  
  
@@ -60,7 +62,16 @@ Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
  
  
  
-@@ -23110,7 +23110,7 @@
+@@ -23002,7 +23002,7 @@ else
+ fi
+ 
+ 
+-JAVAC=${JAVAC/ecj/ecj -1.5}
++JAVAC=`echo "$JAVAC" | sed -e 's/ecj/ecj -1.5/'`
+ 
+ # Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
+ # look strictly at the $JAVA_HOME in order to avoid mixing different versions
+@@ -23110,7 +23110,7 @@ fi
  done
  test -n "$JAR" || JAR=":"
  
@@ -69,7 +80,7 @@ Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
    have_java="no"
  fi
  
-@@ -23163,7 +23163,7 @@
+@@ -23163,7 +23163,7 @@ test -n "$JAVA" || JAVA="/bin/false"
  
  
  
@@ -78,7 +89,7 @@ Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
    CLASSPATH="."
  fi
  
-@@ -26983,7 +26983,7 @@
+@@ -26981,7 +26981,7 @@ echo "GTK                    --with-gtk=
  echo "GObject introspection  --with-gir=$with_gir"
  echo "Qt                     --with-qt=$with_qt            Qt${QT_VERSION}"
  echo "Java                   --with-java=$with_java"
@@ -87,7 +98,7 @@ Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
    echo "Dbus                   --with-dbus=$with_dbus"
  fi
  if test "x$have_GM" = "xyes"; then :
-@@ -27014,7 +27014,7 @@
+@@ -27012,7 +27012,7 @@ fi
  if test "x$have_GM" = "xyes"; then :
    echo "        => ImageMagick is preferred, as GraphicsMagick doesn't support https"
  fi
@@ -96,7 +107,7 @@ Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
    echo "        => GTK support will *NOT* be built"
  fi
  if test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"; then :
-@@ -27023,7 +27023,7 @@
+@@ -27021,7 +27021,7 @@ fi
  if test "x$with_qt" != "xyes"; then :
    echo "        => the Qt widget will *NOT* be built"
  fi
@@ -105,7 +116,7 @@ Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
    echo "        => Building a static Qt library"
  fi
  if test "x$with_java" != "xyes"; then :
-@@ -27035,6 +27035,6 @@
+@@ -27033,6 +27033,6 @@ fi
  #echo "NPAPI Plugin     --with-npapi=$with_npapi"
  #AS_IF([test "x$with_mozilla" != "xyes"],
  #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])