Update to RC2

New message parser (less memory consuming)
Works with PHP safe_mode
Create valid HTML
New LDAP integration
Search for contacts
Improve message compose screen
IPv6 Compatability
Improved XHTML validation
Identify mailboxes case-sensitive
Lowered status message time from 5 to 3 seconds to improve responsiveness

See http://trac.roundcube.net/wiki/Changelog for all the details

5 files changed, 42 insertions, 57 deletions

diff --git a/mail/roundcube/MESSAGE b/mail/roundcube/MESSAGE
index cac64db981e..81998e3a50f 100644
--- a/mail/roundcube/MESSAGE
+++ b/mail/roundcube/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2007/06/05 20:25:26 adrianp Exp $
+$NetBSD: MESSAGE,v 1.3 2007/11/08 23:35:33 adrianp Exp $
 
 Please refer to the following file on how to setup your RoundCube
 installation.
@@ -10,7 +10,7 @@ For pkgsrc installations the RoundCube package is installed in
 non-default locations.
 
 	Configuration files:	${PKG_SYSCONFDIR}/roundcube/
-	Log files:		${VARBASE}/roundcube/
+	Log files:		${VARBASE}/roundcube/log/
 	Document root:		${PREFIX}/share/roundcube/
 
 You will also need to make RoundCube accessible through your HTTP server.
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 58062ad1adc..8aaa0205ab3 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2007/07/04 20:54:47 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2007/11/08 23:35:33 adrianp Exp $
 #
 
