diff -urN /usr/ports/www/horde2.orig/Makefile /usr/ports/www/horde2/Makefile --- /usr/ports/www/horde2.orig/Makefile Thu May 16 20:44:45 2002 +++ /usr/ports/www/horde2/Makefile Sat May 18 22:28:34 2002 @@ -9,7 +9,7 @@ PORTVERSION= 2.1 CATEGORIES= www MASTER_SITES= ftp://ftp.horde.org/pub/horde/tarballs/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-RC2 +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 16 20:44:45 2002 +++ /usr/ports/www/horde2/distinfo Sat May 18 22:35:47 2002 @@ -1 +1 @@ -MD5 (horde-2.1-RC2.tar.gz) = 212e5f84a37a20dac48799b9d0f8e4b6 +MD5 (horde-2.1-RC3.tar.gz) = 9c8b99e5247a267a3be6da26d31a3c40 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 16 20:44:45 2002 +++ /usr/ports/www/horde2/files/patch-ac Sun May 19 00:02:35 2002 @@ -1,5 +1,5 @@ ---- config/registry.php.dist.orig Tue Mar 12 17:56:41 2002 -+++ config/registry.php.dist Mon Apr 8 21:47:24 2002 +--- config/registry.php.dist.orig Tue Apr 16 14:24:58 2002 ++++ config/registry.php.dist Sun May 19 00:01:04 2002 @@ -20,8 +20,8 @@ * IMP or Gollem handle the authentication for Horde. This avoids the * "double login" while accessing IMP. @@ -11,10 +11,21 @@ /* mail: Handler for sending mail. */ $this->registry['mail']['compose'] = 'imp'; -@@ -33,12 +33,18 @@ +@@ -33,12 +33,29 @@ $this->registry['contacts']['sources'] = 'turba'; $this->registry['contacts']['fields'] = 'turba'; ++//$this->registry['publickey']['add'] = 'turba'; ++//$this->registry['publickey']['delete'] = 'turba'; ++//$this->registry['publickey']['get'] = 'turba'; ++//$this->registry['publickey']['list'] = 'turba'; ++ ++/* memos: Handler for memos/notepad. */ ++$this->registry['memos']['search'] = 'mnemo'; ++$this->registry['memos']['list'] = 'mnemo'; ++$this->registry['memos']['show'] = 'mnemo'; ++$this->registry['memos']['add'] = 'mnemo'; ++ +/* nic: network utilities */ +$this->registry['net']['finger'] = 'nic'; + @@ -30,7 +41,7 @@ /** * Application registry -@@ -68,50 +74,112 @@ +@@ -68,50 +85,121 @@ 'server_port' => $GLOBALS['HTTP_SERVER_VARS']['SERVER_PORT'] ); @@ -168,6 +179,15 @@ +//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', @@ -186,8 +206,8 @@ +//UNCOMMENTWHENINSTORATOR); - /** -@@ -168,6 +236,61 @@ + /** +@@ -168,6 +256,86 @@ 'function' => 'turbaGetFields', 'args' => array('addressbook'), 'type' => 'array' @@ -196,6 +216,31 @@ +$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' +); diff -urN /usr/ports/www/horde2.orig/files/patch-mime_drivers.php.dist /usr/ports/www/horde2/files/patch-mime_drivers.php.dist --- /usr/ports/www/horde2.orig/files/patch-mime_drivers.php.dist Thu May 16 20:44:46 2002 +++ /usr/ports/www/horde2/files/patch-mime_drivers.php.dist Sat May 18 22:46:45 2002 @@ -1,10 +1,10 @@ ---- config/mime_drivers.php.dist.orig Sat Mar 9 19:43:39 2002 -+++ config/mime_drivers.php.dist Tue Mar 12 22:51:51 2002 -@@ -20,8 +20,12 @@ +--- config/mime_drivers.php.dist.orig Tue May 7 13:38:08 2002 ++++ config/mime_drivers.php.dist Sat May 18 22:45:30 2002 +@@ -21,8 +21,12 @@ $mime_drivers_map['horde']['registered'] = array( - 'php', 'tgz', 'vcard' -- // ,'msword', 'msexcel', 'mspowerpoint', + 'php', 'tgz', 'vcard', 'enriched' +- // ,'msword', 'msexcel', 'mspowerpoint' - // ,'enscript', 'rar', 'zip', 'rpm', 'deb' + //UNCOMMENTIFWV ,'msword' + //UNCOMMENTIFXL , 'msexcel', 'mspowerpoint' @@ -15,7 +15,7 @@ ); -@@ -101,22 +105,22 @@ +@@ -113,22 +117,22 @@ */ /* Location of the enscript binary. */ @@ -54,7 +54,7 @@ /** -@@ -124,7 +128,7 @@ +@@ -136,7 +140,7 @@ */ /* Location of the tar binary. */ @@ -63,7 +63,7 @@ $mime_drivers['horde']['tgz']['inline'] = true; $mime_drivers['horde']['tgz']['handles'] = array( 'x-extension/tgz', -@@ -142,14 +146,14 @@ +@@ -154,14 +158,14 @@ */ /* Location of the zipinfo binary. */ @@ -86,7 +86,7 @@ /** -@@ -158,13 +162,13 @@ +@@ -170,13 +174,13 @@ */ /* Location of the rar binary. */ @@ -107,7 +107,7 @@ /** -@@ -174,15 +178,15 @@ +@@ -186,15 +190,15 @@ */ /* Location of the wvHtml binary. */ @@ -132,7 +132,7 @@ /** -@@ -192,14 +196,14 @@ +@@ -204,14 +208,14 @@ */ /* Location of the xlhtml binary. */ @@ -155,7 +155,7 @@ /** -@@ -210,14 +214,14 @@ +@@ -222,14 +226,14 @@ */ /* Location of the ppthtml binary. */ diff -urN /usr/ports/www/horde2.orig/pkg-plist /usr/ports/www/horde2/pkg-plist --- /usr/ports/www/horde2.orig/pkg-plist Thu May 16 20:44:46 2002 +++ /usr/ports/www/horde2/pkg-plist Sat May 18 22:54:17 2002 @@ -107,6 +107,7 @@ %%HORDEDIR%%/lib/MIME/Viewer.php %%HORDEDIR%%/lib/MIME/Viewer/deb.php %%HORDEDIR%%/lib/MIME/Viewer/default.php +%%HORDEDIR%%/lib/MIME/Viewer/enriched.php %%HORDEDIR%%/lib/MIME/Viewer/enscript.php %%HORDEDIR%%/lib/MIME/Viewer/msexcel.php %%HORDEDIR%%/lib/MIME/Viewer/mspowerpoint.php @@ -158,6 +159,7 @@ %%HORDEDIR%%/locale/ru_RU/LC_MESSAGES/horde.mo %%HORDEDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/horde.mo %%HORDEDIR%%/locale/sk_SK/LC_MESSAGES/horde.mo +%%HORDEDIR%%/locale/sl_SI/LC_MESSAGES/horde.mo %%HORDEDIR%%/locale/sv_SE/LC_MESSAGES/horde.mo %%HORDEDIR%%/locale/uk_UA/LC_MESSAGES/horde.mo %%HORDEDIR%%/locale/zh_CN/LC_MESSAGES/horde.mo @@ -190,11 +192,13 @@ %%HORDEDIR%%/po/ru_RU.KOI8-R.po %%HORDEDIR%%/po/shtool %%HORDEDIR%%/po/sk_SK.po +%%HORDEDIR%%/po/sl_SI.po %%HORDEDIR%%/po/sv_SE.po %%HORDEDIR%%/po/uk_UA.po %%HORDEDIR%%/po/xgettext.sh %%HORDEDIR%%/po/zh_CN.po %%HORDEDIR%%/po/zh_TW.po +%%HORDEDIR%%/prefs.php %%HORDEDIR%%/problem.php %%HORDEDIR%%/scripts/.htaccess %%HORDEDIR%%/scripts/SCRIPTS @@ -208,12 +212,7 @@ %%HORDEDIR%%/scripts/db/pgsql_drop.sql %%HORDEDIR%%/scripts/db/prefs.sql %%HORDEDIR%%/scripts/horde-rsync.sh -%%HORDEDIR%%/scripts/ldap/gollem.schema %%HORDEDIR%%/scripts/ldap/horde.schema -%%HORDEDIR%%/scripts/ldap/imp.schema -%%HORDEDIR%%/scripts/ldap/kronolith.schema -%%HORDEDIR%%/scripts/ldap/nag.schema -%%HORDEDIR%%/scripts/ldap/turba.schema %%HORDEDIR%%/scripts/mime_mapping/Makefile %%HORDEDIR%%/scripts/mime_mapping/convert.pl %%HORDEDIR%%/scripts/mime_mapping/mime.types @@ -330,6 +329,8 @@ @dirrm %%HORDEDIR%%/locale/ru_RU.KOI8-R @dirrm %%HORDEDIR%%/locale/sk_SK/LC_MESSAGES @dirrm %%HORDEDIR%%/locale/sk_SK +@dirrm %%HORDEDIR%%/locale/sl_SI/LC_MESSAGES +@dirrm %%HORDEDIR%%/locale/sl_SI @dirrm %%HORDEDIR%%/locale/sv_SE/LC_MESSAGES @dirrm %%HORDEDIR%%/locale/sv_SE @dirrm %%HORDEDIR%%/locale/uk_UA/LC_MESSAGES