summaryrefslogtreecommitdiff
path: root/mail/squirrelmail
diff options
context:
space:
mode:
Diffstat (limited to 'mail/squirrelmail')
-rw-r--r--mail/squirrelmail/Makefile4
-rw-r--r--mail/squirrelmail/PLIST92
-rw-r--r--mail/squirrelmail/distinfo8
-rw-r--r--mail/squirrelmail/patches/patch-aa37
4 files changed, 110 insertions, 31 deletions
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 181223bd975..58a06414a25 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2004/04/26 20:42:00 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2004/05/31 20:14:39 bouyer Exp $
-DISTNAME= squirrelmail-1.4.2
+DISTNAME= squirrelmail-1.4.3
CATEGORIES= mail www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index 852eb3db838..6e33ec86e23 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2003/10/08 05:12:08 martti Exp $
+@comment $NetBSD: PLIST,v 1.14 2004/05/31 20:14:39 bouyer Exp $
share/examples/squirrelmail/squirrelmail.conf
share/squirrelmail/AUTHORS
share/squirrelmail/COPYING
@@ -50,6 +50,8 @@ share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.1.txt
share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.2.txt
share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.0.txt
share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.1.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.2.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3.txt
share/squirrelmail/doc/addressbook.txt
share/squirrelmail/doc/authentication.txt
share/squirrelmail/doc/compose.txt
@@ -73,12 +75,54 @@ share/squirrelmail/functions/auth.php
share/squirrelmail/functions/constants.php
share/squirrelmail/functions/date.php
share/squirrelmail/functions/db_prefs.php
+share/squirrelmail/functions/decode/big5.php
+share/squirrelmail/functions/decode/cp10000.php
+share/squirrelmail/functions/decode/cp10006.php
+share/squirrelmail/functions/decode/cp10007.php
+share/squirrelmail/functions/decode/cp10017.php
+share/squirrelmail/functions/decode/cp10029.php
+share/squirrelmail/functions/decode/cp10079.php
+share/squirrelmail/functions/decode/cp10081.php
+share/squirrelmail/functions/decode/cp1250.php
+share/squirrelmail/functions/decode/cp1251.php
+share/squirrelmail/functions/decode/cp1252.php
+share/squirrelmail/functions/decode/cp1253.php
+share/squirrelmail/functions/decode/cp1254.php
+share/squirrelmail/functions/decode/cp1255.php
+share/squirrelmail/functions/decode/cp1256.php
+share/squirrelmail/functions/decode/cp1257.php
+share/squirrelmail/functions/decode/cp1258.php
+share/squirrelmail/functions/decode/cp855.php
+share/squirrelmail/functions/decode/cp866.php
+share/squirrelmail/functions/decode/gb2312.php
+share/squirrelmail/functions/decode/iso-ir-111.php
+share/squirrelmail/functions/decode/iso8859-1.php
+share/squirrelmail/functions/decode/iso8859-10.php
+share/squirrelmail/functions/decode/iso8859-11.php
+share/squirrelmail/functions/decode/iso8859-13.php
+share/squirrelmail/functions/decode/iso8859-14.php
+share/squirrelmail/functions/decode/iso8859-15.php
+share/squirrelmail/functions/decode/iso8859-16.php
+share/squirrelmail/functions/decode/iso8859-2.php
+share/squirrelmail/functions/decode/iso8859-3.php
+share/squirrelmail/functions/decode/iso8859-4.php
+share/squirrelmail/functions/decode/iso8859-5.php
+share/squirrelmail/functions/decode/iso8859-6.php
+share/squirrelmail/functions/decode/iso8859-7.php
+share/squirrelmail/functions/decode/iso8859-8.php
+share/squirrelmail/functions/decode/iso8859-9.php
+share/squirrelmail/functions/decode/koi8-r.php
+share/squirrelmail/functions/decode/koi8-u.php
+share/squirrelmail/functions/decode/tis620.php
+share/squirrelmail/functions/decode/utf-8.php
share/squirrelmail/functions/display_messages.php
share/squirrelmail/functions/file_prefs.php
+share/squirrelmail/functions/forms.php
share/squirrelmail/functions/gettext.php
share/squirrelmail/functions/global.php
share/squirrelmail/functions/html.php
share/squirrelmail/functions/i18n.php
+share/squirrelmail/functions/identity.php
share/squirrelmail/functions/imap.php
share/squirrelmail/functions/imap_general.php
share/squirrelmail/functions/imap_mailbox.php
@@ -149,6 +193,15 @@ share/squirrelmail/help/de_DE/main_folder.hlp
share/squirrelmail/help/de_DE/options.hlp
share/squirrelmail/help/de_DE/read_mail.hlp
share/squirrelmail/help/de_DE/search.hlp
+share/squirrelmail/help/en_GB/FAQ.hlp
+share/squirrelmail/help/en_GB/addresses.hlp
+share/squirrelmail/help/en_GB/basic.hlp
+share/squirrelmail/help/en_GB/compose.hlp
+share/squirrelmail/help/en_GB/folders.hlp
+share/squirrelmail/help/en_GB/main_folder.hlp
+share/squirrelmail/help/en_GB/options.hlp
+share/squirrelmail/help/en_GB/read_mail.hlp
+share/squirrelmail/help/en_GB/search.hlp
share/squirrelmail/help/en_US/FAQ.hlp
share/squirrelmail/help/en_US/addresses.hlp
share/squirrelmail/help/en_US/basic.hlp
@@ -336,22 +389,30 @@ share/squirrelmail/images/draft.png
share/squirrelmail/images/folder.png
share/squirrelmail/images/inbox.png
share/squirrelmail/images/index.php
-share/squirrelmail/images/minus.gif
share/squirrelmail/images/minus.png
-share/squirrelmail/images/plus.gif
share/squirrelmail/images/plus.png
share/squirrelmail/images/sec_remove_da_DK.png
+share/squirrelmail/images/sec_remove_de_DE.png
+share/squirrelmail/images/sec_remove_el_GR.png
share/squirrelmail/images/sec_remove_eng.png
share/squirrelmail/images/sec_remove_es_ES.png
share/squirrelmail/images/sec_remove_fr_FR.png
+share/squirrelmail/images/sec_remove_hr_HR.png
+share/squirrelmail/images/sec_remove_hu_HU.png
share/squirrelmail/images/sec_remove_id_ID.png
+share/squirrelmail/images/sec_remove_it_IT.png
share/squirrelmail/images/sec_remove_ja_JP.png
share/squirrelmail/images/sec_remove_ko_KR.png
share/squirrelmail/images/sec_remove_lt_LT.png
+share/squirrelmail/images/sec_remove_nb_NO.png
+share/squirrelmail/images/sec_remove_nl_NL.png
+share/squirrelmail/images/sec_remove_nn_NO.png
share/squirrelmail/images/sec_remove_pt_PT.png
-share/squirrelmail/images/sec_remove_ru.png
+share/squirrelmail/images/sec_remove_ru_RU.png
share/squirrelmail/images/sec_remove_sl_SI.png
share/squirrelmail/images/sec_remove_sr_YU.png
+share/squirrelmail/images/sec_remove_sv_SE.png
+share/squirrelmail/images/sec_remove_tr_TR.png
share/squirrelmail/images/senti.png
share/squirrelmail/images/sm_logo.png
share/squirrelmail/images/sort_none.png
@@ -380,6 +441,8 @@ share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrelmail.po
share/squirrelmail/locale/el_GR/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/el_GR/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/en_GB/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/en_GB/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
@@ -411,12 +474,12 @@ share/squirrelmail/locale/lt_LT/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/squirrelmail.po
share/squirrelmail/locale/ms_MY/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/ms_MY/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/nb_NO/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/nb_NO/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
@@ -573,7 +636,7 @@ share/squirrelmail/po/compilepo
share/squirrelmail/po/independent_strings.txt
share/squirrelmail/po/index.php
share/squirrelmail/po/mergepo
-share/squirrelmail/po/squirrelmail.po
+share/squirrelmail/po/squirrelmail.pot
share/squirrelmail/po/xgetpo
share/squirrelmail/src/addrbook_popup.php
share/squirrelmail/src/addrbook_search.php
@@ -618,11 +681,17 @@ 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/css/comic-sans-08.css
+share/squirrelmail/themes/css/comic-sans-10.css
+share/squirrelmail/themes/css/comic-sans-12.css
share/squirrelmail/themes/css/sans-08.css
share/squirrelmail/themes/css/sans-10.css
share/squirrelmail/themes/css/sans-12.css
share/squirrelmail/themes/css/serif-10.css
share/squirrelmail/themes/css/serif-12.css
+share/squirrelmail/themes/css/verdana-08.css
+share/squirrelmail/themes/css/verdana-10.css
+share/squirrelmail/themes/css/verdana-12.css
share/squirrelmail/themes/dark_green.php
share/squirrelmail/themes/dark_grey_theme.php
share/squirrelmail/themes/darkness.php
@@ -646,6 +715,7 @@ share/squirrelmail/themes/penguin.php
share/squirrelmail/themes/plain_blue_theme.php
share/squirrelmail/themes/purple_theme.php
share/squirrelmail/themes/random.php
+share/squirrelmail/themes/redmond.php
share/squirrelmail/themes/sandstorm_theme.php
share/squirrelmail/themes/seaspray_theme.php
share/squirrelmail/themes/servery_theme.php
@@ -710,10 +780,10 @@ share/squirrelmail/themes/spice_of_life_lite.php
@dirrm share/squirrelmail/locale/pt_BR
@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/nb_NO/LC_MESSAGES
+@dirrm share/squirrelmail/locale/nb_NO
@dirrm share/squirrelmail/locale/nl_NL/LC_MESSAGES
@dirrm share/squirrelmail/locale/nl_NL
@dirrm share/squirrelmail/locale/ms_MY/LC_MESSAGES
@@ -746,6 +816,8 @@ share/squirrelmail/themes/spice_of_life_lite.php
@dirrm share/squirrelmail/locale/et_EE
@dirrm share/squirrelmail/locale/es_ES/LC_MESSAGES
@dirrm share/squirrelmail/locale/es_ES
+@dirrm share/squirrelmail/locale/en_GB/LC_MESSAGES
+@dirrm share/squirrelmail/locale/en_GB
@dirrm share/squirrelmail/locale/el_GR/LC_MESSAGES
@dirrm share/squirrelmail/locale/el_GR
@dirrm share/squirrelmail/locale/de_DE/LC_MESSAGES
@@ -786,6 +858,7 @@ share/squirrelmail/themes/spice_of_life_lite.php
@dirrm share/squirrelmail/help/fi_FI
@dirrm share/squirrelmail/help/es_ES
@dirrm share/squirrelmail/help/en_US
+@dirrm share/squirrelmail/help/en_GB
@dirrm share/squirrelmail/help/de_DE
@dirrm share/squirrelmail/help/da_DK
@dirrm share/squirrelmail/help/cy_GB
@@ -793,6 +866,7 @@ share/squirrelmail/themes/spice_of_life_lite.php
@dirrm share/squirrelmail/help/ca_ES
@dirrm share/squirrelmail/help/bg_BG
@dirrm share/squirrelmail/help
+@dirrm share/squirrelmail/functions/decode
@dirrm share/squirrelmail/functions
@dirrm share/squirrelmail/doc/ReleaseNotes/1.4
@dirrm share/squirrelmail/doc/ReleaseNotes/1.3
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index a7b1998903d..c7ddf860583 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2003/10/08 05:12:08 martti Exp $
+$NetBSD: distinfo,v 1.16 2004/05/31 20:14:39 bouyer Exp $
-SHA1 (squirrelmail-1.4.2.tar.bz2) = c04567d49c627bfcb927ea7653101b301fd39b95
-Size (squirrelmail-1.4.2.tar.bz2) = 1888703 bytes
-SHA1 (patch-aa) = 2c1340abf3fd5f28b7a050316f07d07fb50f57f2
+SHA1 (squirrelmail-1.4.3.tar.bz2) = 8eb0c45e322b18994732baba70a81168e5a8a0ff
+Size (squirrelmail-1.4.3.tar.bz2) = 2254146 bytes
+SHA1 (patch-aa) = cad816ce6e36def3f1b99ba831aa297c074d5aca
diff --git a/mail/squirrelmail/patches/patch-aa b/mail/squirrelmail/patches/patch-aa
index 96b8f75ada7..1934fe2b5d8 100644
--- a/mail/squirrelmail/patches/patch-aa
+++ b/mail/squirrelmail/patches/patch-aa
@@ -1,31 +1,36 @@
-$NetBSD: patch-aa,v 1.6 2003/09/01 11:51:27 martti Exp $
-
---- config/config_default.php.orig Mon Jul 7 10:28:21 2003
-+++ config/config_default.php Mon Sep 1 09:41:14 2003
-@@ -193,7 +193,7 @@
+--- config/config_default.php.orig 2004-04-21 20:21:54.000000000 +0300
++++ config/config_default.php 2004-05-31 21:32:43.000000000 +0300
+@@ -383,7 +383,7 @@
* false. (Cyrus works fine whether it's true OR false).
+ * @global bool $show_contain_subfolders_option
*/
- global $show_contain_subfolders_option;
-$show_contain_subfolders_option = false;
+$show_contain_subfolders_option = true;
/**
- * This option controls what character set is used when sending mail
-@@ -220,7 +220,7 @@
+ * These next two options set the defaults for the way that the
+@@ -442,7 +442,7 @@
* $data_dir = SM_PATH . 'data/';
+ * @global string $data_dir
*/
- global $data_dir;
-$data_dir = SM_PATH . 'data/';
+$data_dir = '@USER_PREFS_DIR@/';
/**
- * Path to directory used for storing attachments while a mail is
-@@ -236,7 +236,7 @@
+ * Attachments directory
+@@ -460,7 +460,7 @@
* + It should probably be another directory than data_dir.
+ * @global string $attachment_dir
*/
- global $attachment_dir;
--$attachment_dir = "$data_dir";
-+$attachment_dir = "@ATTACHMENTS_DIR@/";
+-$attachment_dir = $data_dir;
++$attachment_dir = '@ATTACHMENTS_DIR@/';
- /* Hash level used for data directory. */
- global $dir_hash_level;
+ /**
+ * Hash level used for data directory.
+@@ -823,4 +823,4 @@
+ * sent and regular output to begin, which will majorly screw
+ * things up when we try to send more headers later.
+ */
+-?>
+\ No newline at end of file
++?>