libetpan: Update to 1.9.4

Changes:

- Bugfixes on QUOTA
- Various warning fixes & build fixes
- Added IMAP CLIENTID / SMTP CLIENTID support
- Use Cyrus SASL 2.1.27
- Support of TLS SNI
- LMDB for cache DB
- Fixed build with recent versions of curl

6 files changed, 32 insertions, 41 deletions

diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 9af007b3e7e..c484cdac8dd 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2020/05/06 14:04:11 adam Exp $
+# $NetBSD: Makefile,v 1.63 2020/05/19 09:57:05 nia Exp $
 
-DISTNAME=	libetpan-1.9.1
-PKGREVISION=	8
+DISTNAME=	libetpan-1.9.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=dinhviethoa/}
 EXTRACT_USING=	bsdtar
@@ -20,21 +19,12 @@ USE_TOOLS+=		autoconf automake
 TEST_TARGET=		check
 
 pre-configure:
-	cd ${WRKSRC} && \
-	libtoolize --force --copy && \
-	aclocal -I m4 && \
-	autoheader && \
-	autoconf && \
-	automake --add-missing --foreign --force --copy
-
-SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	pre-configure
-SUBST_FILES.conf=	libetpan-config.in
-SUBST_SED.conf=		-e "s|@COMPILERFLAGS@|${COMPILER_RPATH_FLAG}|g"
-SUBST_MESSAGE.conf=	Fixing libetpan-config.
+	cd ${WRKSRC} && NOCONFIGURE=1 ${SH} autogen.sh
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
+PKGCONFIG_OVERRIDE+=	libetpan-config.in
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/mail/libetpan/PLIST b/mail/libetpan/PLIST
index 4dfe20e5c3c..a96d2a2b9d2 100644
--- a/mail/libetpan/PLIST
+++ b/mail/libetpan/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2015/04/03 12:04:30 nros Exp $
-bin/libetpan-config
+@comment $NetBSD: PLIST,v 1.12 2020/05/19 09:57:05 nia Exp $
 include/libetpan.h
 include/libetpan/acl.h
 include/libetpan/acl_types.h
@@ -8,6 +7,7 @@ include/libetpan/annotatemore_types.h
 include/libetpan/carray.h
 include/libetpan/charconv.h
 include/libetpan/chash.h
+include/libetpan/clientid.h
 include/libetpan/clist.h
 include/libetpan/condstore.h
 include/libetpan/condstore_types.h
@@ -165,3 +165,4 @@ include/libetpan/xgmmsgid.h
 include/libetpan/xgmthrid.h
 include/libetpan/xlist.h
 lib/libetpan.la
+lib/pkgconfig/libetpan.pc
diff --git a/mail/libetpan/distinfo b/mail/libetpan/distinfo
index 53fc3aba236..83a9ffaacda 100644
--- a/mail/libetpan/distinfo
+++ b/mail/libetpan/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2018/12/10 15:18:21 maya Exp $
+$NetBSD: distinfo,v 1.23 2020/05/19 09:57:05 nia Exp $
 
-SHA1 (libetpan-1.9.1.tar.gz) = b7c0b645af9d5e5e250d2085782be4da1698d43b
-RMD160 (libetpan-1.9.1.tar.gz) = bb8adc310fb05e32dc22dd1c28373d2063c1d321
-SHA512 (libetpan-1.9.1.tar.gz) = 1dd72644672e15eecc9883ffb4b29ef34d4355c55aec950cac44e7b59f252d9355f37ef0ad37007c89728c09e057144b4c3b853496a011d693598b6027356286
-Size (libetpan-1.9.1.tar.gz) = 6189971 bytes
-SHA1 (patch-aa) = e783adf544c9a63df584815ee4b033249cecf0ff
-SHA1 (patch-configure.ac) = 45ec1bd4384e3bdd31c1dd7ebef1d855b5c962c6
+SHA1 (libetpan-1.9.4.tar.gz) = cfdfe4329382a30afc5b540e258aaa950fabd25f
+RMD160 (libetpan-1.9.4.tar.gz) = cc1718182a677bc10aaab726ab0dc3d52de2e2f6
+SHA512 (libetpan-1.9.4.tar.gz) = 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
+Size (libetpan-1.9.4.tar.gz) = 5000025 bytes
+SHA1 (patch-configure.ac) = 9d1562b4dd016fb26372bb437e3f4a0749ab2592
+SHA1 (patch-libetpan.pc.in) = b977b0982e3f6d32722eec7222eb3c40476d4fc9
 SHA1 (patch-src_low-level_feed_newsfeed.c) = 962f2059bb13a8f9c40cb6845276ee52e3bcd937
diff --git a/mail/libetpan/patches/patch-aa b/mail/libetpan/patches/patch-aa
deleted file mode 100644
index 9ae6ce9190b..00000000000
--- a/mail/libetpan/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/03/08 06:33:32 wiz Exp $
-
---- 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@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
-+      libdir="-L@libdir@ @COMPILERFLAGS@@libdir@"
-+      echo $libdir -letpan@LIBSUFFIX@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
-       ;;
-     *)
-       echo "${usage}" 1>&2
diff --git a/mail/libetpan/patches/patch-configure.ac b/mail/libetpan/patches/patch-configure.ac
index 5f31e1b1722..cb673977bcb 100644
--- a/mail/libetpan/patches/patch-configure.ac
+++ b/mail/libetpan/patches/patch-configure.ac
@@ -1,5 +1,7 @@
-$NetBSD: patch-configure.ac,v 1.2 2016/09/03 17:56:37 nros Exp $
- Conversion of patch-ab to configure.ac
+$NetBSD: patch-configure.ac,v 1.3 2020/05/19 09:57:05 nia Exp $
+
+Correct db library names for pkgsrc.
+
 --- configure.ac.orig	2016-05-26 05:27:47.000000000 +0000
 +++ configure.ac
 @@ -395,7 +395,7 @@ dnl Look for db3 or superior with db_cre
diff --git a/mail/libetpan/patches/patch-libetpan.pc.in b/mail/libetpan/patches/patch-libetpan.pc.in
new file mode 100644
index 00000000000..8d87859a3c5
--- /dev/null
+++ b/mail/libetpan/patches/patch-libetpan.pc.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-libetpan.pc.in,v 1.1 2020/05/19 09:57:05 nia Exp $
+
+Allow PKGCONFIG_OVERRIDE to work properly.
+
+--- libetpan.pc.in.orig	2019-11-01 17:58:50.000000000 +0000
++++ libetpan.pc.in
+@@ -6,5 +6,5 @@ libdir=@libdir@
+ Name: libetpan
+ Description: Libetpan C library.
+ Version: @VERSION@
+-Libs: -L${libdir} -letpan@LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
++Libs: -letpan@LIBSUFFIX@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
+ Cflags: -I${includedir}