Update to 0.3. From the changelog:

- Fix gn and givenName should be synonymous in LDAP addressbook (#1485892)
- Add mail_domain to LDAP email entries without @ sign (#1485201)
- Fix saving empty values in LDAP contact data (#1485781)
- Fix LDAP contact update when RDN field is changed (#1485788)
- Fix LDAP attributes case senitivity problems (#1485830)
- Fix LDAP addressbook browsing when only one directory is used (#1486022)
- Fix endless loop on error response for APPEND command (#1486060)
- Don't require date.timezone setting in installer (#1485989)
- Fix date sorting problem with Courier IMAP server (#1486065)
- Unselect pressed buttons on mouse up (#1485987)
- Don't set php_value error_log in .htaccess but mention in INSTALL (#1485924)
- Fix too small status/flag/attachment columns in Safari 4 (#1486063)
- Fix selection disabling while dragging splitter in webkit browsers (#1486056)
- Added 'new_messages' plugin hook (#1486005)
- Added 'logout_after' plugin hook (#1486042)
- Added 'message_compose' hook
- Added 'imap_connect' hook (#1485956)
- Fix vcard_attachments plugin (#1486035)
- Updated PEAR::Auth_SASL to 1.0.3 version
- Use sequence names only with PostgreSQL (#1486018)
- Re-designed User Preferences interface
- Fix MS SQL DDL (#1486020)
- Fix rcube_mdb2.php: call to setCharset not implemented in mssql driver (#1486019)
- Added 'display_next' option
- Fix rcube_mdb2::unixtimestamp for MS SQL (#1486015)
- Fix HTML washing to respect character encoding
- Fix endless loop in iil_C_Login() with Courier IMAP (#1486010)
- Fix #messagemenu display on IE (#1486006)
- Speedup UI by using sprites for (toolbar) buttons
- Fix charset names with X- prefix handling
- Fix displaying of HTML messages with unknown/malformed tags (#1486003)

From Fredrik Pettai in pkg/42099.

4 files changed, 194 insertions, 125 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 661413fc173..cb4eb621057 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2009/07/25 01:19:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2009/09/20 02:59:32 schmonz Exp $
 #
 
-DISTNAME=	roundcubemail-${RCVERSION}-dep
-PKGNAME=	${DISTNAME:S/mail-${RCVERSION}-dep/-${VERSION}/}
+DISTNAME=	roundcubemail-${RCVERSION}-stable-dep
+PKGNAME=	${DISTNAME:S/mail-${RCVERSION}-stable-dep/-${VERSION}/}
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
 
@@ -14,12 +14,12 @@ LICENSE=	gnu-gpl-v2
 USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 NO_BUILD=	yes
-RCVERSION=	0.2.2
+RCVERSION=	0.3
 VERSION=	${RCVERSION:S/-//}
 
 PKG_DESTDIR_SUPPORT=  	user-destdir
-INSTALLATION_DIRS=	${RCDIR}/program ${RCDIR}/skins ${EGDIR}/SQL ${DOCDIR}
-INSTALLATION_DIRS+=	${RCDIR}/bin
+INSTALLATION_DIRS=	${RCDIR}/plugins ${RCDIR}/program ${RCDIR}/skins
+INSTALLATION_DIRS+=	${EGDIR}/SQL ${DOCDIR} ${RCDIR}/bin
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../lang/php/phpversion.mk"
@@ -47,7 +47,7 @@ BUILD_DEFS+=		VARBASE WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP
 RCDIR=			${PREFIX}/share/roundcube
 EGDIR=			${PREFIX}/share/examples/roundcube
 DOCDIR=			${PREFIX}/share/doc/roundcube
-PAX_DIRS=		program skins installer bin
+PAX_DIRS=		plugins program skins installer bin
 
 MESSAGE_SUBST+=		DOCDIR=${DOCDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 MESSAGE_SUBST+=		VARBASE=${VARBASE:Q} RCDIR=${RCDIR:Q}
@@ -84,7 +84,7 @@ REPLACE.php.old=	.*/bin/php
 REPLACE.php.new=	${PREFIX}/bin/php
 REPLACE_FILES.php=	bin/*.sh
 
-EMPTY_DIRS=	plugins/cleanup plugins/emotions/images \
+EMPTY_DIRS=	plugins/emotions/images \
 		plugins/emotions/jscripts plugins/media/images \
 		plugins/media/jscripts plugins/nonbreaking/images \
 		plugins/nonbreaking/langs plugins/searchreplace/images \
diff --git a/mail/roundcube/PLIST b/mail/roundcube/PLIST
index 0070c8a84d1..451b9f5743b 100644
--- a/mail/roundcube/PLIST
+++ b/mail/roundcube/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/07/25 01:19:16 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.14 2009/09/20 02:59:32 schmonz Exp $
 share/doc/roundcube/INSTALL
 share/doc/roundcube/LICENSE
 share/doc/roundcube/README
@@ -14,6 +14,7 @@ share/examples/roundcube/db.inc.php.dist
 share/examples/roundcube/main.inc.php.dist
 share/examples/roundcube/roundcube.conf
 share/roundcube/.htaccess
+share/roundcube/bin/decrypt.php
 share/roundcube/bin/html2text.php
 share/roundcube/bin/killcache.php
 share/roundcube/bin/modcss.php
@@ -37,6 +38,137 @@ share/roundcube/installer/styles.css
 share/roundcube/installer/test.php
 share/roundcube/installer/utils.php
 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/de_CH.inc
+share/roundcube/plugins/archive/localization/de_DE.inc
+share/roundcube/plugins/archive/localization/en_US.inc
+share/roundcube/plugins/archive/localization/fr_FR.inc
+share/roundcube/plugins/archive/localization/pl_PL.inc
+share/roundcube/plugins/autologon/autologon.php
+share/roundcube/plugins/database_attachments/database_attachments.php
+share/roundcube/plugins/debug_logger/debug_logger.php
+share/roundcube/plugins/debug_logger/runlog/runlog.php
+share/roundcube/plugins/emoticons/emoticons.php
+share/roundcube/plugins/example_addressbook/example_addressbook.php
+share/roundcube/plugins/example_addressbook/example_addressbook_backend.php
+share/roundcube/plugins/filesystem_attachments/filesystem_attachments.php
+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/en_GB.inc
+share/roundcube/plugins/help/localization/en_US.inc
+share/roundcube/plugins/help/localization/et_EE.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
+share/roundcube/plugins/help/skins/default/help.gif
+share/roundcube/plugins/help/skins/default/templates/help.html
+share/roundcube/plugins/http_authentication/http_authentication.php
+share/roundcube/plugins/managesieve/Changelog
+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/de_CH.inc
+share/roundcube/plugins/managesieve/localization/de_DE.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
+share/roundcube/plugins/managesieve/localization/pl_PL.inc
+share/roundcube/plugins/managesieve/localization/pt_BR.inc
+share/roundcube/plugins/managesieve/localization/ru_RU.inc
+share/roundcube/plugins/managesieve/localization/sl_SI.inc
+share/roundcube/plugins/managesieve/localization/sv_SE.inc
+share/roundcube/plugins/managesieve/localization/uk_UA.inc
+share/roundcube/plugins/managesieve/localization/zh_CN.inc
+share/roundcube/plugins/managesieve/managesieve.js
+share/roundcube/plugins/managesieve/managesieve.php
+share/roundcube/plugins/managesieve/skins/default/filter_add_act.png
+share/roundcube/plugins/managesieve/skins/default/filter_add_pas.png
+share/roundcube/plugins/managesieve/skins/default/filter_add_sel.png
+share/roundcube/plugins/managesieve/skins/default/filter_del_act.png
+share/roundcube/plugins/managesieve/skins/default/filter_del_pas.png
+share/roundcube/plugins/managesieve/skins/default/filter_del_sel.png
+share/roundcube/plugins/managesieve/skins/default/filter_down_act.png
+share/roundcube/plugins/managesieve/skins/default/filter_down_pas.png
+share/roundcube/plugins/managesieve/skins/default/filter_down_sel.png
+share/roundcube/plugins/managesieve/skins/default/filter_up_act.png
+share/roundcube/plugins/managesieve/skins/default/filter_up_pas.png
+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/en_US.inc
+share/roundcube/plugins/markasjunk/localization/et_EE.inc
+share/roundcube/plugins/markasjunk/localization/pl_PL.inc
+share/roundcube/plugins/markasjunk/localization/sv_SE.inc
+share/roundcube/plugins/markasjunk/markasjunk.js
+share/roundcube/plugins/markasjunk/markasjunk.php
+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/sv_SE.inc
+share/roundcube/plugins/new_user_dialog/new_user_dialog.php
+share/roundcube/plugins/new_user_dialog/newuserdialog.css
+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/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/localization/de_CH.inc
+share/roundcube/plugins/password/localization/de_DE.inc
+share/roundcube/plugins/password/localization/en_US.inc
+share/roundcube/plugins/password/localization/et_EE.inc
+share/roundcube/plugins/password/localization/fr_FR.inc
+share/roundcube/plugins/password/localization/hu_HU.inc
+share/roundcube/plugins/password/localization/it_IT.inc
+share/roundcube/plugins/password/localization/nl_NL.inc
+share/roundcube/plugins/password/localization/pl_PL.inc
+share/roundcube/plugins/password/localization/pt_BR.inc
+share/roundcube/plugins/password/localization/pt_PT.inc
+share/roundcube/plugins/password/localization/sl_SI.inc
+share/roundcube/plugins/password/localization/sv_SE.inc
+share/roundcube/plugins/password/password.js
+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/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/sv_SE.inc
+share/roundcube/plugins/subscriptions_option/subscriptions_option.php
+share/roundcube/plugins/userinfo/localization/de_CH.inc
+share/roundcube/plugins/userinfo/localization/en_US.inc
+share/roundcube/plugins/userinfo/localization/et_EE.inc
+share/roundcube/plugins/userinfo/localization/pl_PL.inc
+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/vcard_add_contact.png
+share/roundcube/plugins/vcard_attachments/vcard_attachments.php
+share/roundcube/plugins/vcard_attachments/vcardattach.js
 share/roundcube/program/blank.gif
 share/roundcube/program/blocked.gif
 share/roundcube/program/include/bugs.inc
@@ -44,6 +176,7 @@ share/roundcube/program/include/html.php
 share/roundcube/program/include/iniset.php
 share/roundcube/program/include/main.inc
 share/roundcube/program/include/rcmail.php
+share/roundcube/program/include/rcube_addressbook.php
 share/roundcube/program/include/rcube_browser.php
 share/roundcube/program/include/rcube_config.php
 share/roundcube/program/include/rcube_contacts.php
@@ -54,9 +187,11 @@ share/roundcube/program/include/rcube_ldap.php
 share/roundcube/program/include/rcube_mail_mime.php
 share/roundcube/program/include/rcube_mdb2.php
 share/roundcube/program/include/rcube_message.php
+share/roundcube/program/include/rcube_plugin.php
+share/roundcube/program/include/rcube_plugin_api.php
 share/roundcube/program/include/rcube_result_set.php
 share/roundcube/program/include/rcube_shared.inc
-share/roundcube/program/include/rcube_smtp.inc
+share/roundcube/program/include/rcube_smtp.php
 share/roundcube/program/include/rcube_sqlite.inc
 share/roundcube/program/include/rcube_string_replacer.php
 share/roundcube/program/include/rcube_template.php
@@ -64,15 +199,12 @@ 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
@@ -519,7 +651,6 @@ share/roundcube/program/js/tiny_mce/utils/mctabs.js
 share/roundcube/program/js/tiny_mce/utils/validate.js
 share/roundcube/program/lib/enriched.inc
 share/roundcube/program/lib/html2text.php
-share/roundcube/program/lib/icl_commons.inc
 share/roundcube/program/lib/imap.inc
 share/roundcube/program/lib/mime.inc
 share/roundcube/program/lib/tnef_decoder.inc
@@ -535,6 +666,8 @@ share/roundcube/program/localization/bg_BG/labels.inc
 share/roundcube/program/localization/bg_BG/messages.inc
 share/roundcube/program/localization/bn_BD/labels.inc
 share/roundcube/program/localization/bn_BD/messages.inc
+share/roundcube/program/localization/br/labels.inc
+share/roundcube/program/localization/br/messages.inc
 share/roundcube/program/localization/bs_BA/labels.inc
 share/roundcube/program/localization/bs_BA/messages.inc
 share/roundcube/program/localization/ca_ES/labels.inc
@@ -567,6 +700,8 @@ share/roundcube/program/localization/eu_ES/labels.inc
 share/roundcube/program/localization/eu_ES/messages.inc
 share/roundcube/program/localization/fa/labels.inc
 share/roundcube/program/localization/fa/messages.inc
+share/roundcube/program/localization/fa_AF/labels.inc
+share/roundcube/program/localization/fa_AF/messages.inc
 share/roundcube/program/localization/fi_FI/labels.inc
 share/roundcube/program/localization/fi_FI/messages.inc
 share/roundcube/program/localization/fr_FR/labels.inc
@@ -606,6 +741,8 @@ share/roundcube/program/localization/lv_LV/labels.inc
 share/roundcube/program/localization/lv_LV/messages.inc
 share/roundcube/program/localization/mk_MK/labels.inc
 share/roundcube/program/localization/mk_MK/messages.inc
+share/roundcube/program/localization/mr_IN/labels.inc
+share/roundcube/program/localization/mr_IN/messages.inc
 share/roundcube/program/localization/ms_MY/labels.inc
 share/roundcube/program/localization/ms_MY/messages.inc
 share/roundcube/program/localization/nb_NO/labels.inc
@@ -620,6 +757,8 @@ share/roundcube/program/localization/nn_NO/labels.inc
 share/roundcube/program/localization/nn_NO/messages.inc
 share/roundcube/program/localization/pl_PL/labels.inc
 share/roundcube/program/localization/pl_PL/messages.inc
+share/roundcube/program/localization/ps/labels.inc
+share/roundcube/program/localization/ps/messages.inc
 share/roundcube/program/localization/pt_BR/labels.inc
 share/roundcube/program/localization/pt_BR/messages.inc
 share/roundcube/program/localization/pt_PT/labels.inc
@@ -688,6 +827,7 @@ share/roundcube/program/steps/mail/spell_pspell.inc
 share/roundcube/program/steps/mail/viewsource.inc
 share/roundcube/program/steps/settings/delete_identity.inc
 share/roundcube/program/steps/settings/edit_identity.inc
+share/roundcube/program/steps/settings/edit_prefs.inc
 share/roundcube/program/steps/settings/func.inc
 share/roundcube/program/steps/settings/identities.inc
 share/roundcube/program/steps/settings/manage_folders.inc
@@ -700,95 +840,20 @@ share/roundcube/skins/default/common.css
 share/roundcube/skins/default/editor_content.css
 share/roundcube/skins/default/functions.js
 share/roundcube/skins/default/googiespell.css
+share/roundcube/skins/default/ie6hacks.css
+share/roundcube/skins/default/iehacks.css
+share/roundcube/skins/default/images/abook_toolbar.gif
+share/roundcube/skins/default/images/abook_toolbar.png
 share/roundcube/skins/default/images/blank.gif
 share/roundcube/skins/default/images/buttons/add_act.png
-share/roundcube/skins/default/images/buttons/add_contact_act.png
-share/roundcube/skins/default/images/buttons/add_contact_pas.png
-share/roundcube/skins/default/images/buttons/add_contact_sel.png
 share/roundcube/skins/default/images/buttons/add_pas.png
 share/roundcube/skins/default/images/buttons/add_sel.png
-share/roundcube/skins/default/images/buttons/addressbook.gif
-share/roundcube/skins/default/images/buttons/addressbook.png
-share/roundcube/skins/default/images/buttons/adr_import_act.png
-share/roundcube/skins/default/images/buttons/adr_import_pas.png
-share/roundcube/skins/default/images/buttons/adr_import_sel.png
-share/roundcube/skins/default/images/buttons/attach_act.png
-share/roundcube/skins/default/images/buttons/attach_pas.png
-share/roundcube/skins/default/images/buttons/attach_sel.png
-share/roundcube/skins/default/images/buttons/back_act.png
-share/roundcube/skins/default/images/buttons/back_pas.png
-share/roundcube/skins/default/images/buttons/back_sel.png
 share/roundcube/skins/default/images/buttons/bg.gif
-share/roundcube/skins/default/images/buttons/compose_act.png
-share/roundcube/skins/default/images/buttons/compose_pas.png
-share/roundcube/skins/default/images/buttons/compose_sel.png
-share/roundcube/skins/default/images/buttons/contacts_act.png
-share/roundcube/skins/default/images/buttons/contacts_pas.png
-share/roundcube/skins/default/images/buttons/contacts_sel.png
-share/roundcube/skins/default/images/buttons/delete_act.png
-share/roundcube/skins/default/images/buttons/delete_pas.png
-share/roundcube/skins/default/images/buttons/delete_sel.png
-share/roundcube/skins/default/images/buttons/down_arrow.png
-share/roundcube/skins/default/images/buttons/download_act.png
-share/roundcube/skins/default/images/buttons/download_pas.png
-share/roundcube/skins/default/images/buttons/download_sel.png
-share/roundcube/skins/default/images/buttons/drafts_act.png
-share/roundcube/skins/default/images/buttons/drafts_pas.png
-share/roundcube/skins/default/images/buttons/drafts_sel.png
-share/roundcube/skins/default/images/buttons/edit_contact_act.png
-share/roundcube/skins/default/images/buttons/edit_contact_pas.png
-share/roundcube/skins/default/images/buttons/edit_contact_sel.png
-share/roundcube/skins/default/images/buttons/first_act.png
-share/roundcube/skins/default/images/buttons/first_pas.png
-share/roundcube/skins/default/images/buttons/first_sel.png
-share/roundcube/skins/default/images/buttons/forward_act.png
-share/roundcube/skins/default/images/buttons/forward_pas.png
-share/roundcube/skins/default/images/buttons/forward_sel.png
-share/roundcube/skins/default/images/buttons/inbox_act.png
-share/roundcube/skins/default/images/buttons/inbox_pas.png
-share/roundcube/skins/default/images/buttons/inbox_sel.png
-share/roundcube/skins/default/images/buttons/last_act.png
-share/roundcube/skins/default/images/buttons/last_pas.png
-share/roundcube/skins/default/images/buttons/last_sel.png
-share/roundcube/skins/default/images/buttons/logout.gif
-share/roundcube/skins/default/images/buttons/logout.png
-share/roundcube/skins/default/images/buttons/mail.gif
-share/roundcube/skins/default/images/buttons/mail.png
-share/roundcube/skins/default/images/buttons/markread_act.png
-share/roundcube/skins/default/images/buttons/next_act.png
-share/roundcube/skins/default/images/buttons/next_pas.png
-share/roundcube/skins/default/images/buttons/next_sel.png
-share/roundcube/skins/default/images/buttons/previous_act.png
-share/roundcube/skins/default/images/buttons/previous_pas.png
-share/roundcube/skins/default/images/buttons/previous_sel.png
-share/roundcube/skins/default/images/buttons/print_act.png
-share/roundcube/skins/default/images/buttons/print_pas.png
-share/roundcube/skins/default/images/buttons/print_sel.png
-share/roundcube/skins/default/images/buttons/reply_act.png
-share/roundcube/skins/default/images/buttons/reply_pas.png
-share/roundcube/skins/default/images/buttons/reply_sel.png
-share/roundcube/skins/default/images/buttons/replyall_act.png
-share/roundcube/skins/default/images/buttons/replyall_pas.png
-share/roundcube/skins/default/images/buttons/replyall_sel.png
-share/roundcube/skins/default/images/buttons/send_act.png
-share/roundcube/skins/default/images/buttons/send_pas.png
-share/roundcube/skins/default/images/buttons/send_sel.png
-share/roundcube/skins/default/images/buttons/settings.gif
-share/roundcube/skins/default/images/buttons/settings.png
-share/roundcube/skins/default/images/buttons/source_act.png
-share/roundcube/skins/default/images/buttons/source_pas.png
-share/roundcube/skins/default/images/buttons/source_sel.png
-share/roundcube/skins/default/images/buttons/spacer.gif
-share/roundcube/skins/default/images/buttons/spellcheck_act.png
-share/roundcube/skins/default/images/buttons/spellcheck_pas.png
-share/roundcube/skins/default/images/buttons/spellcheck_sel.png
-share/roundcube/skins/default/images/buttons/up_arrow.png
 share/roundcube/skins/default/images/cleardot.png
 share/roundcube/skins/default/images/dimple.png
-share/roundcube/skins/default/images/display/confirm.png
-share/roundcube/skins/default/images/display/info.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/warning.png
 share/roundcube/skins/default/images/favicon.ico
 share/roundcube/skins/default/images/googiespell/change_lang.gif
 share/roundcube/skins/default/images/googiespell/indicator.gif
@@ -798,53 +863,54 @@ share/roundcube/skins/default/images/icons/abcard.png
 share/roundcube/skins/default/images/icons/attachment.png
 share/roundcube/skins/default/images/icons/blank.gif
 share/roundcube/skins/default/images/icons/collapsed.png
+share/roundcube/skins/default/images/icons/delete.png
 share/roundcube/skins/default/images/icons/deleted.png
 share/roundcube/skins/default/images/icons/dot.png
 share/roundcube/skins/default/images/icons/down_small.gif
 share/roundcube/skins/default/images/icons/expanded.png
 share/roundcube/skins/default/images/icons/extwin.png
 share/roundcube/skins/default/images/icons/flagged.png
-share/roundcube/skins/default/images/icons/folder-closed.png
-share/roundcube/skins/default/images/icons/folder-drafts.png
-share/roundcube/skins/default/images/icons/folder-inbox.png
-share/roundcube/skins/default/images/icons/folder-junk.png
-share/roundcube/skins/default/images/icons/folder-open.png
-share/roundcube/skins/default/images/icons/folder-sent.png
-share/roundcube/skins/default/images/icons/folder-trash.png
+share/roundcube/skins/default/images/icons/folders.gif
+share/roundcube/skins/default/images/icons/folders.png
 share/roundcube/skins/default/images/icons/forwarded.png
 share/roundcube/skins/default/images/icons/forwarded_replied.png
+share/roundcube/skins/default/images/icons/glass.gif
+share/roundcube/skins/default/images/icons/glass.png
+share/roundcube/skins/default/images/icons/glass_roll.png
 share/roundcube/skins/default/images/icons/minus.gif
 share/roundcube/skins/default/images/icons/plus.gif
-share/roundcube/skins/default/images/icons/remove-attachment.png
 share/roundcube/skins/default/images/icons/rename.png
 share/roundcube/skins/default/images/icons/replied.png
 share/roundcube/skins/default/images/icons/reset.gif
 share/roundcube/skins/default/images/icons/silhouette.png
+share/roundcube/skins/default/images/icons/sort.gif
 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_aqua.gif
-share/roundcube/skins/default/images/listheader_dark.gif
-share/roundcube/skins/default/images/listheader_light.gif
+share/roundcube/skins/default/images/listheader.gif
+share/roundcube/skins/default/images/mail_toolbar.gif
+share/roundcube/skins/default/images/mail_toolbar.png
 share/roundcube/skins/default/images/mailbox_list.gif
 share/roundcube/skins/default/images/mailbox_selected.gif
-share/roundcube/skins/default/images/roundcube_logo.gif
+share/roundcube/skins/default/images/messageactions.gif
+share/roundcube/skins/default/images/messageactions.png
+share/roundcube/skins/default/images/pagenav.gif
 share/roundcube/skins/default/images/roundcube_logo.png
-share/roundcube/skins/default/images/roundcube_logo_print.gif
 share/roundcube/skins/default/images/searchfield.gif
-share/roundcube/skins/default/images/sort_asc.gif
-share/roundcube/skins/default/images/sort_desc.gif
-share/roundcube/skins/default/images/tab_act.gif
-share/roundcube/skins/default/images/tab_pas.gif
+share/roundcube/skins/default/images/tabs.gif
 share/roundcube/skins/default/images/taskbar.gif
+share/roundcube/skins/default/images/taskicons.gif
+share/roundcube/skins/default/images/taskicons.png
 share/roundcube/skins/default/images/watermark.gif
 share/roundcube/skins/default/includes/header.html
 share/roundcube/skins/default/includes/links.html
+share/roundcube/skins/default/includes/messagemenu.html
 share/roundcube/skins/default/includes/settingstabs.html
 share/roundcube/skins/default/includes/taskbar.html
 share/roundcube/skins/default/mail.css
 share/roundcube/skins/default/pngbehavior.htc
 share/roundcube/skins/default/print.css
+share/roundcube/skins/default/safari.css
 share/roundcube/skins/default/settings.css
 share/roundcube/skins/default/splitter.js
 share/roundcube/skins/default/templates/addcontact.html
@@ -859,9 +925,12 @@ share/roundcube/skins/default/templates/login.html
 share/roundcube/skins/default/templates/mail.html
 share/roundcube/skins/default/templates/managefolders.html
 share/roundcube/skins/default/templates/message.html
+share/roundcube/skins/default/templates/messageerror.html
 share/roundcube/skins/default/templates/messagepart.html
 share/roundcube/skins/default/templates/messagepreview.html
+share/roundcube/skins/default/templates/plugin.html
 share/roundcube/skins/default/templates/printmessage.html
 share/roundcube/skins/default/templates/settings.html
+share/roundcube/skins/default/templates/settingsedit.html
 share/roundcube/skins/default/templates/showcontact.html
 share/roundcube/skins/default/watermark.html
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 28f48792f17..d255fa64d27 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2009/07/25 01:19:16 schmonz Exp $
+$NetBSD: distinfo,v 1.13 2009/09/20 02:59:32 schmonz Exp $
 
-SHA1 (roundcubemail-0.2.2-dep.tar.gz) = ea8c1e0cd9da22018a78c1756d648f8f148deb68
-RMD160 (roundcubemail-0.2.2-dep.tar.gz) = d3979da7ec2e138217ba78e2298150578b1c1f4b
-Size (roundcubemail-0.2.2-dep.tar.gz) = 1217948 bytes
-SHA1 (patch-aa) = 277afd7f1e4e163afc0a7a8ca2580e28deb14081
+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 (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 baa360b73d9..5718532fdd0 100644
--- a/mail/roundcube/patches/patch-aa
+++ b/mail/roundcube/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2009/01/19 20:15:49 abs Exp $
+$NetBSD: patch-aa,v 1.5 2009/09/20 02:59:32 schmonz Exp $
 
---- config/main.inc.php.dist.orig	2008-12-30 14:33:28.000000000 +0000
+--- config/main.inc.php.dist.orig	2009-08-07 12:13:35.000000000 -0400
 +++ config/main.inc.php.dist
-@@ -30,10 +30,10 @@ $rcmail_config['syslog_facility'] = LOG_
+@@ -33,10 +33,10 @@ $rcmail_config['syslog_facility'] = LOG_
  
  // use this folder to store log files (must be writeable for apache user)
  // This is used by the 'file' log driver.
@@ -13,10 +13,10 @@ $NetBSD: patch-aa,v 1.4 2009/01/19 20:15:49 abs Exp $
 -$rcmail_config['temp_dir'] = 'temp/';
 +$rcmail_config['temp_dir'] = '@VARBASE@/tmp/roundcube/';
  
- // enable caching of messages and mailbox data in the local database.
- // this is recommended if the IMAP server does not run on the same machine
-@@ -413,4 +413,7 @@ $rcmail_config['keep_alive'] = 60;
- $rcmail_config['check_all_folders'] = FALSE;
+ // 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;
  
  // end of config file
 +