gutenprint-lib: Minor patch adjustments

Quote variables formerly in [[ (thanks rillig@).
Note upstream status.

4 files changed, 22 insertions, 16 deletions

diff --git a/print/gutenprint-lib/distinfo b/print/gutenprint-lib/distinfo
index 7149b2003e5..3633e9c197f 100644
--- a/print/gutenprint-lib/distinfo
+++ b/print/gutenprint-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2020/03/17 23:06:08 gdt Exp $
+$NetBSD: distinfo,v 1.26 2020/03/18 13:49:29 gdt Exp $
 
 SHA1 (gutenprint-5.3.3.tar.xz) = edfab4bafe8e6420c7c321915eeb2dd16e899c59
 RMD160 (gutenprint-5.3.3.tar.xz) = 3a1a9a66ad376294fbb10b547ff53481a81b0337
@@ -6,6 +6,6 @@ SHA512 (gutenprint-5.3.3.tar.xz) = d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead
 Size (gutenprint-5.3.3.tar.xz) = 5050624 bytes
 SHA1 (patch-aa) = 711c925b330a4c4f960439a1722251a4f022ac9f
 SHA1 (patch-configure) = 92bf9185fc7fbadd05e1c8e4f59209d0de574dc8
-SHA1 (patch-scripts_gversion) = b352ed2690a8ccad3e730cec0cc12a790a9ab696
-SHA1 (patch-scripts_gversion.in) = 21d4891a013275a11aa7fc3bd49b0e11cdb0ec70
-SHA1 (patch-scripts_snapstamp) = 69d7b30608c90630cc0939ba12d8b0d42ec398f7
+SHA1 (patch-scripts_gversion) = 117b9daa6b4807e1de73ae3711ea0101b2e3d738
+SHA1 (patch-scripts_gversion.in) = 03e74de2a33561125bc63912534cabf37d3ce5a7
+SHA1 (patch-scripts_snapstamp) = f910a3be5d07f438a12169e2d7cd63ee93889fa8
diff --git a/print/gutenprint-lib/patches/patch-scripts_gversion b/print/gutenprint-lib/patches/patch-scripts_gversion
index 471cee09fcc..257f1244858 100644
--- a/print/gutenprint-lib/patches/patch-scripts_gversion
+++ b/print/gutenprint-lib/patches/patch-scripts_gversion
@@ -1,7 +1,9 @@
-$NetBSD: patch-scripts_gversion,v 1.1 2020/03/17 23:06:08 gdt Exp $
+$NetBSD: patch-scripts_gversion,v 1.2 2020/03/18 13:49:30 gdt Exp $
 
 Remediate bashisms.
 
+Sent upstream by email 20200317.
+
 --- scripts/gversion.orig	2019-08-25 15:14:28.000000000 +0000
 +++ scripts/gversion
 @@ -43,10 +43,10 @@ gutenprint_release=gutenprint-5.3
@@ -12,10 +14,10 @@ Remediate bashisms.
 -	[[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
 -	[[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
 -	[[ -z $tag ]] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
-+	[ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null)
-+	[ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
-+	[ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
-+	[ -z $tag ] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
++	[ -z "$tag" ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null)
++	[ -z "$tag" ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
++	[ -z "$tag" ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
++	[ -z "$tag" ] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
  	echo $tag | sed 's/^[^0-9]*-//' > "$root/git-version-stamp"
      fi
  
diff --git a/print/gutenprint-lib/patches/patch-scripts_gversion.in b/print/gutenprint-lib/patches/patch-scripts_gversion.in
index 68fff3a8093..bc4ed68aca3 100644
--- a/print/gutenprint-lib/patches/patch-scripts_gversion.in
+++ b/print/gutenprint-lib/patches/patch-scripts_gversion.in
@@ -1,7 +1,9 @@
-$NetBSD: patch-scripts_gversion.in,v 1.1 2020/03/17 23:06:08 gdt Exp $
+$NetBSD: patch-scripts_gversion.in,v 1.2 2020/03/18 13:49:30 gdt Exp $
 
 Remediate bashisms.
 
+Sent upstream by email 20200317.
+
 --- scripts/gversion.in.orig	2019-05-25 15:18:50.000000000 +0000
 +++ scripts/gversion.in
 @@ -43,10 +43,10 @@ gutenprint_release=gutenprint-@GUTENPRIN
@@ -12,10 +14,10 @@ Remediate bashisms.
 -	[[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
 -	[[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
 -	[[ -z $tag ]] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
-+	[ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null)
-+	[ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
-+	[ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
-+	[ -z $tag ] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
++	[ -z "$tag" ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null)
++	[ -z "$tag" ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
++	[ -z "$tag" ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
++	[ -z "$tag" ] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
  	echo $tag | sed 's/^[^0-9]*-//' > "$root/git-version-stamp"
      fi
  
diff --git a/print/gutenprint-lib/patches/patch-scripts_snapstamp b/print/gutenprint-lib/patches/patch-scripts_snapstamp
index cc7cea02430..904f369b956 100644
--- a/print/gutenprint-lib/patches/patch-scripts_snapstamp
+++ b/print/gutenprint-lib/patches/patch-scripts_snapstamp
@@ -1,7 +1,9 @@
-$NetBSD: patch-scripts_snapstamp,v 1.1 2020/03/17 23:06:08 gdt Exp $
+$NetBSD: patch-scripts_snapstamp,v 1.2 2020/03/18 13:49:30 gdt Exp $
 
 Remediate bashisms.
 
+Sent upstream by email 20200317.
+
 --- scripts/snapstamp.orig	2019-05-25 19:15:55.000000000 +0000
 +++ scripts/snapstamp
 @@ -17,4 +17,4 @@
@@ -9,4 +11,4 @@ Remediate bashisms.
  # along with this program.  If not, see <https://www.gnu.org/licenses/>.
  
 -[[ -n $STP_BUILD_SNAPSHOT && -d .git ]] && printf '%s%(%Y-%m-%dT%H-%M)T-%s' - -1 $(git describe --dirty --always --first-parent --exclude '*')
-+[ -n $STP_BUILD_SNAPSHOT && -d .git ] && printf '%s%(%Y-%m-%dT%H-%M)T-%s' - -1 $(git describe --dirty --always --first-parent --exclude '*')
++[ -n "$STP_BUILD_SNAPSHOT" && -d .git ] && printf '%s%(%Y-%m-%dT%H-%M)T-%s' - -1 $(git describe --dirty --always --first-parent --exclude '*')