3 files changed, 75 insertions, 72 deletions

diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index 9eab8737c131..0c358b576a4b 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	gnumail
 PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail gnustep
-MASTER_SITES=	http://www.collaboration-world.com/gnumail.data/releases/Stable/
-DISTNAME=	GNUMail-${PORTVERSION}pre3
+MASTER_SITES=	http://download.gna.org/gnustep-nonfsf/
+DISTNAME=	GNUMail-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep mail client
@@ -25,7 +25,6 @@ USE_GNUSTEP_LOCAL_LIBS+=	Pantomime:${PANTOMIME_PORT}
 USE_GNUSTEP_LOCAL_LIBS+=	Addresses:${ADDRESSES_PORT}
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
-WRKSRC=		${WRKDIR}/GNUMail
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
 
 PANTOMIME_PORT?=	mail/pantomime
diff --git a/mail/gnumail/distinfo b/mail/gnumail/distinfo
index 19db020865a1..9a1cf6563b1d 100644
--- a/mail/gnumail/distinfo
+++ b/mail/gnumail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (GNUMail-1.2.0pre3.tar.gz) = 29127a65f35208a461436853b41de81f46db7d735958b40e06776805114d7b37
-SIZE (GNUMail-1.2.0pre3.tar.gz) = 1327521
+SHA256 (GNUMail-1.2.0.tar.gz) = 792512276b253d79362736fb0cb7d614d5a980ea356d03d6adec4d0dd0f6ef2c
+SIZE (GNUMail-1.2.0.tar.gz) = 1380032
diff --git a/mail/gnumail/pkg-plist b/mail/gnumail/pkg-plist
index a4d0b280ba01..bab9a7b9d03d 100644
--- a/mail/gnumail/pkg-plist
+++ b/mail/gnumail/pkg-plist
@@ -160,6 +160,53 @@ GNUstep/Local/Applications/GNUMail.app/Resources/trash_16.tiff
 GNUstep/Local/Applications/GNUMail.app/Resources/trash_20.tiff
 GNUstep/Local/Applications/GNUMail.app/Resources/up_15.tiff
 GNUstep/Local/Applications/GNUMail.app/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Account.prefs/Account
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Account.prefs/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Account.prefs/Resources/account.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Account.prefs/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Advanced.prefs/Advanced
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Advanced.prefs/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Advanced.prefs/Resources/advanced.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Advanced.prefs/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Colors.prefs/Colors
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Colors.prefs/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Colors.prefs/Resources/colors.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Colors.prefs/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/Compose
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/Filtering
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/Resources/Filtering.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Fonts.prefs/Fonts
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Fonts.prefs/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Fonts.prefs/Resources/fonts.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Fonts.prefs/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Import.bundle/Import
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Import.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Import.bundle/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/MIME
+GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/Resources/mime.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/Receiving
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/Resources/MailIcon_retrieve.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Sending.prefs/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Sending.prefs/Resources/MailIcon_send.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Sending.prefs/Sending
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Sending.prefs/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/3-pane_96x96.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/drawer_96x96.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/floating_96x96.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/viewing.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/widescreen_96x96.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Viewing
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/stamp.make
 GNUstep/Local/Library/Frameworks/GNUMail.framework/GNUMail
 GNUstep/Local/Library/Frameworks/GNUMail.framework/Headers
 GNUstep/Local/Library/Frameworks/GNUMail.framework/Resources
@@ -170,82 +217,39 @@ GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/lib
 GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so.%%VERSION%%
 GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/Current
 GNUstep/Local/Library/Frameworks/GNUMail.framework/libGNUMail.so
