Update horde to 3.3.13.

(while here, set LICENSE=gnu-lgpl-v2, move empty directory handling to PLIST)
-------
v3.3.13
-------

[mms] SECURITY: Fix XSS vulnerability in email form field validation.
[jan] Fix UTF-8 support with Firefox 10 or later.
[jan] Add support for resetting passwords to LDAP driver.


-------
v3.3.12
-------

[jan] Convert charset of group names in SQL driver (Bug #9611).
[jan] Fix deleting of SyncML anchors if PHP short_open_tag is off (Bug #9349).
[jan] Add an experimental new Share SQL driver with better performance.
[jan] Fix integer overflow in ASN.1 parser for S/MIME messages.
[jan] Fix splitread database usage in VFS (Bug #9467).
[jan] Fix invalidating permission cache in SQL driver (Bug #9392).

3 files changed, 23 insertions, 37 deletions

diff --git a/www/horde/Makefile b/www/horde/Makefile
index 19d89bbd1a0..38da0b187c8 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2011/09/16 05:46:26 obache Exp $
+# $NetBSD: Makefile,v 1.73 2012/02/23 10:34:07 obache Exp $
 
-DISTNAME=	horde-3.3.11
-PKGREVISION=	1
+DISTNAME=	horde-3.3.13
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.horde.org/pub/horde/ \
 		ftp://ftp.horde.org/pub/horde/
@@ -9,6 +8,7 @@ MASTER_SITES=	http://ftp.horde.org/pub/horde/ \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.horde.org/
 COMMENT=	PHP application framework
+LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -86,23 +86,6 @@ CONF_FILES_PERMS+=	${EGDIR}/config/hooks.php \
 			${HORDEDIR}/config/hooks.php \
 			${APACHE_USER} ${ROOT_GROUP} 0440
 
-# Empty directories installed by install target
-# that we need to create in the install script
-# to get the same layout from a binary package installation
-REQD_DIRS+=	share/horde/lib/data
-REQD_DIRS+=	share/horde/lib/XML/tests
-REQD_DIRS+=	share/horde/lib/XML/docs/examples
-REQD_DIRS+=	share/horde/lib/XML/docs
-REQD_DIRS+=	share/horde/lib/VFS/tests
-REQD_DIRS+=	share/horde/lib/Text/tests
-REQD_DIRS+=	share/horde/lib/Text/docs/examples
-REQD_DIRS+=	share/horde/lib/Text/docs
-REQD_DIRS+=	share/horde/lib/Horde/tests
-REQD_DIRS+=	share/horde/lib/Horde/docs/examples
-REQD_DIRS+=	share/horde/lib/Horde/docs
-REQD_DIRS+=	share/horde/lib/Horde/Text/tests
-REQD_DIRS+=	share/horde/lib/File/tests
-
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-build
 SUBST_FILES.files=	horde.conf.dist config/conf.xml config/conf.xml.dist \
diff --git a/www/horde/PLIST b/www/horde/PLIST
index d78346ea6cc..e3d9023c355 100644
--- a/www/horde/PLIST
+++ b/www/horde/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2010/11/10 12:46:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2012/02/23 10:34:07 obache Exp $
 share/doc/horde/CHANGES
 share/doc/horde/CODING_STANDARDS
 share/doc/horde/CONTRIBUTING
@@ -372,10 +372,13 @@ share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Base.php
 share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php
 share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined/Decorator/Cache.php
 share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Decorator/Log.php
-share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Fwthree.php
 share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl/Cache.php
 share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl/Configuration.php
 share/horde/lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl/Decorator/Log.php
+share/horde/lib/Horde/Kolab/FreeBusy/Helper/Freebusy/Owa.php
+share/horde/lib/Horde/Kolab/FreeBusy/Helper/Freebusy/StatusMap.php
+share/horde/lib/Horde/Kolab/FreeBusy/Helper/Freebusy/StatusMap/Config.php
+share/horde/lib/Horde/Kolab/FreeBusy/Helper/Freebusy/StatusMap/Default.php
 share/horde/lib/Horde/Kolab/FreeBusy/Imap.php
 share/horde/lib/Horde/Kolab/FreeBusy/Logger.php
 share/horde/lib/Horde/Kolab/FreeBusy/Object/Event.php
@@ -384,9 +387,12 @@ share/horde/lib/Horde/Kolab/FreeBusy/Owner/Event.php
 share/horde/lib/Horde/Kolab/FreeBusy/Owner/Event/Kolab.php
 share/horde/lib/Horde/Kolab/FreeBusy/Owner/Kolab.php
 share/horde/lib/Horde/Kolab/FreeBusy/Params/Freebusy/Folder.php
-share/horde/lib/Horde/Kolab/FreeBusy/Params/Freebusy/Owner.php
+share/horde/lib/Horde/Kolab/FreeBusy/Params/Freebusy/Folder/Named.php
+share/horde/lib/Horde/Kolab/FreeBusy/Params/Freebusy/Folder/Request.php
 share/horde/lib/Horde/Kolab/FreeBusy/Params/Freebusy/Resource/Kolab.php
 share/horde/lib/Horde/Kolab/FreeBusy/Params/Owner.php
+share/horde/lib/Horde/Kolab/FreeBusy/Params/Owner/Named.php
+share/horde/lib/Horde/Kolab/FreeBusy/Params/Owner/Request.php
 share/horde/lib/Horde/Kolab/FreeBusy/Params/User.php
 share/horde/lib/Horde/Kolab/FreeBusy/Report.php
 share/horde/lib/Horde/Kolab/FreeBusy/Request.php
@@ -398,6 +404,7 @@ share/horde/lib/Horde/Kolab/FreeBusy/Resource/Event/Decorator/Log.php
 share/horde/lib/Horde/Kolab/FreeBusy/Resource/Event/Decorator/Mcache.php
 share/horde/lib/Horde/Kolab/FreeBusy/Resource/Event/Fwthree.php
 share/horde/lib/Horde/Kolab/FreeBusy/Resource/Event/Kolab.php
+share/horde/lib/Horde/Kolab/FreeBusy/Resource/Event/Owa.php
 share/horde/lib/Horde/Kolab/FreeBusy/Resource/Kolab.php
 share/horde/lib/Horde/Kolab/FreeBusy/User.php
 share/horde/lib/Horde/Kolab/FreeBusy/User/Decorator/Log.php
@@ -648,6 +655,7 @@ share/horde/lib/Horde/Share/datatree.php
 share/horde/lib/Horde/Share/kolab.php
 share/horde/lib/Horde/Share/sql.php
 share/horde/lib/Horde/Share/sql_hierarchical.php
+share/horde/lib/Horde/Share/sqlng.php
 share/horde/lib/Horde/SpellChecker.php
 share/horde/lib/Horde/SpellChecker/aspell.php
 share/horde/lib/Horde/String.php
@@ -941,6 +949,10 @@ share/horde/scripts/import_squirrelmail_sql_prefs.php
 share/horde/scripts/ldap/horde.prefs.acl
 share/horde/scripts/ldap/horde.schema
 share/horde/scripts/set_perms.sh
+share/horde/scripts/share-stress-test-conf.php.dist
+share/horde/scripts/share-stress-test-sql.xml
+share/horde/scripts/share-stress-test-sqlng.xml
+share/horde/scripts/share-stress-test.php
 share/horde/scripts/sql/README
 share/horde/scripts/sql/README.OCI8
 share/horde/scripts/sql/create.mssql.sql
@@ -3874,13 +3886,4 @@ share/horde/themes/tango-blue/screen.css
 share/horde/themes/tango-blue/themed_graphics
 share/horde/util/barcode.php
 share/horde/util/icon_browser.php
-@pkgdir share/horde/lib/File/tests
-@pkgdir share/horde/lib/Horde/Text/tests
-@pkgdir share/horde/lib/Horde/docs/examples
-@pkgdir share/horde/lib/Horde/tests
-@pkgdir share/horde/lib/Text/docs/examples
-@pkgdir share/horde/lib/Text/tests
-@pkgdir share/horde/lib/VFS/tests
-@pkgdir share/horde/lib/XML/docs/examples
-@pkgdir share/horde/lib/XML/tests
-@pkgdir share/horde/lib/data
+@pkgdir share/horde/config
diff --git a/www/horde/distinfo b/www/horde/distinfo
index bdd8bd25ce8..46ae74bf28f 100644
--- a/www/horde/distinfo
+++ b/www/horde/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2010/12/16 03:38:32 taca Exp $
+$NetBSD: distinfo,v 1.30 2012/02/23 10:34:08 obache Exp $
 
-SHA1 (horde-3.3.11.tar.gz) = 66710a5026d78e462422969b187e78ff52b04e34
-RMD160 (horde-3.3.11.tar.gz) = e5e80e47a564b69e8e5db8648614a4fc6f6e06fd
-Size (horde-3.3.11.tar.gz) = 8788320 bytes
+SHA1 (horde-3.3.13.tar.gz) = 382d084d7af9a0fa27431aa23881a3c81fb0e9b8
+RMD160 (horde-3.3.13.tar.gz) = b6e14214c5c2151c53798f3ed99e1b94f671ebfb
+Size (horde-3.3.13.tar.gz) = 8923715 bytes
 SHA1 (patch-aa) = 91150235a9739231e5c4da8622f9d48ec26f1115