Upgrade to version 2.1 RC2.

PR:	ports/36903
Submitted by:	maintainer

1 files changed, 89 insertions, 31 deletions

diff --git a/www/horde2/files/patch-ac b/www/horde2/files/patch-ac
index 29f56e72a9eb..e21d55a0ac02 100644
--- a/www/horde2/files/patch-ac
+++ b/www/horde2/files/patch-ac
@@ -1,5 +1,5 @@
---- config/registry.php.dist.orig	Sun Dec 23 03:22:14 2001
-+++ config/registry.php.dist	Tue Dec 25 13:11:34 2001
+--- config/registry.php.dist.orig	Tue Mar 12 17:56:41 2002
++++ config/registry.php.dist	Mon Apr  8 21:47:24 2002
 @@ -20,8 +20,8 @@
   *   IMP or Gollem handle the authentication for Horde. This avoids the
   *   "double login" while accessing IMP.
@@ -11,40 +11,77 @@
  
  /* mail: Handler for sending mail. */
  $this->registry['mail']['compose'] = 'imp';
-@@ -62,32 +62,103 @@
+@@ -33,12 +33,18 @@
+ $this->registry['contacts']['sources'] = 'turba';
+ $this->registry['contacts']['fields'] = 'turba';
+ 
++/* nic: network utilities */
++$this->registry['net']['finger'] = 'nic';
++
+ /* tasks: Handler for todo lists. */
+ $this->registry['tasks']['search'] = 'nag';
+ $this->registry['tasks']['list'] = 'nag';
+ $this->registry['tasks']['show'] = 'nag';
+ $this->registry['tasks']['add'] = 'nag';
+ 
++/* whups: bugs reports */
++$this->registry['projects']['list'] = 'whups';
++$this->registry['projects']['add'] = 'whups';
+ 
+ /**
+  * Application registry
+@@ -68,50 +74,112 @@
      'server_port' => $GLOBALS['HTTP_SERVER_VARS']['SERVER_PORT']
  );
  
 -// $this->applications['imp'] = array(
 -//     'fileroot' => dirname(__FILE__) . '/../imp',
 -//     'webroot' => $this->applications['horde']['webroot'] . '/imp',
--//     'icon' => '/horde/imp/graphics/imp.gif',
+-//     'icon' => $this->applications['horde']['webroot'] . '/imp/graphics/imp.gif',
 -//     'name' => _("Mail"),
--//     'allow_guests' => true,
+-//     'allow_guests' => false,
 -//     'show' => true
 -// );
 -
 -// $this->applications['turba'] = array(
 -//     'fileroot' => dirname(__FILE__) . '/../turba',
 -//     'webroot' => $this->applications['horde']['webroot'] . '/turba',
--//     'icon' => '/horde/turba/graphics/turba.gif',
+-//     'icon' => $this->applications['horde']['webroot'] . '/turba/graphics/turba.gif',
 -//     'name' => _("Addressbook"),
 -//     'allow_guests' => false,
 -//     'show' => true
 -// );
 -
+-// $this->applications['kronolith'] = array(
+-//     'fileroot' => dirname(__FILE__) . '/../kronolith',
+-//     'webroot' => $this->applications['horde']['webroot'] . '/kronolith',
+-//     'icon' => $this->applications['horde']['webroot'] . '/kronolith/graphics/kronolith.gif',
+-//     'name' => _("Calendar"),
+-//     'allow_guests' => false,
+-//     'show' => false
+-// );
+-
+-// $this->applications['nag'] = array(
+-//     'fileroot' => dirname(__FILE__) . '/../nag',
+-//     'webroot' => $this->applications['horde']['webroot'] . '/nag',
+-//     'icon' => $this->applications['horde']['webroot'] . '/nag/graphics/nag.gif',
+-//     'name' => _("Tasks"),
+-//     'allow_guests' => false,
+-//     'show' => false
+-// );
+-
 -// $this->applications['chora'] = array(
 -//     'fileroot' => dirname(__FILE__) . '/../chora',
 -//     'webroot' => $this->applications['horde']['webroot'] . '/chora',
--//     'icon' => '/horde/chora/graphics/chora.gif',
+-//     'icon' => $this->applications['horde']['webroot'] . '/chora/graphics/chora.gif',
 -//     'name' => _("CVS"),
--//     'allow_guests' => true,
+-//     'allow_guests' => false,
 -//     'show' => false
 -// );
 +//UNCOMMENTWHENINSTIMP$this->applications['imp'] = array(
 +//UNCOMMENTWHENINSTIMP    'fileroot' => dirname(__FILE__) . '/../imp',
 +//UNCOMMENTWHENINSTIMP    'webroot' => $this->applications['horde']['webroot'] . '/imp',
-+//UNCOMMENTWHENINSTIMP    'icon' => '/horde/imp/graphics/imp.gif',
++//UNCOMMENTWHENINSTIMP    'icon' => $this->applications['horde']['webroot'] . '/imp/graphics/imp.gif',
 +//UNCOMMENTWHENINSTIMP    'name' => _("Mail"),
 +//UNCOMMENTWHENINSTIMP    'allow_guests' => false,
 +//UNCOMMENTWHENINSTIMP    'show' => true
@@ -53,27 +90,18 @@
 +//UNCOMMENTWHENINSTTURBA$this->applications['turba'] = array(
 +//UNCOMMENTWHENINSTTURBA    'fileroot' => dirname(__FILE__) . '/../turba',
 +//UNCOMMENTWHENINSTTURBA    'webroot' => $this->applications['horde']['webroot'] . '/turba',
-+//UNCOMMENTWHENINSTTURBA    'icon' => '/horde/turba/graphics/turba.gif',
++//UNCOMMENTWHENINSTTURBA    'icon' => $this->applications['horde']['webroot'] . '/turba/graphics/turba.gif',
 +//UNCOMMENTWHENINSTTURBA    'name' => _("Addressbook"),
 +//UNCOMMENTWHENINSTTURBA    'allow_guests' => false,
 +//UNCOMMENTWHENINSTTURBA    'show' => true
-+//UNCOMMENTWHENINSTTURBA );
-+
-+//UNCOMMENTWHENINSTCHORA$this->applications['chora'] = array(
-+//UNCOMMENTWHENINSTCHORA    'fileroot' => dirname(__FILE__) . '/../chora',
-+//UNCOMMENTWHENINSTCHORA    'webroot' => $this->applications['horde']['webroot'] . '/chora',
-+//UNCOMMENTWHENINSTCHORA    'icon' => '/horde/chora/graphics/chora.gif',
-+//UNCOMMENTWHENINSTCHORA    'name' => _("CVS"),
-+//UNCOMMENTWHENINSTCHORA    'allow_guests' => true,
-+//UNCOMMENTWHENINSTCHORA    'show' => true
-+//UNCOMMENTWHENINSTCHORA );
++//UNCOMMENTWHENINSTTURBA);
 + 
 +//UNCOMMENTWHENINSTGOLLEM$this->applications['gollem'] = array(
 +//UNCOMMENTWHENINSTGOLLEM    'fileroot' => dirname(__FILE__) . '/../gollem',
 +//UNCOMMENTWHENINSTGOLLEM    'webroot' => '/horde/gollem',
 +//UNCOMMENTWHENINSTGOLLEM    'icon' => '/horde/gollem/graphics/gollem.gif',
 +//UNCOMMENTWHENINSTGOLLEM    'name' => _("FTP"),
-+//UNCOMMENTWHENINSTGOLLEM    'allow_guests' => true,
++//UNCOMMENTWHENINSTGOLLEM    'allow_guests' => false,
 +//UNCOMMENTWHENINSTGOLLEM    'show' => true
 +//UNCOMMENTWHENINSTGOLLEM);
 +
@@ -82,14 +110,14 @@
 +//UNCOMMENTWHENINSTNIC    'webroot' => '/horde/nic',
 +//UNCOMMENTWHENINSTNIC    'icon' => '/horde/nic/graphics/nic.gif',
 +//UNCOMMENTWHENINSTNIC    'name' => _("Network"),
-+//UNCOMMENTWHENINSTNIC    'allow_guests' => true,
++//UNCOMMENTWHENINSTNIC    'allow_guests' => false,
 +//UNCOMMENTWHENINSTNIC    'show' => true
 +//UNCOMMENTWHENINSTNIC);
 +
 +//UNCOMMENTWHENINSTKRONOLITH$this->applications['kronolith'] = array(
 +//UNCOMMENTWHENINSTKRONOLITH    'fileroot' => dirname(__FILE__) . '/../kronolith',
-+//UNCOMMENTWHENINSTKRONOLITH    'webroot' => '/horde/kronolith',
-+//UNCOMMENTWHENINSTKRONOLITH    'icon' => '/horde/kronolith/graphics/kronolith.gif',
++//UNCOMMENTWHENINSTKRONOLITH    'webroot' => $this->applications['horde']['webroot'] . '/kronolith',
++//UNCOMMENTWHENINSTKRONOLITH    'icon' => $this->applications['horde']['webroot'] . '/kronolith/graphics/kronolith.gif',
 +//UNCOMMENTWHENINSTKRONOLITH    'name' => _("Calendar"),
 +//UNCOMMENTWHENINSTKRONOLITH    'allow_guests' => false,
 +//UNCOMMENTWHENINSTKRONOLITH    'show' => true
@@ -109,25 +137,43 @@
 +//UNCOMMENTWHENINSTTROLL    'webroot' => '/horde/troll',
 +//UNCOMMENTWHENINSTTROLL    'icon' => '/horde/troll/graphics/troll.gif',
 +//UNCOMMENTWHENINSTTROLL    'name' => _("News"),
-+//UNCOMMENTWHENINSTTROLL    'allow_guests' => true,
++//UNCOMMENTWHENINSTTROLL    'allow_guests' => false,
 +//UNCOMMENTWHENINSTTROLL    'show' => true
 +//UNCOMMENTWHENINSTTROLL);
 +
++//UNCOMMENTWHENINSTCHORA$this->applications['chora'] = array(
++//UNCOMMENTWHENINSTCHORA    'fileroot' => dirname(__FILE__) . '/../chora',
++//UNCOMMENTWHENINSTCHORA    'webroot' => $this->applications['horde']['webroot'] . '/chora',
++//UNCOMMENTWHENINSTCHORA    'icon' => $this->applications['horde']['webroot'] . '/chora/graphics/chora.gif',
++//UNCOMMENTWHENINSTCHORA    'name' => _("CVS"),
++//UNCOMMENTWHENINSTCHORA    'allow_guests' => true,
++//UNCOMMENTWHENINSTCHORA    'show' => true
++//UNCOMMENTWHENINSTCHORA);
++
++//UNCOMMENTWHENINSTBABEL$this->applications['babel'] = array(
++//UNCOMMENTWHENINSTBABEL    'fileroot' => dirname(__FILE__) . '/../babel',
++//UNCOMMENTWHENINSTBABEL    'webroot' => $this->applications['horde']['webroot'] . '/babel',
++//UNCOMMENTWHENINSTBABEL    'icon' => $this->applications['horde']['webroot'] . '/babel/graphics/babel.gif',
++//UNCOMMENTWHENINSTBABEL    'name' => _("i18n"),
++//UNCOMMENTWHENINSTBABEL    'allow_guests' => false,
++//UNCOMMENTWHENINSTBABEL    'show' => true
++//UNCOMMENTWHENINSTBABEL);
++
 +//UNCOMMENTWHENINSTWHUPS$this->applications['whups'] = array(
 +//UNCOMMENTWHENINSTWHUPS    'fileroot' => dirname(__FILE__) . '/../whups',
 +//UNCOMMENTWHENINSTWHUPS    'webroot' => '/horde/whups',
 +//UNCOMMENTWHENINSTWHUPS    'icon' => '/horde/whups/graphics/whups.gif',
 +//UNCOMMENTWHENINSTWHUPS    'name' => _("Bugs"),
-+//UNCOMMENTWHENINSTWHUPS    'allow_guests' => true,
++//UNCOMMENTWHENINSTWHUPS    'allow_guests' => false,
 +//UNCOMMENTWHENINSTWHUPS    'show' => true
 +//UNCOMMENTWHENINSTWHUPS);
 +
 +//UNCOMMENTWHENINSTNAG$this->applications['nag'] = array(
 +//UNCOMMENTWHENINSTNAG    'fileroot' => dirname(__FILE__) . '/../nag',
-+//UNCOMMENTWHENINSTNAG    'webroot' => '/horde/nag',
-+//UNCOMMENTWHENINSTNAG    'icon' => '/horde/nag/graphics/nag.gif',
++//UNCOMMENTWHENINSTNAG    'webroot' => $this->applications['horde']['webroot'] . '/nag',
++//UNCOMMENTWHENINSTNAG    'icon' => $this->applications['horde']['webroot'] . '/nag/graphics/nag.gif',
 +//UNCOMMENTWHENINSTNAG    'name' => _("Tasks"),
-+//UNCOMMENTWHENINSTNAG    'allow_guests' => true,
++//UNCOMMENTWHENINSTNAG    'allow_guests' => false,
 +//UNCOMMENTWHENINSTNAG    'show' => true
 +//UNCOMMENTWHENINSTNAG);
 +
@@ -141,7 +187,7 @@
  
  
  /** 
-@@ -144,6 +215,49 @@
+@@ -168,6 +236,61 @@
      'function' => 'turbaGetFields',
      'args' => array('addressbook'),
      'type' => 'array'
@@ -183,6 +229,18 @@
 +);
 +
 +
++$this->services['whups']['projects']['list'] = array(
++    'file' => '%application%/lib/api.php',
++    'function' => 'whupsListModules',
++    'args' => array(),
++    'type' => 'array'
++);
++$this->services['whups']['projects']['add'] = array(
++    'file' => '%application%/lib/api.php',
++    'function' => 'whupsAddModule',
++    'args' => array('name'),
++    'type' => 'integer'
++);
 +$this->services['whups']['horde']['summary'] = array(
 +    'file' => '%application%/lib/api.php',
 +    'function' => 'whupsSummary',
@@ -190,4 +248,4 @@
 +    'type' => 'string'
  );
  
- $this->services['default']['mail']['compose'] = array(
+ $this->services['kronolith']['horde']['summary'] = array(