Sun May 4 16:34:03 2008 UTC ()
Update to 0.1.1

pkgsrc changes:
- Use the 'dep' version to install roundcube with no included dependencies
  and instead manage it all through pkgsrc - suggestion from schmonz@
- Move the config files to ${PREFIX}/share/roundcube/config as it was
  becomming difficult to manage them under ${PKG_SYSCONFDIR}
- Add the GUI installer scripts to the install so users can use it for the
  initial setup and generation of the configuration files.
- Add a note to the roundcube.conf file about protection of the
  installer directory once initially used.
- Don't assume apache is the only supported web server (because it's not)
  we don't support any additional ones now but this will make integration
  down the track easier if we do.
- Increased PKG_SUGGESTED_OPTIONS based on documentation in the INSTALL file.
- Add more required PHP options to roundcube.conf

Thanks to Dan Engholm for feedback on the package.

>From the ChangeLog:
* Clear selection when selecting single item (1484942)
* Remove hard-coded image size in skin templates (1484893)
* Database schema improvements (dropped unnecessary indexes)
* Fixed creating a new folder with a comma in its name (1484681)
* Fixed sorting of messages when default mailbox is empty (1484317)
* Improve message previewpane - less loading (1484316)
* Fixed login form autocompletion (1484839)
* Fixed virtuser_query option for mdb2 backend (1484874)
* Fixed attachment resoting from Drafts when message body was empty (1484506)
* Fixed usage of ob_gzhandler (1484851)
* Fixed message part window in IE6 (1484610)
* Fixed decoding of mime-encoded strings (1484191)
* Fixed some iconv/mb_string problems (1484598)
* Correctly quote mailbox name when using in URL (1484313)
* Fixed "headers already sent" errors (1484860)


(adrianp)
diff -r1.4 -r1.5 pkgsrc/mail/roundcube/MESSAGE
diff -r1.8 -r1.9 pkgsrc/mail/roundcube/Makefile
diff -r1.5 -r1.6 pkgsrc/mail/roundcube/PLIST
diff -r1.5 -r1.6 pkgsrc/mail/roundcube/distinfo
diff -r1.2 -r1.3 pkgsrc/mail/roundcube/options.mk
diff -r1.2 -r1.3 pkgsrc/mail/roundcube/files/roundcube.conf
diff -r1.2 -r0 pkgsrc/mail/roundcube/patches/patch-ab
diff -r0 -r1.1 pkgsrc/mail/roundcube/patches/patch-ac
diff -r0 -r1.1 pkgsrc/mail/roundcube/patches/patch-ad

