Update Pantomime to 1.2.0pre3. Changes include some structural overhaul,

including a brand new mailbox caching code and other performance
improvements.  This also makes Pantomime use the fhs filesystem layout
to make it more hier(7) compliant.

6 files changed, 125 insertions, 104 deletions

diff --git a/mail/Pantomime/Makefile b/mail/Pantomime/Makefile
index 8d1a50298e2..8e5dc169e20 100644
--- a/mail/Pantomime/Makefile
+++ b/mail/Pantomime/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2008/01/18 05:08:19 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2009/04/13 12:40:40 rh Exp $
 #
 
-DISTNAME=	Pantomime-1.1.2
-PKGREVISION=	5
+DISTNAME=	Pantomime-1.2.0pre3
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
 
@@ -10,10 +9,15 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.collaboration-world.com/pantomime/
 COMMENT=	Objective-C mail system class library
 
+LICENSE=	gnu-lgpl-v2
+
+PKG_DESTDIR_SUPPORT=	destdir
+
 USE_LANGUAGES=	objc
 
 WRKSRC=		${WRKDIR}/Pantomime
 NO_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	no
 MAKE_ENV+=	ADDITIONAL_CPPFLAGS=-DMKDIR
 MAKE_FILE=	GNUmakefile
 
diff --git a/mail/Pantomime/PLIST b/mail/Pantomime/PLIST
index b62ad6ab908..bd3da48296a 100644
--- a/mail/Pantomime/PLIST
+++ b/mail/Pantomime/PLIST
@@ -1,68 +1,99 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/05 11:25:58 adam Exp $
-share/GNUstep/Local/Library/Headers/Pantomime/Charset.h
-share/GNUstep/Local/Library/Headers/Pantomime/Connection.h
-share/GNUstep/Local/Library/Headers/Pantomime/Constants.h
-share/GNUstep/Local/Library/Headers/Pantomime/Container.h
-share/GNUstep/Local/Library/Headers/Pantomime/Flags.h
-share/GNUstep/Local/Library/Headers/Pantomime/Folder.h
-share/GNUstep/Local/Library/Headers/Pantomime/FolderInformation.h
-share/GNUstep/Local/Library/Headers/Pantomime/IMAPCacheManager.h
-share/GNUstep/Local/Library/Headers/Pantomime/IMAPFolder.h
-share/GNUstep/Local/Library/Headers/Pantomime/IMAPMessage.h
-share/GNUstep/Local/Library/Headers/Pantomime/IMAPStore.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_1.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_10.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_11.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_13.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_14.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_15.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_2.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_3.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_4.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_5.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_6.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_7.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_8.h
-share/GNUstep/Local/Library/Headers/Pantomime/ISO8859_9.h
-share/GNUstep/Local/Library/Headers/Pantomime/InternetAddress.h
-share/GNUstep/Local/Library/Headers/Pantomime/KOI8_R.h
-share/GNUstep/Local/Library/Headers/Pantomime/KOI8_U.h
-share/GNUstep/Local/Library/Headers/Pantomime/LocalFolder.h
-share/GNUstep/Local/Library/Headers/Pantomime/LocalFolderCacheManager.h
-share/GNUstep/Local/Library/Headers/Pantomime/LocalMessage.h
-share/GNUstep/Local/Library/Headers/Pantomime/LocalStore.h
-share/GNUstep/Local/Library/Headers/Pantomime/MD5.h
-share/GNUstep/Local/Library/Headers/Pantomime/Message.h
-share/GNUstep/Local/Library/Headers/Pantomime/MimeMultipart.h
-share/GNUstep/Local/Library/Headers/Pantomime/MimeUtility.h
-share/GNUstep/Local/Library/Headers/Pantomime/NSData+Extensions.h
-share/GNUstep/Local/Library/Headers/Pantomime/NSRegEx.h
-share/GNUstep/Local/Library/Headers/Pantomime/NSString+Extensions.h
-share/GNUstep/Local/Library/Headers/Pantomime/POP3CacheManager.h
-share/GNUstep/Local/Library/Headers/Pantomime/POP3CacheObject.h
-share/GNUstep/Local/Library/Headers/Pantomime/POP3Folder.h
-share/GNUstep/Local/Library/Headers/Pantomime/POP3Message.h
-share/GNUstep/Local/Library/Headers/Pantomime/POP3Store.h
-share/GNUstep/Local/Library/Headers/Pantomime/Pantomime.h
-share/GNUstep/Local/Library/Headers/Pantomime/Parser.h
-share/GNUstep/Local/Library/Headers/Pantomime/Part.h
-share/GNUstep/Local/Library/Headers/Pantomime/SMTP.h
-share/GNUstep/Local/Library/Headers/Pantomime/Sendmail.h
-share/GNUstep/Local/Library/Headers/Pantomime/Service.h
-share/GNUstep/Local/Library/Headers/Pantomime/Store.h
-share/GNUstep/Local/Library/Headers/Pantomime/TCPConnection.h
-share/GNUstep/Local/Library/Headers/Pantomime/Transport.h
-share/GNUstep/Local/Library/Headers/Pantomime/URLName.h
-share/GNUstep/Local/Library/Headers/Pantomime/UTF8.h
-share/GNUstep/Local/Library/Headers/Pantomime/UUFile.h
-share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1250.h
-share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1251.h
-share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1252.h
-share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1253.h
-share/GNUstep/Local/Library/Headers/Pantomime/WINDOWS_1254.h
-share/GNUstep/Local/Library/Headers/Pantomime/elm_defs.h
-share/GNUstep/Local/Library/Headers/Pantomime/elm_lib.h
-share/GNUstep/Local/Library/Headers/Pantomime/parseaddrs.h
-share/GNUstep/Local/Library/Libraries/libPantomime.so
-share/GNUstep/Local/Library/Libraries/libPantomime.so.1.1.0
-@dirrm share/GNUstep/Local/Library/Headers/Pantomime
+@comment $NetBSD: PLIST,v 1.3 2009/04/13 12:40:40 rh Exp $
+include/Pantomime
+lib/GNUstep/Frameworks/Pantomime.framework/Headers
+lib/GNUstep/Frameworks/Pantomime.framework/Pantomime
+lib/GNUstep/Frameworks/Pantomime.framework/Resources
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWCacheManager.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWCharset.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWConnection.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWConstants.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWContainer.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWDNSManager.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWFlags.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWFolder.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWFolderInformation.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWIMAPCacheManager.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWIMAPFolder.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWIMAPMessage.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWIMAPStore.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_1.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_10.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_11.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_13.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_14.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_15.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_2.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_3.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_4.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_5.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_6.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_7.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_8.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWISO8859_9.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWInternetAddress.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWKOI8_R.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWKOI8_U.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWLocalCacheManager.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWLocalFolder+maildir.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWLocalFolder+mbox.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWLocalFolder.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWLocalMessage.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWLocalStore.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWMD5.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWMIMEMultipart.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWMIMEUtility.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWMessage.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWPOP3CacheManager.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWPOP3CacheObject.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWPOP3Folder.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWPOP3Message.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWPOP3Store.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWParser.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWPart.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWRegEx.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWSMTP.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWSendmail.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWService.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWStore.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWTCPConnection.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWTransport.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWURLName.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWUUFile.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWVirtualFolder.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWWINDOWS_1250.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWWINDOWS_1251.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWWINDOWS_1252.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWWINDOWS_1253.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/CWWINDOWS_1254.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/NSData+Extensions.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/NSFileManager+Extensions.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/NSScanner+Extensions.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/NSString+Extensions.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/Pantomime.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers/io.h
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Pantomime
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/English.lproj/InfoPlist.strings
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/English.lproj/Localizable.strings
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/German.lproj/InfoPlist.strings
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/German.lproj/Localizable.strings
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/Info-gnustep.plist
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/libPantomime.so
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/libPantomime.so.1.2.0
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/Current
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/English.lproj/Localizable.strings
+lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/German.lproj/Localizable.strings
+lib/GNUstep/Frameworks/Pantomime.framework/libPantomime.so
+lib/libPantomime.so
+lib/libPantomime.so.1.2.0
+@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/German.lproj
+@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources/English.lproj
+@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/Resources
+@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/German.lproj
+@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources/English.lproj
+@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Resources
+@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2/Headers
+@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions/1.2
+@dirrm lib/GNUstep/Frameworks/Pantomime.framework/Versions
+@dirrm lib/GNUstep/Frameworks/Pantomime.framework
+@comment in devel/gnustep-base: @dirrm lib/GNUstep/Frameworks
+@comment in devel/gnustep-base: @dirrm lib/GNUstep
diff --git a/mail/Pantomime/buildlink3.mk b/mail/Pantomime/buildlink3.mk
index d80d6b233f7..0887d103e42 100644
--- a/mail/Pantomime/buildlink3.mk
+++ b/mail/Pantomime/buildlink3.mk
@@ -1,17 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/04/13 12:40:40 rh Exp $
 
 BUILDLINK_TREE+=	Pantomime
 
 .if !defined(PANTOMIME_BUILDLINK3_MK)
 PANTOMIME_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.Pantomime+=	Pantomime>=1.1.2
