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.

6 files changed, 495 insertions, 240 deletions

diff --git a/mail/squirrelmail/DESCR b/mail/squirrelmail/DESCR
index 808335f885b..15d2bdc8ea6 100644
--- a/mail/squirrelmail/DESCR
+++ b/mail/squirrelmail/DESCR
@@ -1,7 +1,7 @@
-SquirrelMail is a standards-based webmail package written in PHP4. It
+SquirrelMail is a standards-based webmail package written in PHP4.  It
 includes built-in pure PHP support for the IMAP and SMTP protocols, and all
 pages render in pure HTML 4.0 (with no Javascript) for maximum compatibility
-across browsers. It has very few requirements and is very easy to configure
-and install. SquirrelMail has a all the functionality you would want from an
+across browsers.  It has very few requirements and is very easy to configure
+and install.  SquirrelMail has a all the functionality you would want from an
 email client, including strong MIME support, address books, and folder
 manipulation.  
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 1838fe46277..3ddf233b094 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.18 2002/01/02 11:57:01 tron Exp $
+# $NetBSD: Makefile,v 1.19 2002/01/07 11:49:45 jlam Exp $
 
-DISTNAME=	squirrelmail-1.0.6
+DISTNAME=	squirrelmail-1.2.2
 CATEGORIES=	mail www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/} \
-		http://nerf-herder.net/squirrel/ \
-		ftp://nerf-herder.net/pub/squirrel/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.squirrelmail.org/
 COMMENT=	PHP4 webmail package
 
-DEPENDS+=	php-4.0.[6-9]*:../../www/php4
-DEPENDS+=	php-session-4.0.[6-9]*:../../devel/php4-session
+CONFLICTS=	sq-attachment-handlers-[0-9]*
+CONFLICTS+=	sq-squirrelspell-[0-9]*
 
-USE_PERL5=	# defined
-NO_CONFIGURE=	# defined
-NO_BUILD=	# defined
+DEPENDS+=	php>=4.0.6:../../www/php4
+DEPENDS+=	php-gettext>=4.0.6:../../devel/php4-gettext
+DEPENDS+=	php-session>=4.0.6:../../devel/php4-session
+
+REPLACE_PERL=	config/conf.pl config/ri_once.pl
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -26,31 +26,36 @@ MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 EGDIR=			${PREFIX}/share/examples/squirrelmail
 SMDIR=			${PREFIX}/share/squirrelmail
 DATADIR=		/var/spool/squirrelmail
+ATTACHMENTS_DIR=	${DATADIR}/attachments
+USER_PREFS_DIR=		${DATADIR}/data
+
 MESSAGE_SUBST+=		SMDIR=${SMDIR}
 FILES_SUBST+=		SMDIR=${SMDIR}
 
 CONF_FILES=	${SMDIR}/config/config_default.php ${SMDIR}/config/config.php
 CONF_FILES+=	${SMDIR}/data/default_pref ${DATADIR}/data/default_pref
 CONF_FILES+=	${EGDIR}/squirrelmail.conf ${PKG_SYSCONFDIR}/squirrelmail.conf
+
 OWN_DIRS=		${DATADIR}
 OWN_DIRS+=		${SMDIR} ${SMDIR}/config
-OWN_DIRS_PERMS=		${DATADIR}/attachments root nobody 730
-OWN_DIRS_PERMS+=	${DATADIR}/data nobody nobody 755
+OWN_DIRS_PERMS=		${ATTACHMENTS_DIR} ${ROOT_USER} nobody 730
+OWN_DIRS_PERMS+=	${USER_PREFS_DIR} nobody nobody 755
 
-post-extract:
+post-patch:
 	cd ${WRKSRC};							\
-	${MV} config/conf.pl config/conf.pl.orig;			\
-	${SED}	-e "s|^#!/.*|#!${PERL5}|g"				\
-		config/conf.pl.orig > config/conf.pl;			\
-	${CHMOD} +x config/conf.pl
-	${FIND} ${WRKSRC} -name ".cvsignore" -exec ${RM} -f {} \;
+	for file in config/config_default.php; do			\
+		${SED}	-e "s|@ATTACHMENTS_DIR@|${ATTACHMENTS_DIR}|g"	\
+			-e "s|@USER_PREFS_DIR@|${USER_PREFS_DIR}|g"	\
+			$${file} > $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done;								\
+	${FIND} . \( -name "*.orig" -o -name ".cvsignore" \) -print	\
+		| ${XARGS} ${RM} -f
 
