Bring in 'set -o posix' handling from newer autoconf, fixes a build loop

when mksh is used as CONFIG_SHELL. Analysis and fix from Olivier Duclos in TritonDataCenter/pkgsrc#256.
jsonn · Apr 2, 2015 · 44dbea4 · 44dbea4
1 parent df01ede
commit 44dbea4
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/www/wml/distinfo b/www/wml/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2015/01/16 12:15:31 wiz Exp $
+$NetBSD: distinfo,v 1.19 2015/04/02 12:34:06 jperkin Exp $
 
 SHA1 (wml-2.0.11.tar.gz) = 14dd7c23461716171a66b65676bca6e19a593007
 RMD160 (wml-2.0.11.tar.gz) = fead82a35d116447b860d7b1c506c6de187355e8
 Size (wml-2.0.11.tar.gz) = 3115230 bytes
-SHA1 (patch-aa) = 398ddb03402c17306e259b10cf9b5d7ec774d71b
+SHA1 (patch-aa) = f05d0f06f94a0d26b987a820b924fb94fad3bfb6
 SHA1 (patch-ab) = dbd30a0a23189963aa60b06c319342fac4408a6b
 SHA1 (patch-ac) = 80863037faadf220ba1d01ef2133cdc42e08f0fa
 SHA1 (patch-ad) = 2955f349aa737f1758493897d1989a0b96220268

diff --git a/www/wml/patches/patch-aa b/www/wml/patches/patch-aa
@@ -1,8 +1,26 @@
-$NetBSD: patch-aa,v 1.2 2004/09/24 00:58:30 kim Exp $
+$NetBSD: patch-aa,v 1.3 2015/04/02 12:34:06 jperkin Exp $
 
---- configure.orig	2002-10-18 17:44:21.000000000 -0400
-+++ configure	2004-09-23 19:14:06.000000000 -0400
-@@ -2568,7 +2568,7 @@
+Use POSIX shell mode where available, from newer autoconf.
+
+--- configure.orig	2006-08-19 06:09:50.000000000 +0000
++++ configure
+@@ -17,8 +17,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++else
++  case `(set -o) 2>/dev/null` in #(
++  *posix*) :
++    set -o posix ;; #(
++  *) :
++     ;;
++esac
+ fi
+ DUALCASE=1; export DUALCASE # for MKS sh
+
+@@ -2785,7 +2790,7 @@ for dir in `echo $PATH | sed -e 's/:/ /g
           if test -f "$dir/$perl"; then
               if test -x "$dir/$perl"; then
                   perlprog="$dir/$perl"
@@ -11,7 +29,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/24 00:58:30 kim Exp $
                       perlvers=`$perlprog -e 'printf "%.3f",$]'`
                       break 2
                   fi
-@@ -2580,7 +2580,7 @@
+@@ -2797,7 +2802,7 @@ done
  fi; PATH_PERL=$perlprog
  echo "$as_me:$LINENO: result: $perlprog v$perlvers" >&5
  echo "${ECHO_T}$perlprog v$perlvers" >&6
@@ -20,7 +38,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/24 00:58:30 kim Exp $
      :
  else
      echo ""
-@@ -2639,7 +2639,7 @@
+@@ -2856,7 +2861,7 @@ if test ".$with_openworld" = .no; then
  else
      echo "$as_me:$LINENO: checking for Perl module Getopt::Long (2.16)" >&5
  echo $ECHO_N "checking for Perl module Getopt::Long (2.16)... $ECHO_C" >&6
@@ -29,7 +47,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/24 00:58:30 kim Exp $
  if test ".$rc" = .ok; then
      have_getoptlong=1
      echo "$as_me:$LINENO: result: found" >&5
-@@ -2653,7 +2653,7 @@
+@@ -2870,7 +2875,7 @@ fi
 
      echo "$as_me:$LINENO: checking for Perl module Bit::Vector (5.2)" >&5
  echo $ECHO_N "checking for Perl module Bit::Vector (5.2)... $ECHO_C" >&6
@@ -38,7 +56,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/24 00:58:30 kim Exp $
  if test ".$rc" = .ok; then
      have_bitvector=1
      echo "$as_me:$LINENO: result: found" >&5
-@@ -2665,9 +2665,9 @@
+@@ -2882,9 +2887,9 @@ echo "${ECHO_T}not found" >&6
  fi
 
 
@@ -51,7 +69,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/24 00:58:30 kim Exp $
  if test ".$rc" = .ok; then
      have_filepathconvert=1
      echo "$as_me:$LINENO: result: found" >&5
-@@ -2681,7 +2681,7 @@
+@@ -2898,7 +2903,7 @@ fi
 
      echo "$as_me:$LINENO: checking for Perl module Image::Size (2.6)" >&5
  echo $ECHO_N "checking for Perl module Image::Size (2.6)... $ECHO_C" >&6
@@ -60,7 +78,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/24 00:58:30 kim Exp $
  if test ".$rc" = .ok; then
      have_imagesize=1
      echo "$as_me:$LINENO: result: found" >&5
-@@ -2695,7 +2695,7 @@
+@@ -2912,7 +2917,7 @@ fi
 
      echo "$as_me:$LINENO: checking for Perl module IO::File (1.07)" >&5
  echo $ECHO_N "checking for Perl module IO::File (1.07)... $ECHO_C" >&6
@@ -69,7 +87,7 @@ $NetBSD: patch-aa,v 1.2 2004/09/24 00:58:30 kim Exp $
  if test ".$rc" = .ok; then
      have_io=1
      echo "$as_me:$LINENO: result: found" >&5
-@@ -2709,7 +2709,7 @@
+@@ -2926,7 +2931,7 @@ fi
 
      echo "$as_me:$LINENO: checking for Perl module Term::ReadKey (2.11)" >&5
  echo $ECHO_N "checking for Perl module Term::ReadKey (2.11)... $ECHO_C" >&6