Update GNUMail to 1.2.0. This makes GNUmail compile with clang and the

modern Objective-C runtime.

3 files changed, 58 insertions, 57 deletions

diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile
index c0c5ce13f96..674bd158ed0 100644
--- a/mail/GNUMail/Makefile
+++ b/mail/GNUMail/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2012/10/08 12:19:01 asau Exp $
+# $NetBSD: Makefile,v 1.34 2012/10/22 02:53:12 rh Exp $
 #
 
-DISTNAME=	GNUMail-1.2.0pre3
-PKGREVISION=	2
+DISTNAME=	GNUMail-1.2.0
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
 
@@ -13,15 +12,13 @@ LICENSE=	gnu-lgpl-v2
 
 USE_LANGUAGES=	objc
 
-WRKSRC=		${WRKDIR}/GNUMail
 NO_CONFIGURE=	yes
-MAKE_JOBS_SAFE=	no
 MAKE_FILE=	GNUmakefile
 
 FIX_GNUSTEP_INSTALLATION_DIR= yes
-.for _dir_ in Account Advanced Clock Colors Compose Face Filtering	\
+.for dir in Account Advanced Clock Colors Compose Face Filtering	\
 	Fonts Import MIME PGP Receiving Sending Viewing
-SUBST_FILES.gnustep_installation_dir+=	Bundles/${_dir_}/GNUmakefile
+SUBST_FILES.gnustep_installation_dir+=	Bundles/${dir}/GNUmakefile
 .endfor
 
 .include "../../mail/Pantomime/buildlink3.mk"
diff --git a/mail/GNUMail/PLIST b/mail/GNUMail/PLIST
index 1f5a79017c7..f12dbbe9aeb 100644
--- a/mail/GNUMail/PLIST
+++ b/mail/GNUMail/PLIST
@@ -1,6 +1,53 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 20:45:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/10/22 02:53:12 rh Exp $
 bin/GNUMail
 include/GNUMail
+lib/GNUstep/ApplicationSupport/GNUMail/Account.prefs/Account
+lib/GNUstep/ApplicationSupport/GNUMail/Account.prefs/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GNUMail/Account.prefs/Resources/account.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Account.prefs/stamp.make
+lib/GNUstep/ApplicationSupport/GNUMail/Advanced.prefs/Advanced
+lib/GNUstep/ApplicationSupport/GNUMail/Advanced.prefs/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GNUMail/Advanced.prefs/Resources/advanced.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Advanced.prefs/stamp.make
+lib/GNUstep/ApplicationSupport/GNUMail/Colors.prefs/Colors
+lib/GNUstep/ApplicationSupport/GNUMail/Colors.prefs/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GNUMail/Colors.prefs/Resources/colors.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Colors.prefs/stamp.make
+lib/GNUstep/ApplicationSupport/GNUMail/Compose.prefs/Compose
+lib/GNUstep/ApplicationSupport/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Compose.prefs/stamp.make
+lib/GNUstep/ApplicationSupport/GNUMail/Filtering.prefs/Filtering
+lib/GNUstep/ApplicationSupport/GNUMail/Filtering.prefs/Resources/Filtering.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Filtering.prefs/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GNUMail/Filtering.prefs/stamp.make
+lib/GNUstep/ApplicationSupport/GNUMail/Fonts.prefs/Fonts
+lib/GNUstep/ApplicationSupport/GNUMail/Fonts.prefs/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GNUMail/Fonts.prefs/Resources/fonts.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Fonts.prefs/stamp.make
+lib/GNUstep/ApplicationSupport/GNUMail/Import.bundle/Import
+lib/GNUstep/ApplicationSupport/GNUMail/Import.bundle/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GNUMail/Import.bundle/stamp.make
+lib/GNUstep/ApplicationSupport/GNUMail/MIME.prefs/MIME
+lib/GNUstep/ApplicationSupport/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GNUMail/MIME.prefs/Resources/mime.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/MIME.prefs/stamp.make
+lib/GNUstep/ApplicationSupport/GNUMail/Receiving.prefs/Receiving
+lib/GNUstep/ApplicationSupport/GNUMail/Receiving.prefs/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GNUMail/Receiving.prefs/Resources/MailIcon_retrieve.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Receiving.prefs/stamp.make
+lib/GNUstep/ApplicationSupport/GNUMail/Sending.prefs/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GNUMail/Sending.prefs/Resources/MailIcon_send.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Sending.prefs/Sending
+lib/GNUstep/ApplicationSupport/GNUMail/Sending.prefs/stamp.make
+lib/GNUstep/ApplicationSupport/GNUMail/Viewing.prefs/Resources/3-pane_96x96.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Viewing.prefs/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GNUMail/Viewing.prefs/Resources/drawer_96x96.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Viewing.prefs/Resources/floating_96x96.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Viewing.prefs/Resources/viewing.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Viewing.prefs/Resources/widescreen_96x96.tiff
+lib/GNUstep/ApplicationSupport/GNUMail/Viewing.prefs/Viewing
+lib/GNUstep/ApplicationSupport/GNUMail/Viewing.prefs/stamp.make
 lib/GNUstep/Applications/GNUMail.app/GNUMail
 lib/GNUstep/Applications/GNUMail.app/Resources/AddressBook_32.tiff
 lib/GNUstep/Applications/GNUMail.app/Resources/AddressManager_32.tiff
