Ensure that everything that is linked against libsasl is also linked

against its dependent libraries by using the output of "sasl-config --libs"
if sasl-config is present.

4 files changed, 172 insertions, 4 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 9a725f2517f..115a689f18b 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/10/09 21:50:24 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2002/10/21 06:12:53 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.0.16
 PKGREVISION=		1
@@ -61,8 +61,6 @@ CONFIGURE_ARGS+=	--with-auth=unix
 CONFIGURE_ARGS+=	--without-krb
 .endif
 
-LIBS+=			`sasl-config --libs`
-
 HTMLDIR=		${PREFIX}/share/doc/html/cyrus-imapd
 EGDIR=			${PREFIX}/share/examples/cyrus-imapd
 CONF_FILES=		${EGDIR}/imapd.conf ${PKG_SYSCONFDIR}/imapd.conf
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index f6d941474dd..4300401d328 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/10/09 21:50:25 wiz Exp $
+$NetBSD: distinfo,v 1.9 2002/10/21 06:12:53 jlam Exp $
 
 SHA1 (cyrus-imapd-2.0.16.tar.gz) = 7aa83f4b01d164f57cfd4cfe195f85551212b962
 Size (cyrus-imapd-2.0.16.tar.gz) = 1383996 bytes
@@ -8,6 +8,8 @@ SHA1 (patch-aa) = 51b4fee0e8eb46cd4fd05fdffd4b52c9abe89b11
 SHA1 (patch-ab) = 76000108d4345a19d56c99cc2ccd64cd0d8c897e
 SHA1 (patch-ac) = 95eea5da0d7d54bd31e99decc281c6e55d11aa81
 SHA1 (patch-ad) = 2ded3c0228d6967af5599df0226cf43fc1e94b29
+SHA1 (patch-ae) = df4054aa5aa19129ce2ab28c5d74f0f92230a1c6
+SHA1 (patch-af) = 44bac847b61e06735d28769adc63150e604e665f
 SHA1 (patch-ag) = 08068d3d44a055237b208838def5e1ac4c4715b5
 SHA1 (patch-ah) = d6602de6b2105c97cef1005fb7883e6023184ef7
 SHA1 (patch-ai) = eb32cf0cf4c4007efc57530fa028b5336c22e26a
diff --git a/mail/cyrus-imapd/patches/patch-ae b/mail/cyrus-imapd/patches/patch-ae
new file mode 100644
index 00000000000..b8d205885f4
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-ae
@@ -0,0 +1,30 @@
+$NetBSD: patch-ae,v 1.4 2002/10/21 06:12:54 jlam Exp $
+
+--- cmulocal/sasl.m4.orig	Fri Jul  7 13:46:12 2000
++++ cmulocal/sasl.m4
+@@ -54,6 +54,9 @@ AC_ARG_WITH(sasl,
+ 
+ 	SASLFLAGS=""
+ 	LIB_SASL=""
++	AC_PATH_PROG(SASL_CONFIG, sasl-config, no)
++
++	if test "$SASL_CONFIG" = no; then
+ 
+ 	cmu_saved_CPPFLAGS=$CPPFLAGS
+ 	cmu_saved_LDFLAGS=$LDFLAGS
+@@ -82,6 +85,15 @@ AC_ARG_WITH(sasl,
+ 	  LIB_SASL=""
+ 	  SASLFLAGS=""
+ 	fi
++
++	else	# SASL_CONFIG
++
++	ac_cv_found_sasl=yes
++	SASLFLAGS=`$SASL_CONFIG --cflags`
++	LIB_SASL=`$SASL_CONFIG --libs`
++
++	fi
++
+ 	AC_SUBST(LIB_SASL)
+ 	AC_SUBST(SASLFLAGS)
+ 	])
diff --git a/mail/cyrus-imapd/patches/patch-af b/mail/cyrus-imapd/patches/patch-af
new file mode 100644
index 00000000000..995bf64afee
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-af
@@ -0,0 +1,138 @@
+$NetBSD: patch-af,v 1.4 2002/10/21 06:12:54 jlam Exp $
+
+--- configure.orig	Fri Jul 27 19:53:11 2001
++++ configure
+@@ -1159,49 +1159,27 @@ fi
+ rm -f conftest*
+ 
+ 
+-
+-        echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
+-echo "configure:1165: checking for strerror in -lcposix" >&5
+-ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lcposix  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1173 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char strerror();
+-
+-int main() {
+-strerror()
+-; return 0; }
++echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
++echo "configure:1164: checking for POSIXized ISC" >&5
++if test -d /etc/conf/kconfig.d &&
++  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
++then
++  echo "$ac_t""yes" 1>&6
++  ISC=yes # If later tests want to check for ISC.
++  cat >> confdefs.h <<\EOF
++#define _POSIX_SOURCE 1
+ EOF
+-if { (eval echo configure:1184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  LIBS="$LIBS -lcposix"
++  if test "$GCC" = yes; then
++    CC="$CC -posix"
++  else
++    CC="$CC -Xp"
++  fi
+ else
+   echo "$ac_t""no" 1>&6
++  ISC=
+ fi
+ 
+-  
+-
+ for ac_prog in mawk gawk nawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -4179,6 +4157,44 @@ fi
+ 
+ 	SASLFLAGS=""
+ 	LIB_SASL=""
++	# Extract the first word of "sasl-config", so it can be a program name with args.
++set dummy sasl-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:4164: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_SASL_CONFIG'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$SASL_CONFIG" in
++  /*)
++  ac_cv_path_SASL_CONFIG="$SASL_CONFIG" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_SASL_CONFIG="$SASL_CONFIG" # Let the user override the test with a dos path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_path_SASL_CONFIG="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_SASL_CONFIG" && ac_cv_path_SASL_CONFIG="no"
++  ;;
++esac
++fi
++SASL_CONFIG="$ac_cv_path_SASL_CONFIG"
++if test -n "$SASL_CONFIG"; then
++  echo "$ac_t""$SASL_CONFIG" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++	if test "$SASL_CONFIG" = no; then
+ 
+ 	cmu_saved_CPPFLAGS=$CPPFLAGS
+ 	cmu_saved_LDFLAGS=$LDFLAGS
+@@ -4277,6 +4293,15 @@ fi
+ 	  LIB_SASL=""
+ 	  SASLFLAGS=""
+ 	fi
++
++	else	# SASL_CONFIG
++
++	ac_cv_found_sasl=yes
++	SASLFLAGS=`$SASL_CONFIG --cflags`
++	LIB_SASL=`$SASL_CONFIG --libs`
++
++	fi
++
+ 	
+ 	
+ 	
+@@ -5084,6 +5109,7 @@ s%@COMPILE_ET@%$COMPILE_ET%g
+ s%@COM_ERR_LIBS@%$COM_ERR_LIBS%g
+ s%@COM_ERR_LDFLAGS@%$COM_ERR_LDFLAGS%g
+ s%@COM_ERR_CPPFLAGS@%$COM_ERR_CPPFLAGS%g
++s%@SASL_CONFIG@%$SASL_CONFIG%g
+ s%@LIB_SASL@%$LIB_SASL%g
+ s%@SASLFLAGS@%$SASLFLAGS%g
+ s%@SNMP_SUBDIRS@%$SNMP_SUBDIRS%g