Update to: Pantomime-1.0.4

Update to: GNUMail-1.0.2

6 files changed, 29 insertions, 22 deletions

diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index 6f184ed92380..cbdd8fa273ec 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	gnumail
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.2
 CATEGORIES=	mail
-MASTER_SITES=	http://www.collaboration-world.com/gnumail/ \
+MASTER_SITES=	http://www.collaboration-world.com/mirror/ \
 		http://extrovert.screwdriver.net/~extra/
 DISTNAME=	GNUMail-${PORTVERSION}
 
diff --git a/mail/gnumail/distinfo b/mail/gnumail/distinfo
index 5f3b63c2bb31..3fbd0f810f39 100644
--- a/mail/gnumail/distinfo
+++ b/mail/gnumail/distinfo
@@ -1 +1 @@
-MD5 (GNUMail-1.0.0.tar.gz) = 04f596f3a1c20d7ab854d5d74b5e2dad
+MD5 (GNUMail-1.0.2.tar.gz) = ba8047b00353768a58790c0d13fb9e83
diff --git a/mail/gnumail/pkg-plist b/mail/gnumail/pkg-plist
index 873981a81034..5ec2bdd95691 100644
--- a/mail/gnumail/pkg-plist
+++ b/mail/gnumail/pkg-plist
@@ -17,7 +17,9 @@ Local/Applications/GNUMail.app/Resources/MailIcon_attach.tiff
 Local/Applications/GNUMail.app/Resources/MailIcon_bcc.tiff
 Local/Applications/GNUMail.app/Resources/MailIcon_bcc_remove.tiff
 Local/Applications/GNUMail.app/Resources/MailIcon_box_add.tiff
+Local/Applications/GNUMail.app/Resources/MailIcon_box_copy.tiff
 Local/Applications/GNUMail.app/Resources/MailIcon_box_delete.tiff
+Local/Applications/GNUMail.app/Resources/MailIcon_box_move.tiff
 Local/Applications/GNUMail.app/Resources/MailIcon_box_open.tiff
 Local/Applications/GNUMail.app/Resources/MailIcon_box_rename.tiff
 Local/Applications/GNUMail.app/Resources/MailIcon_box_transfer.tiff
@@ -33,6 +35,7 @@ Local/Applications/GNUMail.app/Resources/MailIcon_send.tiff
 Local/Applications/GNUMail.app/Resources/MailIcon_stop.tiff
 Local/Applications/GNUMail.app/Resources/Spanish.lproj/Localizable.strings
 Local/Applications/GNUMail.app/Resources/Swedish.lproj/Localizable.strings
+Local/Applications/GNUMail.app/Resources/Welcome
 Local/Applications/GNUMail.app/Resources/anim-logo-1.tiff
 Local/Applications/GNUMail.app/Resources/anim-logo-2.tiff
 Local/Applications/GNUMail.app/Resources/anim-logo-3.tiff
@@ -44,23 +47,18 @@ Local/Applications/GNUMail.app/Resources/anim-logo-8.tiff
 Local/Applications/GNUMail.app/Resources/answered-flag.tiff
 Local/Applications/GNUMail.app/Resources/common_Unknown.tiff
 Local/Applications/GNUMail.app/Resources/down.tiff
+Local/Applications/GNUMail.app/Resources/drag_mail.tiff
+Local/Applications/GNUMail.app/Resources/drag_mails.tiff
 Local/Applications/GNUMail.app/Resources/mime-flag.tiff
 Local/Applications/GNUMail.app/Resources/new-flag.tiff
 Local/Applications/GNUMail.app/Resources/pgp-mail.tiff
+Local/Applications/GNUMail.app/Resources/pgp-mail-small.tiff
 Local/Applications/GNUMail.app/Resources/up.tiff
 Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/GNUMail
 Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/library_paths.openapp
 Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGNUMail.so
 Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGNUMail.so.1
 Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGNUMail.so.1.0.0
-Local/Library/Frameworks/GNUMail.framework/Versions/A/Headers/GNUMailBundle.h
-Local/Library/Frameworks/GNUMail.framework/Versions/A/Headers/PreferencesModule.h
-Local/Library/Frameworks/GNUMail.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/GNUMail.framework/Versions/A/Resources/Info.plist
-Local/Library/Frameworks/GNUMail.framework/Versions/A/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/GNUMail
-Local/Library/Frameworks/GNUMail.framework/Versions/A/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGNUMail.so
-Local/Library/Frameworks/GNUMail.framework/Versions/A/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGNUMail.so.1
-Local/Library/Frameworks/GNUMail.framework/Versions/A/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGNUMail.so.1.0.0
 @exec ln -sf A %D/Local/Library/Frameworks/GNUMail.framework/Versions/Current
 @unexec rm -f %D/Local/Library/Frameworks/GNUMail.framework/Versions/Current
 @exec ln -sf Versions/Current/Headers %D/Local/Library/Frameworks/GNUMail.framework/Headers
@@ -88,6 +86,13 @@ Local/Library/GNUMail/Fonts.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Fonts.prefs/Resources/Info.plist
 Local/Library/GNUMail/Fonts.prefs/Resources/fonts.tiff
 Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Fonts
