Fix ESMTP configure test by not hard-wiring -lpthread.

Fix compilation with newer PCRE versions.

3 files changed, 37 insertions, 1 deletions

diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index 94c5b07028b..0131720e0ad 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.14 2006/02/08 18:25:24 drochner Exp $
+$NetBSD: distinfo,v 1.15 2006/02/11 14:17:51 joerg Exp $
 
 SHA1 (balsa-2.3.10.tar.bz2) = 74315661721a7b222403988b2af8fbc690c1ddc4
 RMD160 (balsa-2.3.10.tar.bz2) = 2fba2b3ae62e0fa3c3d8092f559f8ab7a488c22c
 Size (balsa-2.3.10.tar.bz2) = 3273478 bytes
+SHA1 (patch-aa) = 4093290f39ee76d1a02a80c84ecf8d38ddadd3d7
 SHA1 (patch-ab) = 47083f65d404e64ee238bc3e4f3e25008f5f82c8
 SHA1 (patch-ac) = 808f4546204fbc4a23007291637e4b4ca4175db1
 SHA1 (patch-ae) = fcd0ab1c062018b42469b033a98b4575ee2851f3
@@ -11,4 +12,5 @@ SHA1 (patch-ag) = 47036c9108405f25e862ea6402220a70bd0a0cc9
 SHA1 (patch-ah) = 9a17ea3c3f302acf4380c7868ab8c769d9acfc39
 SHA1 (patch-ai) = 44e704eefd63873900609d7c7186469b4b5214d1
 SHA1 (patch-aj) = 4d068d3aa551c11edcc2c7fdc189ebab98a69953
+SHA1 (patch-ak) = a5a5a31d49c1d79610c4ea73557039b2a1b8076d
 SHA1 (patch-ba) = 76b51ced11626e6f36e0763ca64519cc8605c936
diff --git a/mail/balsa2/patches/patch-aa b/mail/balsa2/patches/patch-aa
new file mode 100644
index 00000000000..25197b1013f
--- /dev/null
+++ b/mail/balsa2/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.6 2006/02/11 14:17:51 joerg Exp $
+
+--- configure.orig	2006-02-11 13:51:23.000000000 +0000
++++ configure
+@@ -23041,7 +23041,7 @@ if test "${ac_cv_lib_esmtp_smtp_start_se
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lesmtp -lpthread $LIBS"
++LIBS="-lesmtp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23100,7 +23100,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_esmtp_smtp_start_session" >&5
+ echo "${ECHO_T}$ac_cv_lib_esmtp_smtp_start_session" >&6
+ if test $ac_cv_lib_esmtp_smtp_start_session = yes; then
+-  LIBS="$LIBS -lesmtp -lpthread"
++  LIBS="$LIBS -lesmtp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ else
+   { { echo "$as_me:$LINENO: error: *** You enabled ESMTP but esmtp library is not found." >&5
+ echo "$as_me: error: *** You enabled ESMTP but esmtp library is not found." >&2;}
diff --git a/mail/balsa2/patches/patch-ak b/mail/balsa2/patches/patch-ak
new file mode 100644
index 00000000000..9b6427eba41
--- /dev/null
+++ b/mail/balsa2/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2006/02/11 14:17:51 joerg Exp $
+
+--- libbalsa/misc.h.orig	2006-02-11 13:54:44.000000000 +0000
++++ libbalsa/misc.h
+@@ -32,6 +32,7 @@
+ #endif
+ 
+ #ifdef HAVE_PCRE
++#  include <pcre.h>
+ #  include <pcreposix.h>
+ #else
+ #  include <sys/types.h>