diff -ruN /usr/ports/mail/squirrelmail/Makefile squirrelmail/Makefile --- /usr/ports/mail/squirrelmail/Makefile Thu Mar 4 14:11:18 2004 +++ squirrelmail/Makefile Wed Jun 2 10:57:09 2004 @@ -6,8 +6,7 @@ # PORTNAME= squirrelmail -PORTVERSION= 1.4.2 -PORTREVISION= 1 +PORTVERSION= 1.4.3 CATEGORIES?= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= squirrelmail diff -ruN /usr/ports/mail/squirrelmail/distinfo squirrelmail/distinfo --- /usr/ports/mail/squirrelmail/distinfo Wed Oct 8 10:18:47 2003 +++ squirrelmail/distinfo Wed Jun 2 10:48:02 2004 @@ -1 +1,2 @@ -MD5 (squirrelmail-1.4.2.tar.bz2) = 8d8271c704a9f23d53138a4ceea38fb4 +MD5 (squirrelmail-1.4.3.tar.bz2) = b887b736ab752eff8886383a91f25678 +SIZE (squirrelmail-1.4.3.tar.bz2) = 2254146 diff -ruN /usr/ports/mail/squirrelmail/files/patch-config-config_default.php squirrelmail/files/patch-config-config_default.php --- /usr/ports/mail/squirrelmail/files/patch-config-config_default.php Tue Jan 13 09:14:24 2004 +++ squirrelmail/files/patch-config-config_default.php Wed Jun 2 10:51:41 2004 @@ -1,20 +1,20 @@ ---- config/config_default.php.orig Thu Aug 21 03:14:08 2003 -+++ config/config_default.php Tue Jan 13 00:57:57 2004 -@@ -220,7 +220,7 @@ +--- config/config_default.php.orig Wed Jun 2 10:49:41 2004 ++++ config/config_default.php Wed Jun 2 10:50:21 2004 +@@ -442,7 +442,7 @@ * $data_dir = SM_PATH . 'data/'; + * @global string $data_dir */ - global $data_dir; -$data_dir = SM_PATH . 'data/'; +$data_dir = '/var/spool/squirrelmail/pref/'; /** - * 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 = $data_dir; +$attachment_dir = '/var/spool/squirrelmail/attach/'; - /* Hash level used for data directory. */ - global $dir_hash_level; + /** + * Hash level used for data directory. diff -ruN /usr/ports/mail/squirrelmail/pkg-plist squirrelmail/pkg-plist --- /usr/ports/mail/squirrelmail/pkg-plist Wed Jan 14 12:18:45 2004 +++ squirrelmail/pkg-plist Wed Jun 2 11:07:01 2004 @@ -20,6 +20,8 @@ %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.3/Notes-1.3.2.txt %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.4/Notes-1.4.0.txt %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.4/Notes-1.4.1.txt +%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.4/Notes-1.4.2.txt +%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/1.4/Notes-1.4.3.txt %%PORTDOCS%%%%DOCSDIR%%/addressbook.txt %%PORTDOCS%%%%DOCSDIR%%/authentication.txt %%PORTDOCS%%%%DOCSDIR%%/compose.txt @@ -95,12 +97,54 @@ %%SQUIRRELDIR%%/functions/constants.php %%SQUIRRELDIR%%/functions/date.php %%SQUIRRELDIR%%/functions/db_prefs.php +%%SQUIRRELDIR%%/functions/decode/big5.php +%%SQUIRRELDIR%%/functions/decode/cp10000.php +%%SQUIRRELDIR%%/functions/decode/cp10006.php +%%SQUIRRELDIR%%/functions/decode/cp10007.php +%%SQUIRRELDIR%%/functions/decode/cp10017.php +%%SQUIRRELDIR%%/functions/decode/cp10029.php +%%SQUIRRELDIR%%/functions/decode/cp10079.php +%%SQUIRRELDIR%%/functions/decode/cp10081.php +%%SQUIRRELDIR%%/functions/decode/cp1250.php +%%SQUIRRELDIR%%/functions/decode/cp1251.php +%%SQUIRRELDIR%%/functions/decode/cp1252.php +%%SQUIRRELDIR%%/functions/decode/cp1253.php +%%SQUIRRELDIR%%/functions/decode/cp1254.php +%%SQUIRRELDIR%%/functions/decode/cp1255.php +%%SQUIRRELDIR%%/functions/decode/cp1256.php +%%SQUIRRELDIR%%/functions/decode/cp1257.php +%%SQUIRRELDIR%%/functions/decode/cp1258.php +%%SQUIRRELDIR%%/functions/decode/cp855.php +%%SQUIRRELDIR%%/functions/decode/cp866.php +%%SQUIRRELDIR%%/functions/decode/gb2312.php +%%SQUIRRELDIR%%/functions/decode/iso-ir-111.php +%%SQUIRRELDIR%%/functions/decode/iso8859-1.php +%%SQUIRRELDIR%%/functions/decode/iso8859-10.php +%%SQUIRRELDIR%%/functions/decode/iso8859-11.php +%%SQUIRRELDIR%%/functions/decode/iso8859-13.php +%%SQUIRRELDIR%%/functions/decode/iso8859-14.php +%%SQUIRRELDIR%%/functions/decode/iso8859-15.php +%%SQUIRRELDIR%%/functions/decode/iso8859-16.php +%%SQUIRRELDIR%%/functions/decode/iso8859-2.php +%%SQUIRRELDIR%%/functions/decode/iso8859-3.php +%%SQUIRRELDIR%%/functions/decode/iso8859-4.php +%%SQUIRRELDIR%%/functions/decode/iso8859-5.php +%%SQUIRRELDIR%%/functions/decode/iso8859-6.php +%%SQUIRRELDIR%%/functions/decode/iso8859-7.php +%%SQUIRRELDIR%%/functions/decode/iso8859-8.php +%%SQUIRRELDIR%%/functions/decode/iso8859-9.php +%%SQUIRRELDIR%%/functions/decode/koi8-r.php +%%SQUIRRELDIR%%/functions/decode/koi8-u.php +%%SQUIRRELDIR%%/functions/decode/tis620.php +%%SQUIRRELDIR%%/functions/decode/utf-8.php %%SQUIRRELDIR%%/functions/display_messages.php %%SQUIRRELDIR%%/functions/file_prefs.php +%%SQUIRRELDIR%%/functions/forms.php %%SQUIRRELDIR%%/functions/gettext.php %%SQUIRRELDIR%%/functions/global.php %%SQUIRRELDIR%%/functions/html.php %%SQUIRRELDIR%%/functions/i18n.php +%%SQUIRRELDIR%%/functions/identity.php %%SQUIRRELDIR%%/functions/imap.php %%SQUIRRELDIR%%/functions/imap_general.php %%SQUIRRELDIR%%/functions/imap_mailbox.php @@ -162,6 +206,15 @@ %%SQUIRRELDIR%%/help/de_DE/options.hlp %%SQUIRRELDIR%%/help/de_DE/read_mail.hlp %%SQUIRRELDIR%%/help/de_DE/search.hlp +%%SQUIRRELDIR%%/help/en_GB/FAQ.hlp +%%SQUIRRELDIR%%/help/en_GB/addresses.hlp +%%SQUIRRELDIR%%/help/en_GB/basic.hlp +%%SQUIRRELDIR%%/help/en_GB/compose.hlp +%%SQUIRRELDIR%%/help/en_GB/folders.hlp +%%SQUIRRELDIR%%/help/en_GB/main_folder.hlp +%%SQUIRRELDIR%%/help/en_GB/options.hlp +%%SQUIRRELDIR%%/help/en_GB/read_mail.hlp +%%SQUIRRELDIR%%/help/en_GB/search.hlp %%SQUIRRELDIR%%/help/en_US/FAQ.hlp %%SQUIRRELDIR%%/help/en_US/addresses.hlp %%SQUIRRELDIR%%/help/en_US/basic.hlp @@ -354,8 +407,6 @@ %%SQUIRRELDIR%%/help/sk_SK/search.hlp %%SQUIRRELDIR%%/images/down_pointer.png %%SQUIRRELDIR%%/images/index.php -%%SQUIRRELDIR%%/images/minus.gif -%%SQUIRRELDIR%%/images/plus.gif %%SQUIRRELDIR%%/images/draft.png %%SQUIRRELDIR%%/images/folder.png %%SQUIRRELDIR%%/images/inbox.png @@ -363,17 +414,27 @@ %%SQUIRRELDIR%%/images/plus.png %%SQUIRRELDIR%%/images/senti.png %%SQUIRRELDIR%%/images/delitem.png -%%SQUIRRELDIR%%/images/sec_remove_pt_PT.png %%SQUIRRELDIR%%/images/sec_remove_da_DK.png +%%SQUIRRELDIR%%/images/sec_remove_de_DE.png +%%SQUIRRELDIR%%/images/sec_remove_el_GR.png %%SQUIRRELDIR%%/images/sec_remove_eng.png %%SQUIRRELDIR%%/images/sec_remove_es_ES.png %%SQUIRRELDIR%%/images/sec_remove_fr_FR.png +%%SQUIRRELDIR%%/images/sec_remove_hr_HR.png +%%SQUIRRELDIR%%/images/sec_remove_hu_HU.png %%SQUIRRELDIR%%/images/sec_remove_id_ID.png +%%SQUIRRELDIR%%/images/sec_remove_it_IT.png %%SQUIRRELDIR%%/images/sec_remove_ja_JP.png %%SQUIRRELDIR%%/images/sec_remove_ko_KR.png %%SQUIRRELDIR%%/images/sec_remove_lt_LT.png -%%SQUIRRELDIR%%/images/sec_remove_ru.png +%%SQUIRRELDIR%%/images/sec_remove_nb_NO.png +%%SQUIRRELDIR%%/images/sec_remove_nl_NL.png +%%SQUIRRELDIR%%/images/sec_remove_nn_NO.png +%%SQUIRRELDIR%%/images/sec_remove_pt_PT.png +%%SQUIRRELDIR%%/images/sec_remove_ru_RU.png %%SQUIRRELDIR%%/images/sec_remove_sl_SI.png +%%SQUIRRELDIR%%/images/sec_remove_sv_SE.png +%%SQUIRRELDIR%%/images/sec_remove_tr_TR.png %%SQUIRRELDIR%%/images/sec_remove_sr_YU.png %%SQUIRRELDIR%%/images/sm_logo.png %%SQUIRRELDIR%%/images/sort_none.png @@ -400,6 +461,8 @@ %%SQUIRRELDIR%%/locale/de_DE/LC_MESSAGES/squirrelmail.po %%SQUIRRELDIR%%/locale/el_GR/LC_MESSAGES/squirrelmail.mo %%SQUIRRELDIR%%/locale/el_GR/LC_MESSAGES/squirrelmail.po +%%SQUIRRELDIR%%/locale/en_GB/LC_MESSAGES/squirrelmail.mo +%%SQUIRRELDIR%%/locale/en_GB/LC_MESSAGES/squirrelmail.po %%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES/squirrelmail.mo %%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES/squirrelmail.po %%SQUIRRELDIR%%/locale/et_EE/LC_MESSAGES/squirrelmail.mo @@ -427,12 +490,12 @@ %%SQUIRRELDIR%%/locale/ko_KR/LC_MESSAGES/squirrelmail.po %%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/squirrelmail.mo %%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/squirrelmail.po +%%SQUIRRELDIR%%/locale/nb_NO/LC_MESSAGES/squirrelmail.mo +%%SQUIRRELDIR%%/locale/nb_NO/LC_MESSAGES/squirrelmail.po %%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES/squirrelmail.mo %%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES/squirrelmail.po %%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/squirrelmail.mo %%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/squirrelmail.po -%%SQUIRRELDIR%%/locale/no_NO/LC_MESSAGES/squirrelmail.mo -%%SQUIRRELDIR%%/locale/no_NO/LC_MESSAGES/squirrelmail.po %%SQUIRRELDIR%%/locale/pl_PL/LC_MESSAGES/squirrelmail.mo %%SQUIRRELDIR%%/locale/pl_PL/LC_MESSAGES/squirrelmail.po %%SQUIRRELDIR%%/locale/pt_BR/LC_MESSAGES/squirrelmail.mo @@ -568,7 +631,7 @@ %%SQUIRRELDIR%%/po/independent_strings.txt %%SQUIRRELDIR%%/po/index.php %%SQUIRRELDIR%%/po/mergepo -%%SQUIRRELDIR%%/po/squirrelmail.po +%%SQUIRRELDIR%%/po/squirrelmail.pot %%SQUIRRELDIR%%/po/xgetpo %%SQUIRRELDIR%%/src/addrbook_popup.php %%SQUIRRELDIR%%/src/addrbook_search.php @@ -612,11 +675,17 @@ %%SQUIRRELDIR%%/themes/bluesnews_theme.php %%SQUIRRELDIR%%/themes/bluesteel_theme.php %%SQUIRRELDIR%%/themes/christmas.php +%%SQUIRRELDIR%%/themes/css/comic-sans-08.css +%%SQUIRRELDIR%%/themes/css/comic-sans-10.css +%%SQUIRRELDIR%%/themes/css/comic-sans-12.css %%SQUIRRELDIR%%/themes/css/sans-08.css %%SQUIRRELDIR%%/themes/css/sans-10.css %%SQUIRRELDIR%%/themes/css/sans-12.css %%SQUIRRELDIR%%/themes/css/serif-10.css %%SQUIRRELDIR%%/themes/css/serif-12.css +%%SQUIRRELDIR%%/themes/css/verdana-08.css +%%SQUIRRELDIR%%/themes/css/verdana-10.css +%%SQUIRRELDIR%%/themes/css/verdana-12.css %%SQUIRRELDIR%%/themes/dark_green.php %%SQUIRRELDIR%%/themes/dark_grey_theme.php %%SQUIRRELDIR%%/themes/darkness.php @@ -640,6 +709,7 @@ %%SQUIRRELDIR%%/themes/plain_blue_theme.php %%SQUIRRELDIR%%/themes/purple_theme.php %%SQUIRRELDIR%%/themes/random.php +%%SQUIRRELDIR%%/themes/redmond.php %%SQUIRRELDIR%%/themes/sandstorm_theme.php %%SQUIRRELDIR%%/themes/seaspray_theme.php %%SQUIRRELDIR%%/themes/servery_theme.php @@ -726,12 +796,12 @@ @dirrm %%SQUIRRELDIR%%/locale/pt_BR @dirrm %%SQUIRRELDIR%%/locale/pl_PL/LC_MESSAGES @dirrm %%SQUIRRELDIR%%/locale/pl_PL -@dirrm %%SQUIRRELDIR%%/locale/no_NO/LC_MESSAGES -@dirrm %%SQUIRRELDIR%%/locale/no_NO @dirrm %%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES @dirrm %%SQUIRRELDIR%%/locale/nn_NO @dirrm %%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES @dirrm %%SQUIRRELDIR%%/locale/nl_NL +@dirrm %%SQUIRRELDIR%%/locale/nb_NO/LC_MESSAGES +@dirrm %%SQUIRRELDIR%%/locale/nb_NO @dirrm %%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES @dirrm %%SQUIRRELDIR%%/locale/lt_LT @dirrm %%SQUIRRELDIR%%/locale/ko_KR/LC_MESSAGES @@ -758,6 +828,8 @@ @dirrm %%SQUIRRELDIR%%/locale/et_EE @dirrm %%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES @dirrm %%SQUIRRELDIR%%/locale/es_ES +@dirrm %%SQUIRRELDIR%%/locale/en_GB/LC_MESSAGES +@dirrm %%SQUIRRELDIR%%/locale/en_GB @dirrm %%SQUIRRELDIR%%/locale/el_GR/LC_MESSAGES @dirrm %%SQUIRRELDIR%%/locale/el_GR @dirrm %%SQUIRRELDIR%%/locale/de_DE/LC_MESSAGES @@ -800,6 +872,7 @@ @dirrm %%SQUIRRELDIR%%/help/fi_FI @dirrm %%SQUIRRELDIR%%/help/es_ES @dirrm %%SQUIRRELDIR%%/help/en_US +@dirrm %%SQUIRRELDIR%%/help/en_GB @dirrm %%SQUIRRELDIR%%/help/de_DE @dirrm %%SQUIRRELDIR%%/help/da_DK @dirrm %%SQUIRRELDIR%%/help/cs_CZ @@ -809,6 +882,7 @@ @dirrm %%SQUIRRELDIR%%/help/cy_GB @dirrm %%SQUIRRELDIR%%/help/sk_SK @dirrm %%SQUIRRELDIR%%/help +@dirrm %%SQUIRRELDIR%%/functions/decode @dirrm %%SQUIRRELDIR%%/functions @dirrm %%SQUIRRELDIR%%/data @dirrm %%SQUIRRELDIR%%/config