Update roundcubemail to 0.9.4.

pkgsrc changes:
	* Make installer work.
	* Add various dependency to PHP extensions.

RELEASE 0.9.4
-------------
- Make identities matching case insensitive (#1485480)
- Fix issue where too big message data was stored in cache causing sql errors
  (#1489316)
- Fix iframe scrollbars on webkit desktop browsers (#1489306)
- Fix issue where legacy config was overriden by default config (#1489288)
- Fix newmail_notifier issue where favicon wasn't changed back to default
  (#1489313)
- Fix setting of Junk and NonJunk flags by markasjunk plugin (#1489285)
- Fix lack of Reply-To address in header of forwarded message body (#1489298)
- Fix bugs when invoking contact creation form when read-only addressbook is
  selected (#1489296)
- Fix identity selection on reply (#1489291)
- Fix so additional headers are added to all messages sent (#1489284)
- Fix display issue after moving folder in Folder Manager (#1489293)
- Fix handling of non-default date formats (#1489294)
- Fix unquoted path in PREG expression on Windows (#1489290)
- Fix Junk folder icon alignment when it's nested in inbox folder (#1489292)
- Fix wrong close tag in /template/mail.html (#1489295)

5 files changed, 48 insertions, 13 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 39aa336740b..f1356d90272 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2013/08/22 17:08:10 taca Exp $
+# $NetBSD: Makefile,v 1.59 2013/09/13 11:13:49 taca Exp $
 
-DISTNAME=	roundcubemail-0.9.3-dep
+DISTNAME=	roundcubemail-0.9.4-dep
 PKGNAME=	${DISTNAME:S/mail-/-/:S/-dep//}
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
@@ -10,9 +10,12 @@ HOMEPAGE=	http://roundcube.net/
 COMMENT=	Browser-based multilingual IMAP client
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
-DEPENDS+=	${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
-DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=4.3.1:../../security/php-mcrypt
+DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
+DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=	${PHP_PKG_PREFIX}-dom>=${PHP_BASE_VERS}:../../textproc/php-dom
+DEPENDS+=	${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
+DEPENDS+=	${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
+DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=${PHP_BASE_VERS}:../../security/php-mcrypt
 
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.4.2:../../net/pear-Net_SMTP
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_IDNA2>=0.1.1:../../net/pear-Net_IDNA2
@@ -79,10 +82,11 @@ SUBST_CLASSES+=		files
 SUBST_STAGE.files=	do-configure
 SUBST_FILES.files=	roundcube.conf
 SUBST_FILES.files+=	config/main.inc.php.dist
-SUBST_FILES.files+=	installer/index.php
+SUBST_FILES.files+=	installer/index.php installer/rcube_install.php
 SUBST_FILES.files+=	program/include/iniset.php
 SUBST_SED.files=	-e "s|@RCDIR@|${RCDIR}|g"
 SUBST_SED.files+=	-e "s|@VARBASE@|${VARBASE}|g"
+SUBST_SED.files+=	-e "s|@PKG_EXAMPLES@|${PREFIX}/share/examples/roundcube|g"
 SUBST_SED.files+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.files=	Fixing configuration files.
 
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index fa7bed03d33..47b94887c5a 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.32 2013/08/22 17:08:10 taca Exp $
+$NetBSD: distinfo,v 1.33 2013/09/13 11:13:49 taca Exp $
 
-SHA1 (roundcubemail-0.9.3-dep.tar.gz) = 060d3c2939ab8964c3c71d5ec1e18e940570ec90
-RMD160 (roundcubemail-0.9.3-dep.tar.gz) = 3d210e715ebead32655fe651e80d5d0233217d7c
-Size (roundcubemail-0.9.3-dep.tar.gz) = 3408855 bytes
+SHA1 (roundcubemail-0.9.4-dep.tar.gz) = 66acb337b422940d7d79ed942a866d238d628960
+RMD160 (roundcubemail-0.9.4-dep.tar.gz) = dc6c2aa2ab5217e130d996bf6dbc522f4a0e3c92
+Size (roundcubemail-0.9.4-dep.tar.gz) = 3410013 bytes
 SHA1 (patch-aa) = 2391f0ddb6b9ba6026f9db6d7050f3412d02e160
 SHA1 (patch-ab) = 19b62d4a24d9b1ccc476f8d3fbe5f386faf6c553
-SHA1 (patch-ac) = ea60a00f8d53f36e069f4b61962ff97c980edb20
+SHA1 (patch-ac) = 8ab62bdbcce807c76f1929546ade88a128db2fff
 SHA1 (patch-af) = 1f95a7005569207469563aa37ff48da0383b7668
+SHA1 (patch-installer_check.php) = e37c25f073fad9c9fc319722116e0316924a7010
+SHA1 (patch-installer_rcube__install.php) = b81f04c050a7e507dc202501f22b77a3817ec9dd
diff --git a/mail/roundcube/patches/patch-ac b/mail/roundcube/patches/patch-ac
index e92d9f38abb..44cdd0a6839 100644
--- a/mail/roundcube/patches/patch-ac
+++ b/mail/roundcube/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2013/06/15 16:08:09 taca Exp $
+$NetBSD: patch-ac,v 1.8 2013/09/13 11:13:49 taca Exp $
 
 Honor PKG_SYSCONFDIR.
 
@@ -9,7 +9,7 @@ Honor PKG_SYSCONFDIR.
  define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
  define('RCUBE_INSTALL_PATH', INSTALL_PATH);
 -define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/');
-+define('RCMAIL_CONFIG_DIR', '@PKG_SYSCONFDIR@');
++define('RCUBE_CONFIG_DIR', '@PKG_SYSCONFDIR@');
  
  $include_path  = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
  $include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
diff --git a/mail/roundcube/patches/patch-installer_check.php b/mail/roundcube/patches/patch-installer_check.php
new file mode 100644
index 00000000000..484e32b4857
--- /dev/null
+++ b/mail/roundcube/patches/patch-installer_check.php
@@ -0,0 +1,14 @@
+$NetBSD: patch-installer_check.php,v 1.1 2013/09/13 11:13:49 taca Exp $
+
+Roundcube dosen't use php-exif.
+
+--- installer/check.php.orig	2013-09-06 12:20:52.000000000 +0000
++++ installer/check.php
+@@ -24,7 +24,6 @@ $optional_php_exts = array(
+     'OpenSSL'   => 'openssl',
+     'Mcrypt'    => 'mcrypt',
+     'Intl'      => 'intl',
+-    'Exif'      => 'exif',
+ );
+ 
+ $required_libs = array(
diff --git a/mail/roundcube/patches/patch-installer_rcube__install.php b/mail/roundcube/patches/patch-installer_rcube__install.php
new file mode 100644
index 00000000000..8afa2c95eaf
--- /dev/null
+++ b/mail/roundcube/patches/patch-installer_rcube__install.php
@@ -0,0 +1,15 @@
+$NetBSD: patch-installer_rcube__install.php,v 1.3 2013/09/13 11:13:49 taca Exp $
+
+Use template from examples dir.
+
+--- installer/rcube_install.php.orig	2013-09-06 12:20:52.000000000 +0000
++++ installer/rcube_install.php
+@@ -147,7 +147,7 @@ class rcube_install
+    */
+   function create_config($which, $force = false)
+   {
+-    $out = @file_get_contents(RCUBE_CONFIG_DIR . $which . '.inc.php.dist');
++    $out = @file_get_contents('@PKG_EXAMPLES@/' . $which . '.inc.php.dist');
+ 
+     if (!$out)
+       return '[Warning: could not read the config template file]';