Upgrading to Horde 2.2.5.

The full list of changes (from version 2.2.4) can be viewed here:
<http://cvs.horde.org/diff.php/horde/docs/CHANGES?r1=1.207.2.86&r2=1.207.2.91&ty=h>.

PR:		ports/63947.
Submitted by:	maintainer.
Approved by:	mat (mentor).

4 files changed, 43 insertions, 31 deletions

diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index 40169bd7544f..60764252b200 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	2.2.4
-PORTREVISION=	2
+PORTVERSION=	2.2.5
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
-		ftp://ftp.au.horde.org/pub/horde/			\
+		ftp://ftp.planetmirror.com/pub/horde/horde/		\
+		ftp://ftp.au.horde.org/pub/horde/horde/			\
+		ftp://ftp.be.horde.org/horde/				\
 		ftp://ftp.es.horde.org/pub/horde/			\
 		ftp://ftp.it.horde.org/pub/mirror/horde.org/horde/	\
 		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/horde/	\
-		ftp://ftp.pt.horde.org/pub/horde-ftp/horde/
+		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/horde/	\
+		http://ftp.horde.org/pub/horde/
 
 MAINTAINER=	thierry@pompo.net
 COMMENT=	A common code-base used by Horde applications, written in PHP
@@ -29,7 +31,6 @@ COMMENT=	A common code-base used by Horde applications, written in PHP
 #-----------------------------------------------------------------------
 
 BUILD_DEPENDS=	pear:${PORTSDIR}/lang/php4-horde
