Update squirrelmail to stable release version 1.0.1. Changes from development

version 0.9.3:

- Improved the way sqimap_read_data() is handled
- Sped up "no sorting" even more
- Fixed problems with sending messages
- Fixed some pass-by-reference calls that caused problems with newer PHP
  versions
- Fixed bug that didn't display last folder subscribed to
- Removed requirement of PHP 4.0.1 for array_unique() function
- Removed unnecessary echo statements by breaking out of PHP
- Changed evaluation method from using " to ' for speed improvements
- If no plugin array set in config.php, now handled correctly
- If subject is > 55 chars, trims it and puts "..." in message list
- Hundreds of minor changes to remove all verbose PHP warning messages
- Updated config_default.php to include attachment_common plugin (now in
  distribution)
- A few minor speed improvements
- Fixed problems in sqimap_read_body(), made it more reliable
- Added French translation of help files by gore K <gore_k@ymca-cepiere.org>
- Added Finnish translation by Teemu Junnila <teejun@vallcom.com>
- Updated Sweedish translation
- Updated Russian translation

6 files changed, 33 insertions, 17 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 89d8c260a79..fd91e1d0a28 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:32 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/02 19:39:18 jlam Exp $
 
-DISTNAME=	squirrelmail-1.0pre3
-PKGNAME=	squirrelmail-0.9.3
+DISTNAME=	squirrelmail-1.0.1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/} \
-		http://nerf-herder.net/squirrel/
+		http://nerf-herder.net/squirrel/ \
+		ftp://nerf-herder.net/pub/squirrel/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.squirrelmail.org/
@@ -25,9 +26,10 @@ MESSAGE_SUBST+=	SMDIR=${SMDIR}
 post-extract:
 	cd ${WRKSRC};							\
 	${MV} config/conf.pl config/conf.pl.orig;			\
-	${SED}	-e "s|/usr/bin/perl|${PERL5}|g"				\
+	${SED}	-e "s|^#!/.*|#!${PERL5}|g"				\
 		config/conf.pl.orig > config/conf.pl;			\
-	${CHMOD} +x config/conf.pl					\
+	${CHMOD} +x config/conf.pl
+	${FIND} ${WRKSRC} -name ".cvsignore" -exec ${RM} -f {} \;
 
 post-patch:
 	${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
diff --git a/mail/squirrelmail/files/md5 b/mail/squirrelmail/files/md5
index 25ab9c66924..13f5c3c2987 100644
--- a/mail/squirrelmail/files/md5
+++ b/mail/squirrelmail/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2001/01/24 22:44:13 jlam Exp $
+$NetBSD: md5,v 1.2 2001/02/02 19:39:19 jlam Exp $
 
-MD5 (squirrelmail-1.0pre3.tar.gz) = 08abfd243dd048fa2ec9d5c9fd725fee
+MD5 (squirrelmail-1.0.1.tar.bz2) = cf9a2692c2bf8322e8b0bb5a134469d1
diff --git a/mail/squirrelmail/files/patch-sum b/mail/squirrelmail/files/patch-sum
index 03a4e1c5b74..527089dbb9c 100644
--- a/mail/squirrelmail/files/patch-sum
+++ b/mail/squirrelmail/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 2001/01/24 22:44:13 jlam Exp $
+$NetBSD: patch-sum,v 1.2 2001/02/02 19:39:19 jlam Exp $
 
-MD5 (patch-aa) = d3faf6d1a730098b2b2bac6807530ffa
+MD5 (patch-aa) = 4754d03a2afe569d8ed02ab018b07c89
diff --git a/mail/squirrelmail/patches/patch-aa b/mail/squirrelmail/patches/patch-aa
index ed0f57a117e..13988924aac 100644
--- a/mail/squirrelmail/patches/patch-aa
+++ b/mail/squirrelmail/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/24 22:44:13 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2001/02/02 19:39:19 jlam Exp $
 
---- config/config_default.php.orig	Tue Jan 23 08:26:47 2001
+--- config/config_default.php.orig	Fri Feb  2 10:43:27 2001
 +++ config/config_default.php
 @@ -125,7 +125,7 @@
  //  anything if it's true, but some servers will respond weird if it's
@@ -27,5 +27,5 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/01/24 22:44:13 jlam Exp $
 -    $attachment_dir = $data_dir;
 +    $attachment_dir = "/var/spool/squirrelmail/attachments/";
  
- //  This is the default size of the folder list.  Default is 200,
+ //  This is the default size of the folder list.  Default is 150,
  //  but you can set it to whatever you wish.
diff --git a/mail/squirrelmail/pkg/MESSAGE b/mail/squirrelmail/pkg/MESSAGE
index 0d6b5637124..fc7a7da7a25 100644
--- a/mail/squirrelmail/pkg/MESSAGE
+++ b/mail/squirrelmail/pkg/MESSAGE
@@ -1,5 +1,5 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:33 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2001/02/02 19:39:20 jlam Exp $
 
 You will need to make SquirrelMail accessible through your HTTP server.
 If you are running Apache and ap-php, then you may either symlink
@@ -8,9 +8,9 @@ If you are running Apache and ap-php, then you may either symlink
 
 into DocumentRoot, or add the following lines to httpd.conf:
 
-	Alias /mail/ "${SMDIR}"
+	Alias /mail/ "${SMDIR}/"
 
-	<Directory "${SMDIR}">
+	<Directory "${SMDIR}/">
 		Options Indexes MultiViews
 		AllowOverride None
 		Order allow,deny
diff --git a/mail/squirrelmail/pkg/PLIST b/mail/squirrelmail/pkg/PLIST
index ef450fa00e1..730b8626f8a 100644
--- a/mail/squirrelmail/pkg/PLIST
+++ b/mail/squirrelmail/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/01/24 22:44:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/02/02 19:39:20 jlam Exp $
 share/squirrelmail/AUTHORS
 share/squirrelmail/COPYING
 share/squirrelmail/ChangeLog
@@ -72,6 +72,15 @@ 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/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/index.php
 share/squirrelmail/help/ko/FAQ.hlp
 share/squirrelmail/help/ko/addresses.hlp
@@ -116,6 +125,8 @@ 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/index.php
@@ -226,6 +237,8 @@ share/squirrelmail/themes/slashdot_theme.php
 @dirrm share/squirrelmail/locale/ger
 @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
@@ -241,6 +254,7 @@ share/squirrelmail/themes/slashdot_theme.php
 @dirrm share/squirrelmail/help/ru
 @dirrm share/squirrelmail/help/pl
 @dirrm share/squirrelmail/help/ko
+@dirrm share/squirrelmail/help/fr
 @dirrm share/squirrelmail/help/en
 @dirrm share/squirrelmail/help/cs
 @dirrm share/squirrelmail/help/ca