>Number:         34297
>Category:       pkg
>Synopsis:       [Update to 0.4.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Aug 27 11:35:00 +0000 2006
>Originator:     Martin Wilke
>Release:        NetBSD 4.0_BETA i386
>Organization:
>Environment:


System: NetBSD 4.0_BETA (GENERIC) #0: Thu Aug 24 06:00:32 UTC 2006
	builds@b0.netbsd.org:/home/builds/ab/netbsd-4/i386/200608230000Z-obj/home/builds/ab/netbsd-4/src/sys/arch/i386/compile/GENERIC



>Description:


- Update to 0.4.6


>How-To-Repeat:





>Fix:


--- libetpan.diff begins here ---
diff -ruN libetpan.orgi/Makefile libetpan/Makefile
--- libetpan.orgi/Makefile	2006-04-14 09:13:18.000000000 +0200
+++ libetpan/Makefile	2006-08-27 09:18:04.000000000 +0200
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.10 2006/04/13 21:45:13 wiz Exp $
 #
 
-DISTNAME=		libetpan-0.43
+DISTNAME=		libetpan-0.46
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libetpan/}
 
diff -ruN libetpan.orgi/PLIST libetpan/PLIST
--- libetpan.orgi/PLIST	2005-08-05 21:29:56.000000000 +0200
+++ libetpan/PLIST	2006-08-27 09:27:36.000000000 +0200
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2005/08/05 19:29:56 xtraeme Exp $
+@comment $NetBSD$
 bin/libetpan-config
 include/libetpan.h
+include/libetpan/acl.h
+include/libetpan/annotatemore.h
 include/libetpan/carray.h
 include/libetpan/charconv.h
 include/libetpan/chash.h
@@ -38,6 +40,8 @@
 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
diff -ruN libetpan.orgi/buildlink3.mk libetpan/buildlink3.mk
--- libetpan.orgi/buildlink3.mk	2006-07-09 09:02:29.000000000 +0200
+++ libetpan/buildlink3.mk	2006-08-27 09:38:56.000000000 +0200
@@ -1,9 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:57 jlam Exp $
+# $NetBSD$
+# XXX
+# XXX This file was created automatically using createbuildlink-3.13.
+# XXX After this file has been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed.  Please do not commit
+# XXX unverified buildlink3.mk files.
+# XXX
+# XXX Packages that only install static libraries or headers should
+# XXX include the following line:
+# XXX
+# XXX	BUILDLINK_DEPMETHOD.libetpan?=	build
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBETPAN_BUILDLINK3_MK:=	${LIBETPAN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	libetpan
 .endif
 
@@ -11,9 +21,8 @@
 BUILDLINK_PACKAGES+=	libetpan
 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
+.if ${LIBETPAN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.libetpan+=	libetpan>=0.46
 BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 .endif	# LIBETPAN_BUILDLINK3_MK
 
diff -ruN libetpan.orgi/distinfo libetpan/distinfo
--- libetpan.orgi/distinfo	2006-03-08 08:08:03.000000000 +0100
+++ libetpan/distinfo	2006-08-27 09:30:40.000000000 +0200
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.5 2006/03/08 06:33:31 wiz 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.46.tar.gz) = 81507d43f40e33cfc98bf1b7a47e7ad5cbdef60b
+RMD160 (libetpan-0.46.tar.gz) = 482904916cda8156af171931af96cb68fa0b7391
+Size (libetpan-0.46.tar.gz) = 1010995 bytes
 SHA1 (patch-aa) = e783adf544c9a63df584815ee4b033249cecf0ff
-SHA1 (patch-ab) = d0a7d015bcaf4ea545fccc597006d38f291010a2
diff -ruN libetpan.orgi/patches/patch-ab libetpan/patches/patch-ab
--- libetpan.orgi/patches/patch-ab	2006-03-08 08:08:03.000000000 +0100
+++ libetpan/patches/patch-ab	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-$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@
- TARGET = libetpan@LIBSUFFIX@.la
- 
- VERSINFO    = @API_VERSION@
--CC          = @CC@
--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 \
--- libetpan.diff ends here ---