3 files changed, 195 insertions, 46 deletions

diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index 5471d68496a3..4f5dcb6e534d 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnumail
-PORTVERSION=	0.7.0
+PORTVERSION=	1.0.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.collaboration-world.com/gnumail/
 DISTNAME=	GNUMail-${PORTVERSION}
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${XGPSBUNDLEDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-xgps
 		${LOCALLIBDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libPantomime.so:${PORTSDIR}/mail/pantomime
 
 PREFIX=		${LOCALBASE}/GNUstep
-WRKSRC=		${WRKDIR}/GNUMail/Source
+WRKSRC=		${WRKDIR}/GNUMail
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
 MAKEFILE=
diff --git a/mail/gnumail/distinfo b/mail/gnumail/distinfo
index d3189f6b52f1..5f3b63c2bb31 100644
--- a/mail/gnumail/distinfo
+++ b/mail/gnumail/distinfo
@@ -1 +1 @@
-MD5 (GNUMail-0.7.0.tar.gz) = 21d97f833ee2f4bc741f5b3e9e079244
+MD5 (GNUMail-1.0.0.tar.gz) = 04f596f3a1c20d7ab854d5d74b5e2dad
diff --git a/mail/gnumail/pkg-plist b/mail/gnumail/pkg-plist
index a903ce1703f9..873981a81034 100644
--- a/mail/gnumail/pkg-plist
+++ b/mail/gnumail/pkg-plist
@@ -1,43 +1,192 @@
-Local/Apps/GNUMail.app/GNUMail
-Local/Apps/GNUMail.app/Resources/Address_add.tiff
-Local/Apps/GNUMail.app/Resources/Address_bcc.tiff
-Local/Apps/GNUMail.app/Resources/Address_cc.tiff
-Local/Apps/GNUMail.app/Resources/Address_delete.tiff
-Local/Apps/GNUMail.app/Resources/Address_to.tiff
-Local/Apps/GNUMail.app/Resources/GNUMail.tiff
-Local/Apps/GNUMail.app/Resources/Info-gnustep.plist
-Local/Apps/GNUMail.app/Resources/Magnifier.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_addresses.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_attach.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_bcc.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_bcc_remove.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_box_add.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_box_delete.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_box_open.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_box_transfer.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_cc.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_cc_remove.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_create.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_delete.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_forward.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_mailboxes.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_prefs_quote.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_reply.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_retrieve.tiff
-Local/Apps/GNUMail.app/Resources/MailIcon_send.tiff
-Local/Apps/GNUMail.app/Resources/common_Unknown.tiff
-Local/Apps/GNUMail.app/Resources/down.tiff
-Local/Apps/GNUMail.app/Resources/mime.tiff
-Local/Apps/GNUMail.app/Resources/personal.tiff
-Local/Apps/GNUMail.app/Resources/pgp-mail.tiff
-Local/Apps/GNUMail.app/Resources/stop.tiff
-Local/Apps/GNUMail.app/Resources/up.tiff
-Local/Apps/GNUMail.app/Resources/viewing.tiff
-Local/Apps/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/GNUMail
-Local/Apps/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/library_paths.openapp
-@dirrm Local/Apps/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Apps/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Apps/GNUMail.app/%%GNU_ARCH%%
-@dirrm Local/Apps/GNUMail.app/Resources
-@dirrm Local/Apps/GNUMail.app
-@dirrm Local/Apps
+Local/Applications/GNUMail.app/GNUMail
+Local/Applications/GNUMail.app/Resources/Address_add.tiff
+Local/Applications/GNUMail.app/Resources/Address_bcc.tiff
+Local/Applications/GNUMail.app/Resources/Address_cc.tiff
+Local/Applications/GNUMail.app/Resources/Address_delete.tiff
+Local/Applications/GNUMail.app/Resources/Address_to.tiff
+Local/Applications/GNUMail.app/Resources/English.lproj/Localizable.strings
+Local/Applications/GNUMail.app/Resources/French.lproj/Localizable.strings
+Local/Applications/GNUMail.app/Resources/GNUMail.desktop
+Local/Applications/GNUMail.app/Resources/GNUMail.tiff
+Local/Applications/GNUMail.app/Resources/GNUMail_Full.tiff
+Local/Applications/GNUMail.app/Resources/German.lproj/Localizable.strings
+Local/Applications/GNUMail.app/Resources/Info-gnustep.plist
+Local/Applications/GNUMail.app/Resources/Magnifier.tiff
+Local/Applications/GNUMail.app/Resources/MailIcon_addresses.tiff
+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_delete.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
+Local/Applications/GNUMail.app/Resources/MailIcon_cc.tiff
+Local/Applications/GNUMail.app/Resources/MailIcon_cc_remove.tiff
+Local/Applications/GNUMail.app/Resources/MailIcon_create.tiff
+Local/Applications/GNUMail.app/Resources/MailIcon_delete.tiff
+Local/Applications/GNUMail.app/Resources/MailIcon_forward.tiff
+Local/Applications/GNUMail.app/Resources/MailIcon_mailboxes.tiff
+Local/Applications/GNUMail.app/Resources/MailIcon_reply.tiff
+Local/Applications/GNUMail.app/Resources/MailIcon_retrieve.tiff
+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/anim-logo-1.tiff
+Local/Applications/GNUMail.app/Resources/anim-logo-2.tiff
+Local/Applications/GNUMail.app/Resources/anim-logo-3.tiff
+Local/Applications/GNUMail.app/Resources/anim-logo-4.tiff
+Local/Applications/GNUMail.app/Resources/anim-logo-5.tiff
+Local/Applications/GNUMail.app/Resources/anim-logo-6.tiff
+Local/Applications/GNUMail.app/Resources/anim-logo-7.tiff
+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/mime-flag.tiff
+Local/Applications/GNUMail.app/Resources/new-flag.tiff
+Local/Applications/GNUMail.app/Resources/pgp-mail.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
+@unexec rm -f %D/Local/Library/Frameworks/GNUMail.framework/Headers
+@exec ln -sf Versions/Current/Resources %D/Local/Library/Frameworks/GNUMail.framework/Resources
+@unexec rm -f %D/Local/Library/Frameworks/GNUMail.framework/Resources
+Local/Library/GNUMail/Compose.prefs/Contents/Info.plist
+@exec ln -sf ../Resources %D/Local/Library/GNUMail/Compose.prefs/Contents/Resources
+@unexec rm -f %D/Local/Library/GNUMail/Compose.prefs/Contents/Resources
+Local/Library/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
+Local/Library/GNUMail/Compose.prefs/Resources/Info.plist
+Local/Library/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
+Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Compose
+Local/Library/GNUMail/Filtering.prefs/Contents/Info.plist
+@exec ln -sf ../Resources %D/Local/Library/GNUMail/Filtering.prefs/Contents/Resources
+@unexec rm -f %D/Local/Library/GNUMail/Filtering.prefs/Contents/Resources
+Local/Library/GNUMail/Filtering.prefs/Resources/Filtering.tiff
+Local/Library/GNUMail/Filtering.prefs/Resources/Info-gnustep.plist
+Local/Library/GNUMail/Filtering.prefs/Resources/Info.plist
+Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Filtering
+Local/Library/GNUMail/Fonts.prefs/Contents/Info.plist
+@exec ln -sf ../Resources %D/Local/Library/GNUMail/Fonts.prefs/Contents/Resources
+@unexec rm -f %D/Local/Library/GNUMail/Fonts.prefs/Contents/Resources
+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/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
+Local/Library/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
+Local/Library/GNUMail/MIME.prefs/Resources/Info.plist
+Local/Library/GNUMail/MIME.prefs/Resources/mime.tiff
+Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/MIME
+Local/Library/GNUMail/Personal.prefs/Contents/Info.plist
+@exec ln -sf ../Resources %D/Local/Library/GNUMail/Personal.prefs/Contents/Resources
+@unexec rm -f %D/Local/Library/GNUMail/Personal.prefs/Contents/Resources
+Local/Library/GNUMail/Personal.prefs/Resources/Info-gnustep.plist
+Local/Library/GNUMail/Personal.prefs/Resources/Info.plist
+Local/Library/GNUMail/Personal.prefs/Resources/personal.tiff
+Local/Library/GNUMail/Personal.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Personal
+Local/Library/GNUMail/Receiving.prefs/Contents/Info.plist
+@exec ln -sf ../Resources %D/Local/Library/GNUMail/Receiving.prefs/Contents/Resources
+@unexec rm -f %D/Local/Library/GNUMail/Receiving.prefs/Contents/Resources
+Local/Library/GNUMail/Receiving.prefs/Resources/Info-gnustep.plist
+Local/Library/GNUMail/Receiving.prefs/Resources/Info.plist
+Local/Library/GNUMail/Receiving.prefs/Resources/MailIcon_retrieve.tiff
+Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Receiving
+Local/Library/GNUMail/Sending.prefs/Contents/Info.plist
+@exec ln -sf ../Resources %D/Local/Library/GNUMail/Sending.prefs/Contents/Resources
+@unexec rm -f %D/Local/Library/GNUMail/Sending.prefs/Contents/Resources
+Local/Library/GNUMail/Sending.prefs/Resources/Info-gnustep.plist
+Local/Library/GNUMail/Sending.prefs/Resources/Info.plist
+Local/Library/GNUMail/Sending.prefs/Resources/MailIcon_send.tiff
+Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Sending
+Local/Library/GNUMail/Viewing.prefs/Contents/Info.plist
+@exec ln -sf ../Resources %D/Local/Library/GNUMail/Viewing.prefs/Contents/Resources
+@unexec rm -f %D/Local/Library/GNUMail/Viewing.prefs/Contents/Resources
+Local/Library/GNUMail/Viewing.prefs/Resources/Info-gnustep.plist
+Local/Library/GNUMail/Viewing.prefs/Resources/Info.plist
+Local/Library/GNUMail/Viewing.prefs/Resources/viewing.tiff
+Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Viewing
+@dirrm Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%
+@dirrm Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%
+@dirrm Local/Library/GNUMail/Viewing.prefs/Resources
+@dirrm Local/Library/GNUMail/Viewing.prefs/Contents
+@dirrm Local/Library/GNUMail/Viewing.prefs
+@dirrm Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%/%%OPSYS%%
+@dirrm Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%
+@dirrm Local/Library/GNUMail/Sending.prefs/Resources
+@dirrm Local/Library/GNUMail/Sending.prefs/Contents
+@dirrm Local/Library/GNUMail/Sending.prefs
+@dirrm Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%/%%OPSYS%%
+@dirrm Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%
+@dirrm Local/Library/GNUMail/Receiving.prefs/Resources
+@dirrm Local/Library/GNUMail/Receiving.prefs/Contents
+@dirrm Local/Library/GNUMail/Receiving.prefs
+@dirrm Local/Library/GNUMail/Personal.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/GNUMail/Personal.prefs/%%GNU_ARCH%%/%%OPSYS%%
+@dirrm Local/Library/GNUMail/Personal.prefs/%%GNU_ARCH%%
+@dirrm Local/Library/GNUMail/Personal.prefs/Resources
+@dirrm Local/Library/GNUMail/Personal.prefs/Contents
+@dirrm Local/Library/GNUMail/Personal.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%%
+@dirrm Local/Library/GNUMail/MIME.prefs/Resources
+@dirrm Local/Library/GNUMail/MIME.prefs/Contents
+@dirrm Local/Library/GNUMail/MIME.prefs
+@dirrm Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%/%%OPSYS%%
+@dirrm Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%
+@dirrm Local/Library/GNUMail/Fonts.prefs/Resources
+@dirrm Local/Library/GNUMail/Fonts.prefs/Contents
+@dirrm Local/Library/GNUMail/Fonts.prefs
+@dirrm Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%/%%OPSYS%%
+@dirrm Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%
+@dirrm Local/Library/GNUMail/Filtering.prefs/Resources
+@dirrm Local/Library/GNUMail/Filtering.prefs/Contents
+@dirrm Local/Library/GNUMail/Filtering.prefs
+@dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%/%%OPSYS%%
+@dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%
+@dirrm Local/Library/GNUMail/Compose.prefs/Resources
+@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%%
+@dirrm Local/Applications/GNUMail.app/Resources/Swedish.lproj
+@dirrm Local/Applications/GNUMail.app/Resources/Spanish.lproj
+@dirrm Local/Applications/GNUMail.app/Resources/German.lproj
+@dirrm Local/Applications/GNUMail.app/Resources/French.lproj
+@dirrm Local/Applications/GNUMail.app/Resources/English.lproj
+@dirrm Local/Applications/GNUMail.app/Resources
+@dirrm Local/Applications/GNUMail.app