Update GNUMail to 1.1.2. Noteable changes include:

	* Now uses Addresses framework.
        * Updated the OS X version of the Filtering bundle.
	* Added Matt, Ken and Bjorn in the About panel.
	* Simplified and optimized the Filtering bundle
	  initialization code under GNUstep.
	* Removed some NSLog() calls in the Import bundle
	* We don't save an "empty MailWindow" in the prefs
        * We now disable the "Use secure connection" buttons
	  in the AccountEditorWindow if the SSL bundle is not
	  installed under GNUstep (it's always installed with
	  our dmg on the OS X version).
	* Updated the German translation. Work done by
	  Hermann Gundel <Hermann.Gundel@nussberg.de>
        * Modified AdvancedViewController to no longer
	  statically allocate everything.
	* Modified MailWindowController: -deleteMessage
	  to use the new Folder's method (-setFlags: messages:)
	  in order to accelerate IMAP messages deletion.
        * We no longer check all IMAP accounts
	  but only opened ones.
	* We no longer remove the DELTED message flag when
	  deleting from the keyboard.
        * Removed the "Open on startup" feature in the Mailboxes
	  window / drawer. GNUMail.app will now automatically
	  reopen the mailboxes that were opened when the app
	  was closed.
        * Added an extra check in MailboxManagerController: -outlineView:
	  acceptDrop: .. since the GNUstep's NSOutlineView code is
	  broken wrt DnD. Savannah is still down so I can't fix the
	  real bug :(
        * We now STATUS all IMAP folders for an opened IMAP connection
	  in a separate thread when clicking on the "Get" button. We no
	  longer only NOOP the IMAP store.
	* Added AddressBook framework to the Filtering target based on the
	  previous change.
	* Fixed crash on quitting on OS X.
        * Modified MailboxManagerController: -_reloadFoldersForIMAPStoreWithName: ...
	  to also use -reloadItem: under GNUstep since that method has been
	  fixed lately.
	* Reverted the change. -reloadItem is still plain broken.
	* Added a patch from Bjorn Giesler to enhance the filtering code
	  to support address book groups. The OS X nib NEEDs to be modified.
	* Added Bjorn in the AboutPanel's list of contributors.
	* Fixed a warning in MailWindowController: -windowWillClose.
	* Added Constants.m to the OS X project file.
        * Added Constants.m and cleaned the header. That
	  new file _must_ be added to the OS X project file.
        * Added Matt Ackeret and Ken Ferry to the About panel.
	* We now properly call -controlTextDidChange: in the
	  -takeTo* methods (in EditWindowController) in order
	  to correctly enable the Send button.
	* Updated ViewingView.nib
	* Updated AboutPanel.nib
	* Updated InfoPlist.strings
	* Fixed a compiler warning in GNUMail.m
	* Added patches from Bjorn Giesler to:
	   - improve address completion
	   - implement the "preferred label" in AddressBookPanel
	   - convert the Mailboxes window and Console window to
	     panels. This is a quick hack since the classes NEED
	     to be renamed eventually.
	* We no longer force the ADScreenNameFirstNameFirst since
	  we'll use the user's default in AddressManager.
	* Removed the "Mailbox" string the in Mailboxes's drawer
	  for the contextual menu.
	* Renamed Id -> Number in the Viewing pref panel under GNUstep.
	  The OS X nib needs to be modified.
	* We now save correctly the order of MailWindow's dataView columns.
	* Added a simple patch from David Ayers for key comparisons
	  in AccountViewController.m.
	* Improved AddressBookPanel.nib.
        * We now correctly synchronize our popups in the FilterEditorWindow.
	* We now correctly reload the table columns when changing the
	  dataview type in MailWindowController.
	* Added modal sheet to "Save message as text" action in GNUMail.
	* An address (to|cc|bcc) must be defined for the send button to
	  be active in EditWindowController.
	* Fixed color space in ColorsViewController (Colors bundle).
	* Improved behavior of modal sheet in EditWindowController when
	  closing an unsaved message.
        * Removed two more observers in GNUMail: -applicationShouldTerminate:
	  and reorganized all the calls in MailWindowController: -dealloc.
	* Defined ReloadMessageList in Constants.h so it's cleaner.
        * We no longer require the user to specify a To: recipient.
	* Also fixed a bug in the filtering code wrt trailing ">"
	  when the criteria operation is "has suffix". Issues reported
	  by Alistair Windsor <awindsor@onetel.com>.
        * Simplified the code a little bit in AddressBookController.
	* Simplified it some more and reactivated AddressBookController:
	  -addressesWithSubstring: so it's now possible to filter incoming
	  mails based on the recipients / Apple's Address Book (or
	  GNUstep's implementation). This fixes TODO #33.
	* Renamed a local variable to not conflict with an ivar on OS X.
	* Added AddressBook_32.tiff and modified the AddressBookPanel.nib
	  to use it.
	* Enhanced MailboxImport.nib.
	* Lots of very minor improvements wrt the Vera font.
	* Modified MailboxImportController: -dealloc to set the datasource
	  of our table view to nil.
	* Did the same thing for the outline view shown in MailWindow's drawer
	  under OS X.

3 files changed, 22 insertions, 17 deletions

diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile
index ef8c6b14d56..7456efd13bc 100644
--- a/mail/GNUMail/Makefile
+++ b/mail/GNUMail/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:43 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/11 00:03:10 rh Exp $
 #
 
-DISTNAME=	GNUMail-1.1.1
-PKGREVISION=			3
+DISTNAME=	GNUMail-1.1.2
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
 
@@ -10,13 +9,13 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.collaboration-world.com/gnumail/
 COMMENT=	GNUstep clone of NeXT's Mail.app application
 
-WRKSRC=			${WRKDIR}/GNUMail
-USE_BUILDLINK2=		YES
-USE_GNU_TOOLS+=		make
-USE_X11=		YES
-NO_CONFIGURE=		YES
-MAKEFILE=		GNUmakefile
+WRKSRC=		${WRKDIR}/GNUMail
+USE_BUILDLINK3=	yes
+USE_X11=	yes
+NO_CONFIGURE=	yes
 
-.include "../../mail/Pantomime/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mail/Pantomime/buildlink3.mk"
+.include "../../misc/Addresses/buildlink3.mk"
+.include "../../x11/gnustep-back/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/GNUMail/PLIST b/mail/GNUMail/PLIST
index 3da0c1aa54d..958b7496f95 100644
--- a/mail/GNUMail/PLIST
+++ b/mail/GNUMail/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2003/12/05 11:27:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/11 00:03:10 rh Exp $
 share/GNUstep/Local/Applications/GNUMail.app/GNUMail
-share/GNUstep/Local/Applications/GNUMail.app/Resources/Address_add.tiff
 share/GNUstep/Local/Applications/GNUMail.app/Resources/Address_bcc.tiff
 share/GNUstep/Local/Applications/GNUMail.app/Resources/Address_cc.tiff
-share/GNUstep/Local/Applications/GNUMail.app/Resources/Address_delete.tiff
 share/GNUstep/Local/Applications/GNUMail.app/Resources/Address_to.tiff
+share/GNUstep/Local/Applications/GNUMail.app/Resources/AddressBook_32.tiff
+share/GNUstep/Local/Applications/GNUMail.app/Resources/AddressManager_32.tiff
+share/GNUstep/Local/Applications/GNUMail.app/Resources/sort_left.tiff
 share/GNUstep/Local/Applications/GNUMail.app/Resources/CVS/Entries
 share/GNUstep/Local/Applications/GNUMail.app/Resources/CVS/Repository
 share/GNUstep/Local/Applications/GNUMail.app/Resources/CVS/Root
@@ -120,6 +121,9 @@ share/GNUstep/Local/Library/GNUMail/Fonts.prefs/Fonts
 share/GNUstep/Local/Library/GNUMail/Fonts.prefs/Resources/Info-gnustep.plist
 share/GNUstep/Local/Library/GNUMail/Fonts.prefs/Resources/fonts.tiff
 share/GNUstep/Local/Library/GNUMail/Fonts.prefs/stamp.make
+share/GNUstep/Local/Library/GNUMail/Import.bundle/Import
+share/GNUstep/Local/Library/GNUMail/Import.bundle/Resources/Info-gnustep.plist
+share/GNUstep/Local/Library/GNUMail/Import.bundle/stamp.make
 share/GNUstep/Local/Library/GNUMail/MIME.prefs/MIME
 share/GNUstep/Local/Library/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
 share/GNUstep/Local/Library/GNUMail/MIME.prefs/Resources/mime.tiff
@@ -146,6 +150,8 @@ share/GNUstep/Local/Library/Libraries/libGNUMail.so.1.0.0
 @dirrm share/GNUstep/Local/Library/GNUMail/Receiving.prefs
 @dirrm share/GNUstep/Local/Library/GNUMail/MIME.prefs/Resources
 @dirrm share/GNUstep/Local/Library/GNUMail/MIME.prefs
+@dirrm share/GNUstep/Local/Library/GNUMail/Import.bundle/Resources
+@dirrm share/GNUstep/Local/Library/GNUMail/Import.bundle
 @dirrm share/GNUstep/Local/Library/GNUMail/Fonts.prefs/Resources
 @dirrm share/GNUstep/Local/Library/GNUMail/Fonts.prefs
 @dirrm share/GNUstep/Local/Library/GNUMail/Filtering.prefs/Resources
diff --git a/mail/GNUMail/distinfo b/mail/GNUMail/distinfo
index 135e45c7e3b..1f9492756bb 100644
--- a/mail/GNUMail/distinfo
+++ b/mail/GNUMail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/12/05 11:27:01 adam Exp $
+$NetBSD: distinfo,v 1.3 2004/04/11 00:03:10 rh Exp $
 
-SHA1 (GNUMail-1.1.1.tar.gz) = c97a92015ac909c0a2a3757008a397c987b53ca9
-Size (GNUMail-1.1.1.tar.gz) = 1048002 bytes
+SHA1 (GNUMail-1.1.2.tar.gz) = 311a53d724ea0aa4852b781aa909983242748b5c
+Size (GNUMail-1.1.2.tar.gz) = 1078949 bytes