-BUILDLINK_ABI_DEPENDS.Pantomime+=	Pantomime>=1.1.2nb5
+BUILDLINK_API_DEPENDS.Pantomime+=	Pantomime>1.1.9
+BUILDLINK_ABI_DEPENDS.Pantomime+=	Pantomime>1.1.9
 BUILDLINK_PKGSRCDIR.Pantomime?=	../../mail/Pantomime
 
 .include "../../devel/gnustep-make/gnustep.mk"
 
-BUILDLINK_INCDIRS.Pantomime+=	${GNUSTEP_LOCAL_ROOT:Q}/${GNUSTEP_IDIR:Q}/Pantomime
+BUILDLINK_INCDIRS.Pantomime+=	lib/GNUstep/Frameworks/Pantomime.framework/Headers
+BUILDLINK_FILES.Pantomime+= 	include/Pantomime/*.h
 
 .include "../../devel/gnustep-base/buildlink3.mk"
 .endif # PANTOMIME_BUILDLINK3_MK
diff --git a/mail/Pantomime/distinfo b/mail/Pantomime/distinfo
index c8cf9319efd..18981407e1a 100644
--- a/mail/Pantomime/distinfo
+++ b/mail/Pantomime/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2007/05/25 23:37:11 rh Exp $
+$NetBSD: distinfo,v 1.7 2009/04/13 12:40:40 rh Exp $
 
-SHA1 (Pantomime-1.1.2.tar.gz) = 06755835a74ff3686eca35ba5169722f17cf968e
-RMD160 (Pantomime-1.1.2.tar.gz) = 2d6a3bf2c5e1cd146ba3f72ac69970ed6b5ee999
-Size (Pantomime-1.1.2.tar.gz) = 394509 bytes
-SHA1 (patch-aa) = ef93a034eb706006ae9c7f0b6f393d8117656129
-SHA1 (patch-ab) = e93e2e507b22d9deaf91af147ec6552a707f70bb
+SHA1 (Pantomime-1.2.0pre3.tar.gz) = beddf538d239513bdd46f67db04e9b4d4bd7441c
+RMD160 (Pantomime-1.2.0pre3.tar.gz) = 25c397080f0826d7b266e018246658707e9bbd00
+Size (Pantomime-1.2.0pre3.tar.gz) = 441478 bytes
+SHA1 (patch-ab) = 0691970542c20876c709a07c33842948bfd536f6
diff --git a/mail/Pantomime/patches/patch-aa b/mail/Pantomime/patches/patch-aa
deleted file mode 100644
index 67c24875b7c..00000000000
--- a/mail/Pantomime/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/01/20 03:24:10 joerg Exp $
-
---- Headers/Pantomime/elm_lib.h.orig	2006-01-20 03:19:01.000000000 +0000
-+++ Headers/Pantomime/elm_lib.h
-@@ -69,8 +69,8 @@ int elm_access P_((const char *, int));
- 
- 
- /* errno.c */
-+#include <errno.h>
- 
--extern int errno;
- #ifndef STRERROR
- char *strerror P_((int));
- #endif
diff --git a/mail/Pantomime/patches/patch-ab b/mail/Pantomime/patches/patch-ab
index b03f27f966f..cf693c555df 100644
--- a/mail/Pantomime/patches/patch-ab
+++ b/mail/Pantomime/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2007/05/25 23:37:11 rh Exp $
+$NetBSD: patch-ab,v 1.2 2009/04/13 12:40:40 rh Exp $
 
---- Source/GNUmakefile.orig	2003-08-13 00:17:39.000000000 +1000
-+++ Source/GNUmakefile
-@@ -88,7 +88,7 @@ ADDITIONAL_OBJCFLAGS = -DHAVE_ICONV -Wal
- 
- # Under Solaris, we link to libucb
+--- Framework/Pantomime/GNUmakefile.orig	2006-12-17 02:13:38.000000000 +1000
++++ Framework/Pantomime/GNUmakefile
+@@ -191,7 +191,7 @@ endif
+ # Under Solaris, we include SSL headers / libraries 
  ifeq ($(findstring solaris, $(GNUSTEP_TARGET_OS)), solaris)
--ADDITIONAL_LDFLAGS = -L/usr/ucblib -lucb
-+ADDITIONAL_LDFLAGS = -Wl,-L/usr/ucblib -lucb
+ ADDITIONAL_OBJCFLAGS += -I/usr/local/ssl/include
+-ADDITIONAL_LDFLAGS += -L/usr/local/ssl/lib
++ADDITIONAL_LDFLAGS += -Wl,-L/usr/local/ssl/lib
  endif
  
- include $(GNUSTEP_MAKEFILES)/library.make
+ include $(GNUSTEP_MAKEFILES)/framework.make