CVS commit: pkgsrc/devel/apenwarr-redo

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Sep  2 18:20:50 UTC 2019

Modified Files:
        pkgsrc/devel/apenwarr-redo: distinfo
        pkgsrc/devel/apenwarr-redo/patches: patch-do patch-redo_sh.do
Added Files:
        pkgsrc/devel/apenwarr-redo/patches: patch-bin_all.do

Log Message:
Try to get more info from failing bulk builds.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/apenwarr-redo/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/apenwarr-redo/patches/patch-bin_all.do
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/apenwarr-redo/patches/patch-do
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/apenwarr-redo/patches/patch-redo_sh.do

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

Modified files:

Index: pkgsrc/devel/apenwarr-redo/distinfo
diff -u pkgsrc/devel/apenwarr-redo/distinfo:1.2 pkgsrc/devel/apenwarr-redo/distinfo:1.3
--- pkgsrc/devel/apenwarr-redo/distinfo:1.2     Thu Aug 29 10:14:03 2019
+++ pkgsrc/devel/apenwarr-redo/distinfo Mon Sep  2 18:20:50 2019
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.2 2019/08/29 10:14:03 schmonz Exp $
+$NetBSD: distinfo,v 1.3 2019/09/02 18:20:50 schmonz Exp $
 
 SHA1 (redo-0.41.tar.gz) = 937655c5c4b2f912185f8876d88185bf3d6b7217
 RMD160 (redo-0.41.tar.gz) = d3a22ef8ee7fda1b6899af035fb74322970afd9e
 SHA512 (redo-0.41.tar.gz) = 94e4414a2f8120e5d4a949461734ed69dc2f39edfb7929d2efff83041ac0b941e037359ccfafcb4eff760608274e32c579df56d58fdb67b13b8a26eb1945b0d0
 Size (redo-0.41.tar.gz) = 140167 bytes
-SHA1 (patch-do) = f23bfc7ccbd9c988b164dfa9194e7effc8830942
-SHA1 (patch-redo_sh.do) = 1b4871c04c9b73039920b4886eadc07e3b286691
+SHA1 (patch-bin_all.do) = 51f1b2e286879287a4a0b13064ca712be17ca6f4
+SHA1 (patch-do) = 75b461b94d83f6145d161355aec59633bcad2c20
+SHA1 (patch-redo_sh.do) = d6223596c83744d19f23d0026a321fc89102569d
 SHA1 (patch-t_shelltest.od) = ca86299da6ae30b44a0e10cfe1a6ef30299dd0bc

Index: pkgsrc/devel/apenwarr-redo/patches/patch-do
diff -u pkgsrc/devel/apenwarr-redo/patches/patch-do:1.2 pkgsrc/devel/apenwarr-redo/patches/patch-do:1.3
--- pkgsrc/devel/apenwarr-redo/patches/patch-do:1.2     Thu Aug 29 10:14:03 2019
+++ pkgsrc/devel/apenwarr-redo/patches/patch-do Mon Sep  2 18:20:50 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-do,v 1.2 2019/08/29 10:14:03 schmonz Exp $
+$NetBSD: patch-do,v 1.3 2019/09/02 18:20:50 schmonz Exp $
 
 Avoid spurious output.
 Run self-test verbosely, to try to get more info from failing bulk builds.
@@ -19,7 +19,7 @@ Run self-test verbosely, to try to get m
  build() {
        ./minimal/do -c bin/all || die "failed to compile redo."
 -      bin/redo bin/all || die "redo failed self test."
-+      bin/redo -vv bin/all || die "redo failed self test."
++      bin/redo -vv -x bin/all || die "redo failed self test."
  }
  
  clean() {

Index: pkgsrc/devel/apenwarr-redo/patches/patch-redo_sh.do
diff -u pkgsrc/devel/apenwarr-redo/patches/patch-redo_sh.do:1.1 pkgsrc/devel/apenwarr-redo/patches/patch-redo_sh.do:1.2
--- pkgsrc/devel/apenwarr-redo/patches/patch-redo_sh.do:1.1     Sat Jul 20 21:17:11 2019
+++ pkgsrc/devel/apenwarr-redo/patches/patch-redo_sh.do Mon Sep  2 18:20:50 2019
@@ -1,15 +1,17 @@
-$NetBSD: patch-redo_sh.do,v 1.1 2019/07/20 21:17:11 schmonz Exp $
+$NetBSD: patch-redo_sh.do,v 1.2 2019/09/02 18:20:50 schmonz Exp $
 
-Look for pkgsrc-provided dash.
+Look for pkgsrc-provided dash only.
 
 --- redo/sh.do.orig    2019-01-02 19:49:33.000000000 +0000
 +++ redo/sh.do
-@@ -11,7 +11,7 @@ WARN=
+@@ -11,9 +11,7 @@ WARN=
  # powerful ones.  We want weaker shells to take precedence, as long as they
  # pass the tests, because weaker shells are more likely to point out when you
  # use some non-portable feature.
 -for sh in dash /usr/xpg4/bin/sh ash posh \
-+for sh in ${PREFIX}/bin/dash /usr/xpg4/bin/sh ash posh \
-               lksh mksh ksh ksh88 ksh93 pdksh \
-               zsh bash busybox /bin/sh; do
+-              lksh mksh ksh ksh88 ksh93 pdksh \
+-              zsh bash busybox /bin/sh; do
++for sh in ${PREFIX}/bin/dash; do
        printf " %-22s" "$sh..."
+       FOUND=`which $sh 2>/dev/null` || { echo "missing"; continue; }
+       

Added files:

Index: pkgsrc/devel/apenwarr-redo/patches/patch-bin_all.do
diff -u /dev/null pkgsrc/devel/apenwarr-redo/patches/patch-bin_all.do:1.1
--- /dev/null   Mon Sep  2 18:20:50 2019
+++ pkgsrc/devel/apenwarr-redo/patches/patch-bin_all.do Mon Sep  2 18:20:50 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-bin_all.do,v 1.1 2019/09/02 18:20:50 schmonz Exp $
+
+Add info to help debug bulk build failures.
+
+--- bin/all.do.orig    2019-01-02 19:49:33.000000000 +0000
++++ bin/all.do
+@@ -1,3 +1,6 @@
+ exec >&2
+ redo-ifchange ../redo/version/all ../redo/py list redo-sh
++echo "pkgsrc: PATH = $PATH"
++echo "pkgsrc: xargs = $(type xargs)"
++echo "pkgsrc: list = $(cat list)"
+ xargs redo-ifchange <list