Update to 0.48

5 files changed, 24 insertions, 18 deletions

diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 10f0787310e..2041ec9d05b 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/04/13 21:45:13 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/09 15:46:37 smb Exp $
 #
 
-DISTNAME=		libetpan-0.43
+DISTNAME=		libetpan-0.48
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libetpan/}
 
diff --git a/mail/libetpan/PLIST b/mail/libetpan/PLIST
index 69cf56a367c..50b50037be7 100644
--- a/mail/libetpan/PLIST
+++ b/mail/libetpan/PLIST
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2005/08/05 19:29:56 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/01/09 15:46:37 smb Exp $
 bin/libetpan-config
 include/libetpan.h
+include/libetpan/acl.h
+include/libetpan/acl_types.h
+include/libetpan/annotatemore.h
+include/libetpan/annotatemore_types.h
 include/libetpan/carray.h
 include/libetpan/charconv.h
 include/libetpan/chash.h
@@ -38,6 +42,8 @@ include/libetpan/maildriver_types_helper.h
 include/libetpan/mailengine.h
 include/libetpan/mailfolder.h
 include/libetpan/mailimap.h
+include/libetpan/mailimap_extension.h
+include/libetpan/mailimap_extension_types.h
 include/libetpan/mailimap_helper.h
 include/libetpan/mailimap_socket.h
 include/libetpan/mailimap_ssl.h
@@ -49,6 +55,7 @@ include/libetpan/mailimf_types_helper.h
 include/libetpan/mailimf_write_file.h
 include/libetpan/mailimf_write_generic.h
 include/libetpan/mailimf_write_mem.h
+include/libetpan/maillock.h
 include/libetpan/mailmbox.h
 include/libetpan/mailmbox_types.h
 include/libetpan/mailmessage.h
@@ -119,5 +126,7 @@ include/libetpan/pop3driver_cached_message.h
 include/libetpan/pop3driver_message.h
 include/libetpan/pop3driver_types.h
 include/libetpan/pop3storage.h
+include/libetpan/uidplus.h
+include/libetpan/uidplus_types.h
 lib/libetpan.la
 @dirrm include/libetpan
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index 7fcd9ebcf3c..acc48c4d369 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:57 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/01/09 15:46:37 smb Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBETPAN_BUILDLINK3_MK:=	${LIBETPAN_BUILDLINK3_MK}+
@@ -14,6 +14,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.43
+BUILDLINK_ABI_DEPENDS.libetpan?=	libetpan>=0.48
 BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 .endif	# LIBETPAN_BUILDLINK3_MK
 
diff --git a/mail/libetpan/distinfo b/mail/libetpan/distinfo
index 514a0ac13e0..1f2365ba8c1 100644
--- a/mail/libetpan/distinfo
+++ b/mail/libetpan/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2006/03/08 06:33:31 wiz Exp $
+$NetBSD: distinfo,v 1.6 2007/01/09 15:46:37 smb Exp $
 
-SHA1 (libetpan-0.43.tar.gz) = 64428185c17082ae4fa0d6c239313e39b6023f47
-RMD160 (libetpan-0.43.tar.gz) = bd58f6607c8ffc65480177297de5b587c73d05fc
-Size (libetpan-0.43.tar.gz) = 1282503 bytes
+SHA1 (libetpan-0.48.tar.gz) = 1b18831d72671c37382f3e3186552707f35c0a5a
+RMD160 (libetpan-0.48.tar.gz) = bf7190d3235df21a344eaf5f79e38b31f681f12a
+Size (libetpan-0.48.tar.gz) = 1018656 bytes
 SHA1 (patch-aa) = e783adf544c9a63df584815ee4b033249cecf0ff
-SHA1 (patch-ab) = d0a7d015bcaf4ea545fccc597006d38f291010a2
+SHA1 (patch-ab) = 969db9d52a419c9557e3faad7fe17be91d96ab25
diff --git a/mail/libetpan/patches/patch-ab b/mail/libetpan/patches/patch-ab
index 849da03c20b..0d6e47f215f 100644
--- a/mail/libetpan/patches/patch-ab
+++ b/mail/libetpan/patches/patch-ab
@@ -1,17 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2006/03/08 06:33:32 wiz Exp $
-
---- src/Makefile.in.orig	2006-01-04 12:08:35.000000000 +0100
-+++ src/Makefile.in
-@@ -14,9 +14,9 @@ LIBTOOL	    = @LIBTOOL@
+--- 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@
+-LDFLAGS     = @LDFLAGS@ @LIBS@ @SSLLIBS@ @LIBICONV@ @DBLIB@ @GNUTLSLIB@ @SASLLIBS@
 +#CC          = @CC@
-+LDFLAGS += @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@ @GNUTLSLIB@
-+
++LDFLAGS     = @LIBS@ @SSLLIBS@ @LDFLAGS@ @LIBICONV@ @DBLIB@ @GNUTLSLIB@ @SASLLIBS@
  
  SUBLIBS = data-types/libdata-types.la \
  	low-level/liblow-level.la \