4 files changed, 96 insertions, 86 deletions

diff --git a/devel/horde-chora/Makefile b/devel/horde-chora/Makefile
index d1bc7059d5e7..93c2c673edb2 100644
--- a/devel/horde-chora/Makefile
+++ b/devel/horde-chora/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	chora
-PORTVERSION=	2.0.2
-PORTREVISION=	5
+PORTVERSION=	2.1
 CATEGORIES=	devel www
 DIST_SUBDIR=	horde
 
diff --git a/devel/horde-chora/distinfo b/devel/horde-chora/distinfo
index 16b902da08dd..aaa997e4ab93 100644
--- a/devel/horde-chora/distinfo
+++ b/devel/horde-chora/distinfo
@@ -1,3 +1,3 @@
-MD5 (horde/chora-h3-2.0.2.tar.gz) = dfddec61103e4437b5ad773888ae55c2
-SHA256 (horde/chora-h3-2.0.2.tar.gz) = bbadfc0f63ba3c5034c98c9c2cbf0913c2e01fa0656ac2d49d372c2c7d1c1745
-SIZE (horde/chora-h3-2.0.2.tar.gz) = 801775
+MD5 (horde/chora-h3-2.1.tar.gz) = 9265e3734fdd9be167b9983d421208e6
+SHA256 (horde/chora-h3-2.1.tar.gz) = 5e3ad447a77f9adb870ba0fdb2e9df0b36343bc2546cd1df7460d909967f2713
+SIZE (horde/chora-h3-2.1.tar.gz) = 997600
diff --git a/devel/horde-chora/files/patch-config::sourceroots.php.dist b/devel/horde-chora/files/patch-config::sourceroots.php.dist
index 18c1a987243b..1a75771ecaf1 100644
--- a/devel/horde-chora/files/patch-config::sourceroots.php.dist
+++ b/devel/horde-chora/files/patch-config::sourceroots.php.dist
@@ -1,16 +1,7 @@
---- config/sourceroots.php.dist.orig	Wed Aug 27 16:08:21 2003
-+++ config/sourceroots.php.dist	Thu Dec  2 23:30:08 2004
-@@ -11,7 +11,7 @@
-  * 'name'     [M] : Short name for the repository.
-  *
-  * 'location' [M] : Location on the filesystem of the repository.
-- * 
-+ *
-  * 'title'    [M] : Long title for the repository.
-  *
-  * 'type'     [M] : Indicates software used, either 'cvs' or 'svn'.
-@@ -31,6 +31,17 @@
-  *                  whose contents should be protected and not displayed.
+--- config/sourceroots.php.dist.orig	2008-10-09 09:40:03.000000000 -0800
++++ config/sourceroots.php.dist	2009-03-24 14:46:09.000000000 -0800
+@@ -37,6 +37,17 @@
+  *                  repositories that require authentication).
   */
  
 +$sourceroots['myprojects'] = array(
@@ -27,19 +18,3 @@
  $sourceroots['php4'] = array(
      'name' => 'PHP4',
      'location' => '/home/cvs/php4',
-@@ -64,9 +75,11 @@
-     'type' => 'svn',
- );
- 
--$sourceroots['openbsd'] = array(
--    'name' => 'OpenBSD',
--    'location' => '/home/cvs/openbsd',
--    'title' => 'OpenBSD CVS Repository',
-+$sourceroots['freebsd'] = array(
-+    'name' => 'FreeBSD',
-+    'location' => '/home/cvs/freebsd',
-+    'title' => 'FreeBSD CVS Repository',
-     'type' => 'cvs',
- );
-+
-+*/
diff --git a/devel/horde-chora/pkg-plist b/devel/horde-chora/pkg-plist
index 26e439472b3f..2841803ce256 100644
--- a/devel/horde-chora/pkg-plist
+++ b/devel/horde-chora/pkg-plist
@@ -14,8 +14,20 @@
 %%HORDIR%%/diff.php
 %%HORDIR%%/history.php
 %%HORDIR%%/index.php
+%%HORDIR%%/js/QuickFinder.js
+%%HORDIR%%/js/prototype.js
+%%HORDIR%%/js/revlog.js
+%%HORDIR%%/js/src/QuickFinder.js
+%%HORDIR%%/js/src/prototype.js
+%%HORDIR%%/js/src/revlog.js
+%%HORDIR%%/js/src/stripe.js
+%%HORDIR%%/js/src/tables.js
+%%HORDIR%%/js/stripe.js
+%%HORDIR%%/js/tables.js
 %%HORDIR%%/lib/.htaccess
+%%HORDIR%%/lib/Block/tree_menu.php
 %%HORDIR%%/lib/Chora.php
+%%HORDIR%%/lib/api.php
 %%HORDIR%%/lib/base.php
 %%HORDIR%%/lib/version.php
 %%HORDIR%%/locale/.htaccess
@@ -29,6 +41,7 @@
 %%HORDIR%%/locale/fi_FI/LC_MESSAGES/chora.mo
 %%HORDIR%%/locale/fi_FI/help.xml
 %%HORDIR%%/locale/fr_FR/LC_MESSAGES/chora.mo
+%%HORDIR%%/locale/it_IT/LC_MESSAGES/chora.mo
 %%HORDIR%%/locale/nb_NO/LC_MESSAGES/chora.mo
 %%HORDIR%%/locale/nl_NL/LC_MESSAGES/chora.mo
 %%HORDIR%%/locale/pl_PL/LC_MESSAGES/chora.mo
@@ -49,6 +62,7 @@
 %%HORDIR%%/po/es_ES.po
 %%HORDIR%%/po/fi_FI.po
 %%HORDIR%%/po/fr_FR.po
+%%HORDIR%%/po/it_IT.po
 %%HORDIR%%/po/nb_NO.po
 %%HORDIR%%/po/nl_NL.po
 %%HORDIR%%/po/pl_PL.po
@@ -78,7 +92,6 @@
 %%HORDIR%%/templates/directory/back.inc
 %%HORDIR%%/templates/directory/dir.inc
 %%HORDIR%%/templates/directory/file.inc
-%%HORDIR%%/templates/directory/footer.inc
 %%HORDIR%%/templates/directory/header.inc
 %%HORDIR%%/templates/error_page.inc
 %%HORDIR%%/templates/headerbar.inc
@@ -87,70 +100,93 @@
 %%HORDIR%%/templates/history/footer.inc
 %%HORDIR%%/templates/history/header.inc
 %%HORDIR%%/templates/history/rev.inc
-%%HORDIR%%/templates/history/row_end.inc
-%%HORDIR%%/templates/history/row_start.inc
-%%HORDIR%%/templates/log/request.inc
+%%HORDIR%%/templates/log/footer.inc
+%%HORDIR%%/templates/log/header.inc
 %%HORDIR%%/templates/log/rev.inc
 %%HORDIR%%/templates/menu.inc
+%%HORDIR%%/templates/patchsets/footer.inc
+%%HORDIR%%/templates/patchsets/header.inc
 %%HORDIR%%/templates/patchsets/ps.inc
 %%HORDIR%%/templates/stats/stats.inc
+%%HORDIR%%/test.php
 %%HORDIR%%/themes/burntorange/screen.css
+%%HORDIR%%/themes/graphics/az.png
 %%HORDIR%%/themes/graphics/back.png
 %%HORDIR%%/themes/graphics/chora.png
 %%HORDIR%%/themes/graphics/deleted.png
+%%HORDIR%%/themes/graphics/diff.png
 %%HORDIR%%/themes/graphics/favicon.ico
 %%HORDIR%%/themes/graphics/folder.png
+%%HORDIR%%/themes/graphics/za.png
+%%HORDIR%%/themes/hordeweb/screen.css
 %%HORDIR%%/themes/screen.css
-@dirrmtry %%HORDIR%%/config
-@dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/cs_CZ
-@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/da_DK
-@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/de_DE
-@dirrm %%HORDIR%%/locale/en_US
-@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/es_ES
-@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fi_FI
-@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fr_FR
-@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nb_NO
-@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pl_PL
-@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_BR
-@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ro_RO
-@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ru_RU
-@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sk_SK
-@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sv_SE
-@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_CN
-@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_TW
-@dirrm %%HORDIR%%/locale
-@dirrm %%HORDIR%%/po
-@dirrm %%HORDIR%%/templates/annotate
-@dirrm %%HORDIR%%/templates/checkout
-@dirrm %%HORDIR%%/templates/cvsgraph
+%%HORDIR%%/themes/silver/graphics/az.png
+%%HORDIR%%/themes/silver/graphics/back.png
+%%HORDIR%%/themes/silver/graphics/chora.png
+%%HORDIR%%/themes/silver/graphics/deleted.png
+%%HORDIR%%/themes/silver/graphics/diff.png
+%%HORDIR%%/themes/silver/graphics/favicon.ico
+%%HORDIR%%/themes/silver/graphics/folder.png
+%%HORDIR%%/themes/silver/graphics/za.png
+%%HORDIR%%/themes/silver/themed_graphics
+@dirrm %%HORDIR%%/themes/silver/graphics
+@dirrm %%HORDIR%%/themes/silver
+@dirrm %%HORDIR%%/themes/hordeweb
+@dirrm %%HORDIR%%/themes/graphics
+@dirrm %%HORDIR%%/themes/burntorange
+@dirrm %%HORDIR%%/themes
+@dirrm %%HORDIR%%/templates/stats
+@dirrm %%HORDIR%%/templates/patchsets
+@dirrm %%HORDIR%%/templates/log
+@dirrm %%HORDIR%%/templates/history
+@dirrm %%HORDIR%%/templates/directory
 @dirrm %%HORDIR%%/templates/diff/hr
 @dirrm %%HORDIR%%/templates/diff
-@dirrm %%HORDIR%%/templates/directory
-@dirrm %%HORDIR%%/templates/history
-@dirrm %%HORDIR%%/templates/log
-@dirrm %%HORDIR%%/templates/patchsets
-@dirrm %%HORDIR%%/templates/stats
+@dirrm %%HORDIR%%/templates/cvsgraph
+@dirrm %%HORDIR%%/templates/checkout
+@dirrm %%HORDIR%%/templates/annotate
 @dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/themes/burntorange
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes
+@dirrm %%HORDIR%%/po
+@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/zh_TW
+@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/zh_CN
+@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sv_SE
+@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sk_SK
+@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ru_RU
+@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ro_RO
+@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_BR
+@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pl_PL
+@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nl_NL
+@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nb_NO
+@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/it_IT
+@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fr_FR
+@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fi_FI
+@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/es_ES
+@dirrm %%HORDIR%%/locale/en_US
+@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/de_DE
+@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/da_DK
+@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/cs_CZ
+@dirrm %%HORDIR%%/locale
+@dirrm %%HORDIR%%/lib/Block
+@dirrm %%HORDIR%%/lib
+@dirrm %%HORDIR%%/js/src
+@dirrm %%HORDIR%%/js
+@dirrmtry %%HORDIR%%/config
 @dirrmtry %%HORDIR%%
 @dirrmtry %%HORBAS%%