cvs diff -r1.4 -r1.5 pkgsrc/mail/roundcube/MESSAGE (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/MESSAGE 2008/03/15 13:54:58 1.4
+++ pkgsrc/mail/roundcube/MESSAGE 2008/05/04 16:34:03 1.5
@@ -1,22 +1,27 @@ @@ -1,22 +1,27 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.4 2008/03/15 13:54:58 adrianp Exp $ 2$NetBSD: MESSAGE,v 1.5 2008/05/04 16:34:03 adrianp Exp $
3 3
4Please refer to the following file on how to setup your RoundCube 4Please refer to the following file on how to setup your RoundCube
5installation. 5installation.
6 6
7 ${DOCDIR}/INSTALL 7 ${DOCDIR}/INSTALL
8 8
9For pkgsrc installations the RoundCube package is installed in 9For pkgsrc installations the RoundCube package is installed in
10non-default locations. 10non-default locations.
11 11
12 Configuration files: ${PKG_SYSCONFDIR}/roundcube/ 12 Configuration files: ${RCDIR}/config/
13 Log files: ${VARBASE}/log/roundcube/ 13 Log files: ${VARBASE}/log/roundcube/
14 Document root: ${PREFIX}/share/roundcube/ 14 Document root: ${PREFIX}/share/roundcube/
15 15
16You will also need to make RoundCube accessible through your HTTP server. 16You will also need to make RoundCube accessible through your HTTP server.
17If you are running Apache and ap-php, then you can add the following lines 17If you are running Apache and ap-php, then you can add the following lines
18to httpd.conf: 18to httpd.conf:
19 19
20 Include ${PKG_SYSCONFDIR}/roundcube.conf 20 Include ${PKG_SYSCONFDIR}/roundcube.conf
21 21
 22NOTE: As of version 0.1.1 the location of some of the roundcube
 23configuration files have changed. In addition to this please read the
 24note in the ${PKG_SYSCONFDIR}/roundcube.conf file about the
 25protection of the installer directory.
 26
22=========================================================================== 27===========================================================================

cvs diff -r1.8 -r1.9 pkgsrc/mail/roundcube/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/Makefile 2008/03/15 13:54:59 1.8
+++ pkgsrc/mail/roundcube/Makefile 2008/05/04 16:34:03 1.9
@@ -1,88 +1,104 @@ @@ -1,88 +1,104 @@
1# $NetBSD: Makefile,v 1.8 2008/03/15 13:54:59 adrianp Exp $ 1# $NetBSD: Makefile,v 1.9 2008/05/04 16:34:03 adrianp Exp $
2# 2#
3 3
4DISTNAME= roundcubemail-0.1 4DISTNAME= roundcubemail-${VERSION}-dep
5PKGNAME= ${DISTNAME:S/mail//} 5PKGNAME= ${DISTNAME:S/mail-${VERSION}-dep/-${VERSION}/}
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
8 8
9MAINTAINER= adrianp@NetBSD.org 9MAINTAINER= adrianp@NetBSD.org
10HOMEPAGE= http://roundcube.net/ 10HOMEPAGE= http://roundcube.net/
11COMMENT= Browser-based multilingual IMAP client 11COMMENT= Browser-based multilingual IMAP client
12 12
13USE_LANGUAGES= # none 13USE_LANGUAGES= # none
14NO_BUILD= yes 14NO_BUILD= yes
 15VERSION= 0.1.1
15 16
16.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
 18.include "../../lang/php/phpversion.mk"
17 19
18PKG_SYSCONFSUBDIR?= httpd 20DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.2.10:../../net/pear-Net_SMTP
 21DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.3:../../mail/pear-Mail_Mime
 22DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2>=2.4.1:../../databases/pear-MDB2
 23DEPENDS+= ${PHP_PKG_PREFIX}-pear-Auth_SASL-[0-9]*:../../mail/pear-Auth_SASL
 24
 25PKG_SYSCONFSUBDIR?= roundcube
 26
 27WWW_USER?= ${APACHE_USER}
 28WWW_GROUP?= ${APACHE_GROUP}
 29
 30PKG_GROUPS_VARS+= WWW_GROUP
 31PKG_USERS_VARS+= WWW_USER
 32BUILD_DEFS+= VARBASE WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP
 33
 34RCDIR= ${PREFIX}/share/roundcube
 35EGDIR= ${PREFIX}/share/examples/roundcube
 36DOCDIR= ${PREFIX}/share/doc/roundcube
 37PAX_DIRS= program skins installer
 38
 39MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 40MESSAGE_SUBST+= VARBASE=${VARBASE:Q} RCDIR=${RCDIR:Q}
 41FILES_SUBST+= RCDIR=${RCDIR:Q}
 42
 43OWN_DIRS_PERMS+= ${VARBASE}/log/roundcube \
 44 ${WWW_USER} ${WWW_GROUP} 0755
 45OWN_DIRS_PERMS+= ${VARBASE}/tmp/roundcube \
 46 ${WWW_USER} ${WWW_GROUP} 0755
19 47
20PKG_GROUPS_VARS+= APACHE_GROUP 48CONF_FILES= ${EGDIR}/roundcube.conf \
21PKG_USERS_VARS+= APACHE_USER 49 ${PKG_SYSCONFDIR}/roundcube.conf
22BUILD_DEFS+= VARBASE APACHE_USER APACHE_GROUP 
23 
24RCDIR= ${PREFIX}/share/roundcube 
25EGDIR= ${PREFIX}/share/examples/roundcube 
26DOCDIR= ${PREFIX}/share/doc/roundcube 
27PAX_DIRS= program skins 
28 
29MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} 
30MESSAGE_SUBST+= VARBASE=${VARBASE:Q} 
31FILES_SUBST+= RCDIR=${RCDIR:Q} 
32 
33OWN_DIRS+= ${PKG_SYSCONFDIR}/roundcube 
34OWN_DIRS_PERMS+=${VARBASE}/log/roundcube ${APACHE_USER} ${APACHE_GROUP} 0755 
35OWN_DIRS_PERMS+=${VARBASE}/tmp/roundcube ${APACHE_USER} ${APACHE_GROUP} 0755 
36 
37CONF_FILES= ${EGDIR}/roundcube.conf ${PKG_SYSCONFDIR}/roundcube.conf 
38CONF_FILES_PERMS+= \ 
39 ${EGDIR}/db.inc.php ${PKG_SYSCONFDIR}/roundcube/db.inc.php \ 
40 ${ROOT_USER} ${APACHE_GROUP} 0640 \ 
41 ${EGDIR}/main.inc.php ${PKG_SYSCONFDIR}/roundcube/main.inc.php \ 
42 ${ROOT_USER} ${APACHE_GROUP} 0640 
43 50
44SUBST_CLASSES+= files 51SUBST_CLASSES+= files
45SUBST_STAGE.files= do-configure 52SUBST_STAGE.files= do-configure
46SUBST_FILES.files= roundcube.conf 53SUBST_FILES.files= roundcube.conf
47SUBST_FILES.files+= config/main.inc.php.dist 54SUBST_FILES.files+= config/main.inc.php.dist
48SUBST_FILES.files+= program/include/main.inc 
49SUBST_SED.files= -e "s|@RCDIR@|${RCDIR}|g" 55SUBST_SED.files= -e "s|@RCDIR@|${RCDIR}|g"
50SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g" 56SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g"
51SUBST_SED.files+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" 
52SUBST_MESSAGE.files= Fixing configuration files. 57SUBST_MESSAGE.files= Fixing configuration files.
53 58
54INSTALLATION_DIRS= ${RCDIR}/program ${RCDIR}/skins ${EGDIR}/SQL ${DOCDIR} 59INSTALLATION_DIRS= ${RCDIR}/program ${RCDIR}/skins ${EGDIR}/SQL ${DOCDIR}
55 60
56.include "options.mk" 
57.include "../../mk/apache.mk" 61.include "../../mk/apache.mk"
 62.include "options.mk"
58 63
59post-extract: 64post-extract:
60 ${CP} ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf 65 ${CP} ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf
61 66
62pre-install: 67pre-install:
63 ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f 68 ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
64 69
65do-install: 70do-install:
 71 ${INSTALL_DATA_DIR} ${RCDIR}/config
66 ${INSTALL_DATA} ${WRKSRC}/roundcube.conf ${EGDIR}/roundcube.conf 72 ${INSTALL_DATA} ${WRKSRC}/roundcube.conf ${EGDIR}/roundcube.conf
67 ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR} 73 ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}
68 ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCDIR} 74 ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCDIR}
69 ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} 75 ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
70 ${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DOCDIR} 76 ${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DOCDIR}
71 77
72 ${INSTALL_DATA} ${WRKSRC}/SQL/*.sql ${EGDIR}/SQL/ 78 ${INSTALL_DATA} ${WRKSRC}/SQL/*.sql ${EGDIR}/SQL/
73 79
74 ${INSTALL_DATA} ${WRKSRC}/.htaccess ${RCDIR}/ 80 ${INSTALL_DATA} ${WRKSRC}/.htaccess ${RCDIR}/
75 
76 ${INSTALL_DATA} ${WRKSRC}/index.php ${RCDIR}/ 81 ${INSTALL_DATA} ${WRKSRC}/index.php ${RCDIR}/
 82 ${INSTALL_DATA} ${WRKSRC}/robots.txt ${RCDIR}/
77 83
78 ${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist ${EGDIR}/db.inc.php 84 ${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist \
79 ${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist ${EGDIR}/main.inc.php 85 ${EGDIR}/db.inc.php.dist
80 86 ${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist \
81.for i in ${PAX_DIRS} 87 ${EGDIR}/main.inc.php.dist
82 cd ${WRKSRC}/${i} && ${PAX} -rw . ${RCDIR}/${i} 88 ${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist \
83 ${FIND} ${RCDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE} 89 ${RCDIR}/config/db.inc.php.dist
84 ${FIND} ${RCDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE} 90 ${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist \
85 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${RCDIR}/${i} 91 ${RCDIR}/config/main.inc.php.dist
86.endfor 92
 93 ${CHMOD} ${PKGDIRMODE} ${RCDIR}/config
 94 ${CHOWN} ${WWW_USER}:${WWW_GROUP} ${RCDIR}/config
 95 ${CHOWN} ${WWW_USER}:${WWW_GROUP} ${RCDIR}/config/*.dist
 96
 97. for i in ${PAX_DIRS}
 98 cd ${WRKSRC}/${i} && ${PAX} -rw . ${RCDIR}/${i}
 99 ${FIND} ${RCDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 100 ${FIND} ${RCDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 101 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${RCDIR}/${i}
 102. endfor
87 103
88.include "../../mk/bsd.pkg.mk" 104.include "../../mk/bsd.pkg.mk"

cvs diff -r1.5 -r1.6 pkgsrc/mail/roundcube/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/PLIST 2008/03/15 13:54:59 1.5
+++ pkgsrc/mail/roundcube/PLIST 2008/05/04 16:34:03 1.6
@@ -1,47 +1,61 @@ @@ -1,47 +1,61 @@
1@comment $NetBSD: PLIST,v 1.5 2008/03/15 13:54:59 adrianp Exp $ 1@comment $NetBSD: PLIST,v 1.6 2008/05/04 16:34:03 adrianp Exp $
2share/doc/roundcube/INSTALL 2share/doc/roundcube/INSTALL
3share/doc/roundcube/LICENSE 3share/doc/roundcube/LICENSE
4share/doc/roundcube/README 4share/doc/roundcube/README
5share/doc/roundcube/UPGRADING 5share/doc/roundcube/UPGRADING
6share/examples/roundcube/SQL/mssql.initial.sql 6share/examples/roundcube/SQL/mssql.initial.sql
7share/examples/roundcube/SQL/mysql.initial.sql 7share/examples/roundcube/SQL/mysql.initial.sql
8share/examples/roundcube/SQL/mysql.update-0.1a.sql 
9share/examples/roundcube/SQL/mysql.update.sql 8share/examples/roundcube/SQL/mysql.update.sql
10share/examples/roundcube/SQL/mysql5.initial.sql 9share/examples/roundcube/SQL/mysql5.initial.sql
11share/examples/roundcube/SQL/postgres.initial.sql 10share/examples/roundcube/SQL/postgres.initial.sql
12share/examples/roundcube/SQL/postgres.update.sql 11share/examples/roundcube/SQL/postgres.update.sql
13share/examples/roundcube/SQL/sqlite.initial.sql 12share/examples/roundcube/SQL/sqlite.initial.sql
14share/examples/roundcube/SQL/sqlite.update.sql 13share/examples/roundcube/SQL/sqlite.update.sql
15share/examples/roundcube/db.inc.php 14share/examples/roundcube/db.inc.php.dist
16share/examples/roundcube/main.inc.php 15share/examples/roundcube/main.inc.php.dist
17share/examples/roundcube/roundcube.conf 16share/examples/roundcube/roundcube.conf
18share/roundcube/.htaccess 17share/roundcube/.htaccess
19share/roundcube/index.php 18share/roundcube/index.php
 19share/roundcube/config/db.inc.php.dist
 20share/roundcube/config/main.inc.php.dist
 21share/roundcube/installer/check.php
 22share/roundcube/installer/client.js
 23share/roundcube/installer/config.php
 24share/roundcube/installer/images/add.png
 25share/roundcube/installer/images/banner_bg.gif
 26share/roundcube/installer/images/banner_logo.gif
 27share/roundcube/installer/images/banner_right.gif
 28share/roundcube/installer/images/delete.png
 29share/roundcube/installer/index.php
 30share/roundcube/installer/rcube_install.php
 31share/roundcube/installer/styles.css
 32share/roundcube/installer/test.php
 33share/roundcube/installer/welcome.html
20share/roundcube/program/blank.gif 34share/roundcube/program/blank.gif
21share/roundcube/program/blocked.gif 35share/roundcube/program/blocked.gif
22share/roundcube/program/include/bugs.inc 36share/roundcube/program/include/bugs.inc
23share/roundcube/program/include/rcube_html.inc 
24share/roundcube/program/include/rcube_user.inc 
25share/roundcube/program/include/main.inc 37share/roundcube/program/include/main.inc
26share/roundcube/program/include/rcmail_template.inc 38share/roundcube/program/include/rcmail_template.inc
27share/roundcube/program/include/rcube_contacts.inc 39share/roundcube/program/include/rcube_contacts.inc
28share/roundcube/program/include/rcube_db.inc 40share/roundcube/program/include/rcube_db.inc
 41share/roundcube/program/include/rcube_html.inc
29share/roundcube/program/include/rcube_imap.inc 42share/roundcube/program/include/rcube_imap.inc
30share/roundcube/program/include/rcube_ldap.inc 43share/roundcube/program/include/rcube_ldap.inc
31share/roundcube/program/include/rcube_mdb2.inc 44share/roundcube/program/include/rcube_mdb2.inc
32share/roundcube/program/include/rcube_shared.inc 45share/roundcube/program/include/rcube_shared.inc
33share/roundcube/program/include/rcube_smtp.inc 46share/roundcube/program/include/rcube_smtp.inc
34share/roundcube/program/include/rcube_sqlite.inc 47share/roundcube/program/include/rcube_sqlite.inc
 48share/roundcube/program/include/rcube_user.inc
35share/roundcube/program/include/session.inc 49share/roundcube/program/include/session.inc
36share/roundcube/program/js/app.js 50share/roundcube/program/js/app.js
37share/roundcube/program/js/common.js 51share/roundcube/program/js/common.js
38share/roundcube/program/js/editor.js 52share/roundcube/program/js/editor.js
39share/roundcube/program/js/editor_images.js 53share/roundcube/program/js/editor_images.js
40share/roundcube/program/js/googiespell.js 54share/roundcube/program/js/googiespell.js
41share/roundcube/program/js/list.js 55share/roundcube/program/js/list.js
42share/roundcube/program/js/tiny_mce/blank.htm 56share/roundcube/program/js/tiny_mce/blank.htm
43share/roundcube/program/js/tiny_mce/langs/en.js 57share/roundcube/program/js/tiny_mce/langs/en.js
44share/roundcube/program/js/tiny_mce/langs/readme.txt 58share/roundcube/program/js/tiny_mce/langs/readme.txt
45share/roundcube/program/js/tiny_mce/license.txt 59share/roundcube/program/js/tiny_mce/license.txt
46share/roundcube/program/js/tiny_mce/plugins/cleanup/editor_plugin.js 60share/roundcube/program/js/tiny_mce/plugins/cleanup/editor_plugin.js
47share/roundcube/program/js/tiny_mce/plugins/cleanup/editor_plugin_src.js 61share/roundcube/program/js/tiny_mce/plugins/cleanup/editor_plugin_src.js
@@ -139,26 +153,27 @@ share/roundcube/program/js/tiny_mce/plug @@ -139,26 +153,27 @@ share/roundcube/program/js/tiny_mce/plug
139share/roundcube/program/js/tiny_mce/plugins/table/langs/en.js 153share/roundcube/program/js/tiny_mce/plugins/table/langs/en.js
140share/roundcube/program/js/tiny_mce/plugins/table/merge_cells.htm 154share/roundcube/program/js/tiny_mce/plugins/table/merge_cells.htm
141share/roundcube/program/js/tiny_mce/plugins/table/readme.txt 155share/roundcube/program/js/tiny_mce/plugins/table/readme.txt
142share/roundcube/program/js/tiny_mce/plugins/table/row.htm 156share/roundcube/program/js/tiny_mce/plugins/table/row.htm
143share/roundcube/program/js/tiny_mce/plugins/table/table.htm 157share/roundcube/program/js/tiny_mce/plugins/table/table.htm
144share/roundcube/program/js/tiny_mce/plugins/visualchars/editor_plugin.js 158share/roundcube/program/js/tiny_mce/plugins/visualchars/editor_plugin.js
145share/roundcube/program/js/tiny_mce/plugins/visualchars/editor_plugin_src.js 159share/roundcube/program/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
146share/roundcube/program/js/tiny_mce/plugins/visualchars/images/visualchars.gif 160share/roundcube/program/js/tiny_mce/plugins/visualchars/images/visualchars.gif
147share/roundcube/program/js/tiny_mce/plugins/visualchars/langs/en.js 161share/roundcube/program/js/tiny_mce/plugins/visualchars/langs/en.js
148share/roundcube/program/js/tiny_mce/themes/advanced/about.htm 162share/roundcube/program/js/tiny_mce/themes/advanced/about.htm
149share/roundcube/program/js/tiny_mce/themes/advanced/anchor.htm 163share/roundcube/program/js/tiny_mce/themes/advanced/anchor.htm
150share/roundcube/program/js/tiny_mce/themes/advanced/charmap.htm 164share/roundcube/program/js/tiny_mce/themes/advanced/charmap.htm
151share/roundcube/program/js/tiny_mce/themes/advanced/color_picker.htm 165share/roundcube/program/js/tiny_mce/themes/advanced/color_picker.htm
 166share/roundcube/program/js/tiny_mce/themes/advanced/css/editor_content.css
152share/roundcube/program/js/tiny_mce/themes/advanced/css/editor_popup.css 167share/roundcube/program/js/tiny_mce/themes/advanced/css/editor_popup.css
153share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/about.htm 168share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/about.htm
154share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/common_buttons.htm 169share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/common_buttons.htm
155share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/create_accessible_content.htm 170share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/create_accessible_content.htm
156share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/images/insert_anchor_window.gif 171share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/images/insert_anchor_window.gif
157share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/images/insert_image_window.gif 172share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/images/insert_image_window.gif
158share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/images/insert_link_window.gif 173share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/images/insert_link_window.gif
159share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/images/insert_table_window.gif 174share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/images/insert_table_window.gif
160share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/index.htm 175share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/index.htm
161share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/insert_anchor_button.htm 176share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/insert_anchor_button.htm
162share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/insert_image_button.htm 177share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/insert_image_button.htm
163share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/insert_link_button.htm 178share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/insert_link_button.htm
164share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/insert_table_button.htm 179share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/insert_table_button.htm
@@ -240,166 +255,42 @@ share/roundcube/program/js/tiny_mce/them @@ -240,166 +255,42 @@ share/roundcube/program/js/tiny_mce/them
240share/roundcube/program/js/tiny_mce/themes/advanced/jscripts/link.js 255share/roundcube/program/js/tiny_mce/themes/advanced/jscripts/link.js
241share/roundcube/program/js/tiny_mce/themes/advanced/jscripts/source_editor.js 256share/roundcube/program/js/tiny_mce/themes/advanced/jscripts/source_editor.js
242share/roundcube/program/js/tiny_mce/themes/advanced/langs/en.js 257share/roundcube/program/js/tiny_mce/themes/advanced/langs/en.js
243share/roundcube/program/js/tiny_mce/themes/advanced/link.htm 258share/roundcube/program/js/tiny_mce/themes/advanced/link.htm
244share/roundcube/program/js/tiny_mce/themes/advanced/source_editor.htm 259share/roundcube/program/js/tiny_mce/themes/advanced/source_editor.htm
245share/roundcube/program/js/tiny_mce/tiny_mce.js 260share/roundcube/program/js/tiny_mce/tiny_mce.js
246share/roundcube/program/js/tiny_mce/tiny_mce_popup.js 261share/roundcube/program/js/tiny_mce/tiny_mce_popup.js
247share/roundcube/program/js/tiny_mce/tiny_mce_src.js 262share/roundcube/program/js/tiny_mce/tiny_mce_src.js
248share/roundcube/program/js/tiny_mce/utils/editable_selects.js 263share/roundcube/program/js/tiny_mce/utils/editable_selects.js
249share/roundcube/program/js/tiny_mce/utils/form_utils.js 264share/roundcube/program/js/tiny_mce/utils/form_utils.js
250share/roundcube/program/js/tiny_mce/utils/mclayer.js 265share/roundcube/program/js/tiny_mce/utils/mclayer.js
251share/roundcube/program/js/tiny_mce/utils/mctabs.js 266share/roundcube/program/js/tiny_mce/utils/mctabs.js
252share/roundcube/program/js/tiny_mce/utils/validate.js 267share/roundcube/program/js/tiny_mce/utils/validate.js
253share/roundcube/program/lib/Auth/SASL.php 
254share/roundcube/program/lib/Auth/SASL/Anonymous.php 
255share/roundcube/program/lib/Auth/SASL/Common.php 
256share/roundcube/program/lib/Auth/SASL/CramMD5.php 
257share/roundcube/program/lib/Auth/SASL/DigestMD5.php 
258share/roundcube/program/lib/Auth/SASL/Login.php 
259share/roundcube/program/lib/Auth/SASL/Plain.php 
260share/roundcube/program/lib/DB.php 
261share/roundcube/program/lib/DB/common.php 
262share/roundcube/program/lib/DB/dbase.php 
263share/roundcube/program/lib/DB/fbsql.php 
264share/roundcube/program/lib/DB/ibase.php 
265share/roundcube/program/lib/DB/ifx.php 
266share/roundcube/program/lib/DB/msql.php 
267share/roundcube/program/lib/DB/mssql.php 
268share/roundcube/program/lib/DB/mysql.php 
269share/roundcube/program/lib/DB/mysqli.php 
270share/roundcube/program/lib/DB/oci8.php 
271share/roundcube/program/lib/DB/odbc.php 
272share/roundcube/program/lib/DB/pgsql.php 
273share/roundcube/program/lib/DB/sqlite.php 
274share/roundcube/program/lib/DB/storage.php 
275share/roundcube/program/lib/DB/sybase.php 
276share/roundcube/program/lib/Mail/mime.php 
277share/roundcube/program/lib/Mail/mimeDecode.php 
278share/roundcube/program/lib/Mail/mimePart.php 
279share/roundcube/program/lib/MDB2.php 
280share/roundcube/program/lib/MDB2/Date.php 
281share/roundcube/program/lib/MDB2/Driver/Datatype/Common.php 
282share/roundcube/program/lib/MDB2/Driver/Datatype/mssql.php 
283share/roundcube/program/lib/MDB2/Driver/Datatype/mysql.php 
284share/roundcube/program/lib/MDB2/Driver/Datatype/mysqli.php 
285share/roundcube/program/lib/MDB2/Driver/Datatype/pgsql.php 
286share/roundcube/program/lib/MDB2/Driver/Datatype/sqlite.php 
287share/roundcube/program/lib/MDB2/Driver/Function/Common.php 
288share/roundcube/program/lib/MDB2/Driver/Function/mssql.php 
289share/roundcube/program/lib/MDB2/Driver/Function/mysql.php 
290share/roundcube/program/lib/MDB2/Driver/Function/mysqli.php 
291share/roundcube/program/lib/MDB2/Driver/Function/pgsql.php 
292share/roundcube/program/lib/MDB2/Driver/Function/sqlite.php 
293share/roundcube/program/lib/MDB2/Driver/Manager/Common.php 
294share/roundcube/program/lib/MDB2/Driver/Manager/mssql.php 
295share/roundcube/program/lib/MDB2/Driver/Manager/mysql.php 
296share/roundcube/program/lib/MDB2/Driver/Manager/mysqli.php 
297share/roundcube/program/lib/MDB2/Driver/Manager/pgsql.php 
298share/roundcube/program/lib/MDB2/Driver/Manager/sqlite.php 
299share/roundcube/program/lib/MDB2/Driver/Native/Common.php 
300share/roundcube/program/lib/MDB2/Driver/Native/mssql.php 
301share/roundcube/program/lib/MDB2/Driver/Native/mysql.php 
302share/roundcube/program/lib/MDB2/Driver/Native/mysqli.php 
303share/roundcube/program/lib/MDB2/Driver/Native/pgsql.php 
304share/roundcube/program/lib/MDB2/Driver/Native/sqlite.php 
305share/roundcube/program/lib/MDB2/Driver/Reverse/Common.php 
306share/roundcube/program/lib/MDB2/Driver/Reverse/mssql.php 
307share/roundcube/program/lib/MDB2/Driver/Reverse/mysql.php 
308share/roundcube/program/lib/MDB2/Driver/Reverse/mysqli.php 
309share/roundcube/program/lib/MDB2/Driver/Reverse/pgsql.php 
310share/roundcube/program/lib/MDB2/Driver/Reverse/sqlite.php 
311share/roundcube/program/lib/MDB2/Driver/mssql.php 
312share/roundcube/program/lib/MDB2/Driver/mysql.php 
313share/roundcube/program/lib/MDB2/Driver/mysqli.php 
314share/roundcube/program/lib/MDB2/Driver/pgsql.php 
315share/roundcube/program/lib/MDB2/Driver/sqlite.php 
316share/roundcube/program/lib/MDB2/Extended.php 
317share/roundcube/program/lib/MDB2/Iterator.php 
318share/roundcube/program/lib/MDB2/LOB.php 
319share/roundcube/program/lib/Net/SMTP.php 
320share/roundcube/program/lib/Net/Socket.php 
321share/roundcube/program/lib/PEAR.php 
322share/roundcube/program/lib/des.inc 
323share/roundcube/program/lib/encoding/CP1250.map 
324share/roundcube/program/lib/encoding/CP1251.map 
325share/roundcube/program/lib/encoding/CP1252.map 
326share/roundcube/program/lib/encoding/CP1253.map 
327share/roundcube/program/lib/encoding/CP1254.map 
328share/roundcube/program/lib/encoding/CP1255.map 
329share/roundcube/program/lib/encoding/CP1256.map 
330share/roundcube/program/lib/encoding/CP1257.map 
331share/roundcube/program/lib/encoding/CP1258.map 
332share/roundcube/program/lib/encoding/ISO-8859-1.map 
333share/roundcube/program/lib/encoding/ISO-8859-10.map 
334share/roundcube/program/lib/encoding/ISO-8859-11.map 
335share/roundcube/program/lib/encoding/ISO-8859-13.map 
336share/roundcube/program/lib/encoding/ISO-8859-14.map 
337share/roundcube/program/lib/encoding/ISO-8859-15.map 
338share/roundcube/program/lib/encoding/ISO-8859-16.map 
339share/roundcube/program/lib/encoding/ISO-8859-2.map 
340share/roundcube/program/lib/encoding/ISO-8859-3.map 
341share/roundcube/program/lib/encoding/ISO-8859-4.map 
342share/roundcube/program/lib/encoding/ISO-8859-5.map 
343share/roundcube/program/lib/encoding/ISO-8859-6.map 
344share/roundcube/program/lib/encoding/ISO-8859-7.map 
345share/roundcube/program/lib/encoding/ISO-8859-8.map 
346share/roundcube/program/lib/encoding/ISO-8859-9.map 
347share/roundcube/program/lib/encoding/KSC5601.map 
348share/roundcube/program/lib/enriched.inc 268share/roundcube/program/lib/enriched.inc
349share/roundcube/program/lib/html2text.inc 269share/roundcube/program/lib/html2text.inc
350share/roundcube/program/lib/icl_commons.inc 270share/roundcube/program/lib/icl_commons.inc
351share/roundcube/program/lib/imap.inc 271share/roundcube/program/lib/imap.inc
352share/roundcube/program/lib/magic 272share/roundcube/program/lib/magic
353share/roundcube/program/lib/mime.inc 273share/roundcube/program/lib/mime.inc
354share/roundcube/program/lib/rc_mail_mime.inc 274share/roundcube/program/lib/rc_mail_mime.inc
355share/roundcube/program/lib/utf7.inc 275share/roundcube/program/lib/utf7.inc
356share/roundcube/program/lib/utf8.class.php 
357share/roundcube/program/localization/bs_BA/labels.inc 
358share/roundcube/program/localization/bs_BA/messages.inc 
359share/roundcube/program/localization/ge/labels.inc 
360share/roundcube/program/localization/ge/messages.inc 
361share/roundcube/program/localization/he/labels.inc 
362share/roundcube/program/localization/he/messages.inc 
363share/roundcube/program/localization/hi/labels.inc 
364share/roundcube/program/localization/hi/messages.inc 
365share/roundcube/program/localization/id_ID/labels.inc 
366share/roundcube/program/localization/id_ID/messages.inc 
367share/roundcube/program/localization/is/labels.inc 
368share/roundcube/program/localization/is/messages.inc 
369share/roundcube/program/localization/kr/labels.inc 
370share/roundcube/program/localization/kr/messages.inc 
371share/roundcube/program/localization/ne/labels.inc 
372share/roundcube/program/localization/ne/messages.inc 
373share/roundcube/program/localization/nl_BE/labels.inc 
374share/roundcube/program/localization/nl_BE/messages.inc 
375share/roundcube/program/localization/nn_NO/labels.inc 
376share/roundcube/program/localization/nn_NO/messages.inc 
377share/roundcube/program/localization/sq_AL/labels.inc 
378share/roundcube/program/localization/sq_AL/messages.inc 
379share/roundcube/program/localization/sr_cyrillic/labels.inc 
380share/roundcube/program/localization/sr_cyrillic/messages.inc 
381share/roundcube/program/localization/sr_latin/labels.inc 
382share/roundcube/program/localization/sr_latin/messages.inc 
383share/roundcube/program/localization/th_TH/labels.inc 
384share/roundcube/program/localization/th_TH/messages.inc 
385share/roundcube/program/localization/vn/labels.inc 
386share/roundcube/program/localization/vn/messages.inc 
387share/roundcube/program/localization/am/labels.inc 276share/roundcube/program/localization/am/labels.inc
388share/roundcube/program/localization/am/messages.inc 277share/roundcube/program/localization/am/messages.inc
389share/roundcube/program/localization/ar/labels.inc 278share/roundcube/program/localization/ar/labels.inc
390share/roundcube/program/localization/ar/messages.inc 279share/roundcube/program/localization/ar/messages.inc
391share/roundcube/program/localization/bg/labels.inc 280share/roundcube/program/localization/bg/labels.inc
392share/roundcube/program/localization/bg/messages.inc 281share/roundcube/program/localization/bg/messages.inc
 282share/roundcube/program/localization/bs_BA/labels.inc
 283share/roundcube/program/localization/bs_BA/messages.inc
393share/roundcube/program/localization/ca/labels.inc 284share/roundcube/program/localization/ca/labels.inc
394share/roundcube/program/localization/ca/messages.inc 285share/roundcube/program/localization/ca/messages.inc
395share/roundcube/program/localization/cz/labels.inc 286share/roundcube/program/localization/cz/labels.inc
396share/roundcube/program/localization/cz/messages.inc 287share/roundcube/program/localization/cz/messages.inc
397share/roundcube/program/localization/da/labels.inc 288share/roundcube/program/localization/da/labels.inc
398share/roundcube/program/localization/da/messages.inc 289share/roundcube/program/localization/da/messages.inc
399share/roundcube/program/localization/de_CH/labels.inc 290share/roundcube/program/localization/de_CH/labels.inc
400share/roundcube/program/localization/de_CH/messages.inc 291share/roundcube/program/localization/de_CH/messages.inc
401share/roundcube/program/localization/de_DE/labels.inc 292share/roundcube/program/localization/de_DE/labels.inc
402share/roundcube/program/localization/de_DE/messages.inc 293share/roundcube/program/localization/de_DE/messages.inc
403share/roundcube/program/localization/el/labels.inc 294share/roundcube/program/localization/el/labels.inc
404share/roundcube/program/localization/el/messages.inc 295share/roundcube/program/localization/el/messages.inc
405share/roundcube/program/localization/en_GB/labels.inc 296share/roundcube/program/localization/en_GB/labels.inc
@@ -412,71 +303,101 @@ share/roundcube/program/localization/es/ @@ -412,71 +303,101 @@ share/roundcube/program/localization/es/
412share/roundcube/program/localization/es/messages.inc 303share/roundcube/program/localization/es/messages.inc
413share/roundcube/program/localization/et_EE/labels.inc 304share/roundcube/program/localization/et_EE/labels.inc
414share/roundcube/program/localization/et_EE/messages.inc 305share/roundcube/program/localization/et_EE/messages.inc
415share/roundcube/program/localization/eu/labels.inc 306share/roundcube/program/localization/eu/labels.inc
416share/roundcube/program/localization/eu/messages.inc 307share/roundcube/program/localization/eu/messages.inc
417share/roundcube/program/localization/fa/labels.inc 308share/roundcube/program/localization/fa/labels.inc
418share/roundcube/program/localization/fa/messages.inc 309share/roundcube/program/localization/fa/messages.inc
419share/roundcube/program/localization/fi/labels.inc 310share/roundcube/program/localization/fi/labels.inc
420share/roundcube/program/localization/fi/messages.inc 311share/roundcube/program/localization/fi/messages.inc
421share/roundcube/program/localization/fr/labels.inc 312share/roundcube/program/localization/fr/labels.inc
422share/roundcube/program/localization/fr/messages.inc 313share/roundcube/program/localization/fr/messages.inc
423share/roundcube/program/localization/ga_IE/labels.inc 314share/roundcube/program/localization/ga_IE/labels.inc
424share/roundcube/program/localization/ga_IE/messages.inc 315share/roundcube/program/localization/ga_IE/messages.inc
 316share/roundcube/program/localization/ge/labels.inc
 317share/roundcube/program/localization/ge/messages.inc
425share/roundcube/program/localization/gl/labels.inc 318share/roundcube/program/localization/gl/labels.inc
426share/roundcube/program/localization/gl/messages.inc 319share/roundcube/program/localization/gl/messages.inc
 320share/roundcube/program/localization/he/labels.inc
 321share/roundcube/program/localization/he/messages.inc
 322share/roundcube/program/localization/hi/labels.inc
 323share/roundcube/program/localization/hi/messages.inc
427share/roundcube/program/localization/hr/labels.inc 324share/roundcube/program/localization/hr/labels.inc
428share/roundcube/program/localization/hr/messages.inc 325share/roundcube/program/localization/hr/messages.inc
429share/roundcube/program/localization/hu/labels.inc 326share/roundcube/program/localization/hu/labels.inc
430share/roundcube/program/localization/hu/messages.inc 327share/roundcube/program/localization/hu/messages.inc
 328share/roundcube/program/localization/id_ID/labels.inc
 329share/roundcube/program/localization/id_ID/messages.inc
431share/roundcube/program/localization/index.inc 330share/roundcube/program/localization/index.inc
 331share/roundcube/program/localization/is/labels.inc
 332share/roundcube/program/localization/is/messages.inc
432share/roundcube/program/localization/it/labels.inc 333share/roundcube/program/localization/it/labels.inc
433share/roundcube/program/localization/it/messages.inc 334share/roundcube/program/localization/it/messages.inc
434share/roundcube/program/localization/ja/labels.inc 335share/roundcube/program/localization/ja/labels.inc
435share/roundcube/program/localization/ja/messages.inc 336share/roundcube/program/localization/ja/messages.inc
 337share/roundcube/program/localization/kr/labels.inc
 338share/roundcube/program/localization/kr/messages.inc
 339share/roundcube/program/localization/ku/labels.inc
 340share/roundcube/program/localization/ku/messages.inc
436share/roundcube/program/localization/lt/labels.inc 341share/roundcube/program/localization/lt/labels.inc
437share/roundcube/program/localization/lt/messages.inc 342share/roundcube/program/localization/lt/messages.inc
438share/roundcube/program/localization/lv/labels.inc 343share/roundcube/program/localization/lv/labels.inc
439share/roundcube/program/localization/lv/messages.inc 344share/roundcube/program/localization/lv/messages.inc
440share/roundcube/program/localization/mk/labels.inc 345share/roundcube/program/localization/mk/labels.inc
441share/roundcube/program/localization/mk/messages.inc 346share/roundcube/program/localization/mk/messages.inc
442share/roundcube/program/localization/ms_MY/labels.inc 347share/roundcube/program/localization/ms_MY/labels.inc
443share/roundcube/program/localization/ms_MY/messages.inc 348share/roundcube/program/localization/ms_MY/messages.inc
444share/roundcube/program/localization/nb_NO/labels.inc 349share/roundcube/program/localization/nb_NO/labels.inc
445share/roundcube/program/localization/nb_NO/messages.inc 350share/roundcube/program/localization/nb_NO/messages.inc
 351share/roundcube/program/localization/ne/labels.inc
 352share/roundcube/program/localization/ne/messages.inc
 353share/roundcube/program/localization/nl_BE/labels.inc
 354share/roundcube/program/localization/nl_BE/messages.inc
446share/roundcube/program/localization/nl_NL/labels.inc 355share/roundcube/program/localization/nl_NL/labels.inc
447share/roundcube/program/localization/nl_NL/messages.inc 356share/roundcube/program/localization/nl_NL/messages.inc
 357share/roundcube/program/localization/nn_NO/labels.inc
 358share/roundcube/program/localization/nn_NO/messages.inc
448share/roundcube/program/localization/pl/labels.inc 359share/roundcube/program/localization/pl/labels.inc
449share/roundcube/program/localization/pl/messages.inc 360share/roundcube/program/localization/pl/messages.inc
450share/roundcube/program/localization/pt_BR/labels.inc 361share/roundcube/program/localization/pt_BR/labels.inc
451share/roundcube/program/localization/pt_BR/messages.inc 362share/roundcube/program/localization/pt_BR/messages.inc
452share/roundcube/program/localization/pt_PT/labels.inc 363share/roundcube/program/localization/pt_PT/labels.inc
453share/roundcube/program/localization/pt_PT/messages.inc 364share/roundcube/program/localization/pt_PT/messages.inc
454share/roundcube/program/localization/ro/labels.inc 365share/roundcube/program/localization/ro/labels.inc
455share/roundcube/program/localization/ro/messages.inc 366share/roundcube/program/localization/ro/messages.inc
456share/roundcube/program/localization/ru/labels.inc 367share/roundcube/program/localization/ru/labels.inc
457share/roundcube/program/localization/ru/messages.inc 368share/roundcube/program/localization/ru/messages.inc
458share/roundcube/program/localization/se/labels.inc 369share/roundcube/program/localization/se/labels.inc
459share/roundcube/program/localization/se/messages.inc 370share/roundcube/program/localization/se/messages.inc
460share/roundcube/program/localization/si/labels.inc 371share/roundcube/program/localization/si/labels.inc
461share/roundcube/program/localization/si/messages.inc 372share/roundcube/program/localization/si/messages.inc
462share/roundcube/program/localization/sl/labels.inc 
463share/roundcube/program/localization/sl/messages.inc 
464share/roundcube/program/localization/sk/labels.inc 373share/roundcube/program/localization/sk/labels.inc
465share/roundcube/program/localization/sk/messages.inc 374share/roundcube/program/localization/sk/messages.inc
 375share/roundcube/program/localization/sl/labels.inc
 376share/roundcube/program/localization/sl/messages.inc
 377share/roundcube/program/localization/sq_AL/labels.inc
 378share/roundcube/program/localization/sq_AL/messages.inc
 379share/roundcube/program/localization/sr_cyrillic/labels.inc
 380share/roundcube/program/localization/sr_cyrillic/messages.inc
 381share/roundcube/program/localization/sr_latin/labels.inc
 382share/roundcube/program/localization/sr_latin/messages.inc
 383share/roundcube/program/localization/th_TH/labels.inc
 384share/roundcube/program/localization/th_TH/messages.inc
466share/roundcube/program/localization/tr/labels.inc 385share/roundcube/program/localization/tr/labels.inc
467share/roundcube/program/localization/tr/messages.inc 386share/roundcube/program/localization/tr/messages.inc
468share/roundcube/program/localization/uk/labels.inc 387share/roundcube/program/localization/uk/labels.inc
469share/roundcube/program/localization/uk/messages.inc 388share/roundcube/program/localization/uk/messages.inc
 389share/roundcube/program/localization/vn/labels.inc
 390share/roundcube/program/localization/vn/messages.inc
470share/roundcube/program/localization/zh_CN/labels.inc 391share/roundcube/program/localization/zh_CN/labels.inc
471share/roundcube/program/localization/zh_CN/messages.inc 392share/roundcube/program/localization/zh_CN/messages.inc
472share/roundcube/program/localization/zh_TW/labels.inc 393share/roundcube/program/localization/zh_TW/labels.inc
473share/roundcube/program/localization/zh_TW/messages.inc 394share/roundcube/program/localization/zh_TW/messages.inc
474share/roundcube/program/steps/addressbook/copy.inc 395share/roundcube/program/steps/addressbook/copy.inc
475share/roundcube/program/steps/addressbook/delete.inc 396share/roundcube/program/steps/addressbook/delete.inc
476share/roundcube/program/steps/addressbook/edit.inc 397share/roundcube/program/steps/addressbook/edit.inc
477share/roundcube/program/steps/addressbook/func.inc 398share/roundcube/program/steps/addressbook/func.inc
478share/roundcube/program/steps/addressbook/list.inc 399share/roundcube/program/steps/addressbook/list.inc
479share/roundcube/program/steps/addressbook/mailto.inc 400share/roundcube/program/steps/addressbook/mailto.inc
480share/roundcube/program/steps/addressbook/save.inc 401share/roundcube/program/steps/addressbook/save.inc
481share/roundcube/program/steps/addressbook/search.inc 402share/roundcube/program/steps/addressbook/search.inc
482share/roundcube/program/steps/addressbook/show.inc 403share/roundcube/program/steps/addressbook/show.inc
@@ -497,26 +418,27 @@ share/roundcube/program/steps/mail/searc @@ -497,26 +418,27 @@ share/roundcube/program/steps/mail/searc
497share/roundcube/program/steps/mail/sendmail.inc 418share/roundcube/program/steps/mail/sendmail.inc
498share/roundcube/program/steps/mail/sendmdn.inc 419share/roundcube/program/steps/mail/sendmdn.inc
499share/roundcube/program/steps/mail/show.inc 420share/roundcube/program/steps/mail/show.inc
500share/roundcube/program/steps/mail/spell.inc 421share/roundcube/program/steps/mail/spell.inc
501share/roundcube/program/steps/mail/upload.inc 422share/roundcube/program/steps/mail/upload.inc
502share/roundcube/program/steps/mail/viewsource.inc 423share/roundcube/program/steps/mail/viewsource.inc
503share/roundcube/program/steps/settings/delete_identity.inc 424share/roundcube/program/steps/settings/delete_identity.inc
504share/roundcube/program/steps/settings/edit_identity.inc 425share/roundcube/program/steps/settings/edit_identity.inc
505share/roundcube/program/steps/settings/func.inc 426share/roundcube/program/steps/settings/func.inc
506share/roundcube/program/steps/settings/identities.inc 427share/roundcube/program/steps/settings/identities.inc
507share/roundcube/program/steps/settings/manage_folders.inc 428share/roundcube/program/steps/settings/manage_folders.inc
508share/roundcube/program/steps/settings/save_identity.inc 429share/roundcube/program/steps/settings/save_identity.inc
509share/roundcube/program/steps/settings/save_prefs.inc 430share/roundcube/program/steps/settings/save_prefs.inc
 431share/roundcube/robots.txt
510share/roundcube/skins/default/addresses.css 432share/roundcube/skins/default/addresses.css
511share/roundcube/skins/default/colorpicker.css 433share/roundcube/skins/default/colorpicker.css
512share/roundcube/skins/default/common.css 434share/roundcube/skins/default/common.css
513share/roundcube/skins/default/editor_content.css 435share/roundcube/skins/default/editor_content.css
514share/roundcube/skins/default/editor_ui.css 436share/roundcube/skins/default/editor_ui.css
515share/roundcube/skins/default/googiespell.css 437share/roundcube/skins/default/googiespell.css
516share/roundcube/skins/default/images/blank.gif 438share/roundcube/skins/default/images/blank.gif
517share/roundcube/skins/default/images/buttons/add_act.png 439share/roundcube/skins/default/images/buttons/add_act.png
518share/roundcube/skins/default/images/buttons/add_contact_act.png 440share/roundcube/skins/default/images/buttons/add_contact_act.png
519share/roundcube/skins/default/images/buttons/add_contact_pas.png 441share/roundcube/skins/default/images/buttons/add_contact_pas.png
520share/roundcube/skins/default/images/buttons/add_contact_sel.png 442share/roundcube/skins/default/images/buttons/add_contact_sel.png
521share/roundcube/skins/default/images/buttons/add_pas.png 443share/roundcube/skins/default/images/buttons/add_pas.png
522share/roundcube/skins/default/images/buttons/add_sel.png 444share/roundcube/skins/default/images/buttons/add_sel.png
@@ -660,112 +582,99 @@ share/roundcube/skins/default/templates/ @@ -660,112 +582,99 @@ share/roundcube/skins/default/templates/
660share/roundcube/skins/default/templates/editidentity.html 582share/roundcube/skins/default/templates/editidentity.html
661share/roundcube/skins/default/templates/error.html 583share/roundcube/skins/default/templates/error.html
662share/roundcube/skins/default/templates/identities.html 584share/roundcube/skins/default/templates/identities.html
663share/roundcube/skins/default/templates/login.html 585share/roundcube/skins/default/templates/login.html
664share/roundcube/skins/default/templates/mail.html 586share/roundcube/skins/default/templates/mail.html
665share/roundcube/skins/default/templates/managefolders.html 587share/roundcube/skins/default/templates/managefolders.html
666share/roundcube/skins/default/templates/message.html 588share/roundcube/skins/default/templates/message.html
667share/roundcube/skins/default/templates/messagepart.html 589share/roundcube/skins/default/templates/messagepart.html
668share/roundcube/skins/default/templates/messagepreview.html 590share/roundcube/skins/default/templates/messagepreview.html
669share/roundcube/skins/default/templates/printmessage.html 591share/roundcube/skins/default/templates/printmessage.html
670share/roundcube/skins/default/templates/settings.html 592share/roundcube/skins/default/templates/settings.html
671share/roundcube/skins/default/templates/showcontact.html 593share/roundcube/skins/default/templates/showcontact.html
672share/roundcube/skins/default/watermark.html 594share/roundcube/skins/default/watermark.html
673@dirrm share/doc/roundcube 
674@dirrm share/roundcube/skins/default/templates 595@dirrm share/roundcube/skins/default/templates
675@dirrm share/roundcube/skins/default/includes 596@dirrm share/roundcube/skins/default/includes
676@dirrm share/roundcube/skins/default/images/icons 597@dirrm share/roundcube/skins/default/images/icons
677@dirrm share/roundcube/skins/default/images/googiespell 598@dirrm share/roundcube/skins/default/images/googiespell
678@dirrm share/roundcube/skins/default/images/display 599@dirrm share/roundcube/skins/default/images/display
679@dirrm share/roundcube/skins/default/images/buttons 600@dirrm share/roundcube/skins/default/images/buttons
680@dirrm share/roundcube/skins/default/images 601@dirrm share/roundcube/skins/default/images
681@dirrm share/roundcube/skins/default 602@dirrm share/roundcube/skins/default
682@dirrm share/roundcube/skins 603@dirrm share/roundcube/skins
683@dirrm share/roundcube/program/steps/settings 604@dirrm share/roundcube/program/steps/settings
684@dirrm share/roundcube/program/steps/mail 605@dirrm share/roundcube/program/steps/mail
685@dirrm share/roundcube/program/steps/addressbook 606@dirrm share/roundcube/program/steps/addressbook
686@dirrm share/roundcube/program/steps 607@dirrm share/roundcube/program/steps
687@dirrm share/roundcube/program/localization/eo 
688@dirrm share/roundcube/program/localization/ga_IE 
689@dirrm share/roundcube/program/localization/gl 
690@dirrm share/roundcube/program/localization/mk 
691@dirrm share/roundcube/program/localization/ms_MY 
692@dirrm share/roundcube/program/localization/uk 
693@dirrm share/roundcube/program/localization/zh_TW 608@dirrm share/roundcube/program/localization/zh_TW
694@dirrm share/roundcube/program/localization/zh_CN 609@dirrm share/roundcube/program/localization/zh_CN
 610@dirrm share/roundcube/program/localization/vn
 611@dirrm share/roundcube/program/localization/uk
695@dirrm share/roundcube/program/localization/tr 612@dirrm share/roundcube/program/localization/tr
 613@dirrm share/roundcube/program/localization/th_TH
 614@dirrm share/roundcube/program/localization/sr_latin
 615@dirrm share/roundcube/program/localization/sr_cyrillic
 616@dirrm share/roundcube/program/localization/sq_AL
 617@dirrm share/roundcube/program/localization/sl
696@dirrm share/roundcube/program/localization/sk 618@dirrm share/roundcube/program/localization/sk
697@dirrm share/roundcube/program/localization/si 619@dirrm share/roundcube/program/localization/si
698@dirrm share/roundcube/program/localization/sl 
699@dirrm share/roundcube/program/localization/se 620@dirrm share/roundcube/program/localization/se
700@dirrm share/roundcube/program/localization/ru 621@dirrm share/roundcube/program/localization/ru
701@dirrm share/roundcube/program/localization/ro 622@dirrm share/roundcube/program/localization/ro
702@dirrm share/roundcube/program/localization/pt_PT 623@dirrm share/roundcube/program/localization/pt_PT
703@dirrm share/roundcube/program/localization/pt_BR 624@dirrm share/roundcube/program/localization/pt_BR
704@dirrm share/roundcube/program/localization/pl 625@dirrm share/roundcube/program/localization/pl
 626@dirrm share/roundcube/program/localization/nn_NO
705@dirrm share/roundcube/program/localization/nl_NL 627@dirrm share/roundcube/program/localization/nl_NL
 628@dirrm share/roundcube/program/localization/nl_BE
 629@dirrm share/roundcube/program/localization/ne
706@dirrm share/roundcube/program/localization/nb_NO 630@dirrm share/roundcube/program/localization/nb_NO
 631@dirrm share/roundcube/program/localization/ms_MY
 632@dirrm share/roundcube/program/localization/mk
707@dirrm share/roundcube/program/localization/lv 633@dirrm share/roundcube/program/localization/lv
708@dirrm share/roundcube/program/localization/lt 634@dirrm share/roundcube/program/localization/lt
 635@dirrm share/roundcube/program/localization/ku
 636@dirrm share/roundcube/program/localization/kr
709@dirrm share/roundcube/program/localization/ja 637@dirrm share/roundcube/program/localization/ja
710@dirrm share/roundcube/program/localization/it 638@dirrm share/roundcube/program/localization/it
 639@dirrm share/roundcube/program/localization/is
 640@dirrm share/roundcube/program/localization/id_ID
711@dirrm share/roundcube/program/localization/hu 641@dirrm share/roundcube/program/localization/hu
712@dirrm share/roundcube/program/localization/hr 642@dirrm share/roundcube/program/localization/hr
 643@dirrm share/roundcube/program/localization/hi
 644@dirrm share/roundcube/program/localization/he
 645@dirrm share/roundcube/program/localization/gl
 646@dirrm share/roundcube/program/localization/ge
 647@dirrm share/roundcube/program/localization/ga_IE
713@dirrm share/roundcube/program/localization/fr 648@dirrm share/roundcube/program/localization/fr
714@dirrm share/roundcube/program/localization/fi 649@dirrm share/roundcube/program/localization/fi
715@dirrm share/roundcube/program/localization/fa 650@dirrm share/roundcube/program/localization/fa
716@dirrm share/roundcube/program/localization/eu 651@dirrm share/roundcube/program/localization/eu
717@dirrm share/roundcube/program/localization/et_EE 652@dirrm share/roundcube/program/localization/et_EE
718@dirrm share/roundcube/program/localization/es 653@dirrm share/roundcube/program/localization/es
 654@dirrm share/roundcube/program/localization/eo
719@dirrm share/roundcube/program/localization/en_US 655@dirrm share/roundcube/program/localization/en_US
720@dirrm share/roundcube/program/localization/en_GB 656@dirrm share/roundcube/program/localization/en_GB
721@dirrm share/roundcube/program/localization/el 657@dirrm share/roundcube/program/localization/el
722@dirrm share/roundcube/program/localization/de_DE 658@dirrm share/roundcube/program/localization/de_DE
723@dirrm share/roundcube/program/localization/de_CH 659@dirrm share/roundcube/program/localization/de_CH
724@dirrm share/roundcube/program/localization/da 660@dirrm share/roundcube/program/localization/da
725@dirrm share/roundcube/program/localization/cz 661@dirrm share/roundcube/program/localization/cz
726@dirrm share/roundcube/program/localization/ca 662@dirrm share/roundcube/program/localization/ca
 663@dirrm share/roundcube/program/localization/bs_BA
727@dirrm share/roundcube/program/localization/bg 664@dirrm share/roundcube/program/localization/bg
728@dirrm share/roundcube/program/localization/ar 665@dirrm share/roundcube/program/localization/ar
729@dirrm share/roundcube/program/localization/am 666@dirrm share/roundcube/program/localization/am
730@dirrm share/roundcube/program/localization/vn 
731@dirrm share/roundcube/program/localization/th_TH 
732@dirrm share/roundcube/program/localization/sr_latin 
733@dirrm share/roundcube/program/localization/sr_cyrillic 
734@dirrm share/roundcube/program/localization/sq_AL 
735@dirrm share/roundcube/program/localization/nn_NO 
736@dirrm share/roundcube/program/localization/nl_BE 
737@dirrm share/roundcube/program/localization/ne 
738@dirrm share/roundcube/program/localization/kr 
739@dirrm share/roundcube/program/localization/is 
740@dirrm share/roundcube/program/localization/id_ID 
741@dirrm share/roundcube/program/localization/hi 
742@dirrm share/roundcube/program/localization/he 
743@dirrm share/roundcube/program/localization/ge 
744@dirrm share/roundcube/program/localization/bs_BA 
745@dirrm share/roundcube/program/localization 667@dirrm share/roundcube/program/localization
746@dirrm share/roundcube/program/lib/encoding 
747@dirrm share/roundcube/program/lib/Net 
748@dirrm share/roundcube/program/lib/MDB2/Driver/Reverse 
749@dirrm share/roundcube/program/lib/MDB2/Driver/Native 
750@dirrm share/roundcube/program/lib/MDB2/Driver/Manager 
751@dirrm share/roundcube/program/lib/MDB2/Driver/Function 
752@dirrm share/roundcube/program/lib/MDB2/Driver/Datatype 
753@dirrm share/roundcube/program/lib/MDB2/Driver 
754@dirrm share/roundcube/program/lib/MDB2 
755@dirrm share/roundcube/program/lib/Mail 
756@dirrm share/roundcube/program/lib/DB 
757@dirrm share/roundcube/program/lib/Auth/SASL 
758@dirrm share/roundcube/program/lib/Auth 
759@dirrm share/roundcube/program/lib 668@dirrm share/roundcube/program/lib
760@dirrm share/roundcube/program/js/tiny_mce/utils 669@dirrm share/roundcube/program/js/tiny_mce/utils
761@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/langs 670@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/langs
762@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/jscripts 671@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/jscripts
763@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/images/xp 672@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/images/xp
764@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/images 673@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/images
765@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/images 674@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/docs/en/images
766@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/docs/en 675@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/docs/en
767@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/docs 676@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/docs
768@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/css 677@dirrm share/roundcube/program/js/tiny_mce/themes/advanced/css
769@dirrm share/roundcube/program/js/tiny_mce/themes/advanced 678@dirrm share/roundcube/program/js/tiny_mce/themes/advanced
770@dirrm share/roundcube/program/js/tiny_mce/themes 679@dirrm share/roundcube/program/js/tiny_mce/themes
771@dirrm share/roundcube/program/js/tiny_mce/plugins/visualchars/langs 680@dirrm share/roundcube/program/js/tiny_mce/plugins/visualchars/langs
@@ -795,17 +704,20 @@ share/roundcube/skins/default/watermark. @@ -795,17 +704,20 @@ share/roundcube/skins/default/watermark.
795@dirrm share/roundcube/program/js/tiny_mce/plugins/media/css 704@dirrm share/roundcube/program/js/tiny_mce/plugins/media/css
796@dirrm share/roundcube/program/js/tiny_mce/plugins/media 705@dirrm share/roundcube/program/js/tiny_mce/plugins/media
797@dirrm share/roundcube/program/js/tiny_mce/plugins/emotions/langs 706@dirrm share/roundcube/program/js/tiny_mce/plugins/emotions/langs
798@dirrm share/roundcube/program/js/tiny_mce/plugins/emotions/jscripts 707@dirrm share/roundcube/program/js/tiny_mce/plugins/emotions/jscripts
799@dirrm share/roundcube/program/js/tiny_mce/plugins/emotions/images 708@dirrm share/roundcube/program/js/tiny_mce/plugins/emotions/images
800@dirrm share/roundcube/program/js/tiny_mce/plugins/emotions 709@dirrm share/roundcube/program/js/tiny_mce/plugins/emotions
801@dirrm share/roundcube/program/js/tiny_mce/plugins/cleanup 710@dirrm share/roundcube/program/js/tiny_mce/plugins/cleanup
802@dirrm share/roundcube/program/js/tiny_mce/plugins 711@dirrm share/roundcube/program/js/tiny_mce/plugins
803@dirrm share/roundcube/program/js/tiny_mce/langs 712@dirrm share/roundcube/program/js/tiny_mce/langs
804@dirrm share/roundcube/program/js/tiny_mce 713@dirrm share/roundcube/program/js/tiny_mce
805@dirrm share/roundcube/program/js 714@dirrm share/roundcube/program/js
806@dirrm share/roundcube/program/include 715@dirrm share/roundcube/program/include
807@dirrm share/roundcube/program 716@dirrm share/roundcube/program
808@dirrm share/roundcube 717@dirrm share/roundcube/installer/images
 718@dirrm share/roundcube/installer
 719@unexec ${RMDIR} %D/share/roundcube/config 2>/dev/null || ${TRUE}
 720@unexec ${RMDIR} %D/share/roundcube 2>/dev/null || ${TRUE}
809@dirrm share/examples/roundcube/SQL 721@dirrm share/examples/roundcube/SQL
810@dirrm share/examples/roundcube 722@dirrm share/examples/roundcube
811@dirrm share/doc/roundcube 723@dirrm share/doc/roundcube

cvs diff -r1.5 -r1.6 pkgsrc/mail/roundcube/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/distinfo 2008/03/15 13:54:59 1.5
+++ pkgsrc/mail/roundcube/distinfo 2008/05/04 16:34:03 1.6
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.5 2008/03/15 13:54:59 adrianp Exp $ 1$NetBSD: distinfo,v 1.6 2008/05/04 16:34:03 adrianp Exp $
2 2
3SHA1 (roundcubemail-0.1.tar.gz) = 8b5b516b41bad98c3bbaf0da0e70b0db82580424 3SHA1 (roundcubemail-0.1.1-dep.tar.gz) = 747ea8ffedfbfea96a5139ffd2c4e4120cba7f60
4RMD160 (roundcubemail-0.1.tar.gz) = 225b3a37c70bcf3b471b7d650233aec30dae2f76 4RMD160 (roundcubemail-0.1.1-dep.tar.gz) = 525bde8ef722bc04a28ea326d716e390a0073c8a
5Size (roundcubemail-0.1.tar.gz) = 1406854 bytes 5Size (roundcubemail-0.1.1-dep.tar.gz) = 964612 bytes
6SHA1 (patch-aa) = 621204db27874a799e5190e2cc00c3187cb3c61a 6SHA1 (patch-aa) = 621204db27874a799e5190e2cc00c3187cb3c61a
7SHA1 (patch-ab) = 5379ccb823a8abf89e39498907730160d1fc517d 7SHA1 (patch-ac) = 9e679ae35bf9722d26a6ea786ef0ff5c457116e3
 8SHA1 (patch-ad) = f0cd3aaf6f9dcd551e3cd630130a198c3e26a6b7

cvs diff -r1.2 -r1.3 pkgsrc/mail/roundcube/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/options.mk 2007/05/11 11:51:05 1.2
+++ pkgsrc/mail/roundcube/options.mk 2008/05/04 16:34:03 1.3
@@ -1,59 +1,82 @@ @@ -1,59 +1,82 @@
1# $NetBSD: options.mk,v 1.2 2007/05/11 11:51:05 schmonz Exp $ 1# $NetBSD: options.mk,v 1.3 2008/05/04 16:34:03 adrianp Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.roundcube 3PKG_OPTIONS_VAR= PKG_OPTIONS.roundcube
4 4
5PKG_OPTIONS_REQUIRED_GROUPS= db 5PKG_OPTIONS_REQUIRED_GROUPS= db
6PKG_OPTIONS_GROUP.db= mysql pgsql sqlite 6PKG_OPTIONS_GROUP.db= mysql pgsql sqlite
7 7
8PKG_SUPPORTED_OPTIONS= iconv ldap multibyte 8PKG_SUPPORTED_OPTIONS= iconv ldap multibyte mcrypt sockets gd
9PKG_SUGGESTED_OPTIONS= mysql 9# Following the recommendations in INSTALL the iconv, multibyte, gd and
 10# mcrypt PHP extensions are all 'recommended' requirements
 11PKG_SUGGESTED_OPTIONS= mysql iconv multibyte mcrypt sockets gd
10 12
11.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
12 14
13.include "../../lang/php/phpversion.mk" 
14 
15### 15###
16### Use mysql backend 16### Use mysql backend
17### 17###
18.if !empty(PKG_OPTIONS:Mmysql) 18.if !empty(PKG_OPTIONS:Mmysql)
19. include "../../mk/mysql.buildlink3.mk" 19. include "../../mk/mysql.buildlink3.mk"
20DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.1:../../databases/php-mysql 20DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.1:../../databases/php-mysql
 21DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2_Driver_mysql-[0-9]*:../../databases/pear-MDB2_Driver_mysql
21.endif 22.endif
22 23
23### 24###
24### Use postgresql backend 25### Use postgresql backend
25### 26###
26.if !empty(PKG_OPTIONS:Mpgsql) 27.if !empty(PKG_OPTIONS:Mpgsql)
27. include "../../mk/pgsql.buildlink3.mk" 28. include "../../mk/pgsql.buildlink3.mk"
28DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=4.3.1:../../databases/php-pgsql 29DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=4.3.1:../../databases/php-pgsql
 30DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2_Driver_pgsql-[0-9]*:../../databases/pear-MDB2_Driver_pgsql
29.endif 31.endif
30 32
31### 33###
32### Use sqlite backend 34### Use sqlite backend
33### 35###
34.if !empty(PKG_OPTIONS:Msqlite) 36.if !empty(PKG_OPTIONS:Msqlite)
35PHP_VERSIONS_ACCEPTED= 4 
36. include "../../databases/sqlite/buildlink3.mk" 37. include "../../databases/sqlite/buildlink3.mk"
37DEPENDS+= ${PHP_PKG_PREFIX}-sqlite-[0-9]*:../../databases/php-sqlite 38DEPENDS+= ${PHP_PKG_PREFIX}-sqlite-[0-9]*:../../databases/php-sqlite
 39DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2_Driver_sqlite-[0-9]*:../../databases/pear-MDB2_Driver_sqlite
38.endif 40.endif
39 41
40### 42###
41### Use iconv 43### Use iconv
42### 44###
43.if !empty(PKG_OPTIONS:Miconv) 45.if !empty(PKG_OPTIONS:Miconv)
44DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=4.3.1:../../converters/php-iconv 46DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=4.3.1:../../converters/php-iconv
45.endif 47.endif
46 48
47### 49###
48### Use OpenLDAP for storing data 50### Use OpenLDAP for storing data
49### 51###
50.if !empty(PKG_OPTIONS:Mldap) 52.if !empty(PKG_OPTIONS:Mldap)
51DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=4.3.1:../../databases/php-ldap 53DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=4.3.1:../../databases/php-ldap
52.endif 54.endif
53 55
54### 56###
55### Use mbstring 57### Use mbstring
56### 58###
57.if !empty(PKG_OPTIONS:Mmultibyte) 59.if !empty(PKG_OPTIONS:Mmultibyte)
58DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.1:../../misc/php-mbstring 60DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.1:../../misc/php-mbstring
59.endif 61.endif
 62
 63###
 64### Use mcrypt
 65###
 66.if !empty(PKG_OPTIONS:Mmcrypt)
 67DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=4.3.1:../../security/php-mcrypt
 68.endif
 69
 70###
 71### Use sockets
 72###
 73.if !empty(PKG_OPTIONS:Msockets)
 74DEPENDS+= ${PHP_PKG_PREFIX}-sockets>=4.3.1:../../net/php-sockets
 75.endif
 76
 77###
 78### Add support for gd
 79###
 80.if !empty(PKG_OPTIONS:Mgd)
 81DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.1:../../graphics/php-gd
 82.endif

cvs diff -r1.2 -r1.3 pkgsrc/mail/roundcube/files/Attic/roundcube.conf (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/files/Attic/roundcube.conf 2007/06/06 18:40:16 1.2
+++ pkgsrc/mail/roundcube/files/Attic/roundcube.conf 2008/05/04 16:34:03 1.3
@@ -1,15 +1,35 @@ @@ -1,15 +1,35 @@
1# $NetBSD: roundcube.conf,v 1.2 2007/06/06 18:40:16 adrianp Exp $ 1# $NetBSD: roundcube.conf,v 1.3 2008/05/04 16:34:03 adrianp Exp $
2# 2#
3# RoundCube configuration file fragment for Apache 3# RoundCube configuration file fragment for Apache
4 4
5<IfModule mod_alias.c> 5<IfModule mod_alias.c>
6 Alias /roundcube "@RCDIR@/" 6 Alias /roundcube "@RCDIR@/"
7</IfModule> 7</IfModule>
8 8
9<Directory "@RCDIR@"> 9<Directory "@RCDIR@">
10 AllowOverride All 10 AllowOverride All
11 DirectoryIndex index.php 11 DirectoryIndex index.php
12 <IfModule mod_php4.c> 12 <IfModule mod_php4.c>
13 php_flag file_uploads On 13 php_flag file_uploads On
 14 php_value session.auto_start Off
 15 php_value upload_max_filesize 2M
 16 </IfModule>
 17 <IfModule mod_php5.c>
 18 php_flag file_uploads On
 19 php_value session.auto_start Off
 20 php_value upload_max_filesize 2M
14 </IfModule> 21 </IfModule>
15</Directory> 22</Directory>
 23
 24#
 25# For security, don't serve pages from the roundcube installer directory.
 26#
 27# If you are using the installer to setup roundcube you will need access to
 28# the installer/ directory for the initial setup. It is recommended that
 29# after installation you uncomment the following block in order to restrict
 30# access to that directory.
 31#
 32#<Directory "@RCDIR@/installer">
 33# Order deny,allow
 34# Deny from all
 35#</Directory>

File Deleted: pkgsrc/mail/roundcube/patches/Attic/patch-ab

File Added: pkgsrc/mail/roundcube/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.1 2008/05/04 16:34:03 adrianp Exp $

--- installer/config.php.orig	2008-04-05 13:49:21.000000000 +0100
+++ installer/config.php
@@ -187,7 +187,7 @@ echo $select_mdnreq->show(intval($RCI->g
 <p>Database settings for read/write operations:</p>
 <?php
 
-require_once 'DB.php';
+require_once 'MDB2.php';
 
 $supported_dbs = array('MySQL' => 'mysql', 'MySQLi' => 'mysqli',
     'PgSQL' => 'pgsql', 'SQLite' => 'sqlite');
@@ -204,7 +204,7 @@ $input_dbname = new textfield(array('nam
 $input_dbuser = new textfield(array('name' => '_dbuser', 'size' => 20, 'id' => "cfgdbuser"));
 $input_dbpass = new textfield(array('name' => '_dbpass', 'size' => 20, 'id' => "cfgdbpass"));
 
-$dsnw = DB::parseDSN($RCI->getprop('db_dsnw'));
+$dsnw = MDB2::parseDSN($RCI->getprop('db_dsnw'));
 
 echo $select_dbtype->show($RCI->is_post ? $_POST['_dbtype'] : $dsnw['phptype']);
 echo '<label for="cfgdbtype">Database type</label><br />';

File Added: pkgsrc/mail/roundcube/patches/Attic/patch-ad
$NetBSD: patch-ad,v 1.1 2008/05/04 16:34:03 adrianp Exp $

--- index.php.orig	2008-04-05 13:49:21.000000000 +0100
+++ index.php
@@ -161,7 +161,7 @@ if ($_action=='login' && $_task=='mail')
   }
   else if ($_SESSION['temp'] && !empty($_POST['_user']) && isset($_POST['_pass']) &&
            rcmail_login(trim(get_input_value('_user', RCUBE_INPUT_POST), ' '),
-              get_input_value('_pass', RCUBE_INPUT_POST, true, 'ISO-8859-1'), $host))
+              get_input_value('_pass', RCUBE_INPUT_POST, true, ''), $host))
   {
     // create new session ID
     unset($_SESSION['temp']);