-post-patch:
-	${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
+do-build:	# nothing
 
 pre-install:
-	${SED}	${FILES_SUBST_SED}					\
-		${FILESDIR}/squirrelmail.conf.dist			\
+	@${SED}	${FILES_SUBST_SED} ${FILESDIR}/squirrelmail.conf.dist	\
 		> ${WRKDIR}/squirrelmail.conf.dist
 
 do-install:
@@ -61,5 +66,6 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
 	${CHMOD} -R a-w ${SMDIR}
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index e1b1a8d032c..0cad1e21fa6 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,35 +1,47 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/07 11:49:45 jlam Exp $
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
 share/squirrelmail/COPYING
 share/squirrelmail/ChangeLog
 share/squirrelmail/INSTALL
+share/squirrelmail/MIRRORS
 share/squirrelmail/README
+share/squirrelmail/ReleaseNotes
 share/squirrelmail/UPGRADE
 share/squirrelmail/config/conf.pl
 share/squirrelmail/config/config_default.php
 share/squirrelmail/config/index.php
+share/squirrelmail/config/ri_once.pl
 share/squirrelmail/configure
 share/squirrelmail/data/default_pref
 share/squirrelmail/data/index.php
 share/squirrelmail/doc/README.russian_apache
+share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.0.txt
+share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.1.txt
 share/squirrelmail/doc/addressbook.txt
+share/squirrelmail/doc/db-backend.txt
 share/squirrelmail/doc/ie_ssl.txt
 share/squirrelmail/doc/index.html
 share/squirrelmail/doc/mime.txt
 share/squirrelmail/doc/plugin.txt
+share/squirrelmail/doc/rfc_documents.txt
 share/squirrelmail/doc/themes.txt
 share/squirrelmail/doc/translating.txt
 share/squirrelmail/doc/translating_help.txt
 share/squirrelmail/doc/tree.txt
 share/squirrelmail/functions/abook_database.php
+share/squirrelmail/functions/abook_global_file.php
 share/squirrelmail/functions/abook_ldap_server.php
 share/squirrelmail/functions/abook_local_file.php
 share/squirrelmail/functions/addressbook.php
 share/squirrelmail/functions/array.php
+share/squirrelmail/functions/attachment_common.php
 share/squirrelmail/functions/auth.php
+share/squirrelmail/functions/constants.php
 share/squirrelmail/functions/date.php
+share/squirrelmail/functions/db_prefs.php
 share/squirrelmail/functions/display_messages.php
+share/squirrelmail/functions/gettext.php
 share/squirrelmail/functions/i18n.php
 share/squirrelmail/functions/imap.php
 share/squirrelmail/functions/imap_general.php
@@ -39,6 +51,7 @@ share/squirrelmail/functions/imap_search.php
 share/squirrelmail/functions/index.php
 share/squirrelmail/functions/mailbox_display.php
 share/squirrelmail/functions/mime.php
+share/squirrelmail/functions/options.php
 share/squirrelmail/functions/page_header.php
 share/squirrelmail/functions/plugin.php
 share/squirrelmail/functions/prefs.php
@@ -46,151 +59,314 @@ share/squirrelmail/functions/smtp.php
 share/squirrelmail/functions/strings.php
 share/squirrelmail/functions/tree.php
 share/squirrelmail/functions/url_parser.php
-share/squirrelmail/help/ca/FAQ.hlp
-share/squirrelmail/help/ca/addresses.hlp
-share/squirrelmail/help/ca/basic.hlp
-share/squirrelmail/help/ca/compose.hlp
-share/squirrelmail/help/ca/folders.hlp
-share/squirrelmail/help/ca/main_folder.hlp
-share/squirrelmail/help/ca/options.hlp
-share/squirrelmail/help/ca/read_mail.hlp
-share/squirrelmail/help/ca/search.hlp
-share/squirrelmail/help/cs/FAQ.hlp
-share/squirrelmail/help/cs/addresses.hlp
-share/squirrelmail/help/cs/basic.hlp
-share/squirrelmail/help/cs/compose.hlp
-share/squirrelmail/help/cs/folders.hlp
-share/squirrelmail/help/cs/main_folder.hlp
-share/squirrelmail/help/cs/options.hlp
-share/squirrelmail/help/cs/read_mail.hlp
-share/squirrelmail/help/cs/search.hlp
-share/squirrelmail/help/en/FAQ.hlp
-share/squirrelmail/help/en/addresses.hlp
-share/squirrelmail/help/en/basic.hlp
-share/squirrelmail/help/en/compose.hlp
-share/squirrelmail/help/en/folders.hlp
-share/squirrelmail/help/en/main_folder.hlp
-share/squirrelmail/help/en/options.hlp
-share/squirrelmail/help/en/read_mail.hlp
-share/squirrelmail/help/en/search.hlp
-share/squirrelmail/help/fi/FAQ.hlp
-share/squirrelmail/help/fi/addresses.hlp
-share/squirrelmail/help/fi/basic.hlp
-share/squirrelmail/help/fi/compose.hlp
-share/squirrelmail/help/fi/folders.hlp
-share/squirrelmail/help/fi/main_folder.hlp
-share/squirrelmail/help/fi/options.hlp
-share/squirrelmail/help/fi/read_mail.hlp
-share/squirrelmail/help/fi/search.hlp
-share/squirrelmail/help/fr/FAQ.hlp
-share/squirrelmail/help/fr/addresses.hlp
-share/squirrelmail/help/fr/basic.hlp
-share/squirrelmail/help/fr/compose.hlp
-share/squirrelmail/help/fr/folders.hlp
-share/squirrelmail/help/fr/main_folder.hlp
-share/squirrelmail/help/fr/options.hlp
-share/squirrelmail/help/fr/read_mail.hlp
-share/squirrelmail/help/fr/search.hlp
+share/squirrelmail/help/ca_ES/FAQ.hlp
+share/squirrelmail/help/ca_ES/addresses.hlp
+share/squirrelmail/help/ca_ES/basic.hlp
+share/squirrelmail/help/ca_ES/compose.hlp
+share/squirrelmail/help/ca_ES/folders.hlp
+share/squirrelmail/help/ca_ES/main_folder.hlp
+share/squirrelmail/help/ca_ES/options.hlp
+share/squirrelmail/help/ca_ES/read_mail.hlp
+share/squirrelmail/help/ca_ES/search.hlp
+share/squirrelmail/help/cs_CZ/FAQ.hlp
+share/squirrelmail/help/cs_CZ/addresses.hlp
+share/squirrelmail/help/cs_CZ/basic.hlp
+share/squirrelmail/help/cs_CZ/compose.hlp
+share/squirrelmail/help/cs_CZ/folders.hlp
+share/squirrelmail/help/cs_CZ/main_folder.hlp
+share/squirrelmail/help/cs_CZ/options.hlp
+share/squirrelmail/help/cs_CZ/read_mail.hlp
+share/squirrelmail/help/cs_CZ/search.hlp
+share/squirrelmail/help/en_US/FAQ.hlp
+share/squirrelmail/help/en_US/addresses.hlp
+share/squirrelmail/help/en_US/basic.hlp
+share/squirrelmail/help/en_US/compose.hlp
+share/squirrelmail/help/en_US/folders.hlp
+share/squirrelmail/help/en_US/main_folder.hlp
+share/squirrelmail/help/en_US/options.hlp
+share/squirrelmail/help/en_US/read_mail.hlp
+share/squirrelmail/help/en_US/search.hlp
+share/squirrelmail/help/es_ES/FAQ.hlp
+share/squirrelmail/help/es_ES/addresses.hlp
+share/squirrelmail/help/es_ES/basic.hlp
+share/squirrelmail/help/es_ES/compose.hlp
+share/squirrelmail/help/es_ES/folders.hlp
+share/squirrelmail/help/es_ES/main_folder.hlp
+share/squirrelmail/help/es_ES/options.hlp
+share/squirrelmail/help/es_ES/read_mail.hlp
+share/squirrelmail/help/es_ES/search.hlp
+share/squirrelmail/help/fi_FI/FAQ.hlp
+share/squirrelmail/help/fi_FI/addresses.hlp
+share/squirrelmail/help/fi_FI/basic.hlp
+share/squirrelmail/help/fi_FI/compose.hlp
+share/squirrelmail/help/fi_FI/folders.hlp
+share/squirrelmail/help/fi_FI/main_folder.hlp
+share/squirrelmail/help/fi_FI/options.hlp
+share/squirrelmail/help/fi_FI/read_mail.hlp
+share/squirrelmail/help/fi_FI/search.hlp
+share/squirrelmail/help/fr_FR/FAQ.hlp
+share/squirrelmail/help/fr_FR/addresses.hlp
+share/squirrelmail/help/fr_FR/basic.hlp
+share/squirrelmail/help/fr_FR/compose.hlp
+share/squirrelmail/help/fr_FR/folders.hlp
+share/squirrelmail/help/fr_FR/main_folder.hlp
+share/squirrelmail/help/fr_FR/options.hlp
+share/squirrelmail/help/fr_FR/read_mail.hlp
+share/squirrelmail/help/fr_FR/search.hlp
+share/squirrelmail/help/id_ID/FAQ.hlp
+share/squirrelmail/help/id_ID/addresses.hlp
+share/squirrelmail/help/id_ID/basic.hlp
+share/squirrelmail/help/id_ID/compose.hlp
+share/squirrelmail/help/id_ID/folders.hlp
+share/squirrelmail/help/id_ID/main_folder.hlp
+share/squirrelmail/help/id_ID/options.hlp
+share/squirrelmail/help/id_ID/read_mail.hlp
+share/squirrelmail/help/id_ID/search.hlp
 share/squirrelmail/help/index.php
-share/squirrelmail/help/it/FAQ.hlp
-share/squirrelmail/help/it/addresses.hlp
-share/squirrelmail/help/it/basic.hlp
-share/squirrelmail/help/it/compose.hlp
-share/squirrelmail/help/it/folders.hlp
-share/squirrelmail/help/it/main_folder.hlp
-share/squirrelmail/help/it/options.hlp
-share/squirrelmail/help/it/read_mail.hlp
-share/squirrelmail/help/it/search.hlp
-share/squirrelmail/help/ko/FAQ.hlp
-share/squirrelmail/help/ko/addresses.hlp
-share/squirrelmail/help/ko/basic.hlp
-share/squirrelmail/help/ko/compose.hlp
-share/squirrelmail/help/ko/folders.hlp
-share/squirrelmail/help/ko/main_folder.hlp
-share/squirrelmail/help/ko/options.hlp
-share/squirrelmail/help/ko/read_mail.hlp
-share/squirrelmail/help/ko/search.hlp
-share/squirrelmail/help/pl/FAQ.hlp
-share/squirrelmail/help/pl/addresses.hlp
-share/squirrelmail/help/pl/basic.hlp
-share/squirrelmail/help/pl/compose.hlp
-share/squirrelmail/help/pl/folders.hlp
-share/squirrelmail/help/pl/main_folder.hlp
-share/squirrelmail/help/pl/options.hlp
-share/squirrelmail/help/pl/read_mail.hlp
-share/squirrelmail/help/pl/search.hlp
-share/squirrelmail/help/ru/FAQ.hlp
-share/squirrelmail/help/ru/addresses.hlp
-share/squirrelmail/help/ru/basic.hlp
-share/squirrelmail/help/ru/compose.hlp
-share/squirrelmail/help/ru/folders.hlp
-share/squirrelmail/help/ru/main_folder.hlp
-share/squirrelmail/help/ru/options.hlp
-share/squirrelmail/help/ru/read_mail.hlp
-share/squirrelmail/help/ru/search.hlp
-share/squirrelmail/help/sv/FAQ.hlp
-share/squirrelmail/help/sv/addresses.hlp
-share/squirrelmail/help/sv/basic.hlp
-share/squirrelmail/help/sv/compose.hlp
-share/squirrelmail/help/sv/folders.hlp
-share/squirrelmail/help/sv/main_folder.hlp
-share/squirrelmail/help/sv/options.hlp
-share/squirrelmail/help/sv/read_mail.hlp
-share/squirrelmail/help/sv/search.hlp
-share/squirrelmail/images/down_pointer.gif
+share/squirrelmail/help/it_IT/FAQ.hlp
+share/squirrelmail/help/it_IT/addresses.hlp
+share/squirrelmail/help/it_IT/basic.hlp
+share/squirrelmail/help/it_IT/compose.hlp
+share/squirrelmail/help/it_IT/folders.hlp
+share/squirrelmail/help/it_IT/main_folder.hlp
+share/squirrelmail/help/it_IT/options.hlp
+share/squirrelmail/help/it_IT/read_mail.hlp
+share/squirrelmail/help/it_IT/search.hlp
+share/squirrelmail/help/ko_KR/FAQ.hlp
+share/squirrelmail/help/ko_KR/addresses.hlp
+share/squirrelmail/help/ko_KR/basic.hlp
+share/squirrelmail/help/ko_KR/compose.hlp
+share/squirrelmail/help/ko_KR/folders.hlp
+share/squirrelmail/help/ko_KR/main_folder.hlp
+share/squirrelmail/help/ko_KR/options.hlp
+share/squirrelmail/help/ko_KR/read_mail.hlp
+share/squirrelmail/help/ko_KR/search.hlp
+share/squirrelmail/help/lt_LT/FAQ.hlp
+share/squirrelmail/help/lt_LT/addresses.hlp
+share/squirrelmail/help/lt_LT/basic.hlp
+share/squirrelmail/help/lt_LT/compose.hlp
+share/squirrelmail/help/lt_LT/folders.hlp
+share/squirrelmail/help/lt_LT/main_folder.hlp
+share/squirrelmail/help/lt_LT/options.hlp
+share/squirrelmail/help/lt_LT/read_mail.hlp
+share/squirrelmail/help/lt_LT/search.hlp
+share/squirrelmail/help/nl_NL/FAQ.hlp
+share/squirrelmail/help/nl_NL/addresses.hlp
+share/squirrelmail/help/nl_NL/basic.hlp
+share/squirrelmail/help/nl_NL/compose.hlp
+share/squirrelmail/help/nl_NL/folders.hlp
+share/squirrelmail/help/nl_NL/main_folder.hlp
+share/squirrelmail/help/nl_NL/options.hlp
+share/squirrelmail/help/nl_NL/read_mail.hlp
+share/squirrelmail/help/nl_NL/search.hlp
+share/squirrelmail/help/pl_PL/FAQ.hlp
+share/squirrelmail/help/pl_PL/addresses.hlp
+share/squirrelmail/help/pl_PL/basic.hlp
+share/squirrelmail/help/pl_PL/compose.hlp
+share/squirrelmail/help/pl_PL/folders.hlp
+share/squirrelmail/help/pl_PL/main_folder.hlp
+share/squirrelmail/help/pl_PL/options.hlp
+share/squirrelmail/help/pl_PL/read_mail.hlp
+share/squirrelmail/help/pl_PL/search.hlp
+share/squirrelmail/help/pt_BR/FAQ.hlp
+share/squirrelmail/help/pt_BR/addresses.hlp
+share/squirrelmail/help/pt_BR/basic.hlp
+share/squirrelmail/help/pt_BR/compose.hlp
+share/squirrelmail/help/pt_BR/folders.hlp
+share/squirrelmail/help/pt_BR/main_folder.hlp
+share/squirrelmail/help/pt_BR/options.hlp
+share/squirrelmail/help/pt_BR/read_mail.hlp
+share/squirrelmail/help/pt_BR/search.hlp
+share/squirrelmail/help/pt_PT/FAQ.hlp
+share/squirrelmail/help/pt_PT/addresses.hlp
+share/squirrelmail/help/pt_PT/basic.hlp
+share/squirrelmail/help/pt_PT/compose.hlp
+share/squirrelmail/help/pt_PT/folders.hlp
+share/squirrelmail/help/pt_PT/main_folder.hlp
+share/squirrelmail/help/pt_PT/options.hlp
+share/squirrelmail/help/pt_PT/read_mail.hlp
+share/squirrelmail/help/pt_PT/search.hlp
+share/squirrelmail/help/ru_RU/FAQ.hlp
+share/squirrelmail/help/ru_RU/addresses.hlp
+share/squirrelmail/help/ru_RU/basic.hlp
+share/squirrelmail/help/ru_RU/compose.hlp
+share/squirrelmail/help/ru_RU/folders.hlp
+share/squirrelmail/help/ru_RU/main_folder.hlp
+share/squirrelmail/help/ru_RU/options.hlp
+share/squirrelmail/help/ru_RU/read_mail.hlp
+share/squirrelmail/help/ru_RU/search.hlp
+share/squirrelmail/help/sl_SI/FAQ.hlp
+share/squirrelmail/help/sl_SI/addresses.hlp
+share/squirrelmail/help/sl_SI/basic.hlp
+share/squirrelmail/help/sl_SI/compose.hlp
+share/squirrelmail/help/sl_SI/folders.hlp
+share/squirrelmail/help/sl_SI/main_folder.hlp
+share/squirrelmail/help/sl_SI/options.hlp
+share/squirrelmail/help/sl_SI/read_mail.hlp
+share/squirrelmail/help/sl_SI/search.hlp
+share/squirrelmail/help/sv_SE/FAQ.hlp
+share/squirrelmail/help/sv_SE/addresses.hlp
+share/squirrelmail/help/sv_SE/basic.hlp
+share/squirrelmail/help/sv_SE/compose.hlp
+share/squirrelmail/help/sv_SE/folders.hlp
+share/squirrelmail/help/sv_SE/main_folder.hlp
+share/squirrelmail/help/sv_SE/options.hlp
+share/squirrelmail/help/sv_SE/read_mail.hlp
+share/squirrelmail/help/sv_SE/search.hlp
+share/squirrelmail/help/th_TH/FAQ.hlp
+share/squirrelmail/help/th_TH/addresses.hlp
+share/squirrelmail/help/th_TH/basic.hlp
+share/squirrelmail/help/th_TH/compose.hlp
+share/squirrelmail/help/th_TH/folders.hlp
+share/squirrelmail/help/th_TH/main_folder.hlp
+share/squirrelmail/help/th_TH/options.hlp
+share/squirrelmail/help/th_TH/read_mail.hlp
+share/squirrelmail/help/th_TH/search.hlp
+share/squirrelmail/images/down_pointer.png
 share/squirrelmail/images/index.php
 share/squirrelmail/images/sm_logo.jpg
-share/squirrelmail/images/sort_none.gif
-share/squirrelmail/images/up_pointer.gif
+share/squirrelmail/images/sm_logo.png
+share/squirrelmail/images/sort_none.png
+share/squirrelmail/images/up_pointer.png
 share/squirrelmail/index.php
-share/squirrelmail/locale/ca/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ca/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/cs/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/cs/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/da/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/da/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/de/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/de/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/es/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/es/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/fi/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/fi/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/fr/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/fr/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/hr/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/hr/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/hu/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/hu/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/bg_BG/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/bg_BG/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ca_ES/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/ca_ES/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/cs_CZ/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/cs_CZ/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/da_DK/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/da_DK/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/es_ES/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/es_ES/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/et_EE/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/et_EE/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/fi_FI/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/fi_FI/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/fr_FR/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/fr_FR/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/hr_HR/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/hr_HR/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/hu_HU/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/hu_HU/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/id_ID/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/id_ID/LC_MESSAGES/squirrelmail.po
 share/squirrelmail/locale/index.php
-share/squirrelmail/locale/is/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/is/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/it/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/it/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ko/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ko/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/nl/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/nl/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/no/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/no/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/no_NO_ny/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/no_NO_ny/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/pl/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/pl/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/is_IS/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/is_IS/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/it_IT/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/it_IT/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ko_KR/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/ko_KR/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/lt_LT/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/lt_LT/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/nl_NL/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/nl_NL/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/no_NO/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/no_NO/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/pl_PL/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/pl_PL/LC_MESSAGES/squirrelmail.po
 share/squirrelmail/locale/pt_BR/LC_MESSAGES/squirrelmail.mo
 share/squirrelmail/locale/pt_BR/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/ru/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/ru/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/sr/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/sr/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/sv/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/sv/LC_MESSAGES/squirrelmail.po
-share/squirrelmail/locale/tw/LC_MESSAGES/squirrelmail.mo
-share/squirrelmail/locale/tw/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/pt_PT/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/pt_PT/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ro_RO/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/ro_RO/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ru_RU/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/ru_RU/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/sk_SK/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/sk_SK/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/sl_SI/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/sl_SI/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/sr_YU/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/sr_YU/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/th_TH/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/th_TH/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/tr_TR/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/tr_TR/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.po
 share/squirrelmail/plugins/README.plugins
+share/squirrelmail/plugins/bug_report/INSTALL
+share/squirrelmail/plugins/bug_report/README
+share/squirrelmail/plugins/bug_report/bug_report.php
+share/squirrelmail/plugins/bug_report/setup.php
+share/squirrelmail/plugins/filters/CHANGES
+share/squirrelmail/plugins/filters/README
+share/squirrelmail/plugins/filters/filters.php
+share/squirrelmail/plugins/filters/index.php
+share/squirrelmail/plugins/filters/options.php
+share/squirrelmail/plugins/filters/setup.php
+share/squirrelmail/plugins/filters/spamoptions.php
 share/squirrelmail/plugins/index.php
+share/squirrelmail/plugins/mail_fetch/README
+share/squirrelmail/plugins/mail_fetch/class.POP3.php
+share/squirrelmail/plugins/mail_fetch/fetch.php
+share/squirrelmail/plugins/mail_fetch/functions.php
+share/squirrelmail/plugins/mail_fetch/mailfetch.po
+share/squirrelmail/plugins/mail_fetch/options.php
+share/squirrelmail/plugins/mail_fetch/setup.php
+share/squirrelmail/plugins/make_archive.pl
+share/squirrelmail/plugins/newmail/HISTORY
+share/squirrelmail/plugins/newmail/README
+share/squirrelmail/plugins/newmail/newmail.php
+share/squirrelmail/plugins/newmail/newmail_opt.php
+share/squirrelmail/plugins/newmail/setup.php
+share/squirrelmail/plugins/newmail/sounds/FanFair.wav
+share/squirrelmail/plugins/newmail/sounds/Friends.wav
+share/squirrelmail/plugins/newmail/sounds/MontyPython.wav
+share/squirrelmail/plugins/newmail/sounds/Notify.wav
+share/squirrelmail/plugins/newmail/testsound.php
+share/squirrelmail/plugins/sent_subfolders/setup.php
+share/squirrelmail/plugins/squirrelspell/INSTALL
+share/squirrelmail/plugins/squirrelspell/doc/CRYPTO
+share/squirrelmail/plugins/squirrelspell/doc/ChangeLog
+share/squirrelmail/plugins/squirrelspell/doc/PRIVACY
+share/squirrelmail/plugins/squirrelspell/doc/README
+share/squirrelmail/plugins/squirrelspell/doc/UPGRADING
+share/squirrelmail/plugins/squirrelspell/doc/index.php
+share/squirrelmail/plugins/squirrelspell/index.php
+share/squirrelmail/plugins/squirrelspell/js/WHATISTHIS
+share/squirrelmail/plugins/squirrelspell/js/check_me.js
+share/squirrelmail/plugins/squirrelspell/js/crypto_settings.js
+share/squirrelmail/plugins/squirrelspell/js/decrypt_error.js
+share/squirrelmail/plugins/squirrelspell/js/index.php
+share/squirrelmail/plugins/squirrelspell/js/init.js
+share/squirrelmail/plugins/squirrelspell/modules/WHATISTHIS
+share/squirrelmail/plugins/squirrelspell/modules/check_me.mod.php
+share/squirrelmail/plugins/squirrelspell/modules/crypto.mod.php
+share/squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php
+share/squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php
+share/squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php
+share/squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php
+share/squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod.php
+share/squirrelmail/plugins/squirrelspell/modules/index.php
+share/squirrelmail/plugins/squirrelspell/modules/init.mod.php
+share/squirrelmail/plugins/squirrelspell/modules/lang_change.mod.php
+share/squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php
+share/squirrelmail/plugins/squirrelspell/modules/options_main.mod.php
+share/squirrelmail/plugins/squirrelspell/setup.php
+share/squirrelmail/plugins/squirrelspell/sqspell_config.php
+share/squirrelmail/plugins/squirrelspell/sqspell_functions.php
+share/squirrelmail/plugins/squirrelspell/sqspell_interface.php
+share/squirrelmail/plugins/squirrelspell/sqspell_options.php
+share/squirrelmail/plugins/translate/INSTALL
+share/squirrelmail/plugins/translate/README
+share/squirrelmail/plugins/translate/index.php
+share/squirrelmail/plugins/translate/options.php
+share/squirrelmail/plugins/translate/setup.php
 share/squirrelmail/po/charsetconvert.pl
+share/squirrelmail/po/compilepo
 share/squirrelmail/po/index.php
+share/squirrelmail/po/mergepo
 share/squirrelmail/po/squirrelmail.po
+share/squirrelmail/po/xgetpo
 share/squirrelmail/src/addrbook_popup.php
 share/squirrelmail/src/addrbook_search.php
 share/squirrelmail/src/addrbook_search_html.php
@@ -198,6 +374,7 @@ share/squirrelmail/src/addressbook.php
 share/squirrelmail/src/compose.php
 share/squirrelmail/src/delete_message.php
 share/squirrelmail/src/download.php
+share/squirrelmail/src/draft_actions.php
 share/squirrelmail/src/empty_trash.php
 share/squirrelmail/src/folders.php
 share/squirrelmail/src/folders_create.php
@@ -206,6 +383,7 @@ share/squirrelmail/src/folders_rename_do.php
 share/squirrelmail/src/folders_rename_getname.php
 share/squirrelmail/src/folders_subscribe.php
 share/squirrelmail/src/help.php
+share/squirrelmail/src/image.php
 share/squirrelmail/src/index.php
 share/squirrelmail/src/left_main.php
 share/squirrelmail/src/load_prefs.php
@@ -215,93 +393,156 @@ share/squirrelmail/src/options.php
 share/squirrelmail/src/options_display.php
 share/squirrelmail/src/options_folder.php
 share/squirrelmail/src/options_highlight.php
+share/squirrelmail/src/options_identities.php
 share/squirrelmail/src/options_order.php
 share/squirrelmail/src/options_personal.php
+share/squirrelmail/src/printer_friendly_bottom.php
+share/squirrelmail/src/printer_friendly_main.php
+share/squirrelmail/src/printer_friendly_top.php
 share/squirrelmail/src/read_body.php
 share/squirrelmail/src/redirect.php
+share/squirrelmail/src/retrievalerror.php
 share/squirrelmail/src/right_main.php
 share/squirrelmail/src/search.php
 share/squirrelmail/src/signout.php
 share/squirrelmail/src/validate.php
+share/squirrelmail/src/vcard.php
 share/squirrelmail/src/webmail.php
 share/squirrelmail/themes/README.themes
 share/squirrelmail/themes/black_bean_burrito_theme.php
+share/squirrelmail/themes/blue_grey_theme.php
 share/squirrelmail/themes/bluesnews_theme.php
 share/squirrelmail/themes/bluesteel_theme.php
+share/squirrelmail/themes/christmas.php
 share/squirrelmail/themes/dark_grey_theme.php
+share/squirrelmail/themes/darkness.php
+share/squirrelmail/themes/deepocean2_theme.php
 share/squirrelmail/themes/deepocean_theme.php
 share/squirrelmail/themes/default_theme.php
+share/squirrelmail/themes/dompie_theme.php
 share/squirrelmail/themes/forest_theme.php
+share/squirrelmail/themes/greenhouse_effect.php
 share/squirrelmail/themes/high_contrast_theme.php
 share/squirrelmail/themes/ice_theme.php
+share/squirrelmail/themes/in_the_pink.php
 share/squirrelmail/themes/index.php
+share/squirrelmail/themes/kind_of_blue.php
 share/squirrelmail/themes/maize_theme.php
+share/squirrelmail/themes/methodical_theme.php
+share/squirrelmail/themes/midnight.php
+share/squirrelmail/themes/monostochastic.php
 share/squirrelmail/themes/plain_blue_theme.php
 share/squirrelmail/themes/purple_theme.php
+share/squirrelmail/themes/random.php
 share/squirrelmail/themes/sandstorm_theme.php
 share/squirrelmail/themes/seaspray_theme.php
 share/squirrelmail/themes/servery_theme.php
+share/squirrelmail/themes/shades_of_grey.php
 share/squirrelmail/themes/slashdot_theme.php
+share/squirrelmail/themes/spice_of_life.php
+share/squirrelmail/themes/spice_of_life_dark.php
+share/squirrelmail/themes/spice_of_life_lite.php
 @dirrm share/squirrelmail/themes
 @dirrm share/squirrelmail/src
 @dirrm share/squirrelmail/po
+@dirrm share/squirrelmail/plugins/translate
+@dirrm share/squirrelmail/plugins/squirrelspell/modules
+@dirrm share/squirrelmail/plugins/squirrelspell/js
+@dirrm share/squirrelmail/plugins/squirrelspell/doc
+@dirrm share/squirrelmail/plugins/squirrelspell
+@dirrm share/squirrelmail/plugins/sent_subfolders
+@dirrm share/squirrelmail/plugins/newmail/sounds
+@dirrm share/squirrelmail/plugins/newmail
+@dirrm share/squirrelmail/plugins/mail_fetch
+@dirrm share/squirrelmail/plugins/filters
+@dirrm share/squirrelmail/plugins/bug_report
 @dirrm share/squirrelmail/plugins
-@dirrm share/squirrelmail/locale/tw/LC_MESSAGES
-@dirrm share/squirrelmail/locale/tw
-@dirrm share/squirrelmail/locale/sv/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sv
-@dirrm share/squirrelmail/locale/sr/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sr
-@dirrm share/squirrelmail/locale/ru/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ru
+@dirrm share/squirrelmail/locale/zh_TW/LC_MESSAGES
+@dirrm share/squirrelmail/locale/zh_TW
+@dirrm share/squirrelmail/locale/tr_TR/LC_MESSAGES
+@dirrm share/squirrelmail/locale/tr_TR
+@dirrm share/squirrelmail/locale/th_TH/LC_MESSAGES
+@dirrm share/squirrelmail/locale/th_TH
+@dirrm share/squirrelmail/locale/sv_SE/LC_MESSAGES
+@dirrm share/squirrelmail/locale/sv_SE
+@dirrm share/squirrelmail/locale/sr_YU/LC_MESSAGES
+@dirrm share/squirrelmail/locale/sr_YU
+@dirrm share/squirrelmail/locale/sl_SI/LC_MESSAGES
+@dirrm share/squirrelmail/locale/sl_SI
+@dirrm share/squirrelmail/locale/sk_SK/LC_MESSAGES
+@dirrm share/squirrelmail/locale/sk_SK
+@dirrm share/squirrelmail/locale/ru_RU/LC_MESSAGES
+@dirrm share/squirrelmail/locale/ru_RU
+@dirrm share/squirrelmail/locale/ro_RO/LC_MESSAGES
+@dirrm share/squirrelmail/locale/ro_RO
+@dirrm share/squirrelmail/locale/pt_PT/LC_MESSAGES
+@dirrm share/squirrelmail/locale/pt_PT
 @dirrm share/squirrelmail/locale/pt_BR/LC_MESSAGES
 @dirrm share/squirrelmail/locale/pt_BR
-@dirrm share/squirrelmail/locale/pl/LC_MESSAGES
-@dirrm share/squirrelmail/locale/pl
-@dirrm share/squirrelmail/locale/no_NO_ny/LC_MESSAGES
-@dirrm share/squirrelmail/locale/no_NO_ny
-@dirrm share/squirrelmail/locale/no/LC_MESSAGES
-@dirrm share/squirrelmail/locale/no
-@dirrm share/squirrelmail/locale/nl/LC_MESSAGES
-@dirrm share/squirrelmail/locale/nl
-@dirrm share/squirrelmail/locale/ko/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ko
-@dirrm share/squirrelmail/locale/it/LC_MESSAGES
-@dirrm share/squirrelmail/locale/it
-@dirrm share/squirrelmail/locale/is/LC_MESSAGES
-@dirrm share/squirrelmail/locale/is
-@dirrm share/squirrelmail/locale/hu/LC_MESSAGES
-@dirrm share/squirrelmail/locale/hu
-@dirrm share/squirrelmail/locale/hr/LC_MESSAGES
-@dirrm share/squirrelmail/locale/hr
-@dirrm share/squirrelmail/locale/fr/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fr
-@dirrm share/squirrelmail/locale/fi/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fi
-@dirrm share/squirrelmail/locale/es/LC_MESSAGES
-@dirrm share/squirrelmail/locale/es
-@dirrm share/squirrelmail/locale/de/LC_MESSAGES
-@dirrm share/squirrelmail/locale/de
-@dirrm share/squirrelmail/locale/da/LC_MESSAGES
-@dirrm share/squirrelmail/locale/da
-@dirrm share/squirrelmail/locale/cs/LC_MESSAGES
-@dirrm share/squirrelmail/locale/cs
-@dirrm share/squirrelmail/locale/ca/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ca
+@dirrm share/squirrelmail/locale/pl_PL/LC_MESSAGES
+@dirrm share/squirrelmail/locale/pl_PL
+@dirrm share/squirrelmail/locale/no_NO/LC_MESSAGES
+@dirrm share/squirrelmail/locale/no_NO
+@dirrm share/squirrelmail/locale/nn_NO/LC_MESSAGES
+@dirrm share/squirrelmail/locale/nn_NO
+@dirrm share/squirrelmail/locale/nl_NL/LC_MESSAGES
+@dirrm share/squirrelmail/locale/nl_NL
+@dirrm share/squirrelmail/locale/lt_LT/LC_MESSAGES
+@dirrm share/squirrelmail/locale/lt_LT
+@dirrm share/squirrelmail/locale/ko_KR/LC_MESSAGES
+@dirrm share/squirrelmail/locale/ko_KR
+@dirrm share/squirrelmail/locale/it_IT/LC_MESSAGES
+@dirrm share/squirrelmail/locale/it_IT
+@dirrm share/squirrelmail/locale/is_IS/LC_MESSAGES
+@dirrm share/squirrelmail/locale/is_IS
+@dirrm share/squirrelmail/locale/id_ID/LC_MESSAGES
+@dirrm share/squirrelmail/locale/id_ID
+@dirrm share/squirrelmail/locale/hu_HU/LC_MESSAGES
+@dirrm share/squirrelmail/locale/hu_HU
+@dirrm share/squirrelmail/locale/hr_HR/LC_MESSAGES
+@dirrm share/squirrelmail/locale/hr_HR
+@dirrm share/squirrelmail/locale/fr_FR/LC_MESSAGES
+@dirrm share/squirrelmail/locale/fr_FR
+@dirrm share/squirrelmail/locale/fi_FI/LC_MESSAGES
+@dirrm share/squirrelmail/locale/fi_FI
+@dirrm share/squirrelmail/locale/et_EE/LC_MESSAGES
+@dirrm share/squirrelmail/locale/et_EE
+@dirrm share/squirrelmail/locale/es_ES/LC_MESSAGES
+@dirrm share/squirrelmail/locale/es_ES
+@dirrm share/squirrelmail/locale/de_DE/LC_MESSAGES
+@dirrm share/squirrelmail/locale/de_DE
+@dirrm share/squirrelmail/locale/da_DK/LC_MESSAGES
+@dirrm share/squirrelmail/locale/da_DK
+@dirrm share/squirrelmail/locale/cs_CZ/LC_MESSAGES
+@dirrm share/squirrelmail/locale/cs_CZ
+@dirrm share/squirrelmail/locale/ca_ES/LC_MESSAGES
+@dirrm share/squirrelmail/locale/ca_ES
+@dirrm share/squirrelmail/locale/bg_BG/LC_MESSAGES
+@dirrm share/squirrelmail/locale/bg_BG
 @dirrm share/squirrelmail/locale
 @dirrm share/squirrelmail/images
-@dirrm share/squirrelmail/help/sv
-@dirrm share/squirrelmail/help/ru
-@dirrm share/squirrelmail/help/pl
-@dirrm share/squirrelmail/help/ko
-@dirrm share/squirrelmail/help/it
-@dirrm share/squirrelmail/help/fr
-@dirrm share/squirrelmail/help/fi
-@dirrm share/squirrelmail/help/en
-@dirrm share/squirrelmail/help/cs
-@dirrm share/squirrelmail/help/ca
+@dirrm share/squirrelmail/help/th_TH
+@dirrm share/squirrelmail/help/sv_SE
+@dirrm share/squirrelmail/help/sl_SI
+@dirrm share/squirrelmail/help/ru_RU
+@dirrm share/squirrelmail/help/pt_PT
+@dirrm share/squirrelmail/help/pt_BR
+@dirrm share/squirrelmail/help/pl_PL
+@dirrm share/squirrelmail/help/nl_NL
+@dirrm share/squirrelmail/help/lt_LT
+@dirrm share/squirrelmail/help/ko_KR
+@dirrm share/squirrelmail/help/it_IT
+@dirrm share/squirrelmail/help/id_ID
+@dirrm share/squirrelmail/help/fr_FR
+@dirrm share/squirrelmail/help/fi_FI
+@dirrm share/squirrelmail/help/es_ES
+@dirrm share/squirrelmail/help/en_US
+@dirrm share/squirrelmail/help/cs_CZ
+@dirrm share/squirrelmail/help/ca_ES
 @dirrm share/squirrelmail/help
 @dirrm share/squirrelmail/functions
+@dirrm share/squirrelmail/doc/ReleaseNotes/1.2
+@dirrm share/squirrelmail/doc/ReleaseNotes
 @dirrm share/squirrelmail/doc
 @dirrm share/squirrelmail/data
 @dirrm share/examples/squirrelmail
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index 796a31749c5..47e8a4095cd 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/04/30 05:03:24 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/01/07 11:49:45 jlam Exp $
 
-SHA1 (squirrelmail-1.0.6.tar.bz2) = 2a149f799351180041b8b98a851f0292c220a26e
-Size (squirrelmail-1.0.6.tar.bz2) = 376384 bytes
-SHA1 (patch-aa) = f558b733a37b53e45b3fdf375a0af5731581a18a
+SHA1 (squirrelmail-1.2.2.tar.bz2) = 1e36b290887a90d842aecd4d90cefc5e4d8e03f0
+Size (squirrelmail-1.2.2.tar.bz2) = 989808 bytes
+SHA1 (patch-aa) = eb638bec1a858d70ba67063ac0a1b6a1bc0d4237
diff --git a/mail/squirrelmail/files/squirrelmail.conf.dist b/mail/squirrelmail/files/squirrelmail.conf.dist
index ee08e6d3d16..cfa08132489 100644
--- a/mail/squirrelmail/files/squirrelmail.conf.dist
+++ b/mail/squirrelmail/files/squirrelmail.conf.dist
@@ -1,4 +1,4 @@
-# $NetBSD: squirrelmail.conf.dist,v 1.2 2001/03/14 15:33:48 jlam Exp $
+# $NetBSD: squirrelmail.conf.dist,v 1.3 2002/01/07 11:49:45 jlam Exp $
 #
 # SquirrelMail configuration file fragment for Apache
 
@@ -7,6 +7,14 @@
 </IfModule>
 
 <Directory "@SMDIR@">
+    #
+    # Currently, SquirrelMail requires that "register_globals" be turned on
+    # to function properly.  If mod_php4.so is not loaded, then this flag
+    # must be set in php.ini.
+    #
+    <IfModule mod_php4.c>
+	php_flag register_globals on
+    </IfModule>
     Options Indexes MultiViews
     AllowOverride None
     Order allow,deny
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;