Upgrade to 3.1.2

ChangeLog:
http://cvs.horde.org/diff.php/horde/docs/CHANGES?r1=1.515.2.231&r2=1.515.2.252&ty=h

Approved by:	ahze (mentor, implicit)

4 files changed, 24 insertions, 45 deletions

diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index b8f65b59494b..7608f3cfb95c 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	3.1.1
-PORTREVISION=	2
+PORTVERSION=	3.1.2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.planetmirror.com/pub/horde/horde/		\
@@ -17,14 +16,10 @@ MASTER_SITES=	ftp://ftp.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.uk.horde.org/mirrors/ftp.horde.org/pub/horde/	\
-		http://ftp.horde.org/pub/horde/				\
-		http://cvs.horde.org/co.php?r=1.146\&p=1\&f=horde/:patch1	\
-		http://cvs.horde.org/co.php?r=2.26\&p=1\&f=horde/templates/problem/:patch2
+		http://ftp.horde.org/pub/horde/
 .if defined(WITH_PHP5)
 PKGNAMESUFFIX=	-php5
 .endif
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} test.php:patch1 problem.inc:patch2
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A common code-base used by Horde applications, written in PHP
@@ -269,9 +264,6 @@ PLIST_SUB+=	RMDIRINC=""
 .endif
 
 pre-configure:
-	@${CP} -p ${DISTDIR}/test.php ${WRKSRC}
-	@${CP} -p ${DISTDIR}/problem.inc ${WRKSRC}/templates/problem/
-
 	@${RM} ${PATCHES2RM:S|^|${WRKSRC}/|:S|$|.orig|}
 	@${SED} -e "s:/home/httpd/html/horde:${HORDEDIR}:"				\
 		-e "s:php_value auto_prepend_file:# php_value auto_prepend_file:"	\
diff --git a/www/horde-base/distinfo b/www/horde-base/distinfo
index e679b7530728..bcc6156b72c1 100644
--- a/www/horde-base/distinfo
+++ b/www/horde-base/distinfo
@@ -1,9 +1,3 @@
-MD5 (horde-3.1.1.tar.gz) = ef5001144b80422b71454d285056e90a
-SHA256 (horde-3.1.1.tar.gz) = 5edb80766cb71832b1c5435b5093392164dbab46bdf5a496050620249d66e06f
-SIZE (horde-3.1.1.tar.gz) = 5068434
-MD5 (test.php) = e54d85c8a923718c3dac72a6403550fb
-SHA256 (test.php) = 487ede8215039250dfaa88cc5917ab2def8b8439d2d2b960fce430a68d8d0dfe
-SIZE (test.php) = 15028
-MD5 (problem.inc) = e125512147a9accf645ca665df182a74
-SHA256 (problem.inc) = 0ecced892b1110b6570f0059bbbb7d18213441d797208943f84d56a8d82f9e1e
-SIZE (problem.inc) = 2247
+MD5 (horde-3.1.2.tar.gz) = 2c1f3e5759fa6bca07483d584151771f
+SHA256 (horde-3.1.2.tar.gz) = 36a0df6ce8155502c524619c017e3cadb54654ac1bd685e099500ee58840be1c
+SIZE (horde-3.1.2.tar.gz) = 5176353
diff --git a/www/horde-base/files/patch-config_mime_drivers.php.dist b/www/horde-base/files/patch-config_mime_drivers.php.dist
index d46eca52df2e..5725bdac7928 100644
--- a/www/horde-base/files/patch-config_mime_drivers.php.dist
+++ b/www/horde-base/files/patch-config_mime_drivers.php.dist
@@ -1,13 +1,17 @@
---- config/mime_drivers.php.dist.orig	Tue Oct 18 13:33:37 2005
-+++ config/mime_drivers.php.dist	Tue Mar  7 22:10:50 2006
-@@ -37,10 +37,21 @@
+--- config/mime_drivers.php.dist.orig	Thu Apr  6 22:32:14 2006
++++ config/mime_drivers.php.dist	Thu Jul 20 22:10:57 2006
+@@ -37,14 +37,21 @@
   * zip            Zip files
   */
  $mime_drivers_map['horde']['registered'] = array(
--    'css', 'deb', 'enriched', 'enscript', 'html', 'images', 'msword',
--    'msexcel', 'mspowerpoint', 'ooo', 'pdf', 'php', 'plain', 'rar', 'report',
--    'rfc822', 'richtext', 'rpm', 'security', 'simple', 'srchighlite', 'tgz',
--    'tnef', 'vcard', 'webcpp', 'zip');
+-    'css', 'enriched', 'html', 'images', 'ooo', 'pdf', 'php', 'plain', 'rar',
+-    'report', 'rfc822', 'richtext', 'security', 'simple', 'tgz', 'tnef',
+-    'vcard', 'zip',
+-    // The following mime drivers require external applications to be
+-    // installed.
+-    // 'deb', 'enscript', 'msword', 'msexcel', 'mspowerpoint', 'rpm',
+-    // 'srchighlite', 'webcpp'
+-);
 +    'css'
 +//UNCOMMENTIFDEB , 'deb'
 +   , 'enriched'
