2 files changed, 86 insertions, 83 deletions

diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index ebbea3dc7a15..bed63d3c90ca 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -23,5 +23,6 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/Pantomime
+DEFAULT_LIBVERSION=	1.2
 
 .include <bsd.port.mk>
diff --git a/mail/pantomime/pkg-plist b/mail/pantomime/pkg-plist
index 78c15beaff14..56d26ee79647 100644
--- a/mail/pantomime/pkg-plist
+++ b/mail/pantomime/pkg-plist
@@ -1,96 +1,98 @@
 Local/Library/Frameworks/Pantomime.framework/Headers
+Local/Library/Frameworks/Pantomime.framework/Pantomime
 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/io.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/English.lproj/InfoPlist.strings
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/German.lproj/InfoPlist.strings
-Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/German.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/%%LIBVERSION%%/Headers/CWCacheManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWCharset.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWConnection.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWConstants.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWContainer.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWDNSManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWFlags.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWFolder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWFolderInformation.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPCacheManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPFolder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPMessage.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPStore.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_1.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_10.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_11.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_13.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_14.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_15.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_2.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_3.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_4.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_5.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_6.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_7.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_8.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_9.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWInternetAddress.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWKOI8_R.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWKOI8_U.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalCacheManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalFolder+maildir.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalFolder+mbox.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalFolder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalMessage.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalStore.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMD5.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMIMEMultipart.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMIMEUtility.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMessage.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3CacheManager.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3CacheObject.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3Folder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3Message.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3Store.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWParser.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPart.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWRegEx.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWSMTP.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWSendmail.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWService.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWStore.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWTCPConnection.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWTransport.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWURLName.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWUUFile.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWVirtualFolder.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1250.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1251.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1252.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1253.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1254.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSData+Extensions.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSFileManager+Extensions.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSScanner+Extensions.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSString+Extensions.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/Pantomime.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/io.h
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Pantomime
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/English.lproj/Localizable.strings
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/English.lproj/InfoPlist.strings
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/German.lproj/InfoPlist.strings
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/German.lproj/Localizable.strings
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/libPantomime.so
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/libPantomime.so.%%LIBVERSION%%
+Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/libPantomime.so.%%VERSION%%
 Local/Library/Frameworks/Pantomime.framework/Versions/Current
 Local/Library/Frameworks/Pantomime.framework/Versions/Resources/English.lproj/Localizable.strings
 Local/Library/Frameworks/Pantomime.framework/Versions/Resources/German.lproj/Localizable.strings
+Local/Library/Frameworks/Pantomime.framework/libPantomime.so
 Local/Library/Headers/Pantomime
 Local/Library/Libraries/libPantomime.so
-Local/Library/Libraries/libPantomime.so.%%MAJORVERSION%%.2
+Local/Library/Libraries/libPantomime.so.%%LIBVERSION%%
 Local/Library/Libraries/libPantomime.so.%%VERSION%%
 @dirrm Local/Library/Frameworks/Pantomime.framework/Versions/Resources/German.lproj
 @dirrm Local/Library/Frameworks/Pantomime.framework/Versions/Resources/English.lproj
 @dirrm Local/Library/Frameworks/Pantomime.framework/Versions/Resources
-@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/A/Resources/German.lproj
-@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/%%LIBVERSION%%/Resources/German.lproj
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/English.lproj
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%
 @dirrm Local/Library/Frameworks/Pantomime.framework/Versions
 @dirrm Local/Library/Frameworks/Pantomime.framework