Update to 0.43. Update to 0.42 provided in PR 32760 by George Michaelson.

0.43:
SSL bugfixes.

0.42:
SMTP addition.
bugfixes.

2005-12-02 - libetpan-0.41

    * release 0.41 - Transfixion
        * passphrase is implemented for S/MIME and PGP.
        * avoid symbols conflict between GnuTLS and OpenSSL.

2005-10-07 - libetpan-0.40 - hoa

    * release 0.40 - Kashmir

	* SSL initialization is optional.

2005-09-16 - libetpan-0.39 - hoa

    * release 0.39 - Deliverance

	* compatibility with GnuTLS
	* SASL for higher level

Add cyrus-sasl dependency.
Bump RECOMMENDED for shlib major bump.

5 files changed, 25 insertions, 20 deletions

diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 2a99a230de3..3d6747fba3a 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/01/06 15:10:05 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/08 06:33:31 wiz Exp $
 #
 
-DISTNAME=		libetpan-0.38
+DISTNAME=		libetpan-0.43
 PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libetpan/}
@@ -21,6 +21,7 @@ SUBST_MESSAGE.conf=	Fixing libetpan-config.
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
+.include "../../security/cyrus-sasl2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index da57b691c81..9a16e45ebe3 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/01/06 15:10:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/03/08 06:33:31 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBETPAN_BUILDLINK3_MK:=	${LIBETPAN_BUILDLINK3_MK}+
@@ -12,11 +12,13 @@ BUILDLINK_PACKAGES+=	libetpan
 
 .if !empty(LIBETPAN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libetpan+=	libetpan>=0.38nb1
+BUILDLINK_RECOMMENDED.libetpan?=	libetpan>=0.43
 BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 .endif	# LIBETPAN_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
+.include "../../security/cyrus-sasl2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/mail/libetpan/distinfo b/mail/libetpan/distinfo
index f9e22eec311..514a0ac13e0 100644
--- a/mail/libetpan/distinfo
+++ b/mail/libetpan/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/08/05 20:55:19 xtraeme Exp $
+$NetBSD: distinfo,v 1.5 2006/03/08 06:33:31 wiz Exp $
 
-SHA1 (libetpan-0.38.tar.gz) = be36c67708d1784b4a7a87ee84c7948064ab3f19
-RMD160 (libetpan-0.38.tar.gz) = 2e1825e74f1cc46a5ddc57d6d4060c5f027d4ad0
-Size (libetpan-0.38.tar.gz) = 1104864 bytes
-SHA1 (patch-aa) = f98ad5c2959ec167c8923c2b3d7c79b54708fcb2
-SHA1 (patch-ab) = 07d149a3896deeb55ef503138d2eb664b4dae847
+SHA1 (libetpan-0.43.tar.gz) = 64428185c17082ae4fa0d6c239313e39b6023f47
+RMD160 (libetpan-0.43.tar.gz) = bd58f6607c8ffc65480177297de5b587c73d05fc
+Size (libetpan-0.43.tar.gz) = 1282503 bytes
+SHA1 (patch-aa) = e783adf544c9a63df584815ee4b033249cecf0ff
+SHA1 (patch-ab) = d0a7d015bcaf4ea545fccc597006d38f291010a2
diff --git a/mail/libetpan/patches/patch-aa b/mail/libetpan/patches/patch-aa
index b5231b85be7..9ae6ce9190b 100644
--- a/mail/libetpan/patches/patch-aa
+++ b/mail/libetpan/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.1 2005/08/05 20:55:19 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2006/03/08 06:33:32 wiz Exp $
 
---- libetpan-config.in.orig	2005-08-05 22:36:50.000000000 +0200
-+++ libetpan-config.in	2005-08-05 22:37:38.000000000 +0200
-@@ -47,8 +47,8 @@
+--- libetpan-config.in.orig	2006-03-08 02:14:34.000000000 +0100
++++ libetpan-config.in
+@@ -47,8 +47,8 @@ while test $# -gt 0; do
        echo $includedir
        ;;
      --libs)
 -      libdir=-L@libdir@
--      echo $libdir -letpan@LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
+-      echo $libdir -letpan@LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
 +      libdir="-L@libdir@ @COMPILERFLAGS@@libdir@"
-+      echo $libdir -letpan@LIBSUFFIX@ @SSLLIBS@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
++      echo $libdir -letpan@LIBSUFFIX@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
        ;;
      *)
        echo "${usage}" 1>&2
diff --git a/mail/libetpan/patches/patch-ab b/mail/libetpan/patches/patch-ab
index 3ea245ace89..849da03c20b 100644
--- a/mail/libetpan/patches/patch-ab
+++ b/mail/libetpan/patches/patch-ab
@@ -1,15 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2005/08/05 20:55:19 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2006/03/08 06:33:32 wiz Exp $
 
---- src/Makefile.in.orig	2005-08-05 22:44:16.000000000 +0200
-+++ src/Makefile.in	2005-08-05 22:45:08.000000000 +0200
-@@ -14,8 +14,8 @@
+--- src/Makefile.in.orig	2006-01-04 12:08:35.000000000 +0100
++++ src/Makefile.in
+@@ -14,9 +14,9 @@ LIBTOOL	    = @LIBTOOL@
  TARGET = libetpan@LIBSUFFIX@.la
  
  VERSINFO    = @API_VERSION@
 -CC          = @CC@
--LDFLAGS     = @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@ @GNUTLSLIB@
+-LDFLAGS     = @LDFLAGS@ @LIBS@ @SSLLIBS@ @LIBICONV@ \
+-	@DBLIB@ @GNUTLSLIB@ @SASLLIBS@
 +#CC          = @CC@
 +LDFLAGS += @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@ @GNUTLSLIB@
++
  
  SUBLIBS = data-types/libdata-types.la \
  	low-level/liblow-level.la \