Update to Roundcube 0.3.1 (ok schmonz). Changes since 0.3-stable:

* Specify toolbar container in compose template (#1486247)
* Fix $_SERVER['HTTPS'] check for SSL forcing on IIS (#1486243)
* Avoid unnecessary page loads for selected tab (#1486032)
* Fix quota indicator issues by content generation on client-size (#1486197, #1486220)
* Don't display disabled sections in Settings (#1486099)
* Added server-side e-mail address validation with 'email_dns_check' option (#1485857)
* Fix login page loading into an iframe when session expires (#1485952)
* Allow setting port number in 'force_https' option (#1486091)
* Option 'force_https' replaced by 'force_https' plugin
* Fix IE issue with non-UTF-8 characters in AJAX response (#1486159)
* Partially fixed "empty body" issue by showing raw body of malformed message (#1486166)
* Fix importing/sending to email address with whitespace (#1486214)
* Added XIMSS (CommuniGate) driver for Password plugin
* Fix newly attached files are not saved in drafts w/o editing any text (#1486202)
* Added attachment upload indicator with parallel upload (#1486058)
* Use default_charset for bodies of messages without charset definition (#1486187)
* Password: added cPanel driver
* Fix return to first page from e-mail screen (#1486105)
* Fix handling HTML comments in HTML messages (#1486189)
* Fix folder/messagelist controls alignment - icons used (#1486072)
* Fix LDAP addressbook shows 'Contact not found' error sometimes (#1486178)
* Fix cache status checking + improve cache operations performance (#1486104)
* Prevent from setting INBOX as any of special folders (#1486114)
* Fix regular expression for e-mail address (#1486152)
* Fix Received header format
* Implemented sorting by message index - added 'index_sort' option (#1485936)
* Fix dl() use in installer (#1486150)
* Added 'ldap_debug' option
* Fix "Empty startup greeting" bug (#1486085)
* Fix setting user name in 'new_user_identity' plugin (#1486137)
* Fix incorrect count of new messages in folder list when using multiple IMAP clients (#1485995)
* Fix all folders checking for new messages with disabled caching (#1486128)
* Support skins in 'archive' and 'markasjunk' plugins
* Added 'html_editor' hook (#1486068)
* Fix DB constraint violation when populating messages cache (#1486052)
* Password: added password strength options (#1486062)
* Fix LDAP partial result warning (#1485536)
* Fix delete in message view deletes permanently with flag_for_deletion=true (#1486101)
* Use faster/secure mt_rand() (#1486094)
* Fix roundcube hangs on empty inbox with bincimapd (#1486093)
* Fix wrong headers for IE on servers without $_SERVERHTTPS? (#1485926)
* Force IE style headers for attachments in non-HTTPS session, 'use_https' option (#1485655)
* Check 'post_max_size' for upload max filesize (#1486089)
* Password Plugin: Fix %d inserts username instead of domain (#1486088)
* Fix rcube_mdb2::affected_rows() (#1486082)

4 files changed, 53 insertions, 39 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index cb4eb621057..0fe42f01bdf 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2009/09/20 02:59:32 schmonz Exp $
+# $NetBSD: Makefile,v 1.22 2009/11/23 09:37:45 ghen Exp $
 #
 
-DISTNAME=	roundcubemail-${RCVERSION}-stable-dep
-PKGNAME=	${DISTNAME:S/mail-${RCVERSION}-stable-dep/-${VERSION}/}
+DISTNAME=	roundcubemail-${RCVERSION}-dep
+PKGNAME=	${DISTNAME:S/mail-${RCVERSION}-dep/-${VERSION}/}
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
 
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v2
 USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 NO_BUILD=	yes
-RCVERSION=	0.3
+RCVERSION=	0.3.1
 VERSION=	${RCVERSION:S/-//}
 
 PKG_DESTDIR_SUPPORT=  	user-destdir
@@ -84,18 +84,6 @@ REPLACE.php.old=	.*/bin/php
 REPLACE.php.new=	${PREFIX}/bin/php
 REPLACE_FILES.php=	bin/*.sh
 
-EMPTY_DIRS=	plugins/emotions/images \
-		plugins/emotions/jscripts plugins/media/images \
-		plugins/media/jscripts plugins/nonbreaking/images \
-		plugins/nonbreaking/langs plugins/searchreplace/images \
-		plugins/searchreplace/jscripts plugins/spellchecker/images \
-		plugins/spellchecker/langs plugins/table/images \
-		plugins/table/jscripts plugins/visualchars/images \
-		plugins/visualchars/langs themes/advanced/css \
-		themes/advanced/docs/en/images themes/advanced/images/xp \
-		themes/advanced/jscripts themes/advanced/docs/en \
-		themes/advanced/images themes/advanced/docs
-
 .include "../../mk/apache.mk"
 .include "options.mk"
 
@@ -105,10 +93,6 @@ post-extract:
 pre-install:
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
-.	for d in ${EMPTY_DIRS}
-		cd ${WRKSRC}/program/js/tiny_mce && rmdir ${d}
-.	endfor
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/roundcube.conf \
 		${DESTDIR}${EGDIR}/roundcube.conf
diff --git a/mail/roundcube/PLIST b/mail/roundcube/PLIST
index 451b9f5743b..6b999475cf9 100644
--- a/mail/roundcube/PLIST
+++ b/mail/roundcube/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/09/20 02:59:32 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/11/23 09:37:46 ghen Exp $
 share/doc/roundcube/INSTALL
 share/doc/roundcube/LICENSE
 share/doc/roundcube/README
@@ -20,7 +20,6 @@ share/roundcube/bin/killcache.php
 share/roundcube/bin/modcss.php
 share/roundcube/bin/msgexport.sh
 share/roundcube/bin/msgimport.sh
-share/roundcube/bin/quotaimg.php
 share/roundcube/bin/update.sh
 share/roundcube/index.php
 share/roundcube/installer/check.php
@@ -41,14 +40,17 @@ share/roundcube/installer/welcome.html
 share/roundcube/plugins/additional_message_headers/additional_message_headers.php
 share/roundcube/plugins/archive/archive.js
 share/roundcube/plugins/archive/archive.php
-share/roundcube/plugins/archive/archive_act.png
-share/roundcube/plugins/archive/archive_pas.png
-share/roundcube/plugins/archive/foldericon.png
+share/roundcube/plugins/archive/localization/cs_CZ.inc
 share/roundcube/plugins/archive/localization/de_CH.inc
 share/roundcube/plugins/archive/localization/de_DE.inc
 share/roundcube/plugins/archive/localization/en_US.inc
+share/roundcube/plugins/archive/localization/et_EE.inc
 share/roundcube/plugins/archive/localization/fr_FR.inc
 share/roundcube/plugins/archive/localization/pl_PL.inc
+share/roundcube/plugins/archive/localization/ru_RU.inc
+share/roundcube/plugins/archive/skins/default/archive_act.png
+share/roundcube/plugins/archive/skins/default/archive_pas.png
+share/roundcube/plugins/archive/skins/default/foldericon.png
 share/roundcube/plugins/autologon/autologon.php
 share/roundcube/plugins/database_attachments/database_attachments.php
 share/roundcube/plugins/debug_logger/debug_logger.php
@@ -61,9 +63,11 @@ share/roundcube/plugins/help/config.inc.php.dist
 share/roundcube/plugins/help/content/about.html
 share/roundcube/plugins/help/content/license.html
 share/roundcube/plugins/help/help.php
+share/roundcube/plugins/help/localization/cs_CZ.inc
 share/roundcube/plugins/help/localization/en_GB.inc
 share/roundcube/plugins/help/localization/en_US.inc
 share/roundcube/plugins/help/localization/et_EE.inc
+share/roundcube/plugins/help/localization/hu_HU.inc
 share/roundcube/plugins/help/localization/pl_PL.inc
 share/roundcube/plugins/help/localization/sv_SE.inc
 share/roundcube/plugins/help/skins/default/help.css
@@ -75,14 +79,16 @@ share/roundcube/plugins/managesieve/config.inc.php.dist
 share/roundcube/plugins/managesieve/lib/Net/Sieve.php
 share/roundcube/plugins/managesieve/lib/rcube_sieve.php
 share/roundcube/plugins/managesieve/localization/bg_BG.inc
+share/roundcube/plugins/managesieve/localization/cs_CZ.inc
 share/roundcube/plugins/managesieve/localization/de_CH.inc
 share/roundcube/plugins/managesieve/localization/de_DE.inc
+share/roundcube/plugins/managesieve/localization/el_GR.inc
+share/roundcube/plugins/managesieve/localization/en_GB.inc
 share/roundcube/plugins/managesieve/localization/en_US.inc
 share/roundcube/plugins/managesieve/localization/es_ES.inc
 share/roundcube/plugins/managesieve/localization/et_EE.inc
 share/roundcube/plugins/managesieve/localization/fi_FI.inc
 share/roundcube/plugins/managesieve/localization/fr_FR.inc
-share/roundcube/plugins/managesieve/localization/gb_GB.inc
 share/roundcube/plugins/managesieve/localization/hu_HU.inc
 share/roundcube/plugins/managesieve/localization/it_IT.inc
 share/roundcube/plugins/managesieve/localization/nl_NL.inc
@@ -110,19 +116,22 @@ share/roundcube/plugins/managesieve/skins/default/filter_up_sel.png
 share/roundcube/plugins/managesieve/skins/default/managesieve.css
 share/roundcube/plugins/managesieve/skins/default/templates/managesieve.html
 share/roundcube/plugins/managesieve/skins/default/templates/managesieveedit.html
-share/roundcube/plugins/markasjunk/junk_act.png
-share/roundcube/plugins/markasjunk/junk_pas.png
+share/roundcube/plugins/markasjunk/localization/cs_CZ.inc
 share/roundcube/plugins/markasjunk/localization/en_US.inc
 share/roundcube/plugins/markasjunk/localization/et_EE.inc
 share/roundcube/plugins/markasjunk/localization/pl_PL.inc
+share/roundcube/plugins/markasjunk/localization/ru_RU.inc
 share/roundcube/plugins/markasjunk/localization/sv_SE.inc
 share/roundcube/plugins/markasjunk/markasjunk.js
 share/roundcube/plugins/markasjunk/markasjunk.php
+share/roundcube/plugins/markasjunk/skins/default/junk_act.png
+share/roundcube/plugins/markasjunk/skins/default/junk_pas.png
 share/roundcube/plugins/new_user_dialog/localization/de_CH.inc
 share/roundcube/plugins/new_user_dialog/localization/de_DE.inc
 share/roundcube/plugins/new_user_dialog/localization/en_US.inc
 share/roundcube/plugins/new_user_dialog/localization/et_EE.inc
 share/roundcube/plugins/new_user_dialog/localization/pl_PL.inc
+share/roundcube/plugins/new_user_dialog/localization/ru_RU.inc
 share/roundcube/plugins/new_user_dialog/localization/sv_SE.inc
 share/roundcube/plugins/new_user_dialog/new_user_dialog.php
 share/roundcube/plugins/new_user_dialog/newuserdialog.css
@@ -130,11 +139,17 @@ share/roundcube/plugins/new_user_identity/new_user_identity.php
 share/roundcube/plugins/password/README
 share/roundcube/plugins/password/config.inc.php.dist
 share/roundcube/plugins/password/drivers/chgsaslpasswd.c
+share/roundcube/plugins/password/drivers/cpanel.php
 share/roundcube/plugins/password/drivers/directadmin.php
 share/roundcube/plugins/password/drivers/ldap.php
 share/roundcube/plugins/password/drivers/poppassd.php
 share/roundcube/plugins/password/drivers/sasl.php
 share/roundcube/plugins/password/drivers/sql.php
+share/roundcube/plugins/password/drivers/vpopmaild.php
+share/roundcube/plugins/password/drivers/ximss.php
+share/roundcube/plugins/password/localization/bg_BG.inc
+share/roundcube/plugins/password/localization/cs_CZ.inc
+share/roundcube/plugins/password/localization/da_DK.inc
 share/roundcube/plugins/password/localization/de_CH.inc
 share/roundcube/plugins/password/localization/de_DE.inc
 share/roundcube/plugins/password/localization/en_US.inc
@@ -153,11 +168,16 @@ share/roundcube/plugins/password/password.php
 share/roundcube/plugins/show_additional_headers/show_additional_headers.php
 share/roundcube/plugins/squirrelmail_usercopy/config.inc.php.dist
 share/roundcube/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
+share/roundcube/plugins/subscriptions_option/localization/cs_CZ.inc
+share/roundcube/plugins/subscriptions_option/localization/de_CH.inc
+share/roundcube/plugins/subscriptions_option/localization/de_DE.inc
 share/roundcube/plugins/subscriptions_option/localization/en_US.inc
 share/roundcube/plugins/subscriptions_option/localization/et_EE.inc
 share/roundcube/plugins/subscriptions_option/localization/pl_PL.inc
+share/roundcube/plugins/subscriptions_option/localization/ru_RU.inc
 share/roundcube/plugins/subscriptions_option/localization/sv_SE.inc
 share/roundcube/plugins/subscriptions_option/subscriptions_option.php
+share/roundcube/plugins/userinfo/localization/cs_CZ.inc
 share/roundcube/plugins/userinfo/localization/de_CH.inc
 share/roundcube/plugins/userinfo/localization/en_US.inc
 share/roundcube/plugins/userinfo/localization/et_EE.inc
@@ -166,6 +186,10 @@ share/roundcube/plugins/userinfo/localization/pt_PT.inc
 share/roundcube/plugins/userinfo/localization/sv_SE.inc
 share/roundcube/plugins/userinfo/userinfo.js
 share/roundcube/plugins/userinfo/userinfo.php
+share/roundcube/plugins/vcard_attachments/localization/de_CH.inc
+share/roundcube/plugins/vcard_attachments/localization/de_DE.inc
+share/roundcube/plugins/vcard_attachments/localization/en_US.inc
+share/roundcube/plugins/vcard_attachments/localization/ru_RU.inc
 share/roundcube/plugins/vcard_attachments/vcard_add_contact.png
 share/roundcube/plugins/vcard_attachments/vcard_attachments.php
 share/roundcube/plugins/vcard_attachments/vcardattach.js
@@ -199,12 +223,16 @@ share/roundcube/program/include/rcube_user.php
 share/roundcube/program/include/rcube_vcard.php
 share/roundcube/program/include/session.inc
 share/roundcube/program/js/app.js
+share/roundcube/program/js/app.js.src
 share/roundcube/program/js/common.js
+share/roundcube/program/js/common.js.src
 share/roundcube/program/js/editor.js
 share/roundcube/program/js/editor_images.js
 share/roundcube/program/js/googiespell.js
+share/roundcube/program/js/googiespell.js.src
 share/roundcube/program/js/jquery-1.3.min.js
 share/roundcube/program/js/list.js
+share/roundcube/program/js/list.js.src
 share/roundcube/program/js/tiny_mce/langs/ar.js
 share/roundcube/program/js/tiny_mce/langs/bg.js
 share/roundcube/program/js/tiny_mce/langs/bs.js
@@ -854,6 +882,7 @@ share/roundcube/skins/default/images/dimple.png
 share/roundcube/skins/default/images/display/icons.gif
 share/roundcube/skins/default/images/display/icons.png
 share/roundcube/skins/default/images/display/loading.gif
+share/roundcube/skins/default/images/display/loading_blue.gif
 share/roundcube/skins/default/images/favicon.ico
 share/roundcube/skins/default/images/googiespell/change_lang.gif
 share/roundcube/skins/default/images/googiespell/indicator.gif
@@ -888,6 +917,7 @@ share/roundcube/skins/default/images/icons/unflagged.png
 share/roundcube/skins/default/images/icons/unread.png
 share/roundcube/skins/default/images/icons/up_small.gif
 share/roundcube/skins/default/images/listheader.gif
+share/roundcube/skins/default/images/mail_footer.png
 share/roundcube/skins/default/images/mail_toolbar.gif
 share/roundcube/skins/default/images/mail_toolbar.png
 share/roundcube/skins/default/images/mailbox_list.gif
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index d255fa64d27..44be5f72ebc 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2009/09/20 02:59:32 schmonz Exp $
+$NetBSD: distinfo,v 1.14 2009/11/23 09:37:46 ghen Exp $
 
-SHA1 (roundcubemail-0.3-stable-dep.tar.gz) = d3995e30c47763084efd9d9669ab85dcb1400597
-RMD160 (roundcubemail-0.3-stable-dep.tar.gz) = a2c98905df2b27789a5132b0c07ab6112b117c3a
-Size (roundcubemail-0.3-stable-dep.tar.gz) = 1372557 bytes
-SHA1 (patch-aa) = d028bc512f1138b98be8a9711bbc4ca7bc95475c
+SHA1 (roundcubemail-0.3.1-dep.tar.gz) = 72cae0bb68ac1ba56f98da6a1ade2cf10f1ff71f
+RMD160 (roundcubemail-0.3.1-dep.tar.gz) = 9ffc268d04bd0c4ba5b160b26911bb7d82cd0f74
+Size (roundcubemail-0.3.1-dep.tar.gz) = 1431280 bytes
+SHA1 (patch-aa) = 49f4e33db7c3137cb559e7cc3fba836ee858388a
 SHA1 (patch-ab) = 9e81e117952150f363265bbda11cae9eb7d77c08
 SHA1 (patch-ac) = 33e85bd1577f3554213c0f1da55500761967026a
 SHA1 (patch-af) = 858606b6e1b6fb0eafa568267ba98278fcc64fc4
diff --git a/mail/roundcube/patches/patch-aa b/mail/roundcube/patches/patch-aa
index 5718532fdd0..2511eae4839 100644
--- a/mail/roundcube/patches/patch-aa
+++ b/mail/roundcube/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2009/09/20 02:59:32 schmonz Exp $
+$NetBSD: patch-aa,v 1.6 2009/11/23 09:37:46 ghen Exp $
 
---- config/main.inc.php.dist.orig	2009-08-07 12:13:35.000000000 -0400
-+++ config/main.inc.php.dist
-@@ -33,10 +33,10 @@ $rcmail_config['syslog_facility'] = LOG_
+--- config/main.inc.php.dist.orig	2009-10-21 10:47:40.000000000 +0200
++++ config/main.inc.php.dist	2009-11-23 09:48:52.000000000 +0100
+@@ -33,10 +33,10 @@
  
  // use this folder to store log files (must be writeable for apache user)
  // This is used by the 'file' log driver.
@@ -15,8 +15,8 @@ $NetBSD: patch-aa,v 1.5 2009/09/20 02:59:32 schmonz Exp $
  
  // List of active plugins (in plugins/ directory)
  $rcmail_config['plugins'] = array();
-@@ -441,4 +441,7 @@ $rcmail_config['check_all_folders'] = FA
- $rcmail_config['display_next'] = FALSE;
+@@ -451,4 +451,7 @@
+ $rcmail_config['index_sort'] = TRUE;
  
  // end of config file
 +