Update libetpan to version 1.6.

Update homepage.

changelog:
1.6:
    Improved RFC822 and MIME parser
    Implemented SEARCH using LITERAL+ for Gmail
    Fixed SSL connections (don't force SSLv3)
1.5:
    Gmail search features: X-GM-MSGID, X-GM-THRID, X-GM-RAW
    Added POP stat
    Various fixes for Windows
    Fixed OpenSSL / GnuTLS implementation of retrieval of certificates
    Fixed IMAP IDLE in case of COMPRESS-ed streams
    Fixed base64 encoding
1.4:
    Gmail search features: X-GM-MSGID, X-GM-THRID, X-GM-RAW
    Added POP stat
    Various fixes for Windows
    Fixed OpenSSL / GnuTLS implementation of retrieval of certificates
    Fixed IMAP IDLE in case of COMPRESS-ed streams
    Fixed base64 encoding

6 files changed, 52 insertions, 26 deletions

diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index ddbf1d54799..b010399eeca 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.40 2014/02/12 23:18:08 tron Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/03 12:04:30 nros Exp $
 
-DISTNAME=	libetpan-1.1
-PKGREVISION=	3
+DISTNAME=	libetpan-1.6
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libetpan/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=dinhviethoa/}
+EXTRACT_USING=	bsdtar
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://libetpan.sourceforge.net/
+HOMEPAGE=	http://etpan.org/libetpan.html
 COMMENT=	Really nice mail library
 LICENSE=	modified-bsd
 
@@ -15,6 +15,15 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 MAKE_JOBS_SAFE=		no
+USE_TOOLS+=		autoconf automake
+
+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
diff --git a/mail/libetpan/PLIST b/mail/libetpan/PLIST
index 8e565f576c0..4dfe20e5c3c 100644
--- a/mail/libetpan/PLIST
+++ b/mail/libetpan/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/07/03 18:08:20 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2015/04/03 12:04:30 nros Exp $
 bin/libetpan-config
 include/libetpan.h
 include/libetpan/acl.h
@@ -9,11 +9,14 @@ include/libetpan/carray.h
 include/libetpan/charconv.h
 include/libetpan/chash.h
 include/libetpan/clist.h
+include/libetpan/condstore.h
+include/libetpan/condstore_types.h
 include/libetpan/data_message_driver.h
 include/libetpan/dbdriver.h
 include/libetpan/dbdriver_message.h
 include/libetpan/dbdriver_types.h
 include/libetpan/dbstorage.h
+include/libetpan/enable.h
 include/libetpan/feeddriver.h
 include/libetpan/feeddriver_message.h
 include/libetpan/feeddriver_types.h
@@ -48,10 +51,16 @@ include/libetpan/maildriver_types_helper.h
 include/libetpan/mailengine.h
 include/libetpan/mailfolder.h
 include/libetpan/mailimap.h
+include/libetpan/mailimap_compress.h
 include/libetpan/mailimap_extension.h
 include/libetpan/mailimap_extension_types.h
 include/libetpan/mailimap_helper.h
+include/libetpan/mailimap_id.h
+include/libetpan/mailimap_id_types.h
+include/libetpan/mailimap_oauth2.h
 include/libetpan/mailimap_socket.h
+include/libetpan/mailimap_sort.h
+include/libetpan/mailimap_sort_types.h
 include/libetpan/mailimap_ssl.h
 include/libetpan/mailimap_types.h
 include/libetpan/mailimap_types_helper.h
@@ -89,12 +98,15 @@ include/libetpan/mailprivacy_types.h
 include/libetpan/mailsem.h
 include/libetpan/mailsmtp.h
 include/libetpan/mailsmtp_helper.h
+include/libetpan/mailsmtp_oauth2.h
 include/libetpan/mailsmtp_socket.h
 include/libetpan/mailsmtp_ssl.h
 include/libetpan/mailsmtp_types.h
 include/libetpan/mailstorage.h
 include/libetpan/mailstorage_types.h
 include/libetpan/mailstream.h
+include/libetpan/mailstream_cfstream.h
+include/libetpan/mailstream_compress.h
 include/libetpan/mailstream_helper.h
 include/libetpan/mailstream_low.h
 include/libetpan/mailstream_socket.h
@@ -140,11 +152,16 @@ include/libetpan/pop3driver_cached_message.h
 include/libetpan/pop3driver_message.h
 include/libetpan/pop3driver_types.h
 include/libetpan/pop3storage.h
