Update mail/squirrelmail to 1.2.2. Changes from version 1.0.6 include:

  * Collapsible Folders - The folder list can be collapsed at any
          parent folder. This makes folder lists with large
          hierarchical structures much easier to manage and navigate.
  * The Paginator! - This enables quick access to any page in the
          message list by simply choosing the page number to view
          rather than tediously clicking "next" 50 times.
  * Hundreds of UI tweaks - The user interface has been given a
          face-lift. The HTML has been largely overhauled, and while
          it still has the same general feel, it has been made more
          intuitive.
  * Drafts - It is now possible to compose a message and save it to
          be sent at a later date with the drafts option.
  * New Options Page - The options page has been completely
          rewritten for several reasons, the main of which was to
          allow seamless integration of plugin options and to
          provide uniformity throughout the entire section.
  * Multiple Identities - It is now possible to create different
          identities (home, work, school) that can be chosen upon
          sending. Each identity can have its own email address,
          full name, and signature.
  * Reply Citations - Different types of citations are now possible
          when replying to messages.
  * Better Attachment Handling - The plugin, attachment_common, has
          been fully integrated into the core of SquirrelMail.  This
          allows inline viewing of several different types of
          attachments.
  * Integration of Several Plugins - The following plugins have been
          put directly into the core. As a result, be sure not to
          install these as plugins, as the result may be (at best)
          unpredictable: attachment_common, paginator, priority,
          printer_friendly, sqclock, xmailer.
  * Improved support for newer versions of PHP. Note that you may
          have trouble if you are running PHP version 4.0.100
          (commonly distributed with Debian 3.0).
  * Ability to mark messages as read and unread from the message listing.
  * Alternating Colors - The message list now alternates row colors
          by default.  This presents a much cleaner and easier to
          read interface to the user.

1 files changed, 26 insertions, 26 deletions

diff --git a/mail/squirrelmail/patches/patch-aa b/mail/squirrelmail/patches/patch-aa
index 13988924aac..bb1443b2f5e 100644
--- a/mail/squirrelmail/patches/patch-aa
+++ b/mail/squirrelmail/patches/patch-aa
@@ -1,31 +1,31 @@
-$NetBSD: patch-aa,v 1.2 2001/02/02 19:39:19 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2002/01/07 11:49:46 jlam Exp $
 
---- config/config_default.php.orig	Fri Feb  2 10:43:27 2001
+--- config/config_default.php.orig	Fri Dec 28 15:16:18 2001
 +++ config/config_default.php
-@@ -125,7 +125,7 @@
- //  anything if it's true, but some servers will respond weird if it's
- //  false. (Cyrus works fine whether it's true OR false).
+@@ -195,7 +195,7 @@
+  * false. (Cyrus works fine whether it's true OR false).
+  */
+ global $show_contain_subfolders_option;
+-$show_contain_subfolders_option = false;
++$show_contain_subfolders_option = true;
  
--    $show_contain_subfolders_option = false;
-+    $show_contain_subfolders_option = true;
+ /**
+  * This option controls what character set is used when sending mail
+@@ -222,7 +222,7 @@
+  *   $data_dir = '../data/';
+  */
+ global $data_dir;
+-$data_dir = '../data/';
++$data_dir = '@USER_PREFS_DIR@/';
  
- //  This option controls what character set is used when sending mail
- //  and when sending HTMl to the browser. Do not set this to US-ASCII,
-@@ -147,7 +147,7 @@
- //  Relative (to the config directory):
- //    $data_dir = "../data/";
+ /**
+  * Path to directory used for storing attachments while a mail is
+@@ -238,7 +238,7 @@
+  *    + It should probably be another directory than data_dir.
+  */
+ global $attachment_dir;
+-$attachment_dir = "$data_dir";
++$attachment_dir = "@ATTACHMENTS_DIR@/";
  
--    $data_dir = "../data/";
-+    $data_dir = "/var/spool/squirrelmail/data/";
- 
- //  Path to directory used for storing attachments while a mail is
- //  being sent. There are a few security considerations regarding this
-@@ -161,7 +161,7 @@
- //      there for too long.
- //    - It should probably be another directory than data_dir.
- 
--    $attachment_dir = $data_dir;
-+    $attachment_dir = "/var/spool/squirrelmail/attachments/";
- 
- //  This is the default size of the folder list.  Default is 150,
- //  but you can set it to whatever you wish.
+ /* Hash level used for data directory. */
+ global $dir_hash_level;