Apparently autoconf 2.5x has some very sane reasons for not using a

cache file by default; one of them is that recursion isn't re-parsing
the values correctly (and hosing up on multiple spaces in things like
CPPFLAGS).  Amusingly enough, this hosage does not happen with a site
cache file such as the one generated by autoswc.

The switch to using :Q on these variables tripped over this stupidity bug,
so turn off the Cyrus configure.in stupidity where it tries to force use
of a cache file.

Fixes PR pkg/29375 and PR pkg/29380.

3 files changed, 42 insertions, 11 deletions

diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index ec6d1c87f7d..38204f07c83 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.23 2004/11/15 21:58:17 jlam Exp $
+$NetBSD: distinfo,v 1.24 2005/02/15 12:32:38 tv Exp $
 
 SHA1 (cyrus-sasl-2.1.20.tar.gz) = d1eec5644c4e87edb95fa5ab8bf124cfdf277eb6
 Size (cyrus-sasl-2.1.20.tar.gz) = 1775163 bytes
-SHA1 (patch-aa) = a6da3823a3a8bd9e90f757245e0e5a60f44123ab
+SHA1 (patch-aa) = c3542cc0e7887fa92b8b3cfa3c970b0dc2f27a8d
 SHA1 (patch-ab) = f3e86c1125e302466e876e5bf31764b9b5cff3ac
 SHA1 (patch-ac) = e03731395cefef42c5070021c09928c939fc6a58
 SHA1 (patch-ad) = 8a6663e358a67c27380e37be72d71841fd553fdf
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
 SHA1 (patch-ag) = f62062ecee2bf133572d09049a77c5624ddb7f70
 SHA1 (patch-ah) = 1b0cd2d822dac2b01523fbc712f6544cd9fc298d
-SHA1 (patch-ai) = a85078230b06189f4705cfd48b7a6156fbd6ee56
+SHA1 (patch-ai) = 4181f13bf69fec11aa42d98bcb85d5d8bd83dfe2
 SHA1 (patch-ak) = 1f727d2bc0536ac5d9ba28f5e4cf01c6c1998987
 SHA1 (patch-al) = a4d7aa722b334df6b7b9f532b02eb5bc7a797486
 SHA1 (patch-ap) = 3c1f4e554fd49772d2f8f279af3b571eca3a7076
diff --git a/security/cyrus-sasl2/patches/patch-aa b/security/cyrus-sasl2/patches/patch-aa
index cf67c15ca4d..0c3fa401120 100644
--- a/security/cyrus-sasl2/patches/patch-aa
+++ b/security/cyrus-sasl2/patches/patch-aa
@@ -1,8 +1,21 @@
-$NetBSD: patch-aa,v 1.9 2004/11/15 21:58:17 jlam Exp $
+$NetBSD: patch-aa,v 1.10 2005/02/15 12:32:38 tv Exp $
 
---- configure.in.orig	2004-10-24 16:05:13.000000000 -0400
+--- configure.in.orig	2005-02-15 07:16:40.000000000 -0500
 +++ configure.in
-@@ -486,7 +486,6 @@ SASL_KERBEROS_V4_CHK
+@@ -44,12 +44,7 @@ dnl
+ AC_INIT(lib/saslint.h)
+ AC_PREREQ([2.54])
+ 
+-dnl use ./config.cache as the default cache file.
+-dnl we require a cache file to successfully configure our build.
+-if test $cache_file = "/dev/null"; then
+-cache_file="./config.cache"
+ AC_CACHE_LOAD
+-fi
+ 
+ AC_CONFIG_AUX_DIR(config)
+ AC_CANONICAL_HOST
+@@ -486,7 +481,6 @@ SASL_KERBEROS_V4_CHK
  SASL_GSSAPI_CHK
  
  if test "$gssapi" != "no"; then
diff --git a/security/cyrus-sasl2/patches/patch-ai b/security/cyrus-sasl2/patches/patch-ai
index 8a24544a870..c7262065eef 100644
--- a/security/cyrus-sasl2/patches/patch-ai
+++ b/security/cyrus-sasl2/patches/patch-ai
@@ -1,8 +1,26 @@
-$NetBSD: patch-ai,v 1.10 2004/11/15 21:58:17 jlam Exp $
+$NetBSD: patch-ai,v 1.11 2005/02/15 12:32:38 tv Exp $
 
 --- configure.orig	2004-10-24 16:21:08.000000000 -0400
 +++ configure
-@@ -5160,7 +5160,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -1326,8 +1326,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
+-if test $cache_file = "/dev/null"; then
+-cache_file="./config.cache"
+ if test -r "$cache_file"; then
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+@@ -1345,8 +1343,6 @@ echo "$as_me: creating cache $cache_file
+   >$cache_file
+ fi
+ 
+-fi
+-
+ ac_aux_dir=
+ for ac_dir in config $srcdir/config; do
+   if test -f $ac_dir/install-sh; then
+@@ -5160,7 +5156,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11,7 +29,7 @@ $NetBSD: patch-ai,v 1.10 2004/11/15 21:58:17 jlam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5916,7 +5916,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -5916,7 +5912,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -20,7 +38,7 @@ $NetBSD: patch-ai,v 1.10 2004/11/15 21:58:17 jlam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -10680,7 +10680,14 @@ if test $ac_cv_lib_resolv_res_search = y
+@@ -10680,7 +10676,14 @@ if test $ac_cv_lib_resolv_res_search = y
  fi
  
    SASL_MECHS="$SASL_MECHS libgssapiv2.la"
@@ -36,7 +54,7 @@ $NetBSD: patch-ai,v 1.10 2004/11/15 21:58:17 jlam Exp $
  
    cmu_save_LIBS="$LIBS"
    LIBS="$LIBS $GSSAPIBASE_LIBS"
-@@ -10778,11 +10785,6 @@ fi
+@@ -10778,11 +10781,6 @@ fi
  
  
  if test "$gssapi" != "no"; then