Wed Mar 18 13:49:30 2020 UTC ()
gutenprint-lib: Minor patch adjustments

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


(gdt)
diff -r1.25 -r1.26 pkgsrc/print/gutenprint-lib/distinfo
diff -r1.1 -r1.2 pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion
diff -r1.1 -r1.2 pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in
diff -r1.1 -r1.2 pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp
cvs diff -r1.25 -r1.26 pkgsrc/print/gutenprint-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/print/gutenprint-lib/distinfo 2020/03/17 23:06:08 1.25
+++ pkgsrc/print/gutenprint-lib/distinfo 2020/03/18 13:49:29 1.26
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.25 2020/03/17 23:06:08 gdt Exp $ 1$NetBSD: distinfo,v 1.26 2020/03/18 13:49:29 gdt Exp $
2 2
3SHA1 (gutenprint-5.3.3.tar.xz) = edfab4bafe8e6420c7c321915eeb2dd16e899c59 3SHA1 (gutenprint-5.3.3.tar.xz) = edfab4bafe8e6420c7c321915eeb2dd16e899c59
4RMD160 (gutenprint-5.3.3.tar.xz) = 3a1a9a66ad376294fbb10b547ff53481a81b0337 4RMD160 (gutenprint-5.3.3.tar.xz) = 3a1a9a66ad376294fbb10b547ff53481a81b0337
5SHA512 (gutenprint-5.3.3.tar.xz) = d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6 5SHA512 (gutenprint-5.3.3.tar.xz) = d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6
6Size (gutenprint-5.3.3.tar.xz) = 5050624 bytes 6Size (gutenprint-5.3.3.tar.xz) = 5050624 bytes
7SHA1 (patch-aa) = 711c925b330a4c4f960439a1722251a4f022ac9f 7SHA1 (patch-aa) = 711c925b330a4c4f960439a1722251a4f022ac9f
8SHA1 (patch-configure) = 92bf9185fc7fbadd05e1c8e4f59209d0de574dc8 8SHA1 (patch-configure) = 92bf9185fc7fbadd05e1c8e4f59209d0de574dc8
9SHA1 (patch-scripts_gversion) = b352ed2690a8ccad3e730cec0cc12a790a9ab696 9SHA1 (patch-scripts_gversion) = 117b9daa6b4807e1de73ae3711ea0101b2e3d738
10SHA1 (patch-scripts_gversion.in) = 21d4891a013275a11aa7fc3bd49b0e11cdb0ec70 10SHA1 (patch-scripts_gversion.in) = 03e74de2a33561125bc63912534cabf37d3ce5a7
11SHA1 (patch-scripts_snapstamp) = 69d7b30608c90630cc0939ba12d8b0d42ec398f7 11SHA1 (patch-scripts_snapstamp) = f910a3be5d07f438a12169e2d7cd63ee93889fa8
cvs diff -r1.1 -r1.2 pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion (expand / switch to unified diff)

--- pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion 2020/03/17 23:06:08 1.1
+++ pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion 2020/03/18 13:49:30 1.2
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1$NetBSD: patch-scripts_gversion,v 1.1 2020/03/17 23:06:08 gdt Exp $ 1$NetBSD: patch-scripts_gversion,v 1.2 2020/03/18 13:49:30 gdt Exp $
2 2
3Remediate bashisms. 3Remediate bashisms.
4 4
 5Sent upstream by email 20200317.
 6