-# Remark: pear-XML_sql2xml is included, but never used.
 RUN_DEPENDS=	${BUILD_DEPENDS}						\
 		${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date			\
 		${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common	\
@@ -44,7 +45,7 @@ LDD=		/usr/bin/ldd
 REINPLACE_ARGS=	-i.beforeHorde
 DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS \
 		docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL \
-		docs/TRANSLATIONS docs/SECURITY
+		docs/RELEASE_NOTES docs/SECURITY docs/TRANSLATIONS
 CONFFILE=	horde.php html.php lang.php mime_drivers.php mime_mapping.php \
 		motd.php prefs.php registry.php
 SUB_DIRS=	config graphics lib locale po scripts templates util
@@ -182,8 +183,8 @@ do-install:
 
 post-install:
 	@${ECHO}
-	@${CAT} ${PKGMESSAGE} | ${SED} -e \
-	"s:%%HORDEDIR%%:${HORDEDIR}:g;s:%%APACHE_CONF%%:${APACHE_CONF}:g;s:%%HORDESBIN%%:${HORDESBIN}:g"
+	@${SED} -e "s:%%HORDEDIR%%:${HORDEDIR}:g;s:%%APACHE_CONF%%:${APACHE_CONF}:g"	\
+		-e "s:%%HORDESBIN%%:${HORDESBIN}:g" ${PKGMESSAGE}
 	@${ECHO}
 
 .include <bsd.port.mk>
diff --git a/www/horde2/distinfo b/www/horde2/distinfo
index 91e47af2711b..2c8d52ef950a 100644
--- a/www/horde2/distinfo
+++ b/www/horde2/distinfo
@@ -1 +1,2 @@
-MD5 (horde-2.2.4.tar.gz) = b1d70da4ec4e06344abe88670e29b093
+MD5 (horde-2.2.5.tar.gz) = 44a1f60246c2916498ff12ad72f9f811
+SIZE (horde-2.2.5.tar.gz) = 671803
diff --git a/www/horde2/files/patch-ab b/www/horde2/files/patch-ab
index 93f827469a27..342e4bc9a2ee 100644
--- a/www/horde2/files/patch-ab
+++ b/www/horde2/files/patch-ab
@@ -1,5 +1,5 @@
---- config/horde.php.dist.orig	Tue Apr 22 20:45:22 2003
-+++ config/horde.php.dist	Tue Apr 22 23:35:10 2003
+--- config/horde.php.dist.orig	Tue Oct 14 18:52:31 2003
++++ config/horde.php.dist	Mon Mar  8 21:43:56 2004
 @@ -94,7 +94,7 @@
  // What backend should we use for authenticating users to Horde? Valid
  // options are currently 'imap', 'ldap', 'mcal', 'sql', 'ftp', 'smb',
@@ -37,16 +37,16 @@
  
  // This is an example configuration for an LDAP preference backend.
  // The schemas needed for ldap are in horde/scripts/ldap.  For more
-@@ -223,7 +223,7 @@
- // SMTP authentication can be enabled by setting the 'auth' parameter
- // to true.
- $conf['mailer']['params'] = array();
--// $conf['mailer']['params'] = array('sendmail_path' => '/usr/lib/sendmail');
-+// $conf['mailer']['params'] = array('sendmail_path' => '/usr/sbin/sendmail');
- // $conf['mailer']['params'] = array('host' => 'smtp.example.com');
+@@ -225,7 +225,7 @@
+ // want to use the '-oi' argument so that sendmail does not interpret a
+ // single '.' in the body of a message as the end of input.
+ // $conf['mailer']['params'] = array(
+-//     'sendmail_path' => '/usr/lib/sendmail',
++//     'sendmail_path' => '/usr/sbin/sendmail',
+ //     'sendmail_args' => '-oi'
+ // );
  
- 
-@@ -328,3 +328,9 @@
+@@ -350,3 +350,9 @@
  // Should we use DHTML to display a floating menu of Horde appliation
  // links, instead of a frame?
  $conf['menu']['floating_bar'] = false;
diff --git a/www/horde2/pkg-plist b/www/horde2/pkg-plist
index 006420db6e1c..a137ffa841cc 100644
--- a/www/horde2/pkg-plist
+++ b/www/horde2/pkg-plist
@@ -138,6 +138,7 @@
 %%HORDEDIR%%/lib/Perms.php
 %%HORDEDIR%%/lib/Prefs.php
 %%HORDEDIR%%/lib/PrefsUI.php
+%%HORDEDIR%%/lib/Prefs/UI.php
 %%HORDEDIR%%/lib/Prefs/ldap.php
 %%HORDEDIR%%/lib/Prefs/session.php
 %%HORDEDIR%%/lib/Prefs/sql.php
@@ -180,7 +181,9 @@
 %%HORDEDIR%%/locale/fi_FI/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/fi_FI/help.xml
 %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/gl_ES/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/hu_HU/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/id_ID/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
@@ -223,7 +226,9 @@
 %%HORDEDIR%%/po/extract.pl
 %%HORDEDIR%%/po/fi_FI.po
 %%HORDEDIR%%/po/fr_FR.po
+%%HORDEDIR%%/po/gl_ES.po
 %%HORDEDIR%%/po/hu_HU.po
+%%HORDEDIR%%/po/id_ID.po
 %%HORDEDIR%%/po/it_IT.po
 %%HORDEDIR%%/po/horde.pot
 %%HORDEDIR%%/po/ja_JP.po
@@ -323,17 +328,18 @@
 %%HORDEDIR%%/util/special_characters.php
 %%HORDESBIN%%/horde_set_perms.sh
 etc/horde/httpd.conf.horde
-%%PORTDOCS%%share/doc/horde/CHANGES
-%%PORTDOCS%%share/doc/horde/CODING_STANDARDS
-%%PORTDOCS%%share/doc/horde/CONTRIBUTING
-%%PORTDOCS%%share/doc/horde/COPYING
-%%PORTDOCS%%share/doc/horde/CREDITS
-%%PORTDOCS%%share/doc/horde/HACKING
-%%PORTDOCS%%share/doc/horde/INSTALL
-%%PORTDOCS%%share/doc/horde/README
-%%PORTDOCS%%share/doc/horde/SECURITY
-%%PORTDOCS%%share/doc/horde/TRANSLATIONS
-%%PORTDOCS%%@dirrm share/doc/horde
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/CODING_STANDARDS
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/SECURITY
+%%PORTDOCS%%%%DOCSDIR%%/TRANSLATIONS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%HORDEDIR%%/graphics/alerts
 @dirrm %%HORDEDIR%%/graphics/mime
 @dirrm %%HORDEDIR%%/graphics/tree
@@ -374,8 +380,12 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/locale/fi_FI
 @dirrm %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/fr_FR
+@dirrm %%HORDEDIR%%/locale/gl_ES/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/gl_ES
 @dirrm %%HORDEDIR%%/locale/hu_HU/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/hu_HU
+@dirrm %%HORDEDIR%%/locale/id_ID/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/id_ID
 @dirrm %%HORDEDIR%%/locale/it_IT/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/it_IT
 @dirrm %%HORDEDIR%%/locale/ja_JP/LC_MESSAGES