6 files changed, 36 insertions, 7 deletions

diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index d7af11dabd8d..542081912ae9 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.au.horde.org/pub/horde/			\
@@ -30,9 +30,9 @@ LIB_DEPENDS+=	mcal.0:${PORTSDIR}/misc/libmcal
 .endif
 # Remark: pear-XML_sql2xml is included, but never used.
 RUN_DEPENDS=	${PHP_LIB}/Crypt/CBC.php:${PORTSDIR}/security/pear-Crypt_CBC	\
-		${PHP_LIB}/Date.php:${PORTSDIR}/devel/pear-Date		\
-		${PHP_LIB}/HTML/Select.php:${PORTSDIR}/devel/pear-HTML_Select	\
-		${PHP_LIB}/Log.php:${PORTSDIR}/sysutils/pear-Log	\
+		${PHP_LIB}/Date.php:${PORTSDIR}/devel/pear-Date			\
+		${PHP_LIB}/HTML/Select.php:${PORTSDIR}/devel/pear-HTML_Select_Common \
+		${PHP_LIB}/Log.php:${PORTSDIR}/sysutils/pear-Log		\
 		${PHP_LIB}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
 
 NO_BUILD=	yes
@@ -42,7 +42,8 @@ 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/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL \
+		docs/TRANSLATIONS
 CONFFILE=	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
@@ -79,6 +80,12 @@ pre-install:
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
 	fi
+	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libxml2.so"; then \
+	    ${ECHO_MSG} "" ; \
+	    ${ECHO_MSG} "Please configure PHP with DOM XML support." ; \
+	    ${ECHO_MSG} "" ; \
+	    ${FALSE} ; \
+	fi
 	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libintl.so"; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with gettext support." ; \
diff --git a/www/horde2/distinfo b/www/horde2/distinfo
index 31dc91016bf8..561e6f31380c 100644
--- a/www/horde2/distinfo
+++ b/www/horde2/distinfo
@@ -1 +1 @@
-MD5 (horde-2.2.tar.gz) = 3074fe5e4a284e74af37e608f9981401
+MD5 (horde-2.2.1.tar.gz) = 0a1e087f5017524a6b1b3d62204f49bb
diff --git a/www/horde2/files/patch-po_translation.php b/www/horde2/files/patch-po_translation.php
new file mode 100644
index 000000000000..045891903631
--- /dev/null
+++ b/www/horde2/files/patch-po_translation.php
@@ -0,0 +1,8 @@
+--- po/translation.php.orig	Tue Jan 21 16:05:36 2003
++++ po/translation.php	Wed Jan 29 23:00:27 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/php -q
++#!/usr/local/bin/php -q
+ <?php
+ /**
+  * Translation helper application for the Horde framework.
diff --git a/www/horde2/files/patch-scripts_db_README b/www/horde2/files/patch-scripts_db_README
new file mode 100644
index 000000000000..bf560dc37ff0
--- /dev/null
+++ b/www/horde2/files/patch-scripts_db_README
@@ -0,0 +1,11 @@
+--- scripts/db/README.orig	Wed Jul 17 22:19:29 2002
++++ scripts/db/README	Wed Jan 29 23:10:35 2003
+@@ -70,7 +70,7 @@
+ 
+ PostgreSQL
+ ~~~~~~~~~~
+-# su - postgres  (or whatever your database runs as... usually postgres)
++# su - pgsql  (or whatever your database runs as... usually pgsql)
+ $ psql -d template1 -f pgsql_create.sql
+ 
+ This script will create a "horde" database and a "horde" user.  You
diff --git a/www/horde2/pkg-deinstall b/www/horde2/pkg-deinstall
index 5b9c3758c8c1..82ef7bf73586 100644
--- a/www/horde2/pkg-deinstall
+++ b/www/horde2/pkg-deinstall
@@ -11,7 +11,7 @@ fi
 if [ -f ${PKG_PREFIX}/etc/apache/httpd.conf.beforeHorde ] ; then
 	echo "Restoring httpd.conf..."
 	cp ${PKG_PREFIX}/etc/apache/httpd.conf ${PKG_PREFIX}/etc/apache/httpd.conf.deinstHorde
-	sed_inplace -i.tmp -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
+	sed -i.tmp -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
 		${PKG_PREFIX}/etc/apache/httpd.conf
 	rm ${PKG_PREFIX}/etc/apache/httpd.conf.tmp
 fi
diff --git a/www/horde2/pkg-plist b/www/horde2/pkg-plist
index 275bc85f53f3..19412850f9e6 100644
--- a/www/horde2/pkg-plist
+++ b/www/horde2/pkg-plist
@@ -237,6 +237,7 @@
 %%HORDEDIR%%/po/sl_SI.po
 %%HORDEDIR%%/po/sv_SE.po
 %%HORDEDIR%%/po/translation.php
+%%HORDEDIR%%/po/translation.php.orig
 %%HORDEDIR%%/po/uk_UA.po
 %%HORDEDIR%%/po/xgettext.sh
 %%HORDEDIR%%/po/zh_CN.po
@@ -246,6 +247,7 @@
 %%HORDEDIR%%/scripts/.htaccess
 %%HORDEDIR%%/scripts/SCRIPTS
 %%HORDEDIR%%/scripts/db/README
+%%HORDEDIR%%/scripts/db/README.orig
 %%HORDEDIR%%/scripts/db/auth.sql
 %%HORDEDIR%%/scripts/db/category.sql
 %%HORDEDIR%%/scripts/db/category_mysql.sql
@@ -320,6 +322,7 @@ etc/horde/httpd.conf.horde
 %%PORTDOCS%%share/doc/horde/HACKING
 %%PORTDOCS%%share/doc/horde/INSTALL
 %%PORTDOCS%%share/doc/horde/README
+%%PORTDOCS%%share/doc/horde/TRANSLATIONS
 %%PORTDOCS%%@dirrm share/doc/horde
 @dirrm %%HORDEDIR%%/config
 @dirrm %%HORDEDIR%%/graphics/alerts