Update roundcube package to 0.7.1.

* Handle config file of plugins, too.
* Roundcube use GNU GPL3 now.
* take maintainer ship.

Detail changes are too may, please refer CHANGELOG file
(http://trac.roundcube.net/browser/tags/roundcubemail/v0.7.1/CHANGELOG)
and old changes
(http://lists.roundcube.net/mail-archive/announce/2011-08/0000002.html).

7 files changed, 289 insertions, 73 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index b4ca8d98a58..f0c531e171a 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,18 +1,25 @@
-# $NetBSD: Makefile,v 1.36 2011/09/16 05:46:24 obache Exp $
+# $NetBSD: Makefile,v 1.37 2012/01/14 15:36:24 taca Exp $
 
-DISTNAME=	roundcubemail-0.5.4-dep
+DISTNAME=	roundcubemail-0.7.1-dep
 PKGNAME=	${DISTNAME:S/mail-/-/:S/-dep//}
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
 
-MAINTAINER=	pettai@NetBSD.org
+MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://roundcube.net/
 COMMENT=	Browser-based multilingual IMAP client
-LICENSE=	gnu-gpl-v2
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.4.2:../../net/pear-Net_SMTP
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.8.1:../../mail/pear-Mail_Mime
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-MDB2>=2.5.0:../../databases/pear-MDB2
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Auth_SASL>=1.0.3:../../mail/pear-Auth_SASL
+DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
+DEPENDS+=	${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_IDNA2>=0.1.1:../../net/pear-Net_IDNA2
+
 USE_LANGUAGES=		# none
 USE_TOOLS+=		pax
 NO_BUILD=		yes
@@ -23,15 +30,7 @@ INSTALLATION_DIRS+=	${EGDIR}/SQL ${DOCDIR} ${RCDIR}/bin
 .include "../../mk/bsd.prefs.mk"
 .include "../../lang/php/phpversion.mk"
 
-DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_IDNA2>=0.1.0:../../net/pear-Net_IDNA2
-DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.4.2:../../net/pear-Net_SMTP
-DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.7:../../mail/pear-Mail_Mime
-DEPENDS+=	${PHP_PKG_PREFIX}-pear-MDB2>=2.5.0:../../databases/pear-MDB2
-DEPENDS+=	${PHP_PKG_PREFIX}-pear-Auth_SASL-[0-9]*:../../mail/pear-Auth_SASL
-DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
-DEPENDS+=	${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
-
-PKG_SYSCONFSUBDIR=	roundcube
+PKG_SYSCONFSUBDIR?=	roundcube
 
 WWW_USER?=		${APACHE_USER}
 WWW_GROUP?=		${APACHE_GROUP}
@@ -45,6 +44,10 @@ EGDIR=			${PREFIX}/share/examples/roundcube
 DOCDIR=			${PREFIX}/share/doc/roundcube
 PAX_DIRS=		plugins program skins installer bin
 
+CONF_PLUGINS=		acl additional_message_headers enigma help \
+			jqueryui managesieve newmail_notifier password \
+			redundant_attachments squirrelmail_usercopy
+
 MESSAGE_SUBST+=		DOCDIR=${DOCDIR} PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 MESSAGE_SUBST+=		VARBASE=${VARBASE} RCDIR=${RCDIR}
 FILES_SUBST+=		RCDIR=${RCDIR}
@@ -52,7 +55,7 @@ FILES_SUBST+=		RCDIR=${RCDIR}
 OWN_DIRS+=		${PKG_SYSCONFDIR}
 OWN_DIRS_PERMS+=	${VARBASE}/log/roundcube \
 			${WWW_USER} ${WWW_GROUP} 0755
-OWN_DIRS_PERMS+=	${VARBASE}/tmp/roundcube \
+OWN_DIRS_PERMS+=	${VARBASE}/spool/roundcube \
 			${WWW_USER} ${WWW_GROUP} 0755
 
 CONF_FILES=		${EGDIR}/roundcube.conf \
@@ -66,6 +69,12 @@ CONF_FILES_PERMS+=	${EGDIR}/main.inc.php.dist \
 			${PKG_SYSCONFDIR}/main.inc.php \
 			${WWW_USER} ${WWW_GROUP} 0640
 
+.for f in ${CONF_PLUGINS}
+CONF_FILES_PERMS+=	${EGDIR}/plugins/${f}/config.inc.php \
+			${RCDIR}/plugins/${f}/config.iplnc.php \
+			${WWW_USER} ${WWW_GROUP} 0640
+.endfor
+
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	do-configure
 SUBST_FILES.files=	roundcube.conf
@@ -78,7 +87,7 @@ SUBST_SED.files+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 REPLACE_INTERPRETER+=	php
-REPLACE.php.old=	.*/bin/php
+REPLACE.php.old=	/usr/bin/env php
 REPLACE.php.new=	${PREFIX}/bin/php
 REPLACE_FILES.php=	bin/*.sh
 
@@ -121,4 +130,10 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${RCDIR}/${i}
 .endfor
 
+.for f in ${CONF_PLUGINS}
+	${MKDIR} ${DESTDIR}${EGDIR}/plugins/${f}
+	${MV} ${DESTDIR}${RCDIR}/plugins/${f}/config.inc.php.dist \
+		${DESTDIR}${EGDIR}/plugins/${f}/config.inc.php
+.endfor
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/roundcube/PLIST b/mail/roundcube/PLIST
index 91cc4bce03a..126f994ad7d 100644
--- a/mail/roundcube/PLIST
+++ b/mail/roundcube/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2011/04/26 13:47:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2012/01/14 15:36:24 taca Exp $
 share/doc/roundcube/INSTALL
 share/doc/roundcube/LICENSE
 share/doc/roundcube/README
@@ -14,12 +14,26 @@ share/examples/roundcube/SQL/sqlite.update.sql
 share/examples/roundcube/db.inc.php.dist
 share/examples/roundcube/main.inc.php.dist
 share/examples/roundcube/mimetypes.php
+share/examples/roundcube/plugins/acl/config.inc.php
+share/examples/roundcube/plugins/additional_message_headers/config.inc.php
+share/examples/roundcube/plugins/enigma/config.inc.php
+share/examples/roundcube/plugins/help/config.inc.php
+share/examples/roundcube/plugins/jqueryui/config.inc.php
+share/examples/roundcube/plugins/managesieve/config.inc.php
+share/examples/roundcube/plugins/newmail_notifier/config.inc.php
+share/examples/roundcube/plugins/password/config.inc.php
+share/examples/roundcube/plugins/redundant_attachments/config.inc.php
+share/examples/roundcube/plugins/squirrelmail_usercopy/config.inc.php
 share/examples/roundcube/roundcube.conf
 share/roundcube/.htaccess
 share/roundcube/bin/cleandb.sh
 share/roundcube/bin/decrypt.sh
+share/roundcube/bin/dumpschema.sh
+share/roundcube/bin/indexcontacts.sh
+share/roundcube/bin/installto.sh
 share/roundcube/bin/jsshrink.sh
 share/roundcube/bin/jsunshrink.sh
+share/roundcube/bin/makedoc.sh
 share/roundcube/bin/msgexport.sh
 share/roundcube/bin/msgimport.sh
 share/roundcube/bin/update.sh
@@ -28,19 +42,27 @@ share/roundcube/installer/check.php
 share/roundcube/installer/client.js
 share/roundcube/installer/config.php
 share/roundcube/installer/images/add.png
-share/roundcube/installer/images/banner_bg.gif
-share/roundcube/installer/images/banner_logo.gif
-share/roundcube/installer/images/banner_right.gif
+share/roundcube/installer/images/banner_gradient.gif
+share/roundcube/installer/images/banner_schraffur.gif
 share/roundcube/installer/images/delete.png
 share/roundcube/installer/images/error.png
+share/roundcube/installer/images/rcube_logo.gif
 share/roundcube/installer/index.php
 share/roundcube/installer/rcube_install.php
 share/roundcube/installer/styles.css
 share/roundcube/installer/test.php
 share/roundcube/installer/utils.php
 share/roundcube/installer/welcome.html
+share/roundcube/plugins/acl/acl.js
+share/roundcube/plugins/acl/acl.php
+share/roundcube/plugins/acl/localization/de_DE.inc
+share/roundcube/plugins/acl/localization/en_US.inc
+share/roundcube/plugins/acl/localization/pl_PL.inc
+share/roundcube/plugins/acl/skins/default/acl.css
+share/roundcube/plugins/acl/skins/default/images/enabled.png
+share/roundcube/plugins/acl/skins/default/images/partial.png
+share/roundcube/plugins/acl/skins/default/templates/table.html
 share/roundcube/plugins/additional_message_headers/additional_message_headers.php
-share/roundcube/plugins/additional_message_headers/config.inc.php.dist
 share/roundcube/plugins/additional_message_headers/package.xml
 share/roundcube/plugins/archive/archive.js
 share/roundcube/plugins/archive/archive.php
@@ -52,9 +74,11 @@ share/roundcube/plugins/archive/localization/es_AR.inc
 share/roundcube/plugins/archive/localization/es_ES.inc
 share/roundcube/plugins/archive/localization/et_EE.inc
 share/roundcube/plugins/archive/localization/fr_FR.inc
+share/roundcube/plugins/archive/localization/gl_ES.inc
 share/roundcube/plugins/archive/localization/ja_JP.inc
 share/roundcube/plugins/archive/localization/nl_NL.inc
 share/roundcube/plugins/archive/localization/pl_PL.inc
+share/roundcube/plugins/archive/localization/pt_BR.inc
 share/roundcube/plugins/archive/localization/ru_RU.inc
 share/roundcube/plugins/archive/localization/sv_SE.inc
 share/roundcube/plugins/archive/localization/zh_TW.inc
@@ -67,10 +91,43 @@ 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/enigma/README
+share/roundcube/plugins/enigma/enigma.js
+share/roundcube/plugins/enigma/enigma.php
+share/roundcube/plugins/enigma/home/.htaccess
+share/roundcube/plugins/enigma/lib/Crypt/GPG.php
+share/roundcube/plugins/enigma/lib/Crypt/GPG/DecryptStatusHandler.php
+share/roundcube/plugins/enigma/lib/Crypt/GPG/Engine.php
+share/roundcube/plugins/enigma/lib/Crypt/GPG/Exceptions.php
+share/roundcube/plugins/enigma/lib/Crypt/GPG/Key.php
+share/roundcube/plugins/enigma/lib/Crypt/GPG/Signature.php
+share/roundcube/plugins/enigma/lib/Crypt/GPG/SubKey.php
+share/roundcube/plugins/enigma/lib/Crypt/GPG/UserId.php
+share/roundcube/plugins/enigma/lib/Crypt/GPG/VerifyStatusHandler.php
+share/roundcube/plugins/enigma/lib/enigma_driver.php
+share/roundcube/plugins/enigma/lib/enigma_driver_gnupg.php
+share/roundcube/plugins/enigma/lib/enigma_engine.php
+share/roundcube/plugins/enigma/lib/enigma_error.php
+share/roundcube/plugins/enigma/lib/enigma_key.php
+share/roundcube/plugins/enigma/lib/enigma_signature.php
+share/roundcube/plugins/enigma/lib/enigma_subkey.php
+share/roundcube/plugins/enigma/lib/enigma_ui.php
+share/roundcube/plugins/enigma/lib/enigma_userid.php
+share/roundcube/plugins/enigma/localization/en_US.inc
+share/roundcube/plugins/enigma/localization/ja_JP.inc
+share/roundcube/plugins/enigma/localization/ru_RU.inc
+share/roundcube/plugins/enigma/skins/default/enigma.css
+share/roundcube/plugins/enigma/skins/default/enigma.png
+share/roundcube/plugins/enigma/skins/default/enigma_error.png
+share/roundcube/plugins/enigma/skins/default/key.png
+share/roundcube/plugins/enigma/skins/default/key_add.png
+share/roundcube/plugins/enigma/skins/default/keys_toolbar.png
+share/roundcube/plugins/enigma/skins/default/templates/keyimport.html
+share/roundcube/plugins/enigma/skins/default/templates/keyinfo.html
+share/roundcube/plugins/enigma/skins/default/templates/keys.html
 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
@@ -81,9 +138,11 @@ share/roundcube/plugins/help/localization/en_GB.inc
 share/roundcube/plugins/help/localization/en_US.inc
 share/roundcube/plugins/help/localization/es_ES.inc
 share/roundcube/plugins/help/localization/et_EE.inc
+share/roundcube/plugins/help/localization/gl_ES.inc
 share/roundcube/plugins/help/localization/hu_HU.inc
 share/roundcube/plugins/help/localization/ja_JP.inc
 share/roundcube/plugins/help/localization/pl_PL.inc
+share/roundcube/plugins/help/localization/pt_BR.inc
 share/roundcube/plugins/help/localization/ru_RU.inc
 share/roundcube/plugins/help/localization/sv_SE.inc
 share/roundcube/plugins/help/localization/zh_TW.inc
@@ -91,10 +150,104 @@ 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/http_authentication/logout.html
+share/roundcube/plugins/jqueryui/README
+share/roundcube/plugins/jqueryui/jqueryui.php
+share/roundcube/plugins/jqueryui/js/i18n/jquery-ui-i18n.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-af.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ar.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-az.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-bg.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-bs.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ca.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-cs.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-da.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-de-CH.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-de.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-el.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-en-GB.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-eo.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-es.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-et.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-eu.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-fa.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-fi.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-fo.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-fr-CH.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-fr.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-gl.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-he.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-hr.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-hu.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-hy.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-id.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-is.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-it.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ja.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ko.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-kz.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-lt.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-lv.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ms.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-nl-BE.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-nl.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-no.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-pl.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-pt-BR.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-pt.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ro.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ru.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-sk.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-sl.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-sq.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-sr-SR.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-sr.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-sv.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ta.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-th.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-tr.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-uk.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-vi.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-zh-CN.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-zh-HK.js
+share/roundcube/plugins/jqueryui/js/i18n/jquery.ui.datepicker-zh-TW.js
+share/roundcube/plugins/jqueryui/js/jquery-ui-1.8.14.custom.min.js
+share/roundcube/plugins/jqueryui/themes/default/images/buttongradient.png
+share/roundcube/plugins/jqueryui/themes/default/images/listheader.png
+share/roundcube/plugins/jqueryui/themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png
+share/roundcube/plugins/jqueryui/themes/default/images/ui-bg_flat_75_ffffff_40x100.png
+share/roundcube/plugins/jqueryui/themes/default/images/ui-bg_flat_90_cc3333_40x100.png
+share/roundcube/plugins/jqueryui/themes/default/images/ui-bg_glass_95_fef1ec_1x400.png
+share/roundcube/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_a3a3a3_1x100.png
+share/roundcube/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_e6e6e7_1x100.png
+share/roundcube/plugins/jqueryui/themes/default/images/ui-bg_highlight-hard_90_f4f4f4_1x100.png
+share/roundcube/plugins/jqueryui/themes/default/images/ui-icons_000000_256x240.png
+share/roundcube/plugins/jqueryui/themes/default/images/ui-icons_333333_256x240.png
+share/roundcube/plugins/jqueryui/themes/default/images/ui-icons_666666_256x240.png
+share/roundcube/plugins/jqueryui/themes/default/images/ui-icons_cc3333_256x240.png
+share/roundcube/plugins/jqueryui/themes/default/images/ui-icons_dddddd_256x240.png
+share/roundcube/plugins/jqueryui/themes/default/jquery-ui-1.8.14.custom.css
+share/roundcube/plugins/jqueryui/themes/default/roundcube-custom.diff
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_flat_55_fbec88_40x100.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_217bc0_256x240.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_2e83ff_256x240.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_469bdd_256x240.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_6da8d5_256x240.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_cd0a0a_256x240.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_d8e7f3_256x240.png
+share/roundcube/plugins/jqueryui/themes/redmond/images/ui-icons_f9bd01_256x240.png
+share/roundcube/plugins/jqueryui/themes/redmond/jquery-ui-1.8.14.custom.css
 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/lib/rcube_sieve_script.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
@@ -107,9 +260,12 @@ 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/gl_ES.inc
+share/roundcube/plugins/managesieve/localization/hr_HR.inc
 share/roundcube/plugins/managesieve/localization/hu_HU.inc
 share/roundcube/plugins/managesieve/localization/it_IT.inc
 share/roundcube/plugins/managesieve/localization/ja_JP.inc
+share/roundcube/plugins/managesieve/localization/lv_LV.inc
 share/roundcube/plugins/managesieve/localization/nb_NO.inc
 share/roundcube/plugins/managesieve/localization/nl_NL.inc
 share/roundcube/plugins/managesieve/localization/pl_PL.inc
@@ -124,13 +280,28 @@ share/roundcube/plugins/managesieve/localization/zh_CN.inc
 share/roundcube/plugins/managesieve/localization/zh_TW.inc
 share/roundcube/plugins/managesieve/managesieve.js
 share/roundcube/plugins/managesieve/managesieve.php
+share/roundcube/plugins/managesieve/package.xml
+share/roundcube/plugins/managesieve/skins/default/images/add.png
+share/roundcube/plugins/managesieve/skins/default/images/del.png
+share/roundcube/plugins/managesieve/skins/default/images/down_small.gif
+share/roundcube/plugins/managesieve/skins/default/images/filter.png
+share/roundcube/plugins/managesieve/skins/default/images/up_small.gif
 share/roundcube/plugins/managesieve/skins/default/managesieve.css
-share/roundcube/plugins/managesieve/skins/default/managesieve_toolbar.png
+share/roundcube/plugins/managesieve/skins/default/managesieve_mail.css
 share/roundcube/plugins/managesieve/skins/default/templates/filteredit.html
 share/roundcube/plugins/managesieve/skins/default/templates/managesieve.html
 share/roundcube/plugins/managesieve/skins/default/templates/setedit.html
 share/roundcube/plugins/managesieve/tests/Makefile
 share/roundcube/plugins/managesieve/tests/parser.phpt
+share/roundcube/plugins/managesieve/tests/parser_body.phpt
+share/roundcube/plugins/managesieve/tests/parser_imapflags.phpt
+share/roundcube/plugins/managesieve/tests/parser_include.phpt
+share/roundcube/plugins/managesieve/tests/parser_kep14.phpt
+share/roundcube/plugins/managesieve/tests/parser_prefix.phpt
+share/roundcube/plugins/managesieve/tests/parser_relational.phpt
+share/roundcube/plugins/managesieve/tests/parser_vacation.phpt
+share/roundcube/plugins/managesieve/tests/parser_variables.phpt
+share/roundcube/plugins/managesieve/tests/parset_subaddress.phpt
 share/roundcube/plugins/managesieve/tests/tokenize.phpt
 share/roundcube/plugins/markasjunk/localization/cs_CZ.inc
 share/roundcube/plugins/markasjunk/localization/da_DK.inc
@@ -139,6 +310,8 @@ share/roundcube/plugins/markasjunk/localization/en_US.inc
 share/roundcube/plugins/markasjunk/localization/es_AR.inc
 share/roundcube/plugins/markasjunk/localization/es_ES.inc
 share/roundcube/plugins/markasjunk/localization/et_EE.inc
+share/roundcube/plugins/markasjunk/localization/gl_ES.inc
+share/roundcube/plugins/markasjunk/localization/it_IT.inc
 share/roundcube/plugins/markasjunk/localization/ja_JP.inc
 share/roundcube/plugins/markasjunk/localization/pl_PL.inc
 share/roundcube/plugins/markasjunk/localization/ru_RU.inc
@@ -150,6 +323,7 @@ share/roundcube/plugins/markasjunk/markasjunk.php
 share/roundcube/plugins/markasjunk/package.xml
 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/bg_BG.inc
 share/roundcube/plugins/new_user_dialog/localization/cs_CZ.inc
 share/roundcube/plugins/new_user_dialog/localization/de_CH.inc
 share/roundcube/plugins/new_user_dialog/localization/de_DE.inc
@@ -172,8 +346,19 @@ share/roundcube/plugins/new_user_dialog/new_user_dialog.php
 share/roundcube/plugins/new_user_dialog/newuserdialog.css
 share/roundcube/plugins/new_user_dialog/package.xml
 share/roundcube/plugins/new_user_identity/new_user_identity.php
+share/roundcube/plugins/newmail_notifier/favicon.ico
+share/roundcube/plugins/newmail_notifier/localization/de_CH.inc
+share/roundcube/plugins/newmail_notifier/localization/de_DE.inc
+share/roundcube/plugins/newmail_notifier/localization/en_US.inc
+share/roundcube/plugins/newmail_notifier/localization/lv_LV.inc
+share/roundcube/plugins/newmail_notifier/localization/pl_PL.inc
+share/roundcube/plugins/newmail_notifier/localization/pt_BR.inc
+share/roundcube/plugins/newmail_notifier/localization/ru_RU.inc
+share/roundcube/plugins/newmail_notifier/mail.png
+share/roundcube/plugins/newmail_notifier/newmail_notifier.js
+share/roundcube/plugins/newmail_notifier/newmail_notifier.php
+share/roundcube/plugins/newmail_notifier/sound.wav
 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/chgvirtualminpasswd.c
 share/roundcube/plugins/password/drivers/chpass-wrapper.py
@@ -204,6 +389,8 @@ share/roundcube/plugins/password/localization/es_ES.inc
 share/roundcube/plugins/password/localization/et_EE.inc
 share/roundcube/plugins/password/localization/fi_FI.inc
 share/roundcube/plugins/password/localization/fr_FR.inc
+share/roundcube/plugins/password/localization/gl_ES.inc
+share/roundcube/plugins/password/localization/hr_HR.inc
 share/roundcube/plugins/password/localization/hu_HU.inc
 share/roundcube/plugins/password/localization/it_IT.inc
 share/roundcube/plugins/password/localization/ja_JP.inc
@@ -222,8 +409,8 @@ share/roundcube/plugins/password/localization/zh_TW.inc
 share/roundcube/plugins/password/package.xml
 share/roundcube/plugins/password/password.js
 share/roundcube/plugins/password/password.php
+share/roundcube/plugins/redundant_attachments/redundant_attachments.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
@@ -231,6 +418,7 @@ share/roundcube/plugins/subscriptions_option/localization/de_DE.inc
 share/roundcube/plugins/subscriptions_option/localization/en_US.inc
 share/roundcube/plugins/subscriptions_option/localization/es_ES.inc
 share/roundcube/plugins/subscriptions_option/localization/et_EE.inc
+share/roundcube/plugins/subscriptions_option/localization/gl_ES.inc
 share/roundcube/plugins/subscriptions_option/localization/ja_JP.inc
 share/roundcube/plugins/subscriptions_option/localization/pl_PL.inc
 share/roundcube/plugins/subscriptions_option/localization/ru_RU.inc
@@ -243,9 +431,13 @@ share/roundcube/plugins/userinfo/localization/de_CH.inc
 share/roundcube/plugins/userinfo/localization/en_US.inc
 share/roundcube/plugins/userinfo/localization/es_ES.inc
 share/roundcube/plugins/userinfo/localization/et_EE.inc
+share/roundcube/plugins/userinfo/localization/fr_FR.inc
+share/roundcube/plugins/userinfo/localization/gl_ES.inc
 share/roundcube/plugins/userinfo/localization/ja_JP.inc
 share/roundcube/plugins/userinfo/localization/pl_PL.inc
+share/roundcube/plugins/userinfo/localization/pt_BR.inc
 share/roundcube/plugins/userinfo/localization/pt_PT.inc
+share/roundcube/plugins/userinfo/localization/ro_RO.inc
 share/roundcube/plugins/userinfo/localization/ru_RU.inc
 share/roundcube/plugins/userinfo/localization/sv_SE.inc
 share/roundcube/plugins/userinfo/localization/zh_TW.inc
@@ -257,9 +449,11 @@ share/roundcube/plugins/vcard_attachments/localization/de_DE.inc
 share/roundcube/plugins/vcard_attachments/localization/en_US.inc
 share/roundcube/plugins/vcard_attachments/localization/es_ES.inc
 share/roundcube/plugins/vcard_attachments/localization/et_EE.inc
+share/roundcube/plugins/vcard_attachments/localization/gl_ES.inc
 share/roundcube/plugins/vcard_attachments/localization/it_IT.inc
 share/roundcube/plugins/vcard_attachments/localization/ja_JP.inc
 share/roundcube/plugins/vcard_attachments/localization/pl_PL.inc
+share/roundcube/plugins/vcard_attachments/localization/pt_BR.inc
 share/roundcube/plugins/vcard_attachments/localization/ru_RU.inc
 share/roundcube/plugins/vcard_attachments/localization/sv_SE.inc
 share/roundcube/plugins/vcard_attachments/localization/zh_TW.inc
@@ -270,6 +464,7 @@ share/roundcube/plugins/vcard_attachments/vcard_attachments.php
 share/roundcube/plugins/vcard_attachments/vcardattach.js
 share/roundcube/plugins/virtuser_file/virtuser_file.php
 share/roundcube/plugins/virtuser_query/virtuser_query.php
+share/roundcube/program/.htaccess
 share/roundcube/program/blank.gif
 share/roundcube/program/blocked.gif
 share/roundcube/program/include/clisetup.php
@@ -279,10 +474,13 @@ 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_cache.php
 share/roundcube/program/include/rcube_config.php
 share/roundcube/program/include/rcube_contacts.php
+share/roundcube/program/include/rcube_content_filter.php
 share/roundcube/program/include/rcube_html_page.php
 share/roundcube/program/include/rcube_imap.php
+share/roundcube/program/include/rcube_imap_cache.php
 share/roundcube/program/include/rcube_imap_generic.php
 share/roundcube/program/include/rcube_json_output.php
 share/roundcube/program/include/rcube_ldap.php
@@ -295,6 +493,7 @@ share/roundcube/program/include/rcube_result_set.php
 share/roundcube/program/include/rcube_session.php
 share/roundcube/program/include/rcube_shared.inc
 share/roundcube/program/include/rcube_smtp.php
+share/roundcube/program/include/rcube_spellchecker.php
 share/roundcube/program/include/rcube_sqlite.inc
 share/roundcube/program/include/rcube_string_replacer.php
 share/roundcube/program/include/rcube_template.php
@@ -308,7 +507,7 @@ 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.4.min.js
+share/roundcube/program/js/jquery.min.js
 share/roundcube/program/js/list.js
 share/roundcube/program/js/list.js.src
 share/roundcube/program/js/tiny_mce/langs/ar.js
@@ -455,17 +654,9 @@ share/roundcube/program/js/tiny_mce/plugins/emotions/langs/tw_dlg.js
 share/roundcube/program/js/tiny_mce/plugins/emotions/langs/uk_dlg.js
 share/roundcube/program/js/tiny_mce/plugins/emotions/langs/vi_dlg.js
 share/roundcube/program/js/tiny_mce/plugins/emotions/langs/zh_dlg.js
-share/roundcube/program/js/tiny_mce/plugins/media/css/content.css
 share/roundcube/program/js/tiny_mce/plugins/media/css/media.css
 share/roundcube/program/js/tiny_mce/plugins/media/editor_plugin.js
 share/roundcube/program/js/tiny_mce/plugins/media/editor_plugin_src.js
-share/roundcube/program/js/tiny_mce/plugins/media/img/flash.gif
-share/roundcube/program/js/tiny_mce/plugins/media/img/flv_player.swf
-share/roundcube/program/js/tiny_mce/plugins/media/img/quicktime.gif
-share/roundcube/program/js/tiny_mce/plugins/media/img/realmedia.gif
-share/roundcube/program/js/tiny_mce/plugins/media/img/shockwave.gif
-share/roundcube/program/js/tiny_mce/plugins/media/img/trans.gif
-share/roundcube/program/js/tiny_mce/plugins/media/img/windowsmedia.gif
 share/roundcube/program/js/tiny_mce/plugins/media/js/embed.js
 share/roundcube/program/js/tiny_mce/plugins/media/js/media.js
 share/roundcube/program/js/tiny_mce/plugins/media/langs/ar_dlg.js
@@ -751,7 +942,16 @@ share/roundcube/program/js/tiny_mce/themes/advanced/editor_template.js
 share/roundcube/program/js/tiny_mce/themes/advanced/editor_template_src.js
 share/roundcube/program/js/tiny_mce/themes/advanced/image.htm
 share/roundcube/program/js/tiny_mce/themes/advanced/img/colorpicker.jpg
+share/roundcube/program/js/tiny_mce/themes/advanced/img/flash.gif
 share/roundcube/program/js/tiny_mce/themes/advanced/img/icons.gif
+share/roundcube/program/js/tiny_mce/themes/advanced/img/iframe.gif
+share/roundcube/program/js/tiny_mce/themes/advanced/img/pagebreak.gif
+share/roundcube/program/js/tiny_mce/themes/advanced/img/quicktime.gif
+share/roundcube/program/js/tiny_mce/themes/advanced/img/realmedia.gif
+share/roundcube/program/js/tiny_mce/themes/advanced/img/shockwave.gif
+share/roundcube/program/js/tiny_mce/themes/advanced/img/trans.gif
+share/roundcube/program/js/tiny_mce/themes/advanced/img/video.gif
+share/roundcube/program/js/tiny_mce/themes/advanced/img/windowsmedia.gif
 share/roundcube/program/js/tiny_mce/themes/advanced/js/about.js
 share/roundcube/program/js/tiny_mce/themes/advanced/js/anchor.js
 share/roundcube/program/js/tiny_mce/themes/advanced/js/charmap.js
@@ -1070,6 +1270,8 @@ share/roundcube/program/steps/addressbook/mailto.inc
 share/roundcube/program/steps/addressbook/save.inc
 share/roundcube/program/steps/addressbook/search.inc
 share/roundcube/program/steps/addressbook/show.inc
+share/roundcube/program/steps/addressbook/undo.inc
+share/roundcube/program/steps/addressbook/upload_photo.inc
 share/roundcube/program/steps/mail/addcontact.inc
 share/roundcube/program/steps/mail/attachments.inc
 share/roundcube/program/steps/mail/autocomplete.inc
@@ -1106,10 +1308,7 @@ share/roundcube/program/steps/utils/killcache.inc
 share/roundcube/program/steps/utils/modcss.inc
 share/roundcube/program/steps/utils/save_pref.inc
 share/roundcube/program/steps/utils/spell.inc
-share/roundcube/program/steps/utils/spell_googie.inc
-share/roundcube/program/steps/utils/spell_html_googie.inc
-share/roundcube/program/steps/utils/spell_html_pspell.inc
-share/roundcube/program/steps/utils/spell_pspell.inc
+share/roundcube/program/steps/utils/spell_html.inc
 share/roundcube/robots.txt
 share/roundcube/skins/default/README
 share/roundcube/skins/default/addressbook.css
@@ -1127,6 +1326,7 @@ share/roundcube/skins/default/images/buttons/add_pas.png
 share/roundcube/skins/default/images/buttons/add_sel.png
 share/roundcube/skins/default/images/buttons/bg.gif
 share/roundcube/skins/default/images/cleardot.png
+share/roundcube/skins/default/images/contactpic.png
 share/roundcube/skins/default/images/dbutton.png
 share/roundcube/skins/default/images/dimple.png
 share/roundcube/skins/default/images/display/icons.gif
@@ -1174,14 +1374,14 @@ share/roundcube/skins/default/images/mail_footer.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
-share/roundcube/skins/default/images/mailbox_selected.gif
 share/roundcube/skins/default/images/messageactions.gif
 share/roundcube/skins/default/images/messageactions.png
 share/roundcube/skins/default/images/messageicons.gif
 share/roundcube/skins/default/images/messageicons.png
 share/roundcube/skins/default/images/pagenav.gif
+share/roundcube/skins/default/images/quota-colors.png
 share/roundcube/skins/default/images/quota.gif
+share/roundcube/skins/default/images/quota.png
 share/roundcube/skins/default/images/roundcube_logo.png
 share/roundcube/skins/default/images/searchfield.gif
 share/roundcube/skins/default/images/tabs-left.gif
@@ -1194,8 +1394,7 @@ share/roundcube/skins/default/images/tree.gif
 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/replyallmenu.html
+share/roundcube/skins/default/includes/messagetoolbar.html
 share/roundcube/skins/default/includes/settingstabs.html
 share/roundcube/skins/default/includes/taskbar.html
 share/roundcube/skins/default/mail.css
@@ -1209,6 +1408,7 @@ share/roundcube/skins/default/templates/compose.html
 share/roundcube/skins/default/templates/contact.html
 share/roundcube/skins/default/templates/contactadd.html
 share/roundcube/skins/default/templates/contactedit.html
+share/roundcube/skins/default/templates/contactsearch.html
 share/roundcube/skins/default/templates/error.html
 share/roundcube/skins/default/templates/folderedit.html
 share/roundcube/skins/default/templates/folders.html
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 2f5903fa99f..6e29fd79d3a 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2011/08/17 08:31:36 adam Exp $
+$NetBSD: distinfo,v 1.23 2012/01/14 15:36:24 taca Exp $
 
-SHA1 (roundcubemail-0.5.4-dep.tar.gz) = 9c8bebfe07903d73b5dcad1a096c849f28a36295
-RMD160 (roundcubemail-0.5.4-dep.tar.gz) = 116eced24268905a79a8be5466d0aaf8e83dd22b
-Size (roundcubemail-0.5.4-dep.tar.gz) = 1786117 bytes
-SHA1 (patch-aa) = 5acb8f2a021c374c752647d6aea55b37c4586c1c
-SHA1 (patch-ab) = 397b14ed10158094eebcdf43be73884098ff6dbd
-SHA1 (patch-ac) = 33e85bd1577f3554213c0f1da55500761967026a
-SHA1 (patch-af) = 51f5774aa4397310b15d2d357ed028498f01437c
+SHA1 (roundcubemail-0.7.1-dep.tar.gz) = 5700eef255f092619fe66d63d8d05496f79fcb98
+RMD160 (roundcubemail-0.7.1-dep.tar.gz) = 488584eaa97a2f81855407b7d5be6a8e4ae97f49
+Size (roundcubemail-0.7.1-dep.tar.gz) = 2192355 bytes
+SHA1 (patch-aa) = 4946fab1dd1a809d32de7fa16b9eb1075eb8424a
+SHA1 (patch-ab) = ac9f7ac488f9c309fd1b30a8ecec73e52b245c11
+SHA1 (patch-ac) = c25fc1c662bbdbde388165fe835e8af9b5665c5b
+SHA1 (patch-af) = e2bae396f049b2c5030f24e539b7f418a3d09d78
diff --git a/mail/roundcube/patches/patch-aa b/mail/roundcube/patches/patch-aa
index fd3d9ad3de2..abb8b8febff 100644
--- a/mail/roundcube/patches/patch-aa
+++ b/mail/roundcube/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.8 2011/01/13 12:19:19 adam Exp $
+$NetBSD: patch-aa,v 1.9 2012/01/14 15:36:24 taca Exp $
 
---- config/main.inc.php.dist.orig	2011-01-12 08:13:40.000000000 +0000
+Use proper directories for log and temporary.
+
+--- config/main.inc.php.dist.orig	2011-11-30 13:11:34.000000000 +0000
 +++ config/main.inc.php.dist
-@@ -163,10 +163,10 @@ $rcmail_config['enable_installer'] = fal
+@@ -174,10 +174,10 @@ $rcmail_config['enable_installer'] = fal
  
  // use this folder to store log files (must be writeable for apache user)
  // This is used by the 'file' log driver.
@@ -11,14 +13,7 @@ $NetBSD: patch-aa,v 1.8 2011/01/13 12:19:19 adam Exp $
  
  // use this folder to store temp files (must be writeable for apache user)
 -$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
-@@ -626,3 +626,6 @@ $rcmail_config['dsn_default'] = 0;
- $rcmail_config['reply_same_folder'] = false;
++$rcmail_config['temp_dir'] = '@VARBASE@/spool/roundcube/';
  
- // end of config file
-+
-+include_once('main-local.inc.php');
-+?>
+ // lifetime of message cache
+ // possible units: s, m, h, d, w
diff --git a/mail/roundcube/patches/patch-ab b/mail/roundcube/patches/patch-ab
index 1c1c4d50ae4..0fe5cec4f7c 100644
--- a/mail/roundcube/patches/patch-ab
+++ b/mail/roundcube/patches/patch-ab
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.6 2010/09/23 23:54:40 pettai Exp $
+$NetBSD: patch-ab,v 1.7 2012/01/14 15:36:24 taca Exp $
 
---- config/db.inc.php.dist.orig	2010-06-23 09:55:08.000000000 +0000
+* Use db-local.inc.php for local configuration.
+
+--- config/db.inc.php.dist.orig	2011-09-28 10:16:54.000000000 +0000
 +++ config/db.inc.php.dist
-@@ -71,3 +71,6 @@ $rcmail_config['db_sequence_messages'] =
+@@ -61,3 +61,6 @@ $rcmail_config['db_sequence_searches'] =
  
  // end db config file
  
diff --git a/mail/roundcube/patches/patch-ac b/mail/roundcube/patches/patch-ac
index a9cd7915033..4a8af206a4d 100644
--- a/mail/roundcube/patches/patch-ac
+++ b/mail/roundcube/patches/patch-ac
@@ -1,8 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2009/01/19 20:15:49 abs Exp $
+$NetBSD: patch-ac,v 1.5 2012/01/14 15:36:24 taca Exp $
 
---- installer/index.php.orig	2008-12-07 11:10:49.000000000 +0000
+Honor PKG_SYSCONFDIR.
+
+--- installer/index.php.orig	2011-08-31 13:36:27.000000000 +0000
 +++ installer/index.php
-@@ -4,7 +4,7 @@ ini_set('error_reporting', E_ALL&~E_NOTI
+@@ -32,7 +32,7 @@ ini_set('error_reporting', E_ALL&~E_NOTI
  ini_set('display_errors', 1);
  
  define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
diff --git a/mail/roundcube/patches/patch-af b/mail/roundcube/patches/patch-af
index 78de02af73f..e28b4d3e17e 100644
--- a/mail/roundcube/patches/patch-af
+++ b/mail/roundcube/patches/patch-af
@@ -1,8 +1,10 @@
-$NetBSD: patch-af,v 1.4 2010/10/03 22:13:38 pettai Exp $
+$NetBSD: patch-af,v 1.5 2012/01/14 15:36:24 taca Exp $
 
---- program/include/iniset.php.orig	2010-09-29 10:04:09.000000000 +0000
+Honor PKG_SYSCONFDIR.
+
+--- program/include/iniset.php.orig	2012-01-06 16:01:53.000000000 +0000
 +++ program/include/iniset.php
-@@ -46,7 +46,7 @@ if (!defined('INSTALL_PATH')) {
+@@ -47,7 +47,7 @@ if (!defined('INSTALL_PATH')) {
  }
  
  if (!defined('RCMAIL_CONFIG_DIR')) {