diff --git a/www/horde-base/pkg-plist b/www/horde-base/pkg-plist
index 48fa21e72c1d..6f441fc6e773 100644
--- a/www/horde-base/pkg-plist
+++ b/www/horde-base/pkg-plist
@@ -49,6 +49,7 @@
 %%HORDEDIR%%/js/enter_key_trap.js
 %%HORDEDIR%%/js/form_assign.js
 %%HORDEDIR%%/js/form_helpers.js
+%%HORDEDIR%%/js/form_sections.js
 %%HORDEDIR%%/js/hideable.js
 %%HORDEDIR%%/js/horde.ie.js
 %%HORDEDIR%%/js/horde.js
@@ -283,18 +284,6 @@
 %%HORDEDIR%%/lib/Horde/Prefs/ldap.php
 %%HORDEDIR%%/lib/Horde/Prefs/session.php
 %%HORDEDIR%%/lib/Horde/Prefs/sql.php
-%%HORDEDIR%%/lib/Horde/RDO.php
-%%HORDEDIR%%/lib/Horde/RDO/Criteria.php
-%%HORDEDIR%%/lib/Horde/RDO/Exception.php
-%%HORDEDIR%%/lib/Horde/RDO/Mapper.php
-%%HORDEDIR%%/lib/Horde/RDO/MetaData.php
-%%HORDEDIR%%/lib/Horde/RDO/Results.php
-%%HORDEDIR%%/lib/Horde/RDO/Storage.php
-%%HORDEDIR%%/lib/Horde/RDO/Storage/mysql.php
-%%HORDEDIR%%/lib/Horde/RDO/Storage/peardb.php
-%%HORDEDIR%%/lib/Horde/RDO/Storage/pgsql.php
-%%HORDEDIR%%/lib/Horde/RDO/Storage/sql.php
-%%HORDEDIR%%/lib/Horde/RDO/Storage/sqlite.php
 %%HORDEDIR%%/lib/Horde/RPC.php
 %%HORDEDIR%%/lib/Horde/RPC/rest.php
 %%HORDEDIR%%/lib/Horde/RPC/soap.php
@@ -302,7 +291,6 @@
 %%HORDEDIR%%/lib/Horde/RPC/syncml_wbxml.php
 %%HORDEDIR%%/lib/Horde/RPC/webdav.php
 %%HORDEDIR%%/lib/Horde/RPC/xmlrpc.php
-%%HORDEDIR%%/lib/Horde/Rampage.php
 %%HORDEDIR%%/lib/Horde/Registry.php
 %%HORDEDIR%%/lib/Horde/SQL.php
 %%HORDEDIR%%/lib/Horde/SQL/Attributes.php
@@ -314,7 +302,7 @@
 %%HORDEDIR%%/lib/Horde/SessionHandler.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/dbm.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/ldap.php
-%%HORDEDIR%%/lib/Horde/SessionHandler/memcached.php
+%%HORDEDIR%%/lib/Horde/SessionHandler/memcache.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/mysql.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/none.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/oci8.php
@@ -585,11 +573,13 @@
 %%HORDEDIR%%/scripts/setup.php
 %%HORDEDIR%%/scripts/sql/README
 %%HORDEDIR%%/scripts/sql/README.OCI8
