Updated ja-squirrelmail to 1.4.6nb1

* sync with squirrelmail-1.4.6nb1

4 files changed, 44 insertions, 6 deletions

diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index a7fadf1e373..c85453d5b72 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2006/05/05 02:46:54 taca Exp $
+# $NetBSD: Makefile,v 1.28 2006/05/05 05:32:36 martti Exp $
 
 DISTNAME=	squirrelmail-1.4.6
 PKGNAME=	ja-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
@@ -24,7 +25,7 @@ DEPENDS+=	php-mbstring>=4.3.3:../../misc/php-mbstring
 USE_LANGUAGES=	# empty
 NO_BUILD=	yes
 USE_TOOLS+=	perl:run
-REPLACE_PERL+=	config/conf.pl config/ri_once.pl
+REPLACE_PERL+=	config/conf.pl
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -54,7 +55,8 @@ OWN_DIRS_PERMS=		${ATTACHMENTS_DIR} ${ROOT_USER} ${APACHE_GROUP} 730
 OWN_DIRS_PERMS+=	${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755
 
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	${WRKDIR}/squirrelmail.conf.dist config/config_default.php
+SUBST_FILES.paths=	${WRKDIR:Q}/squirrelmail.conf.dist
+SUBST_FILES.paths+=	config/config_default.php
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@ATTACHMENTS_DIR@,${ATTACHMENTS_DIR},g'
 SUBST_SED.paths+=	-e 's,@USER_PREFS_DIR@,${USER_PREFS_DIR},g'
diff --git a/mail/ja-squirrelmail/PLIST b/mail/ja-squirrelmail/PLIST
index 7bc027ba0b5..3e8f2b2970b 100644
--- a/mail/ja-squirrelmail/PLIST
+++ b/mail/ja-squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/07/18 07:04:24 martti Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/05/05 05:32:36 martti Exp $
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
 share/squirrelmail/COPYING
@@ -13,6 +13,7 @@ share/squirrelmail/class/deliver/Deliver_SMTP.class.php
 share/squirrelmail/class/deliver/Deliver_SendMail.class.php
 share/squirrelmail/class/deliver/index.php
 share/squirrelmail/class/helper/VCard.class.php
+share/squirrelmail/class/helper/index.php
 share/squirrelmail/class/html.class.php
 share/squirrelmail/class/index.php
 share/squirrelmail/class/mime.class.php
@@ -63,12 +64,14 @@ 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/ReleaseNotes/1.4/Notes-1.4.3a.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.4.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.5.txt
 share/squirrelmail/doc/authentication.txt
 share/squirrelmail/doc/db-backend.txt
 share/squirrelmail/doc/ie_ssl.txt
 share/squirrelmail/doc/index.html
 share/squirrelmail/doc/presets.txt
 share/squirrelmail/doc/russian_apache.txt
+share/squirrelmail/doc/security.txt
 share/squirrelmail/doc/themes.txt
 share/squirrelmail/doc/translating.txt
 share/squirrelmail/doc/translating_help.txt
@@ -92,7 +95,7 @@ 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/iso_2022_jp.php
+share/squirrelmail/functions/decode/index.php
 share/squirrelmail/functions/decode/iso_8859_1.php
 share/squirrelmail/functions/decode/iso_8859_10.php
 share/squirrelmail/functions/decode/iso_8859_11.php
@@ -119,6 +122,7 @@ share/squirrelmail/functions/display_messages.php
 share/squirrelmail/functions/encode/cp1251.php
 share/squirrelmail/functions/encode/cp1255.php
 share/squirrelmail/functions/encode/cp1256.php
+share/squirrelmail/functions/encode/index.php
 share/squirrelmail/functions/encode/iso_8859_1.php
 share/squirrelmail/functions/encode/iso_8859_15.php
 share/squirrelmail/functions/encode/iso_8859_2.php
@@ -189,6 +193,7 @@ share/squirrelmail/locale/index.php
 share/squirrelmail/locale/timezones.cfg
 share/squirrelmail/plugins/README.plugins
 share/squirrelmail/plugins/abook_take/README
+share/squirrelmail/plugins/abook_take/index.php
 share/squirrelmail/plugins/abook_take/setup.php
 share/squirrelmail/plugins/abook_take/take.php
 share/squirrelmail/plugins/administrator/INSTALL
@@ -223,12 +228,14 @@ share/squirrelmail/plugins/filters/bulkquery/README
 share/squirrelmail/plugins/filters/bulkquery/bq.in
 share/squirrelmail/plugins/filters/bulkquery/bq.out
 share/squirrelmail/plugins/filters/bulkquery/bulkquery.c
+share/squirrelmail/plugins/filters/bulkquery/index.php
 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/fortune/INSTALL
+share/squirrelmail/plugins/fortune/index.php
 share/squirrelmail/plugins/fortune/setup.php
 share/squirrelmail/plugins/index.php
 share/squirrelmail/plugins/info/README
@@ -248,6 +255,7 @@ share/squirrelmail/plugins/mail_fetch/index.php
 share/squirrelmail/plugins/mail_fetch/options.php
 share/squirrelmail/plugins/mail_fetch/setup.php
 share/squirrelmail/plugins/make_archive.pl
+share/squirrelmail/plugins/message_details/index.php
 share/squirrelmail/plugins/message_details/message_details_bottom.php
 share/squirrelmail/plugins/message_details/message_details_main.php
 share/squirrelmail/plugins/message_details/message_details_top.php
@@ -262,6 +270,7 @@ 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/sounds/index.php
 share/squirrelmail/plugins/newmail/testsound.php
 share/squirrelmail/plugins/sent_subfolders/index.php
 share/squirrelmail/plugins/sent_subfolders/setup.php
@@ -358,11 +367,13 @@ share/squirrelmail/themes/alien_glow.php
 share/squirrelmail/themes/black_bean_burrito_theme.php
 share/squirrelmail/themes/blue_grey_theme.php
 share/squirrelmail/themes/bluesnews_theme.php
+share/squirrelmail/themes/bluesome.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/index.php
 share/squirrelmail/themes/css/sans-08.css
 share/squirrelmail/themes/css/sans-10.css
 share/squirrelmail/themes/css/sans-12.css
@@ -403,10 +414,15 @@ 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/silver_steel_theme.php
+share/squirrelmail/themes/simple_green2.php
+share/squirrelmail/themes/simple_green_theme.php
+share/squirrelmail/themes/simple_purple.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
+share/squirrelmail/themes/wood_theme.php
 @dirrm share/squirrelmail/themes/css
 @dirrm share/squirrelmail/themes
 @dirrm share/squirrelmail/src
diff --git a/mail/ja-squirrelmail/distinfo b/mail/ja-squirrelmail/distinfo
index 2abc84feef8..6d4e4f2b5cb 100644
--- a/mail/ja-squirrelmail/distinfo
+++ b/mail/ja-squirrelmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/05/05 02:46:54 taca Exp $
+$NetBSD: distinfo,v 1.10 2006/05/05 05:32:36 martti Exp $
 
 SHA1 (squirrelmail-1.4.6.tar.bz2) = b813aa9f736b4b6c41d1afd35bcbd01604e85cf7
 RMD160 (squirrelmail-1.4.6.tar.bz2) = 3cee894b392620af3e35ef1d00e35775559dd4f7
@@ -7,3 +7,4 @@ SHA1 (squirrelmail-1.4.6-ja-20060504-patch) = 15b17d2f1b8d9c19b01cc23bf6148ac7ee
 RMD160 (squirrelmail-1.4.6-ja-20060504-patch) = 7cb0a584afaffe73176edd75886fe7536363aefe
 Size (squirrelmail-1.4.6-ja-20060504-patch) = 29808 bytes
 SHA1 (patch-aa) = c96e85a28464c414bef744f9d1398fc9dd49549a
+SHA1 (patch-ab) = a7648438c9764e432e5d040e8e3aebb0ab48730e
diff --git a/mail/ja-squirrelmail/patches/patch-ab b/mail/ja-squirrelmail/patches/patch-ab
new file mode 100644
index 00000000000..1802e18974b
--- /dev/null
+++ b/mail/ja-squirrelmail/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.3 2006/05/05 05:32:36 martti Exp $
+
+--- functions/i18n.php.orig	2006-02-10 22:30:31.000000000 +0200
++++ functions/i18n.php	2006-04-11 08:15:24.000000000 +0300
+@@ -834,11 +834,11 @@
+ $languages['zh_CN']['LOCALE']  = 'zh_CN.GB2312';
+ $languages['cn']['ALIAS']      = 'zh_CN';
+ 
+-/*
+ $languages['uk_UA']['NAME']    = 'Ukrainian';
+-$languages['uk_UA']['CHARSET'] = 'koi8-u';
++$languages['uk_UA']['CHARSET'] = 'utf-8';
++$languages['uk_UA']['LOCALE']  = array('uk_UA.UTF-8','uk_UA','uk');
+ $languages['uk']['ALIAS'] = 'uk_UA';
+-*/
++
+ /*
+ $languages['vi_VN']['NAME']    = 'Vietnamese';
+ $languages['vi_VN']['CHARSET'] = 'utf-8';