3 files changed, 96 insertions, 74 deletions

diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index 65dcd0176847..83cba32b1aaf 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:    Pantomime
+# New ports collection makefile for:    pantomime
 # Date created:         17 Sep 2001
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	pantomime
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.collaboration-world.com/pantomime.data/releases/Stable/
-DISTNAME=	Pantomime-${PORTVERSION}
+DISTNAME=	Pantomime-${PORTVERSION}pre2
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Mail/MIME handling library for GNUstep
@@ -24,6 +23,7 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 MAKEFILE=	GNUmakefile
 LDCONFIG_DIRS=	${LOCALLIBDIR}
+NO_FILTER_SHLIBS=	yes
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/mail/pantomime/distinfo b/mail/pantomime/distinfo
index 07edc2a91760..169b9cd440be 100644
--- a/mail/pantomime/distinfo
+++ b/mail/pantomime/distinfo
@@ -1,3 +1,3 @@
-MD5 (Pantomime-1.1.2.tar.gz) = 7070473c8cf4e84945673d43a65cfca8
-SHA256 (Pantomime-1.1.2.tar.gz) = 6e75bc5588be08aef3cca4c51e962a6d9cd6398c5319cc4de8b8aae1718d5fc5
-SIZE (Pantomime-1.1.2.tar.gz) = 394509
+MD5 (Pantomime-1.2.0pre2.tar.gz) = b88f4634ec1f3a1ea1d5551ee10d9db7
+SHA256 (Pantomime-1.2.0pre2.tar.gz) = 2b36d295ffcb0f6732c553d6bc196caafe72708f1546fed80dd514b0cffb0397
+SIZE (Pantomime-1.2.0pre2.tar.gz) = 449383
diff --git a/mail/pantomime/pkg-plist b/mail/pantomime/pkg-plist
index 6109871ad89d..2a9862054926 100644
--- a/mail/pantomime/pkg-plist
+++ b/mail/pantomime/pkg-plist
@@ -1,68 +1,90 @@
-Local/Library/Headers/Pantomime/Charset.h
-Local/Library/Headers/Pantomime/Connection.h
-Local/Library/Headers/Pantomime/Constants.h
-Local/Library/Headers/Pantomime/Container.h
-Local/Library/Headers/Pantomime/Flags.h
-Local/Library/Headers/Pantomime/Folder.h
-Local/Library/Headers/Pantomime/FolderInformation.h
-Local/Library/Headers/Pantomime/IMAPCacheManager.h
-Local/Library/Headers/Pantomime/IMAPFolder.h
-Local/Library/Headers/Pantomime/IMAPMessage.h
-Local/Library/Headers/Pantomime/IMAPStore.h
-Local/Library/Headers/Pantomime/ISO8859_1.h
-Local/Library/Headers/Pantomime/ISO8859_10.h
-Local/Library/Headers/Pantomime/ISO8859_11.h
-Local/Library/Headers/Pantomime/ISO8859_13.h
-Local/Library/Headers/Pantomime/ISO8859_14.h
-Local/Library/Headers/Pantomime/ISO8859_15.h
-Local/Library/Headers/Pantomime/ISO8859_2.h
-Local/Library/Headers/Pantomime/ISO8859_3.h
-Local/Library/Headers/Pantomime/ISO8859_4.h
-Local/Library/Headers/Pantomime/ISO8859_5.h
-Local/Library/Headers/Pantomime/ISO8859_6.h
-Local/Library/Headers/Pantomime/ISO8859_7.h
-Local/Library/Headers/Pantomime/ISO8859_8.h
-Local/Library/Headers/Pantomime/ISO8859_9.h
-Local/Library/Headers/Pantomime/InternetAddress.h
-Local/Library/Headers/Pantomime/KOI8_R.h
-Local/Library/Headers/Pantomime/KOI8_U.h
-Local/Library/Headers/Pantomime/LocalFolder.h
-Local/Library/Headers/Pantomime/LocalFolderCacheManager.h
-Local/Library/Headers/Pantomime/LocalMessage.h
-Local/Library/Headers/Pantomime/LocalStore.h
-Local/Library/Headers/Pantomime/MD5.h
-Local/Library/Headers/Pantomime/Message.h
-Local/Library/Headers/Pantomime/MimeMultipart.h
-Local/Library/Headers/Pantomime/MimeUtility.h
-Local/Library/Headers/Pantomime/NSData+Extensions.h
-Local/Library/Headers/Pantomime/NSRegEx.h
-Local/Library/Headers/Pantomime/NSString+Extensions.h
-Local/Library/Headers/Pantomime/POP3CacheManager.h
-Local/Library/Headers/Pantomime/POP3CacheObject.h
-Local/Library/Headers/Pantomime/POP3Folder.h
-Local/Library/Headers/Pantomime/POP3Message.h
-Local/Library/Headers/Pantomime/POP3Store.h
-Local/Library/Headers/Pantomime/Pantomime.h
-Local/Library/Headers/Pantomime/Parser.h
-Local/Library/Headers/Pantomime/Part.h
-Local/Library/Headers/Pantomime/SMTP.h
-Local/Library/Headers/Pantomime/Sendmail.h
-Local/Library/Headers/Pantomime/Service.h
-Local/Library/Headers/Pantomime/Store.h
-Local/Library/Headers/Pantomime/TCPConnection.h
-Local/Library/Headers/Pantomime/Transport.h
-Local/Library/Headers/Pantomime/URLName.h
-Local/Library/Headers/Pantomime/UTF8.h
-Local/Library/Headers/Pantomime/UUFile.h
-Local/Library/Headers/Pantomime/WINDOWS_1250.h
-Local/Library/Headers/Pantomime/WINDOWS_1251.h
-Local/Library/Headers/Pantomime/WINDOWS_1252.h
-Local/Library/Headers/Pantomime/WINDOWS_1253.h
-Local/Library/Headers/Pantomime/WINDOWS_1254.h
-Local/Library/Headers/Pantomime/elm_defs.h
-Local/Library/Headers/Pantomime/elm_lib.h
-Local/Library/Headers/Pantomime/parseaddrs.h
+Local/Library/Frameworks/Pantomime.framework/Headers
+Local/Library/Frameworks/Pantomime.framework/Resources
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWCacheManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWCharset.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWConnection.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWConstants.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWContainer.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWDNSManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWFlags.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWFolder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWFolderInformation.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWIMAPCacheManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWIMAPFolder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWIMAPMessage.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWIMAPStore.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_1.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_10.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_11.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_13.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_14.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_15.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_2.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_3.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_4.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_5.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_6.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_7.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_8.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWISO8859_9.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWInternetAddress.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWKOI8_R.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWKOI8_U.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWLocalCacheManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWLocalFolder+maildir.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWLocalFolder+mbox.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWLocalFolder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWLocalMessage.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWLocalStore.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWMD5.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWMIMEMultipart.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWMIMEUtility.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWMessage.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWPOP3CacheManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWPOP3CacheObject.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWPOP3Folder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWPOP3Message.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWPOP3Store.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWParser.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWPart.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWRegEx.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWSMTP.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWSendmail.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWService.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWStore.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWTCPConnection.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWTransport.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWURLName.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWUUFile.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWVirtualFolder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWWINDOWS_1250.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWWINDOWS_1251.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWWINDOWS_1252.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWWINDOWS_1253.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/CWWINDOWS_1254.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/NSData+Extensions.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/NSFileManager+Extensions.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/NSScanner+Extensions.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/NSString+Extensions.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/Pantomime.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/elm_defs.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/elm_lib.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/io.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers/parseaddrs.h
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Pantomime
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/English.lproj/Localizable.strings
+Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/Info-gnustep.plist
+Local/Library/Frameworks/Pantomime.framework/Versions/A/libPantomime.so
+Local/Library/Frameworks/Pantomime.framework/Versions/A/libPantomime.so.%%MAJORVERSION%%.2
+Local/Library/Frameworks/Pantomime.framework/Versions/A/libPantomime.so.%%VERSION%%
+Local/Library/Frameworks/Pantomime.framework/Versions/Current
+Local/Library/Headers/Pantomime
 Local/Library/Libraries/libPantomime.so
-Local/Library/Libraries/libPantomime.so.%%MAJORVERSION%%
-Local/Library/Libraries/libPantomime.so.1.1.0
-@dirrm Local/Library/Headers/Pantomime
+Local/Library/Libraries/libPantomime.so.%%MAJORVERSION%%.2
+Local/Library/Libraries/libPantomime.so.%%VERSION%%
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/English.lproj
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/A/Headers
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/A
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions
+@dirrm Local/Library/Frameworks/Pantomime.framework