+%%HORDEDIR%%/scripts/sql/create.sql
 %%HORDEDIR%%/scripts/sql/create.msde.sql
 %%HORDEDIR%%/scripts/sql/create.mysql.sql
 %%HORDEDIR%%/scripts/sql/create.oci8.sql
 %%HORDEDIR%%/scripts/sql/create.pgsql.sql
 %%HORDEDIR%%/scripts/sql/create.sybase.sql
+%%HORDEDIR%%/scripts/sql/create.xml
 %%HORDEDIR%%/scripts/sql/horde_datatree.mssql.sql
 %%HORDEDIR%%/scripts/sql/horde_datatree.mysql.sql
 %%HORDEDIR%%/scripts/sql/horde_datatree.sql
@@ -616,10 +606,14 @@
 %%HORDEDIR%%/scripts/sql/script.initial_horde_user.sql
 %%HORDEDIR%%/scripts/temp-cleanup.cron
 %%HORDEDIR%%/scripts/themes_check.php
+%%HORDEDIR%%/scripts/upgrades/2006-06-29_horde_prefs_indexes.sql
 %%HORDEDIR%%/scripts/upgrades/2.2_to_3.0.mysql.sql
+%%HORDEDIR%%/scripts/upgrades/2.2_to_3.0.oci8.sql
 %%HORDEDIR%%/scripts/upgrades/2.2_to_3.0.pgsql.sql
 %%HORDEDIR%%/scripts/upgrades/2005-09-22_horde_prefs_varchar2.oci8.sql
+%%HORDEDIR%%/scripts/upgrades/3.0_to_3.1.sql
 %%HORDEDIR%%/scripts/upgrades/3.0_to_3.1.mysql.sql
+%%HORDEDIR%%/scripts/upgrades/3.0_to_3.1.oci8.sql
 %%HORDEDIR%%/scripts/upgrades/move_history_out_of_datatree.php
 %%HORDEDIR%%/services/cacheview.php
 %%HORDEDIR%%/services/changepassword.php
@@ -726,7 +720,6 @@
 %%HORDEDIR%%/services/problem.php
 %%HORDEDIR%%/services/resetpassword.php
 %%HORDEDIR%%/services/shares/edit.php
-%%HORDEDIR%%/services/toggle_js.php
 %%HORDEDIR%%/signup.php
 %%HORDEDIR%%/templates/.htaccess
 %%HORDEDIR%%/templates/admin/common-header.inc
@@ -759,7 +752,6 @@
 %%HORDEDIR%%/templates/help/index.inc
 %%HORDEDIR%%/templates/help/menu.inc
 %%HORDEDIR%%/templates/index/frames_index.inc
-%%HORDEDIR%%/templates/javascript/form_sections.js
 %%HORDEDIR%%/templates/javascript/htmlarea.js
 %%HORDEDIR%%/templates/javascript/htmlarea_anselimage_lang.js
 %%HORDEDIR%%/templates/javascript/htmlarea_context_lang.js
@@ -772,7 +764,6 @@
 %%HORDEDIR%%/templates/javascript/open_html_helper.js
 %%HORDEDIR%%/templates/javascript/print.js
 %%HORDEDIR%%/templates/javascript/quoteBlocks.js
-%%HORDEDIR%%/templates/javascript/test_javascript.js
 %%HORDEDIR%%/templates/javascript/tree.js
 %%HORDEDIR%%/templates/login/login.inc
 %%HORDEDIR%%/templates/login/mobile.inc
@@ -1687,8 +1678,6 @@
 @dirrm %%HORDEDIR%%/lib/Horde/Scheduler
 @dirrm %%HORDEDIR%%/lib/Horde/SQL
 @dirrm %%HORDEDIR%%/lib/Horde/RPC
-@dirrm %%HORDEDIR%%/lib/Horde/RDO/Storage
-@dirrm %%HORDEDIR%%/lib/Horde/RDO
 @dirrm %%HORDEDIR%%/lib/Horde/Prefs
 @dirrm %%HORDEDIR%%/lib/Horde/Perms
 @dirrm %%HORDEDIR%%/lib/Horde/Notification/Listener