Attachment 22601 Details for Bug 39170 – file.diff

[patch] file.diff

file.diff (text/plain), 13.96 KB, created by Thierry Thomas on 2002-06-11 23:00:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2002-06-11 23:00:13 UTC

Size: 13.96 KB

patch

obsolete

>diff -urN /usr/ports/www/horde2.orig/Makefile /usr/ports/www/horde2/Makefile
>--- /usr/ports/www/horde2.orig/Makefile	Thu May 23 19:13:05 2002
>+++ /usr/ports/www/horde2/Makefile	Tue Jun 11 19:21:46 2002
>@@ -7,11 +7,10 @@
> 
> PORTNAME=	horde
> PORTVERSION=	2.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/%SUBDIR%/
> MASTER_SITE_SUBDIR=	. old
>-DISTNAME=	${PORTNAME}-${PORTVERSION}-RC3
> 
> MAINTAINER=	thierry@pompo.net
> 
>diff -urN /usr/ports/www/horde2.orig/distinfo /usr/ports/www/horde2/distinfo
>--- /usr/ports/www/horde2.orig/distinfo	Thu May 23 19:13:05 2002
>+++ /usr/ports/www/horde2/distinfo	Tue Jun 11 18:35:56 2002
>@@ -1 +1 @@
>-MD5 (horde-2.1-RC3.tar.gz) = 9c8b99e5247a267a3be6da26d31a3c40
>+MD5 (horde-2.1.tar.gz) = 2e66863e4b5ebabd1a3dae63d2b2cb53
>diff -urN /usr/ports/www/horde2.orig/files/patch-ac /usr/ports/www/horde2/files/patch-ac
>--- /usr/ports/www/horde2.orig/files/patch-ac	Thu May 23 19:13:05 2002
>+++ /usr/ports/www/horde2/files/patch-ac	Tue Jun 11 22:07:51 2002
>@@ -1,5 +1,5 @@
>---- config/registry.php.dist.orig	Tue Apr 16 14:24:58 2002
>-+++ config/registry.php.dist	Sun May 19 00:01:04 2002
>+--- config/registry.php.dist.orig	Mon May 20 18:43:28 2002
>++++ config/registry.php.dist	Tue Jun 11 18:53:47 2002
> @@ -20,8 +20,8 @@
>   *   IMP or Gollem handle the authentication for Horde. This avoids the
>   *   "double login" while accessing IMP.
>@@ -11,9 +11,9 @@
>  
>  /* mail: Handler for sending mail. */
>  $this->registry['mail']['compose'] = 'imp';
>-@@ -33,12 +33,29 @@
>- $this->registry['contacts']['sources'] = 'turba';
>- $this->registry['contacts']['fields'] = 'turba';
>+@@ -39,12 +39,29 @@
>+ $this->registry['memos']['show'] = 'mnemo';
>+ $this->registry['memos']['add'] = 'mnemo';
>  
> +//$this->registry['publickey']['add'] = 'turba';
> +//$this->registry['publickey']['delete'] = 'turba';
>@@ -41,7 +41,7 @@
>  
>  /**
>   * Application registry
>-@@ -68,50 +85,121 @@
>+@@ -74,60 +91,121 @@
>      'server_port' => $GLOBALS['HTTP_SERVER_VARS']['SERVER_PORT']
>  );
>  
>@@ -72,6 +72,15 @@
> -//     'show' => false
> -// );
> -
>+-// $this->applications['mnemo'] = array(
>+-//     'fileroot' => dirname(__FILE__) . '/../mnemo',
>+-//     'webroot' => $this->applications['horde']['webroot'] . '/mnemo',
>+-//     'icon' => $this->applications['horde']['webroot'] . '/mnemo/graphics/mnemo.gif',
>+-//     'name' => _("Memos"),
>+-//     'allow_guests' => false,
>+-//     'show' => true
>+-// );
>+-
> -// $this->applications['nag'] = array(
> -//     'fileroot' => dirname(__FILE__) . '/../nag',
> -//     'webroot' => $this->applications['horde']['webroot'] . '/nag',
>@@ -89,6 +98,7 @@
> -//     'allow_guests' => false,
> -//     'show' => false
> -// );
>+-
> +//UNCOMMENTWHENINSTIMP$this->applications['imp'] = array(
> +//UNCOMMENTWHENINSTIMP    'fileroot' => dirname(__FILE__) . '/../imp',
> +//UNCOMMENTWHENINSTIMP    'webroot' => $this->applications['horde']['webroot'] . '/imp',
>@@ -106,6 +116,42 @@
> +//UNCOMMENTWHENINSTTURBA    'allow_guests' => false,
> +//UNCOMMENTWHENINSTTURBA    'show' => true
> +//UNCOMMENTWHENINSTTURBA);
>++
>++//UNCOMMENTWHENINSTKRONOLITH$this->applications['kronolith'] = array(
>++//UNCOMMENTWHENINSTKRONOLITH    'fileroot' => dirname(__FILE__) . '/../kronolith',
>++//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
>++//UNCOMMENTWHENINSTKRONOLITH);
>++
>++//UNCOMMENTWHENINSTMNEMO$this->applications['mnemo'] = array(
>++//UNCOMMENTWHENINSTMNEMO    'fileroot' => dirname(__FILE__) . '/../mnemo',
>++//UNCOMMENTWHENINSTMNEMO    'webroot' => $this->applications['horde']['webroot'] . '/mnemo',
>++//UNCOMMENTWHENINSTMNEMO    'icon' => $this->applications['horde']['webroot'] . '/mnemo/graphics/mnemo.gif',
>++//UNCOMMENTWHENINSTMNEMO    'name' => _("Memos"),
>++//UNCOMMENTWHENINSTMNEMO    'allow_guests' => false,
>++//UNCOMMENTWHENINSTMNEMO    'show' => true
>++//UNCOMMENTWHENINSTMNEMO);
>++
>++//UNCOMMENTWHENINSTNAG$this->applications['nag'] = array(
>++//UNCOMMENTWHENINSTNAG    'fileroot' => dirname(__FILE__) . '/../nag',
>++//UNCOMMENTWHENINSTNAG    'webroot' => $this->applications['horde']['webroot'] . '/nag',
>++//UNCOMMENTWHENINSTNAG    'icon' => $this->applications['horde']['webroot'] . '/nag/graphics/nag.gif',
>++//UNCOMMENTWHENINSTNAG    'name' => _("Tasks"),
>++//UNCOMMENTWHENINSTNAG    'allow_guests' => false,
>++//UNCOMMENTWHENINSTNAG    'show' => true
>++//UNCOMMENTWHENINSTNAG);
>++
>++//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' => false,
>++//UNCOMMENTWHENINSTCHORA    'show' => true
>++//UNCOMMENTWHENINSTCHORA);
> + 
> +//UNCOMMENTWHENINSTGOLLEM$this->applications['gollem'] = array(
> +//UNCOMMENTWHENINSTGOLLEM    'fileroot' => dirname(__FILE__) . '/../gollem',
>@@ -125,15 +171,6 @@
> +//UNCOMMENTWHENINSTNIC    'show' => true
> +//UNCOMMENTWHENINSTNIC);
> +
>-+//UNCOMMENTWHENINSTKRONOLITH$this->applications['kronolith'] = array(
>-+//UNCOMMENTWHENINSTKRONOLITH    'fileroot' => dirname(__FILE__) . '/../kronolith',
>-+//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
>-+//UNCOMMENTWHENINSTKRONOLITH);
>-+
> +//UNCOMMENTWHENINSTJONAH$this->applications['jonah'] = array(
> +//UNCOMMENTWHENINSTJONAH    'fileroot' => dirname(__FILE__) . '/../jonah',
> +//UNCOMMENTWHENINSTJONAH    'webroot' => '/horde/jonah',
>@@ -152,15 +189,6 @@
> +//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',
>@@ -179,24 +207,6 @@
> +//UNCOMMENTWHENINSTWHUPS    'show' => true
> +//UNCOMMENTWHENINSTWHUPS);
> +
>-+//UNCOMMENTWHENINSTMNEMO$this->applications['mnemo'] = array(
>-+//UNCOMMENTWHENINSTMNEMO    'fileroot' => dirname(__FILE__) . '/../mnemo',
>-+//UNCOMMENTWHENINSTMNEMO    'webroot' => $this->applications['horde']['webroot'] . '/mnemo',
>-+//UNCOMMENTWHENINSTMNEMO    'icon' => $this->applications['horde']['webroot'] . '/mnemo/graphics/mnemo.gif',
>-+//UNCOMMENTWHENINSTMNEMO    'name' => _("Memos"),
>-+//UNCOMMENTWHENINSTMNEMO    'allow_guests' => false,
>-+//UNCOMMENTWHENINSTMNEMO    'show' => true
>-+//UNCOMMENTWHENINSTMNEMO);
>-+
>-+//UNCOMMENTWHENINSTNAG$this->applications['nag'] = array(
>-+//UNCOMMENTWHENINSTNAG    'fileroot' => dirname(__FILE__) . '/../nag',
>-+//UNCOMMENTWHENINSTNAG    'webroot' => $this->applications['horde']['webroot'] . '/nag',
>-+//UNCOMMENTWHENINSTNAG    'icon' => $this->applications['horde']['webroot'] . '/nag/graphics/nag.gif',
>-+//UNCOMMENTWHENINSTNAG    'name' => _("Tasks"),
>-+//UNCOMMENTWHENINSTNAG    'allow_guests' => false,
>-+//UNCOMMENTWHENINSTNAG    'show' => true
>-+//UNCOMMENTWHENINSTNAG);
>-+
> +//UNCOMMENTWHENINSTORATOR$this->applications['orator'] = array(
> +//UNCOMMENTWHENINSTORATOR    'fileroot' => dirname(__FILE__) . '/../orator',
> +//UNCOMMENTWHENINSTORATOR    'webroot' => '/horde/orator',
>@@ -205,67 +215,21 @@
> +//UNCOMMENTWHENINSTORATOR    'show' => true
> +//UNCOMMENTWHENINSTORATOR);
>  
>- 
>  /**
>-@@ -168,6 +256,86 @@
>-     'function' => 'turbaGetFields',
>-     'args' => array('addressbook'),
>+  * Service registry
>+@@ -185,7 +263,7 @@
>      'type' => 'array'
>-+);
>-+
>+ );
>+ 
>+-$this->services['kronolith']['horde']['summary'] = array(
> +$this->services['kronolith']['horde']['summary'] = array( 
>-+    'file' => '%application%/lib/api.php',
>-+    'function' => 'kronolithSummary',
>-+    'args' => array(),
>-+    'type' => 'string'
>-+);
>-+
>-+$this->services['mnemo']['memos']['list'] = array(
>-+    'file' => '%application%/lib/api.php',
>-+    'function' => 'mnemoListMemos',
>-+    'args' => array('sortby', 'sortdir'),
>-+    'type' => 'array'
>-+);
>-+$this->services['mnemo']['memos']['search'] = array(
>-+    'link' => "%application%/search.php"
>-+);
>-+$this->services['mnemo']['memos']['show'] = array(
>-+    'link' => "%application%/view.php?memo=|memo|"
>-+);
>-+$this->services['mnemo']['memos']['add'] = array(
>-+    'file' => '%application%/lib/api.php',
>-+    'function' => 'mnemoAddMemo',
>-+    'args' => array('body', 'category'),
>-+    'type' => 'integer'
>-+);
>-+$this->services['mnemo']['horde']['summary'] = array(
>-+    'file' => '%application%/lib/api.php',
>-+    'function' => 'mnemoSummary',
>-+    'args' => array(),
>-+    'type' => 'string'
>-+);
>-+
>-+$this->services['nag']['tasks']['list'] = array(
>-+    'file' => '%application%/lib/api.php',
>-+    'function' => 'nagListTasks',
>-+    'args' => array('sortby', 'sortdir'),
>-+    'type' => 'array'
>-+);
>-+$this->services['nag']['tasks']['search'] = array(
>-+    'link' => "%application%/search.php"
>-+);
>-+$this->services['nag']['tasks']['show'] = array(
>-+    'link' => "%application%/view.php?task=|task|"
>-+);
>-+$this->services['nag']['tasks']['add'] = array(
>-+    'file' => '%application%/lib/api.php',
>-+    'function' => 'nagAddTask',
>-+    'args' => array('name', 'description', 'due'),
>-+    'type' => 'integer'
>-+);
>-+$this->services['nag']['horde']['summary'] = array(
>-+    'file' => '%application%/lib/api.php',
>-+    'function' => 'nagSummary',
>+     'file' => '%application%/lib/api.php',
>+     'function' => 'kronolithSummary',
>+     'args' => array(),
>+@@ -238,6 +316,29 @@
>+ $this->services['nag']['horde']['summary'] = array(
>+     'file' => '%application%/lib/api.php',
>+     'function' => 'nagSummary',
> +    'args' => array(),
> +    'type' => 'string'
> +);
>@@ -289,8 +253,6 @@
> +$this->services['whups']['horde']['summary'] = array(
> +    'file' => '%application%/lib/api.php',
> +    'function' => 'whupsSummary',
>-+    'args' => array(),
>-+    'type' => 'string'
>+     'args' => array(),
>+     'type' => 'string'
>  );
>- 
>- $this->services['kronolith']['horde']['summary'] = array(
>diff -urN /usr/ports/www/horde2.orig/pkg-descr /usr/ports/www/horde2/pkg-descr
>--- /usr/ports/www/horde2.orig/pkg-descr	Thu May 16 20:44:46 2002
>+++ /usr/ports/www/horde2/pkg-descr	Tue Jun 11 21:49:25 2002
>@@ -1,6 +1,7 @@
> Horde is a framework used by several applications written in PHP4.
> 
> Horde is used by these ports: mail/imp3, mail/turba, devel/chora,
>-deskutils/kronolith, deskutils/nag, www/jonah, net/nic and devel/whups.
>+deskutils/kronolith, deskutils/nag, www/jonah, net/nic, devel/whups,
>+and deskutils/mnemo.
> 
> WWW: http://www.horde.org/
>diff -urN /usr/ports/www/horde2.orig/pkg-message /usr/ports/www/horde2/pkg-message
>--- /usr/ports/www/horde2.orig/pkg-message	Sun Nov 25 18:07:37 2001
>+++ /usr/ports/www/horde2/pkg-message	Tue Jun 11 22:23:07 2002
>@@ -30,4 +30,7 @@
> There is a testing script at <URL:http://localhost/horde/test.php>.
> 
> The script horde_set_perms.sh has been installed in %%HORDESBIN%%.
>+
>+N.B.: if you don't have a directory /usr/local/lib/php/Log, you have   *
>+===== to install it from <URL:http://pear.php.net/get/Log>.            *
> ************************************************************************
>diff -urN /usr/ports/www/horde2.orig/pkg-plist /usr/ports/www/horde2/pkg-plist
>--- /usr/ports/www/horde2.orig/pkg-plist	Thu May 23 19:13:05 2002
>+++ /usr/ports/www/horde2/pkg-plist	Tue Jun 11 19:06:16 2002
>@@ -148,11 +148,13 @@
> %%HORDEDIR%%/locale/et_EE/LC_MESSAGES/horde.mo
> %%HORDEDIR%%/locale/fi_FI/LC_MESSAGES/horde.mo
> %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES/horde.mo
>+%%HORDEDIR%%/locale/hu_HU/LC_MESSAGES/horde.mo
> %%HORDEDIR%%/locale/it_IT/LC_MESSAGES/horde.mo
> %%HORDEDIR%%/locale/ja_JP/LC_MESSAGES/horde.mo
> %%HORDEDIR%%/locale/ko_KR/LC_MESSAGES/horde.mo
> %%HORDEDIR%%/locale/nl_NL/LC_MESSAGES/horde.mo
> %%HORDEDIR%%/locale/nb_NO/LC_MESSAGES/horde.mo
>+%%HORDEDIR%%/locale/nn_NO/LC_MESSAGES/horde.mo
> %%HORDEDIR%%/locale/pl_PL/LC_MESSAGES/horde.mo
> %%HORDEDIR%%/locale/pt_BR/LC_MESSAGES/horde.mo
> %%HORDEDIR%%/locale/pt_PT/LC_MESSAGES/horde.mo
>@@ -180,11 +182,13 @@
> %%HORDEDIR%%/po/extract.pl
> %%HORDEDIR%%/po/fi_FI.po
> %%HORDEDIR%%/po/fr_FR.po
>+%%HORDEDIR%%/po/hu_HU.po
> %%HORDEDIR%%/po/it_IT.po
> %%HORDEDIR%%/po/ja_JP.po
> %%HORDEDIR%%/po/ko_KR.po
> %%HORDEDIR%%/po/nl_NL.po
> %%HORDEDIR%%/po/nb_NO.po
>+%%HORDEDIR%%/po/nn_NO.po
> %%HORDEDIR%%/po/pl_PL.po
> %%HORDEDIR%%/po/pt_BR.po
> %%HORDEDIR%%/po/pt_PT.po
>@@ -307,6 +311,8 @@
> @dirrm %%HORDEDIR%%/locale/fi_FI
> @dirrm %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES
> @dirrm %%HORDEDIR%%/locale/fr_FR
>+@dirrm %%HORDEDIR%%/locale/hu_HU/LC_MESSAGES
>+@dirrm %%HORDEDIR%%/locale/hu_HU
> @dirrm %%HORDEDIR%%/locale/it_IT/LC_MESSAGES
> @dirrm %%HORDEDIR%%/locale/it_IT
> @dirrm %%HORDEDIR%%/locale/ja_JP/LC_MESSAGES
>@@ -317,6 +323,8 @@
> @dirrm %%HORDEDIR%%/locale/nl_NL
> @dirrm %%HORDEDIR%%/locale/nb_NO/LC_MESSAGES
> @dirrm %%HORDEDIR%%/locale/nb_NO
>+@dirrm %%HORDEDIR%%/locale/nn_NO/LC_MESSAGES
>+@dirrm %%HORDEDIR%%/locale/nn_NO
> @dirrm %%HORDEDIR%%/locale/pl_PL/LC_MESSAGES
> @dirrm %%HORDEDIR%%/locale/pl_PL
> @dirrm %%HORDEDIR%%/locale/pt_BR/LC_MESSAGES

Actions: View | Diff

Attachments on bug 39170: 22601