+Local/Library/GNUMail/Mailboxes.prefs/Contents/Info.plist
+@exec ln -sf ../Resources %D/Local/Library/GNUMail/Mailboxes.prefs/Contents/Resources
+@unexec rm -f %D/Local/Library/GNUMail/Mailboxes.prefs/Contents/Resources
+Local/Library/GNUMail/Mailboxes.prefs/Resources/Info-gnustep.plist
+Local/Library/GNUMail/Mailboxes.prefs/Resources/Info.plist
+Local/Library/GNUMail/Mailboxes.prefs/Resources/MailIcon_mailboxes.tiff
+Local/Library/GNUMail/Mailboxes.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Mailboxes
 Local/Library/GNUMail/MIME.prefs/Contents/Info.plist
 @exec ln -sf ../Resources %D/Local/Library/GNUMail/MIME.prefs/Contents/Resources
 @unexec rm -f %D/Local/Library/GNUMail/MIME.prefs/Contents/Resources
@@ -147,6 +152,12 @@ Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Viewing
 @dirrm Local/Library/GNUMail/Personal.prefs/Resources
 @dirrm Local/Library/GNUMail/Personal.prefs/Contents
 @dirrm Local/Library/GNUMail/Personal.prefs
+@dirrm Local/Library/GNUMail/Mailboxes.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/GNUMail/Mailboxes.prefs/%%GNU_ARCH%%/%%OPSYS%%
+@dirrm Local/Library/GNUMail/Mailboxes.prefs/%%GNU_ARCH%%/
+@dirrm Local/Library/GNUMail/Mailboxes.prefs/Resources
+@dirrm Local/Library/GNUMail/Mailboxes.prefs/Contents
+@dirrm Local/Library/GNUMail/Mailboxes.prefs
 @dirrm Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
 @dirrm Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%/%%OPSYS%%
 @dirrm Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%
@@ -172,14 +183,6 @@ Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Viewing
 @dirrm Local/Library/GNUMail/Compose.prefs/Contents
 @dirrm Local/Library/GNUMail/Compose.prefs
 @dirrm Local/Library/GNUMail
-@dirrm Local/Library/Frameworks/GNUMail.framework/Versions/A/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Library/Frameworks/GNUMail.framework/Versions/A/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Library/Frameworks/GNUMail.framework/Versions/A/%%GNU_ARCH%%
-@dirrm Local/Library/Frameworks/GNUMail.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/GNUMail.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/GNUMail.framework/Versions/A
-@dirrm Local/Library/Frameworks/GNUMail.framework/Versions
-@dirrm Local/Library/Frameworks/GNUMail.framework
 @dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
 @dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%
 @dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%
diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index 2cfc15751670..a90281547060 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	pantomime
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.4
 CATEGORIES=	mail
-MASTER_SITES=	http://www.collaboration-world.com/pantomime.data/releases/Development/ \
+MASTER_SITES=	http://www.collaboration-world.com/mirror/ \
 		http://extrovert.screwdriver.net/~extra/ \
 		ftp://ftp.tuwien.ac.at/z6/publishing/gnustep/libs/
 DISTNAME=	Pantomime-${PORTVERSION}
diff --git a/mail/pantomime/distinfo b/mail/pantomime/distinfo
index 477e32b626a5..8754cec97126 100644
--- a/mail/pantomime/distinfo
+++ b/mail/pantomime/distinfo
@@ -1 +1 @@
-MD5 (Pantomime-1.0.2.tar.gz) = f8374b37bb32099880a92a4bc67b7c48
+MD5 (Pantomime-1.0.4.tar.gz) = c0a3e96ac41b2428627d5da44fc7c14e
diff --git a/mail/pantomime/pkg-plist b/mail/pantomime/pkg-plist
index a559562dbfde..35e422049b79 100644
--- a/mail/pantomime/pkg-plist
+++ b/mail/pantomime/pkg-plist
@@ -1,5 +1,6 @@
 Local/Headers/Pantomime/Charset.h
 Local/Headers/Pantomime/Constants.h
+Local/Headers/Pantomime/Connection.h
 Local/Headers/Pantomime/Flags.h
 Local/Headers/Pantomime/Folder.h
 Local/Headers/Pantomime/GSMD5.h
@@ -50,8 +51,11 @@ Local/Headers/Pantomime/TCPConnection.h
 Local/Headers/Pantomime/Transport.h
 Local/Headers/Pantomime/URLName.h
 Local/Headers/Pantomime/UTF8.h
+Local/Headers/Pantomime/WINDOWS_1250.h
 Local/Headers/Pantomime/WINDOWS_1251.h
 Local/Headers/Pantomime/WINDOWS_1252.h
+Local/Headers/Pantomime/WINDOWS_1253.h
+Local/Headers/Pantomime/WINDOWS_1254.h
 Local/Headers/Pantomime/elm_defs.h
 Local/Headers/Pantomime/elm_lib.h
 Local/Headers/Pantomime/parseaddrs.h