@@ -169,52 +216,9 @@ lib/GNUstep/Frameworks/GNUMail.framework/Resources
 lib/GNUstep/Frameworks/GNUMail.framework/Versions/1/GNUMail
 lib/GNUstep/Frameworks/GNUMail.framework/Versions/1/Resources/Info-gnustep.plist
 lib/GNUstep/Frameworks/GNUMail.framework/Versions/1/libGNUMail.so
-lib/GNUstep/Frameworks/GNUMail.framework/Versions/1/libGNUMail.so.1.2.0
+lib/GNUstep/Frameworks/GNUMail.framework/Versions/1/libGNUMail.so.${PKGVERSION}
 lib/GNUstep/Frameworks/GNUMail.framework/Versions/Current
 lib/GNUstep/Frameworks/GNUMail.framework/libGNUMail.so
 lib/libGNUMail.so
-lib/libGNUMail.so.1.2.0
-share/GNUstep/Library/GNUMail/Account.prefs/Account
-share/GNUstep/Library/GNUMail/Account.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Library/GNUMail/Account.prefs/Resources/account.tiff
-share/GNUstep/Library/GNUMail/Account.prefs/stamp.make
-share/GNUstep/Library/GNUMail/Advanced.prefs/Advanced
-share/GNUstep/Library/GNUMail/Advanced.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Library/GNUMail/Advanced.prefs/Resources/advanced.tiff
-share/GNUstep/Library/GNUMail/Advanced.prefs/stamp.make
-share/GNUstep/Library/GNUMail/Colors.prefs/Colors
-share/GNUstep/Library/GNUMail/Colors.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Library/GNUMail/Colors.prefs/Resources/colors.tiff
-share/GNUstep/Library/GNUMail/Colors.prefs/stamp.make
-share/GNUstep/Library/GNUMail/Compose.prefs/Compose
-share/GNUstep/Library/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Library/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
-share/GNUstep/Library/GNUMail/Compose.prefs/stamp.make
-share/GNUstep/Library/GNUMail/Filtering.prefs/Filtering
-share/GNUstep/Library/GNUMail/Filtering.prefs/Resources/Filtering.tiff
-share/GNUstep/Library/GNUMail/Filtering.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Library/GNUMail/Filtering.prefs/stamp.make
-share/GNUstep/Library/GNUMail/Fonts.prefs/Fonts
-share/GNUstep/Library/GNUMail/Fonts.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Library/GNUMail/Fonts.prefs/Resources/fonts.tiff
-share/GNUstep/Library/GNUMail/Fonts.prefs/stamp.make
-share/GNUstep/Library/GNUMail/Import.bundle/Import
-share/GNUstep/Library/GNUMail/Import.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Library/GNUMail/Import.bundle/stamp.make
-share/GNUstep/Library/GNUMail/MIME.prefs/MIME
-share/GNUstep/Library/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Library/GNUMail/MIME.prefs/Resources/mime.tiff
-share/GNUstep/Library/GNUMail/MIME.prefs/stamp.make
-share/GNUstep/Library/GNUMail/Receiving.prefs/Receiving
-share/GNUstep/Library/GNUMail/Receiving.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Library/GNUMail/Receiving.prefs/Resources/MailIcon_retrieve.tiff
-share/GNUstep/Library/GNUMail/Receiving.prefs/stamp.make
-share/GNUstep/Library/GNUMail/Sending.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Library/GNUMail/Sending.prefs/Resources/MailIcon_send.tiff
-share/GNUstep/Library/GNUMail/Sending.prefs/Sending
-share/GNUstep/Library/GNUMail/Sending.prefs/stamp.make
-share/GNUstep/Library/GNUMail/Viewing.prefs/Resources/Info-gnustep.plist
-share/GNUstep/Library/GNUMail/Viewing.prefs/Resources/viewing.tiff
-share/GNUstep/Library/GNUMail/Viewing.prefs/Viewing
-share/GNUstep/Library/GNUMail/Viewing.prefs/stamp.make
+lib/libGNUMail.so.${PKGVERSION}
 @pkgdir lib/GNUstep/Frameworks/GNUMail.framework/Versions/1/Headers
diff --git a/mail/GNUMail/distinfo b/mail/GNUMail/distinfo
index 9f6800b559c..ea943065223 100644
--- a/mail/GNUMail/distinfo
+++ b/mail/GNUMail/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2009/04/13 12:42:38 rh Exp $
+$NetBSD: distinfo,v 1.7 2012/10/22 02:53:12 rh Exp $
 
-SHA1 (GNUMail-1.2.0pre3.tar.gz) = a03e8cc6281c5c050a6fee204d1057be17d69a36
-RMD160 (GNUMail-1.2.0pre3.tar.gz) = 5d8ff5d6d520f586eca5eb194ed2bafa3e718d0c
-Size (GNUMail-1.2.0pre3.tar.gz) = 1327521 bytes
+SHA1 (GNUMail-1.2.0.tar.gz) = cb4a0600c709a2ca53274bc12e355bfbdbde4670
+RMD160 (GNUMail-1.2.0.tar.gz) = 020e9095db9cfdea77747bf2e6e53d0d48f1b1b4
+Size (GNUMail-1.2.0.tar.gz) = 1380032 bytes