5 files changed, 22 insertions, 24 deletions
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 1db64f31e14..a84956ac94b 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/07/08 20:23:12 smb Exp $
+# $NetBSD: Makefile,v 1.14 2007/10/27 13:55:26 wiz Exp $
 #
 
-DISTNAME=		libetpan-0.49
+DISTNAME=		libetpan-0.52
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libetpan/}
 
@@ -22,5 +22,7 @@ SUBST_MESSAGE.conf=	Fixing libetpan-config.
 .include "../../databases/db4/buildlink3.mk"
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/libetpan/PLIST b/mail/libetpan/PLIST
index 50b50037be7..6d46fb81b58 100644
--- a/mail/libetpan/PLIST
+++ b/mail/libetpan/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2007/01/09 15:46:37 smb Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/10/27 13:55:26 wiz Exp $
 bin/libetpan-config
-include/libetpan.h
 include/libetpan/acl.h
 include/libetpan/acl_types.h
 include/libetpan/annotatemore.h
@@ -15,8 +14,13 @@ include/libetpan/dbdriver.h
 include/libetpan/dbdriver_message.h
 include/libetpan/dbdriver_types.h
 include/libetpan/dbstorage.h
+include/libetpan/feeddriver.h
+include/libetpan/feeddriver_message.h
+include/libetpan/feeddriver_types.h
+include/libetpan/feedstorage.h
 include/libetpan/generic_cache_types.h
 include/libetpan/hotmailstorage.h
+include/libetpan/idle.h
 include/libetpan/imapdriver.h
 include/libetpan/imapdriver_cached.h
 include/libetpan/imapdriver_cached_message.h
@@ -110,6 +114,10 @@ include/libetpan/mhdriver_types.h
 include/libetpan/mhstorage.h
 include/libetpan/mime_message_driver.h
 include/libetpan/mmapstring.h
+include/libetpan/newsfeed.h
+include/libetpan/newsfeed_item.h
+include/libetpan/newsfeed_item_enclosure.h
+include/libetpan/newsfeed_types.h
 include/libetpan/newsnntp.h
 include/libetpan/newsnntp_socket.h
 include/libetpan/newsnntp_ssl.h
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index 9dc1b5bba47..35f75709158 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/06/08 12:25:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/10/27 13:55:26 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBETPAN_BUILDLINK3_MK:=	${LIBETPAN_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libetpan
 
 .if !empty(LIBETPAN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libetpan+=	libetpan>=0.38nb1
-BUILDLINK_ABI_DEPENDS.libetpan?=	libetpan>=0.48nb1
+BUILDLINK_ABI_DEPENDS.libetpan?=	libetpan>=0.52
 BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 .endif	# LIBETPAN_BUILDLINK3_MK
 
@@ -21,6 +21,8 @@ BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 .include "../../databases/db4/buildlink3.mk"
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/libetpan/distinfo b/mail/libetpan/distinfo
index ccd4893db9a..411e6610cb6 100644
--- a/mail/libetpan/distinfo
+++ b/mail/libetpan/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2007/07/08 20:23:12 smb Exp $
+$NetBSD: distinfo,v 1.8 2007/10/27 13:55:27 wiz Exp $
 
-SHA1 (libetpan-0.49.tar.gz) = 857fb35678aed2b7a67bea37907c0f4faec6f17f
-RMD160 (libetpan-0.49.tar.gz) = 0878873394f2c3d470a2b516413091f0fdd54a0b
-Size (libetpan-0.49.tar.gz) = 1021102 bytes
+SHA1 (libetpan-0.52.tar.gz) = e2fdf76b471e57a153bad4c4def7fde512385021
+RMD160 (libetpan-0.52.tar.gz) = 3e826d57987780b204c9074a9c225e960f214d66
+Size (libetpan-0.52.tar.gz) = 1611405 bytes
 SHA1 (patch-aa) = e783adf544c9a63df584815ee4b033249cecf0ff
-SHA1 (patch-ab) = 969db9d52a419c9557e3faad7fe17be91d96ab25
diff --git a/mail/libetpan/patches/patch-ab b/mail/libetpan/patches/patch-ab
deleted file mode 100644
index 0d6e47f215f..00000000000
--- a/mail/libetpan/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.in.orig	2006-06-26 21:50:25.000000000 +1000
-+++ src/Makefile.in	2006-09-07 00:04:29.000000000 +1000
-@@ -14,8 +14,8 @@
- TARGET = libetpan@LIBSUFFIX@.la
- 
- VERSINFO    = @API_VERSION@
--CC          = @CC@
--LDFLAGS     = @LDFLAGS@ @LIBS@ @SSLLIBS@ @LIBICONV@ @DBLIB@ @GNUTLSLIB@ @SASLLIBS@
-+#CC          = @CC@
-+LDFLAGS     = @LIBS@ @SSLLIBS@ @LDFLAGS@ @LIBICONV@ @DBLIB@ @GNUTLSLIB@ @SASLLIBS@
- 
- SUBLIBS = data-types/libdata-types.la \
- 	low-level/liblow-level.la \