+include/libetpan/qresync.h
+include/libetpan/qresync_types.h
 include/libetpan/quota.h
 include/libetpan/quota_parser.h
 include/libetpan/quota_sender.h
 include/libetpan/quota_types.h
 include/libetpan/uidplus.h
 include/libetpan/uidplus_types.h
+include/libetpan/xgmlabels.h
+include/libetpan/xgmmsgid.h
+include/libetpan/xgmthrid.h
 include/libetpan/xlist.h
 lib/libetpan.la
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index b62eec62c09..e61b86214f4 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2014/02/12 23:18:08 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2015/04/03 12:04:30 nros Exp $
 
 BUILDLINK_TREE+=	libetpan
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libetpan
 LIBETPAN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libetpan+=	libetpan>=1.0
-BUILDLINK_ABI_DEPENDS.libetpan+=	libetpan>=1.1nb3
+BUILDLINK_ABI_DEPENDS.libetpan+=	libetpan>=1.6
 BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 
 BDB_ACCEPTED?=	db4 db5
diff --git a/mail/libetpan/distinfo b/mail/libetpan/distinfo
index 5b7288f4fcb..88e5af0fecb 100644
--- a/mail/libetpan/distinfo
+++ b/mail/libetpan/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2012/07/03 18:08:20 drochner Exp $
+$NetBSD: distinfo,v 1.16 2015/04/03 12:04:30 nros Exp $
 
-SHA1 (libetpan-1.1.tar.gz) = 3476dc9142e0b78056446d2f143617708f8690b2
-RMD160 (libetpan-1.1.tar.gz) = 7ac42285634efa799adaabc443c3778089de8363
-Size (libetpan-1.1.tar.gz) = 1657767 bytes
+SHA1 (libetpan-1.6.tar.gz) = a5514139a8c5ee94d0337a89db8141cb3c557fa9
+RMD160 (libetpan-1.6.tar.gz) = f625263df1fcab97d010d25743803e5d4164745b
+Size (libetpan-1.6.tar.gz) = 6144117 bytes
 SHA1 (patch-aa) = e783adf544c9a63df584815ee4b033249cecf0ff
-SHA1 (patch-ab) = 6aa0fde517b1ce46e18ca0d2a98d23006428b805
+SHA1 (patch-configure.ac) = 16636e8656018179d62b59ea75fe4a1a753768a2
diff --git a/mail/libetpan/patches/patch-ab b/mail/libetpan/patches/patch-ab
deleted file mode 100644
index ef0f32f938d..00000000000
--- a/mail/libetpan/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2012/07/03 18:08:21 drochner Exp $
-
---- configure.orig	2011-07-12 08:59:08.000000000 +0000
-+++ configure
-@@ -18447,7 +18447,7 @@ rm -f core conftest.err conftest.$ac_obj
-     3)
-     { echo "$as_me:$LINENO: result: version 3.x or above" >&5
- echo "${ECHO_T}version 3.x or above" >&6; }
--    for lib in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do
-+    for lib in db5 db4 db3 db; do
-       if test "x$DBLINKED" = "x0"; then
-         { echo "$as_me:$LINENO: checking for db_create() in -l$lib" >&5
- echo $ECHO_N "checking for db_create() in -l$lib... $ECHO_C" >&6; }
diff --git a/mail/libetpan/patches/patch-configure.ac b/mail/libetpan/patches/patch-configure.ac
new file mode 100644
index 00000000000..c1097dc2199
--- /dev/null
+++ b/mail/libetpan/patches/patch-configure.ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-configure.ac,v 1.1 2015/04/03 12:04:30 nros Exp $
+ Conversion of patch-ab to configure.ac
+--- configure.ac.orig	2015-04-03 11:38:16.000000000 +0000
++++ configure.ac
+@@ -386,7 +386,7 @@ dnl Look for db3 or superior with db_cre
+   case "$DBVERS" in
+     3)
+     AC_MSG_RESULT([version 3.x or above])
+-    for lib in db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do
++    for lib in db5 db4 db3 db; do
+       if test "x$DBLINKED" = "x0"; then
+ dnl        AC_CHECK_LIB($lib, db_create, [DBLIB="-l$lib"; DBLINKED=1], [])
+ dnl installations of libdb4 function names are defined in db.h