-GNUstep/Local/Library/GNUMail/Account.prefs/Account
-GNUstep/Local/Library/GNUMail/Account.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/GNUMail/Account.prefs/Resources/account.tiff
-GNUstep/Local/Library/GNUMail/Account.prefs/stamp.make
-GNUstep/Local/Library/GNUMail/Advanced.prefs/Advanced
-GNUstep/Local/Library/GNUMail/Advanced.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/GNUMail/Advanced.prefs/Resources/advanced.tiff
-GNUstep/Local/Library/GNUMail/Advanced.prefs/stamp.make
-GNUstep/Local/Library/GNUMail/Colors.prefs/Colors
-GNUstep/Local/Library/GNUMail/Colors.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/GNUMail/Colors.prefs/Resources/colors.tiff
-GNUstep/Local/Library/GNUMail/Colors.prefs/stamp.make
-GNUstep/Local/Library/GNUMail/Compose.prefs/Compose
-GNUstep/Local/Library/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
-GNUstep/Local/Library/GNUMail/Compose.prefs/stamp.make
-GNUstep/Local/Library/GNUMail/Filtering.prefs/Filtering
-GNUstep/Local/Library/GNUMail/Filtering.prefs/Resources/Filtering.tiff
-GNUstep/Local/Library/GNUMail/Filtering.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/GNUMail/Filtering.prefs/stamp.make
-GNUstep/Local/Library/GNUMail/Fonts.prefs/Fonts
-GNUstep/Local/Library/GNUMail/Fonts.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/GNUMail/Fonts.prefs/Resources/fonts.tiff
-GNUstep/Local/Library/GNUMail/Fonts.prefs/stamp.make
-GNUstep/Local/Library/GNUMail/Import.bundle/Import
-GNUstep/Local/Library/GNUMail/Import.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/GNUMail/Import.bundle/stamp.make
-GNUstep/Local/Library/GNUMail/MIME.prefs/MIME
-GNUstep/Local/Library/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/GNUMail/MIME.prefs/Resources/mime.tiff
-GNUstep/Local/Library/GNUMail/MIME.prefs/stamp.make
-GNUstep/Local/Library/GNUMail/Receiving.prefs/Receiving
-GNUstep/Local/Library/GNUMail/Receiving.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/GNUMail/Receiving.prefs/Resources/MailIcon_retrieve.tiff
-GNUstep/Local/Library/GNUMail/Receiving.prefs/stamp.make
-GNUstep/Local/Library/GNUMail/Sending.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/GNUMail/Sending.prefs/Resources/MailIcon_send.tiff
-GNUstep/Local/Library/GNUMail/Sending.prefs/Sending
-GNUstep/Local/Library/GNUMail/Sending.prefs/stamp.make
-GNUstep/Local/Library/GNUMail/Viewing.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/GNUMail/Viewing.prefs/Resources/viewing.tiff
-GNUstep/Local/Library/GNUMail/Viewing.prefs/Viewing
-GNUstep/Local/Library/GNUMail/Viewing.prefs/stamp.make
 GNUstep/Local/Library/Headers/GNUMail
 GNUstep/Local/Library/Libraries/libGNUMail.so
 GNUstep/Local/Library/Libraries/libGNUMail.so.%%MAJORVERSION%%
 GNUstep/Local/Library/Libraries/libGNUMail.so.%%VERSION%%
 GNUstep/Local/Tools/GNUMail
-@dirrm GNUstep/Local/Library/GNUMail/Viewing.prefs/Resources
-@dirrm GNUstep/Local/Library/GNUMail/Viewing.prefs
-@dirrm GNUstep/Local/Library/GNUMail/Sending.prefs/Resources
-@dirrm GNUstep/Local/Library/GNUMail/Sending.prefs
-@dirrm GNUstep/Local/Library/GNUMail/Receiving.prefs/Resources
-@dirrm GNUstep/Local/Library/GNUMail/Receiving.prefs
-@dirrm GNUstep/Local/Library/GNUMail/MIME.prefs/Resources
-@dirrm GNUstep/Local/Library/GNUMail/MIME.prefs
-@dirrm GNUstep/Local/Library/GNUMail/Import.bundle/Resources
-@dirrm GNUstep/Local/Library/GNUMail/Import.bundle
-@dirrm GNUstep/Local/Library/GNUMail/Fonts.prefs/Resources
-@dirrm GNUstep/Local/Library/GNUMail/Fonts.prefs
-@dirrm GNUstep/Local/Library/GNUMail/Filtering.prefs/Resources
-@dirrm GNUstep/Local/Library/GNUMail/Filtering.prefs
-@dirrm GNUstep/Local/Library/GNUMail/Compose.prefs/Resources
-@dirrm GNUstep/Local/Library/GNUMail/Compose.prefs
-@dirrm GNUstep/Local/Library/GNUMail/Colors.prefs/Resources
-@dirrm GNUstep/Local/Library/GNUMail/Colors.prefs
-@dirrm GNUstep/Local/Library/GNUMail/Advanced.prefs/Resources
-@dirrm GNUstep/Local/Library/GNUMail/Advanced.prefs
-@dirrm GNUstep/Local/Library/GNUMail/Account.prefs/Resources
-@dirrm GNUstep/Local/Library/GNUMail/Account.prefs
-@dirrm GNUstep/Local/Library/GNUMail
 @dirrm GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Resources
 @dirrm GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Headers
 @dirrm GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%
 @dirrm GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions
 @dirrm GNUstep/Local/Library/Frameworks/GNUMail.framework
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Sending.prefs/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Sending.prefs
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Import.bundle/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Import.bundle
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Fonts.prefs/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Fonts.prefs
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Colors.prefs/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Colors.prefs
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Advanced.prefs/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Advanced.prefs
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Account.prefs/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Account.prefs
+@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail
 @dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Turkish.lproj
 @dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Swedish.lproj
 @dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Spanish.lproj