diff options
| -rw-r--r-- | mail/roundcube/Makefile | 5 | ||||
| -rw-r--r-- | mail/roundcube/PLIST | 26 | ||||
| -rw-r--r-- | mail/roundcube/distinfo | 12 | ||||
| -rw-r--r-- | mail/roundcube/options.mk | 8 | ||||
| -rw-r--r-- | mail/roundcube/patches/patch-aa | 8 | ||||
| -rw-r--r-- | mail/roundcube/patches/patch-ac | 6 |
6 files changed, 38 insertions, 27 deletions
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile index c91b4b31c36..578429b237e 100644 --- a/mail/roundcube/Makefile +++ b/mail/roundcube/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2008/12/23 23:26:38 ahoka Exp $ +# $NetBSD: Makefile,v 1.14 2009/01/19 20:15:49 abs Exp $ # DISTNAME= roundcubemail-${RCVERSION}-dep @@ -13,12 +13,13 @@ COMMENT= Browser-based multilingual IMAP client USE_TOOLS+= pax USE_LANGUAGES= # none NO_BUILD= yes -RCVERSION= 0.2-beta2 +RCVERSION= 0.2-stable VERSION= ${RCVERSION:S/-//} .include "../../mk/bsd.prefs.mk" .include "../../lang/php/phpversion.mk" +DEPENDS+= php5-dom-5.2.*:../../textproc/php5-dom DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.2.10:../../net/pear-Net_SMTP DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.3:../../mail/pear-Mail_Mime DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2>=2.4.1:../../databases/pear-MDB2 diff --git a/mail/roundcube/PLIST b/mail/roundcube/PLIST index a24057f250f..ba436247c81 100644 --- a/mail/roundcube/PLIST +++ b/mail/roundcube/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2008/10/02 15:47:15 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.9 2009/01/19 20:15:49 abs Exp $ share/doc/roundcube/INSTALL share/doc/roundcube/LICENSE share/doc/roundcube/README @@ -6,7 +6,6 @@ share/doc/roundcube/UPGRADING share/examples/roundcube/SQL/mssql.initial.sql share/examples/roundcube/SQL/mysql.initial.sql share/examples/roundcube/SQL/mysql.update.sql -share/examples/roundcube/SQL/mysql5.initial.sql share/examples/roundcube/SQL/postgres.initial.sql share/examples/roundcube/SQL/postgres.update.sql share/examples/roundcube/SQL/sqlite.initial.sql @@ -16,10 +15,12 @@ share/examples/roundcube/main.inc.php.dist share/examples/roundcube/roundcube.conf share/roundcube/.htaccess share/roundcube/bin/html2text.php +share/roundcube/bin/killcache.php share/roundcube/bin/modcss.php share/roundcube/bin/msgexport.sh share/roundcube/bin/msgimport.sh share/roundcube/bin/quotaimg.php +share/roundcube/bin/update.sh share/roundcube/index.php share/roundcube/installer/check.php share/roundcube/installer/client.js @@ -29,10 +30,12 @@ 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/delete.png +share/roundcube/installer/images/error.png 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/program/blank.gif share/roundcube/program/blocked.gif @@ -60,11 +63,15 @@ share/roundcube/program/include/rcube_user.php share/roundcube/program/include/rcube_vcard.php share/roundcube/program/include/session.inc share/roundcube/program/js/app.js +share/roundcube/program/js/app.js.src share/roundcube/program/js/common.js +share/roundcube/program/js/common.js.src share/roundcube/program/js/editor.js share/roundcube/program/js/editor_images.js share/roundcube/program/js/googiespell.js +share/roundcube/program/js/googiespell.js.src share/roundcube/program/js/list.js +share/roundcube/program/js/list.js.src share/roundcube/program/js/tiny_mce/langs/ar.js share/roundcube/program/js/tiny_mce/langs/bg.js share/roundcube/program/js/tiny_mce/langs/bs.js @@ -528,6 +535,8 @@ share/roundcube/program/localization/ca_ES/labels.inc share/roundcube/program/localization/ca_ES/messages.inc share/roundcube/program/localization/cs_CZ/labels.inc share/roundcube/program/localization/cs_CZ/messages.inc +share/roundcube/program/localization/cy_GB/labels.inc +share/roundcube/program/localization/cy_GB/messages.inc share/roundcube/program/localization/da_DK/labels.inc share/roundcube/program/localization/da_DK/messages.inc share/roundcube/program/localization/de_CH/labels.inc @@ -648,6 +657,8 @@ share/roundcube/program/steps/addressbook/search.inc share/roundcube/program/steps/addressbook/show.inc share/roundcube/program/steps/error.inc share/roundcube/program/steps/mail/addcontact.inc +share/roundcube/program/steps/mail/attachments.inc +share/roundcube/program/steps/mail/autocomplete.inc share/roundcube/program/steps/mail/check_recent.inc share/roundcube/program/steps/mail/compose.inc share/roundcube/program/steps/mail/folders.inc @@ -666,7 +677,6 @@ share/roundcube/program/steps/mail/show.inc share/roundcube/program/steps/mail/spell.inc share/roundcube/program/steps/mail/spell_googie.inc share/roundcube/program/steps/mail/spell_pspell.inc -share/roundcube/program/steps/mail/upload.inc share/roundcube/program/steps/mail/viewsource.inc share/roundcube/program/steps/settings/delete_identity.inc share/roundcube/program/steps/settings/edit_identity.inc @@ -680,6 +690,7 @@ share/roundcube/skins/default/addresses.css share/roundcube/skins/default/colorpicker.css share/roundcube/skins/default/common.css share/roundcube/skins/default/editor_content.css +share/roundcube/skins/default/functions.js share/roundcube/skins/default/googiespell.css share/roundcube/skins/default/images/blank.gif share/roundcube/skins/default/images/buttons/add_act.png @@ -731,8 +742,6 @@ share/roundcube/skins/default/images/buttons/inbox_sel.png share/roundcube/skins/default/images/buttons/last_act.png share/roundcube/skins/default/images/buttons/last_pas.png share/roundcube/skins/default/images/buttons/last_sel.png -share/roundcube/skins/default/images/buttons/ldap_act.png -share/roundcube/skins/default/images/buttons/ldap_pas.png share/roundcube/skins/default/images/buttons/logout.gif share/roundcube/skins/default/images/buttons/logout.png share/roundcube/skins/default/images/buttons/mail.gif @@ -779,6 +788,7 @@ share/roundcube/skins/default/images/googiespell/ok.gif share/roundcube/skins/default/images/googiespell/spellc.gif share/roundcube/skins/default/images/icons/abcard.png share/roundcube/skins/default/images/icons/attachment.png +share/roundcube/skins/default/images/icons/blank.gif share/roundcube/skins/default/images/icons/collapsed.png share/roundcube/skins/default/images/icons/deleted.png share/roundcube/skins/default/images/icons/dot.png @@ -795,6 +805,7 @@ share/roundcube/skins/default/images/icons/folder-sent.png share/roundcube/skins/default/images/icons/folder-trash.png share/roundcube/skins/default/images/icons/forwarded.png share/roundcube/skins/default/images/icons/forwarded_replied.png +share/roundcube/skins/default/images/icons/minus.gif share/roundcube/skins/default/images/icons/plus.gif share/roundcube/skins/default/images/icons/remove-attachment.png share/roundcube/skins/default/images/icons/rename.png @@ -809,7 +820,6 @@ share/roundcube/skins/default/images/listheader_dark.gif share/roundcube/skins/default/images/listheader_light.gif share/roundcube/skins/default/images/mailbox_list.gif share/roundcube/skins/default/images/mailbox_selected.gif -share/roundcube/skins/default/images/rcube_watermark.png share/roundcube/skins/default/images/roundcube_logo.gif share/roundcube/skins/default/images/roundcube_logo.png share/roundcube/skins/default/images/roundcube_logo_print.gif @@ -819,10 +829,9 @@ share/roundcube/skins/default/images/sort_desc.gif share/roundcube/skins/default/images/tab_act.gif share/roundcube/skins/default/images/tab_pas.gif share/roundcube/skins/default/images/taskbar.gif +share/roundcube/skins/default/images/watermark.gif share/roundcube/skins/default/includes/header.html -share/roundcube/skins/default/includes/ldapscripts.html share/roundcube/skins/default/includes/links.html -share/roundcube/skins/default/includes/settingscripts.html share/roundcube/skins/default/includes/settingstabs.html share/roundcube/skins/default/includes/taskbar.html share/roundcube/skins/default/mail.css @@ -914,6 +923,7 @@ share/roundcube/skins/default/watermark.html @dirrm share/roundcube/program/localization/de_DE @dirrm share/roundcube/program/localization/de_CH @dirrm share/roundcube/program/localization/da_DK +@dirrm share/roundcube/program/localization/cy_GB @dirrm share/roundcube/program/localization/cs_CZ @dirrm share/roundcube/program/localization/ca_ES @dirrm share/roundcube/program/localization/bs_BA diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo index 5adc49d42e5..4a5582c6d1e 100644 --- a/mail/roundcube/distinfo +++ b/mail/roundcube/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2008/12/23 23:26:38 ahoka Exp $ +$NetBSD: distinfo,v 1.10 2009/01/19 20:15:49 abs Exp $ -SHA1 (roundcubemail-0.2-beta2-dep.tar.gz) = 21ddfc98b561348adc859e7b5701bfa050185582 -RMD160 (roundcubemail-0.2-beta2-dep.tar.gz) = 2bac95dff178ab0bc6ea9e0dde1cbacfc642c1b3 -Size (roundcubemail-0.2-beta2-dep.tar.gz) = 1127097 bytes -SHA1 (patch-aa) = 9e3821f745cfbec7fd2fb2783ff57e570cfd4457 +SHA1 (roundcubemail-0.2-stable-dep.tar.gz) = 23bedb1baa91a67ca14a05aa4acae413c8bf7fc6 +RMD160 (roundcubemail-0.2-stable-dep.tar.gz) = ea47cb59c8b3cea13d10e604070dcf2bc92115fb +Size (roundcubemail-0.2-stable-dep.tar.gz) = 1186285 bytes +SHA1 (patch-aa) = 277afd7f1e4e163afc0a7a8ca2580e28deb14081 SHA1 (patch-ab) = 9e81e117952150f363265bbda11cae9eb7d77c08 -SHA1 (patch-ac) = df56f22ca7f5d932bc1b43d1e4b0a1d2f193a24b +SHA1 (patch-ac) = 33e85bd1577f3554213c0f1da55500761967026a SHA1 (patch-af) = 858606b6e1b6fb0eafa568267ba98278fcc64fc4 diff --git a/mail/roundcube/options.mk b/mail/roundcube/options.mk index c7d8f715aeb..7894cf10572 100644 --- a/mail/roundcube/options.mk +++ b/mail/roundcube/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2008/05/04 16:34:03 adrianp Exp $ +# $NetBSD: options.mk,v 1.4 2009/01/19 20:15:49 abs Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.roundcube @@ -18,7 +18,7 @@ PKG_SUGGESTED_OPTIONS= mysql iconv multibyte mcrypt sockets gd .if !empty(PKG_OPTIONS:Mmysql) . include "../../mk/mysql.buildlink3.mk" DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.1:../../databases/php-mysql -DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2_Driver_mysql-[0-9]*:../../databases/pear-MDB2_Driver_mysql +DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2_Driver_mysql>1.5:../../databases/pear-MDB2_Driver_mysql .endif ### @@ -27,7 +27,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2_Driver_mysql-[0-9]*:../../databases/pear-M .if !empty(PKG_OPTIONS:Mpgsql) . include "../../mk/pgsql.buildlink3.mk" DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=4.3.1:../../databases/php-pgsql -DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2_Driver_pgsql-[0-9]*:../../databases/pear-MDB2_Driver_pgsql +DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2_Driver_pgsql>=1.5:../../databases/pear-MDB2_Driver_pgsql .endif ### @@ -36,7 +36,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2_Driver_pgsql-[0-9]*:../../databases/pear-M .if !empty(PKG_OPTIONS:Msqlite) . include "../../databases/sqlite/buildlink3.mk" DEPENDS+= ${PHP_PKG_PREFIX}-sqlite-[0-9]*:../../databases/php-sqlite -DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2_Driver_sqlite-[0-9]*:../../databases/pear-MDB2_Driver_sqlite +DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2_Driver_sqlite>1.5:../../databases/pear-MDB2_Driver_sqlite .endif ### diff --git a/mail/roundcube/patches/patch-aa b/mail/roundcube/patches/patch-aa index 028dc72adca..baa360b73d9 100644 --- a/mail/roundcube/patches/patch-aa +++ b/mail/roundcube/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2008/10/02 15:47:15 schmonz Exp $ +$NetBSD: patch-aa,v 1.4 2009/01/19 20:15:49 abs Exp $ ---- config/main.inc.php.dist.orig 2008-09-21 07:22:17.000000000 -0400 +--- config/main.inc.php.dist.orig 2008-12-30 14:33:28.000000000 +0000 +++ config/main.inc.php.dist @@ -30,10 +30,10 @@ $rcmail_config['syslog_facility'] = LOG_ @@ -15,8 +15,8 @@ $NetBSD: patch-aa,v 1.3 2008/10/02 15:47:15 schmonz Exp $ // 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 -@@ -378,4 +378,7 @@ $rcmail_config['logout_expunge'] = FALSE - $rcmail_config['inline_images'] = TRUE; +@@ -413,4 +413,7 @@ $rcmail_config['keep_alive'] = 60; + $rcmail_config['check_all_folders'] = FALSE; // end of config file + diff --git a/mail/roundcube/patches/patch-ac b/mail/roundcube/patches/patch-ac index add34d7163e..a9cd7915033 100644 --- a/mail/roundcube/patches/patch-ac +++ b/mail/roundcube/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2008/10/02 15:47:15 schmonz Exp $ +$NetBSD: patch-ac,v 1.4 2009/01/19 20:15:49 abs Exp $ ---- installer/index.php.orig 2008-09-21 07:58:40.000000000 -0400 +--- installer/index.php.orig 2008-12-07 11:10:49.000000000 +0000 +++ installer/index.php -@@ -3,7 +3,7 @@ ini_set('error_reporting', E_ALL&~E_NOTI +@@ -4,7 +4,7 @@ ini_set('error_reporting', E_ALL&~E_NOTI ini_set('display_errors', 1); define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/'); |