-DISTNAME=	roundcube-0.1-20070528
-PKGNAME=	${DISTNAME:S/-0.1//}
+DISTNAME=	roundcubemail-0.1-rc2
+PKGNAME=	roundcube-0.1rc2
 CATEGORIES=	mail
-MASTER_SITES=	http://www.farrokhi.net/roundcube/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
 
 MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://roundcube.net/
@@ -13,7 +12,6 @@ COMMENT=	Browser-based multilingual IMAP client
 
 USE_LANGUAGES=	# none
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/roundcubemail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -21,7 +19,7 @@ PKG_SYSCONFSUBDIR?=	httpd
 
 PKG_GROUPS_VARS+=	APACHE_GROUP
 PKG_USERS_VARS+=	APACHE_USER
-BUILD_DEFS+=		VARBASE
+BUILD_DEFS+=		VARBASE APACHE_USER APACHE_GROUP
 
 RCDIR=		${PREFIX}/share/roundcube
 EGDIR=		${PREFIX}/share/examples/roundcube
@@ -59,10 +57,10 @@ INSTALLATION_DIRS=	${RCDIR}/program ${RCDIR}/skins ${EGDIR}/SQL ${DOCDIR}
 .include "../../mk/apache.mk"
 
 post-extract:
-	cp ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf
+	${CP} ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf
 
 pre-install:
-	find ${WRKSRC} -name "*.orig" -print | xargs rm -f
+	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/roundcube.conf ${EGDIR}/roundcube.conf
@@ -81,10 +79,10 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist ${EGDIR}/main.inc.php
 
 .for i in ${PAX_DIRS}
-	cd ${WRKSRC}/${i} && pax -rw . ${RCDIR}/${i}
-	find ${RCDIR}/${i} -type f | xargs chmod ${SHAREMODE}
-	find ${RCDIR}/${i} -type d | xargs chmod ${PKGDIRMODE}
-	chown -R ${SHAREOWN}:${SHAREGRP} ${RCDIR}/${i}
+	cd ${WRKSRC}/${i} && ${PAX} -rw . ${RCDIR}/${i}
+	${FIND} ${RCDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+	${FIND} ${RCDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${RCDIR}/${i}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/roundcube/PLIST b/mail/roundcube/PLIST
index 868ba953a97..98e9c91eb19 100644
--- a/mail/roundcube/PLIST
+++ b/mail/roundcube/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2007/06/05 20:25:26 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/11/08 23:35:33 adrianp Exp $
 share/doc/roundcube/INSTALL
 share/doc/roundcube/LICENSE
 share/doc/roundcube/README
 share/doc/roundcube/UPGRADING
 share/examples/roundcube/SQL/mssql.initial.sql
 share/examples/roundcube/SQL/mysql.initial.sql
-share/examples/roundcube/SQL/mysql.update-0.1a.sql
 share/examples/roundcube/SQL/mysql.update.sql
 share/examples/roundcube/SQL/mysql5.initial.sql
 share/examples/roundcube/SQL/postgres.initial.sql
@@ -20,7 +19,7 @@ share/roundcube/index.php
 share/roundcube/program/blank.gif
 share/roundcube/program/blocked.gif
 share/roundcube/program/include/bugs.inc
-share/roundcube/program/include/cache.inc
+share/roundcube/program/include/rcube_html.inc
 share/roundcube/program/include/main.inc
 share/roundcube/program/include/rcmail_template.inc
 share/roundcube/program/include/rcube_contacts.inc
@@ -315,8 +314,6 @@ share/roundcube/program/localization/ar/labels.inc
 share/roundcube/program/localization/ar/messages.inc
 share/roundcube/program/localization/bg/labels.inc
 share/roundcube/program/localization/bg/messages.inc
-share/roundcube/program/localization/bs_BA/labels.inc
-share/roundcube/program/localization/bs_BA/messages.inc
 share/roundcube/program/localization/ca/labels.inc
 share/roundcube/program/localization/ca/messages.inc
 share/roundcube/program/localization/cz/labels.inc
@@ -333,6 +330,8 @@ share/roundcube/program/localization/en_GB/labels.inc
 share/roundcube/program/localization/en_GB/messages.inc
 share/roundcube/program/localization/en_US/labels.inc
 share/roundcube/program/localization/en_US/messages.inc
+share/roundcube/program/localization/eo/labels.inc
+share/roundcube/program/localization/eo/messages.inc
 share/roundcube/program/localization/es/labels.inc
 share/roundcube/program/localization/es/messages.inc
 share/roundcube/program/localization/et_EE/labels.inc
@@ -345,33 +344,31 @@ share/roundcube/program/localization/fi/labels.inc
 share/roundcube/program/localization/fi/messages.inc
 share/roundcube/program/localization/fr/labels.inc
 share/roundcube/program/localization/fr/messages.inc
-share/roundcube/program/localization/hi/labels.inc
-share/roundcube/program/localization/hi/messages.inc
+share/roundcube/program/localization/ga_IE/labels.inc
+share/roundcube/program/localization/ga_IE/messages.inc
+share/roundcube/program/localization/gl/labels.inc
+share/roundcube/program/localization/gl/messages.inc
 share/roundcube/program/localization/hr/labels.inc
 share/roundcube/program/localization/hr/messages.inc
 share/roundcube/program/localization/hu/labels.inc
 share/roundcube/program/localization/hu/messages.inc
-share/roundcube/program/localization/id_ID/labels.inc
-share/roundcube/program/localization/id_ID/messages.inc
 share/roundcube/program/localization/index.inc
 share/roundcube/program/localization/it/labels.inc
 share/roundcube/program/localization/it/messages.inc
 share/roundcube/program/localization/ja/labels.inc
 share/roundcube/program/localization/ja/messages.inc
-share/roundcube/program/localization/kur_KU/labels.inc
-share/roundcube/program/localization/kur_KU/messages.inc
 share/roundcube/program/localization/lt/labels.inc
 share/roundcube/program/localization/lt/messages.inc
 share/roundcube/program/localization/lv/labels.inc
 share/roundcube/program/localization/lv/messages.inc
+share/roundcube/program/localization/mk/labels.inc
+share/roundcube/program/localization/mk/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
 share/roundcube/program/localization/nb_NO/messages.inc
-share/roundcube/program/localization/nl_BE/labels.inc
-share/roundcube/program/localization/nl_BE/messages.inc
 share/roundcube/program/localization/nl_NL/labels.inc
 share/roundcube/program/localization/nl_NL/messages.inc
-share/roundcube/program/localization/nn_NO/labels.inc
-share/roundcube/program/localization/nn_NO/messages.inc
 share/roundcube/program/localization/pl/labels.inc
 share/roundcube/program/localization/pl/messages.inc
 share/roundcube/program/localization/pt_BR/labels.inc
@@ -390,16 +387,10 @@ share/roundcube/program/localization/sl/labels.inc
 share/roundcube/program/localization/sl/messages.inc
 share/roundcube/program/localization/sk/labels.inc
 share/roundcube/program/localization/sk/messages.inc
-share/roundcube/program/localization/sr_cyrillic/labels.inc
-share/roundcube/program/localization/sr_cyrillic/messages.inc
-share/roundcube/program/localization/sr_latin/labels.inc
-share/roundcube/program/localization/sr_latin/messages.inc
-share/roundcube/program/localization/th/labels.inc
-share/roundcube/program/localization/th/messages.inc
 share/roundcube/program/localization/tr/labels.inc
 share/roundcube/program/localization/tr/messages.inc
-share/roundcube/program/localization/vn/labels.inc
-share/roundcube/program/localization/vn/messages.inc
+share/roundcube/program/localization/uk/labels.inc
+share/roundcube/program/localization/uk/messages.inc
 share/roundcube/program/localization/zh_CN/labels.inc
 share/roundcube/program/localization/zh_CN/messages.inc
 share/roundcube/program/localization/zh_TW/labels.inc
@@ -615,13 +606,15 @@ share/roundcube/skins/default/watermark.html
 @dirrm share/roundcube/program/steps/mail
 @dirrm share/roundcube/program/steps/addressbook
 @dirrm share/roundcube/program/steps
+@dirrm share/roundcube/program/localization/eo
+@dirrm share/roundcube/program/localization/ga_IE
+@dirrm share/roundcube/program/localization/gl
+@dirrm share/roundcube/program/localization/mk
+@dirrm share/roundcube/program/localization/ms_MY
+@dirrm share/roundcube/program/localization/uk
 @dirrm share/roundcube/program/localization/zh_TW
 @dirrm share/roundcube/program/localization/zh_CN
-@dirrm share/roundcube/program/localization/vn
 @dirrm share/roundcube/program/localization/tr
-@dirrm share/roundcube/program/localization/th
-@dirrm share/roundcube/program/localization/sr_latin
-@dirrm share/roundcube/program/localization/sr_cyrillic
 @dirrm share/roundcube/program/localization/sk
 @dirrm share/roundcube/program/localization/si
 @dirrm share/roundcube/program/localization/sl
@@ -631,19 +624,14 @@ share/roundcube/skins/default/watermark.html
 @dirrm share/roundcube/program/localization/pt_PT
 @dirrm share/roundcube/program/localization/pt_BR
 @dirrm share/roundcube/program/localization/pl
-@dirrm share/roundcube/program/localization/nn_NO
 @dirrm share/roundcube/program/localization/nl_NL
-@dirrm share/roundcube/program/localization/nl_BE
 @dirrm share/roundcube/program/localization/nb_NO
 @dirrm share/roundcube/program/localization/lv
 @dirrm share/roundcube/program/localization/lt
-@dirrm share/roundcube/program/localization/kur_KU
 @dirrm share/roundcube/program/localization/ja
 @dirrm share/roundcube/program/localization/it
-@dirrm share/roundcube/program/localization/id_ID
 @dirrm share/roundcube/program/localization/hu
 @dirrm share/roundcube/program/localization/hr
-@dirrm share/roundcube/program/localization/hi
 @dirrm share/roundcube/program/localization/fr
 @dirrm share/roundcube/program/localization/fi
 @dirrm share/roundcube/program/localization/fa
@@ -658,7 +646,6 @@ share/roundcube/skins/default/watermark.html
 @dirrm share/roundcube/program/localization/da
 @dirrm share/roundcube/program/localization/cz
 @dirrm share/roundcube/program/localization/ca
-@dirrm share/roundcube/program/localization/bs_BA
 @dirrm share/roundcube/program/localization/bg
 @dirrm share/roundcube/program/localization/ar
 @dirrm share/roundcube/program/localization/am
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 420a556ddeb..1b0c9387ced 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2007/06/05 20:25:26 adrianp Exp $
+$NetBSD: distinfo,v 1.4 2007/11/08 23:35:33 adrianp Exp $
 
-SHA1 (roundcube-0.1-20070528.tar.bz2) = d89939c8025c96211040e141ee114b8e2a6fc3a8
-RMD160 (roundcube-0.1-20070528.tar.bz2) = 550cba189fd137a47b74c455b90013d5980f4583
-Size (roundcube-0.1-20070528.tar.bz2) = 768650 bytes
-SHA1 (patch-aa) = 6672520123bab023c2ee50a363a3c634db2202e3
+SHA1 (roundcubemail-0.1-rc2.tar.gz) = c6bcdf1d5192fe58402ace5ee5ae16e5c71dc3fe
+RMD160 (roundcubemail-0.1-rc2.tar.gz) = 904bd5aa189cce462de6d287fec908f301af3da9
+Size (roundcubemail-0.1-rc2.tar.gz) = 915025 bytes
+SHA1 (patch-aa) = 621204db27874a799e5190e2cc00c3187cb3c61a
 SHA1 (patch-ab) = 15ed0f903072be25eaf1d0edac8ddbe8cca8ac25
diff --git a/mail/roundcube/patches/patch-aa b/mail/roundcube/patches/patch-aa
index d25a2631106..08da2a7bd49 100644
--- a/mail/roundcube/patches/patch-aa
+++ b/mail/roundcube/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.1 2007/05/11 11:51:05 schmonz Exp $
+$NetBSD: patch-aa,v 1.2 2007/11/08 23:35:33 adrianp Exp $
 
---- config/main.inc.php.dist.orig	2007-05-08 05:22:27.000000000 -0400
+--- config/main.inc.php.dist.orig	2007-10-20 23:14:12.000000000 +0100
 +++ config/main.inc.php.dist
-@@ -88,10 +88,10 @@ $rcmail_config['list_cols'] = array('sub
- $rcmail_config['skin_path'] = 'skins/default/';
+@@ -97,10 +97,10 @@ $rcmail_config['skin_path'] = 'skins/def
+ $rcmail_config['skin_include_php'] = FALSE;
  
  // use this folder to store temp files (must be writebale for apache user)
 -$rcmail_config['temp_dir'] = 'temp/';