zbar: Rename patch-configure.ac to patch-configure to match patched file

[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 14:36:34 2019 +0100
Changeset:	cb9f673fb8be6d119213e8d89ea3fcd90634bfdb

Modified Files:
	zbar/distinfo
Added Files:
	zbar/patches/patch-configure
Removed Files:
	zbar/patches/patch-configure.ac

Log Message:
zbar: Rename patch-configure.ac to patch-configure to match patched file

While here also improve a bit the comment (only `==' non-standard
test(1) operator was patched).

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

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

diffstat:
 zbar/distinfo                   |   2 +-
 zbar/patches/patch-configure    | 115 ++++++++++++++++++++++++++++++++++++++++
 zbar/patches/patch-configure.ac | 114 ---------------------------------------
 3 files changed, 116 insertions(+), 115 deletions(-)

diffs:
diff --git a/zbar/distinfo b/zbar/distinfo
index 54fd8d21aa..3b7983921b 100644
--- a/zbar/distinfo
+++ b/zbar/distinfo
@@ -4,4 +4,4 @@ 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.ac) = c460ffa7e595b2ea54012191a55c681078bd08e7
+SHA1 (patch-configure) = e9ff600a699c271216d11105d716d9eb26a84885
diff --git a/zbar/patches/patch-configure b/zbar/patches/patch-configure
new file mode 100644
index 0000000000..949468eeb5
--- /dev/null
+++ b/zbar/patches/patch-configure
@@ -0,0 +1,115 @@
+# $NetBSD$
+
+Avoid unportable `==' test(1) operator.
+
+Commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
+
+--- configure.orig	2019-12-03 00:20:34.563193890 +0000
++++ configure
+@@ -21590,7 +21590,7 @@
+ 
+ 
+ 
+-if test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"; then :
++if test "x$with_gtk" = "xgtk3" || test "x$with_gtk" = "xauto"; then :
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK3" >&5
+@@ -21693,7 +21693,7 @@
+ 
+ fi
+ 
+-if test "x$with_gtk" == "xgtk2" || test "x$with_gtk" == "xauto"; then :
++if test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"; then :
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5
+@@ -21845,7 +21845,7 @@
+ 
+ 
+ if test -z "$PYTHON"; then :
+-  if test "x$with_python" == "xauto"; then :
++  if test "x$with_python" = "xauto"; then :
+   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 @@
+ test -n "$PYTHON" || PYTHON=":"
+ 
+ else
+-  if test "x$with_python" == "xpython3"; then :
++  if test "x$with_python" = "xpython3"; then :
+   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 @@
+ test -n "$PYTHON" || PYTHON=":"
+ 
+ else
+-  if test "x$with_python" == "xpython2"; then :
++  if test "x$with_python" = "xpython2"; then :
+   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 @@
+ 
+ 
+ 
+-if test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"; then :
++if test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"; then :
+ 
+ 
+ 
+@@ -23110,7 +23110,7 @@
+ done
+ test -n "$JAR" || JAR=":"
+ 
+-if test "x$JAR" == "x:"; then :
++if test "x$JAR" = "x:"; then :
+   have_java="no"
+ fi
+ 
+@@ -23163,7 +23163,7 @@
+ 
+ 
+ 
+-if test "x$CLASSPATH" == "x"; then :
++if test "x$CLASSPATH" = "x"; then :
+   CLASSPATH="."
+ fi
+ 
+@@ -26983,7 +26983,7 @@
+ echo "GObject introspection  --with-gir=$with_gir"
+ echo "Qt                     --with-qt=$with_qt            Qt${QT_VERSION}"
+ echo "Java                   --with-java=$with_java"
+-if test "x$win32" == "xno"; then :
++if test "x$win32" = "xno"; then :
+   echo "Dbus                   --with-dbus=$with_dbus"
+ fi
+ if test "x$have_GM" = "xyes"; then :
+@@ -27014,7 +27014,7 @@
+ if test "x$have_GM" = "xyes"; then :
+   echo "        => ImageMagick is preferred, as GraphicsMagick doesn't support https"
+ fi
+-if test "x$with_gtk" == "xno"; then :
++if test "x$with_gtk" = "xno"; then :
+   echo "        => GTK support will *NOT* be built"
+ fi
+ if test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"; then :
+@@ -27023,7 +27023,7 @@
+ if test "x$with_qt" != "xyes"; then :
+   echo "        => the Qt widget will *NOT* be built"
+ fi
+-if test "x$with_qt" == "xyes" && test "x$enable_static_qt" == "xyes" ; then :
++if test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ; then :
+   echo "        => Building a static Qt library"
+ fi
+ if test "x$with_java" != "xyes"; then :
+@@ -27035,6 +27035,6 @@
+ #echo "NPAPI Plugin     --with-npapi=$with_npapi"
+ #AS_IF([test "x$with_mozilla" != "xyes"],
+ #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
+-if test "x$enable_pdf417" == "xyes"; then :
++if test "x$enable_pdf417" = "xyes"; then :
+   echo "        => the pdf417 code support is incomplete!"
+ fi
diff --git a/zbar/patches/patch-configure.ac b/zbar/patches/patch-configure.ac
deleted file mode 100644
index 1b80a47f38..0000000000
--- a/zbar/patches/patch-configure.ac
+++ /dev/null
@@ -1,114 +0,0 @@
-# $NetBSD$
-
-portability patches.
-commited upstream as f326730fff1cb3ea7c98d30f67fc94481468d468.
-
---- configure~	2019-12-03 00:20:34.563193890 +0000
-+++ configure	2019-12-03 00:26:36.840747736 +0000
-@@ -21590,7 +21590,7 @@
- 
- 
- 
--if test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"; then :
-+if test "x$with_gtk" = "xgtk3" || test "x$with_gtk" = "xauto"; then :
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK3" >&5
-@@ -21693,7 +21693,7 @@
- 
- fi
- 
--if test "x$with_gtk" == "xgtk2" || test "x$with_gtk" == "xauto"; then :
-+if test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"; then :
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5
-@@ -21845,7 +21845,7 @@
- 
- 
- if test -z "$PYTHON"; then :
--  if test "x$with_python" == "xauto"; then :
-+  if test "x$with_python" = "xauto"; then :
-   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 @@
- test -n "$PYTHON" || PYTHON=":"
- 
- else
--  if test "x$with_python" == "xpython3"; then :
-+  if test "x$with_python" = "xpython3"; then :
-   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 @@
- test -n "$PYTHON" || PYTHON=":"
- 
- else
--  if test "x$with_python" == "xpython2"; then :
-+  if test "x$with_python" = "xpython2"; then :
-   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 @@
- 
- 
- 
--if test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"; then :
-+if test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"; then :
- 
- 
- 
-@@ -23110,7 +23110,7 @@
- done
- test -n "$JAR" || JAR=":"
- 
--if test "x$JAR" == "x:"; then :
-+if test "x$JAR" = "x:"; then :
-   have_java="no"
- fi
- 
-@@ -23163,7 +23163,7 @@
- 
- 
- 
--if test "x$CLASSPATH" == "x"; then :
-+if test "x$CLASSPATH" = "x"; then :
-   CLASSPATH="."
- fi
- 
-@@ -26983,7 +26983,7 @@
- echo "GObject introspection  --with-gir=$with_gir"
- echo "Qt                     --with-qt=$with_qt            Qt${QT_VERSION}"
- echo "Java                   --with-java=$with_java"
--if test "x$win32" == "xno"; then :
-+if test "x$win32" = "xno"; then :
-   echo "Dbus                   --with-dbus=$with_dbus"
- fi
- if test "x$have_GM" = "xyes"; then :
-@@ -27014,7 +27014,7 @@
- if test "x$have_GM" = "xyes"; then :
-   echo "        => ImageMagick is preferred, as GraphicsMagick doesn't support https"
- fi
--if test "x$with_gtk" == "xno"; then :
-+if test "x$with_gtk" = "xno"; then :
-   echo "        => GTK support will *NOT* be built"
- fi
- if test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"; then :
-@@ -27023,7 +27023,7 @@
- if test "x$with_qt" != "xyes"; then :
-   echo "        => the Qt widget will *NOT* be built"
- fi
--if test "x$with_qt" == "xyes" && test "x$enable_static_qt" == "xyes" ; then :
-+if test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ; then :
-   echo "        => Building a static Qt library"
- fi
- if test "x$with_java" != "xyes"; then :
-@@ -27035,6 +27035,6 @@
- #echo "NPAPI Plugin     --with-npapi=$with_npapi"
- #AS_IF([test "x$with_mozilla" != "xyes"],
- #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
--if test "x$enable_pdf417" == "xyes"; then :
-+if test "x$enable_pdf417" = "xyes"; then :
-   echo "        => the pdf417 code support is incomplete!"
- fi