5--- scripts/gversion.orig 2019-08-25 15:14:28.000000000 +0000 7--- scripts/gversion.orig 2019-08-25 15:14:28.000000000 +0000
6+++ scripts/gversion 8+++ scripts/gversion
7@@ -43,10 +43,10 @@ gutenprint_release=gutenprint-5.3 9@@ -43,10 +43,10 @@ gutenprint_release=gutenprint-5.3
8 if [ -z "$3" ] ; then 10 if [ -z "$3" ] ; then
9 if [ -d "$root/.git" ] ; then 11 if [ -d "$root/.git" ] ; then
10 tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_version//./_}*" 2>/dev/null) 12 tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_version//./_}*" 2>/dev/null)
11- [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null) 13- [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null)
12- [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null) 14- [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
13- [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null) 15- [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
14- [[ -z $tag ]] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null) 16- [[ -z $tag ]] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
15+ [ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null) 17+ [ -z "$tag" ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null)
16+ [ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null) 18+ [ -z "$tag" ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
17+ [ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null) 19+ [ -z "$tag" ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
18+ [ -z $tag ] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null) 20+ [ -z "$tag" ] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
19 echo $tag | sed 's/^[^0-9]*-//' > "$root/git-version-stamp" 21 echo $tag | sed 's/^[^0-9]*-//' > "$root/git-version-stamp"
20 fi 22 fi
21  23
cvs diff -r1.1 -r1.2 pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in (expand / switch to unified diff)

--- pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in 2020/03/17 23:06:08 1.1
+++ pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in 2020/03/18 13:49:30 1.2
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1$NetBSD: patch-scripts_gversion.in,v 1.1 2020/03/17 23:06:08 gdt Exp $ 1$NetBSD: patch-scripts_gversion.in,v 1.2 2020/03/18 13:49:30 gdt Exp $
2 2
3Remediate bashisms. 3Remediate bashisms.
4 4
 5Sent upstream by email 20200317.
 6
5--- scripts/gversion.in.orig 2019-05-25 15:18:50.000000000 +0000 7--- scripts/gversion.in.orig 2019-05-25 15:18:50.000000000 +0000
6+++ scripts/gversion.in 8+++ scripts/gversion.in
7@@ -43,10 +43,10 @@ gutenprint_release=gutenprint-@GUTENPRIN 9@@ -43,10 +43,10 @@ gutenprint_release=gutenprint-@GUTENPRIN
8 if [ -z "$3" ] ; then 10 if [ -z "$3" ] ; then
9 if [ -d "$root/.git" ] ; then 11 if [ -d "$root/.git" ] ; then
10 tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_version//./_}*" 2>/dev/null) 12 tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_version//./_}*" 2>/dev/null)
11- [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null) 13- [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null)
12- [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null) 14- [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
13- [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null) 15- [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
14- [[ -z $tag ]] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null) 16- [[ -z $tag ]] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
15+ [ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null) 17+ [ -z "$tag" ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null)
16+ [ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null) 18+ [ -z "$tag" ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
17+ [ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null) 19+ [ -z "$tag" ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
18+ [ -z $tag ] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null) 20+ [ -z "$tag" ] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
19 echo $tag | sed 's/^[^0-9]*-//' > "$root/git-version-stamp" 21 echo $tag | sed 's/^[^0-9]*-//' > "$root/git-version-stamp"
20 fi 22 fi
21  23
cvs diff -r1.1 -r1.2 pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp (expand / switch to unified diff)

--- pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp 2020/03/17 23:06:08 1.1
+++ pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp 2020/03/18 13:49:30 1.2
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-scripts_snapstamp,v 1.1 2020/03/17 23:06:08 gdt Exp $ 1$NetBSD: patch-scripts_snapstamp,v 1.2 2020/03/18 13:49:30 gdt Exp $
2 2
3Remediate bashisms. 3Remediate bashisms.
4 4
 5Sent upstream by email 20200317.
 6
5--- scripts/snapstamp.orig 2019-05-25 19:15:55.000000000 +0000 7--- scripts/snapstamp.orig 2019-05-25 19:15:55.000000000 +0000
6+++ scripts/snapstamp 8+++ scripts/snapstamp
7@@ -17,4 +17,4 @@ 9@@ -17,4 +17,4 @@
8 # You should have received a copy of the GNU General Public License 10 # You should have received a copy of the GNU General Public License
9 # along with this program. If not, see <https://www.gnu.org/licenses/>. 11 # along with this program. If not, see <https://www.gnu.org/licenses/>.
10  12
11-[[ -n $STP_BUILD_SNAPSHOT && -d .git ]] && printf '%s%(%Y-%m-%dT%H-%M)T-%s' - -1 $(git describe --dirty --always --first-parent --exclude '*') 13-[[ -n $STP_BUILD_SNAPSHOT && -d .git ]] && printf '%s%(%Y-%m-%dT%H-%M)T-%s' - -1 $(git describe --dirty --always --first-parent --exclude '*')
12+[ -n $STP_BUILD_SNAPSHOT && -d .git ] && printf '%s%(%Y-%m-%dT%H-%M)T-%s' - -1 $(git describe --dirty --always --first-parent --exclude '*') 14+[ -n "$STP_BUILD_SNAPSHOT" && -d .git ] && printf '%s%(%Y-%m-%dT%H-%M)T-%s' - -1 $(git describe --dirty --always --first-parent --exclude '*')