- Upgrade to 3.0.5;

- Add support for suphp (requested and tested by Maxim Maximov
  <mcsi (at) mcsi.pp.ru>).

24 files changed, 732 insertions, 246 deletions

diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index d33a5e9dfbb0..523f26a5104f 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	3.0.4
-PORTREVISION=	1
+PORTVERSION=	3.0.5
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.planetmirror.com/pub/horde/horde/		\
@@ -36,7 +35,7 @@ COMMENT=	A common code-base used by Horde applications, written in PHP
 #
 # - WITHOUT_MYSQL:	this port is built with MySQL by default
 #			but you might choose any other database
-#			supported by PHP (e.g. WITH_POSTGRESQL).
+#			supported by PHP (e.g. WITH_POSTGRESQL / WITH_SQLITE).
 #
 # - WITHOUT_IMAP:	this port uses IMAP as a default authentication
 #			backend; use this knob if for
@@ -80,6 +79,8 @@ COMMENT=	A common code-base used by Horde applications, written in PHP
 #
 # - WITH_DEB:		handle Debian packages.
 #
+# - WITH_SUPHP:		Install appropriately for use with the www/suphp port.
+#
 #----------------------------------------------------------------------------
 
 RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date			\
@@ -94,11 +95,21 @@ CONFLICTS=	horde-2.*
 
 NO_BUILD=	yes
 USE_PHP=	ctype gettext session
-WANT_PHP_MOD=	yes
 USE_REINPLACE=	yes
-SUB_FILES=	pkg-message
+SUB_FILES=	pkg-message pkg-deinstall
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
+RUN_DEPENDS+=	${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp
+WANT_PHP_CGI=	yes
+HORDEADMUSR?=	horde
+PKGINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES+=	pkg-install
+.else
+WANT_PHP_MOD=	yes
+.endif
+
 .if !defined(WITHOUT_FILEINFO)
 USE_PHP+=	fileinfo
 .endif
@@ -130,6 +141,9 @@ USE_PHP+=	mysql
 . if defined(WITH_POSTGRESQL)
 USE_PHP+=	pgsql
 . endif
+. if defined(WITH_SQLITE)
+USE_PHP+=	sqlite
+. endif
 .endif
 .if !defined(WITHOUT_ZLIB)
 USE_PHP+=	zlib
@@ -208,7 +222,8 @@ LHORDEDIR?=	www/horde
 LHORDESBIN?=	sbin
 
 PLIST_SUB=	HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN}
-SUB_LIST=	HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} HORDESBIN=${HORDESBIN}
+SUB_LIST=	HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} HORDESBIN=${HORDESBIN}	\
+		HORDEADMUSR=${HORDEADMUSR} HORDEGRP=${WWWGRP}
 
 HORDEDIR=	${PREFIX}/${LHORDEDIR}
 HORDESBIN=	${PREFIX}/${LHORDESBIN}
@@ -233,13 +248,15 @@ USE_PHP+=	mcal
 . endif
 .endif
 
+PATCHES2RM=	po/translation.php config/conf.xml scripts/sql/README	\
+		config/mime_drivers.php.dist config/registry.php.dist
+SEDIN2RM=	lib/Horde/Auth/mcal.php config/conf.xml docs/INSTALL	\
+		config/mime_drivers.php.dist
+
 .include <bsd.port.pre.mk>	# Required to test PHP_VER
 
 pre-configure:
-	@${RM} ${WRKSRC}/po/translation.php.orig	\
-		${WRKSRC}/config/conf.xml.orig		\
-		${WRKSRC}/scripts/sql/README.orig	\
-		${WRKSRC}/config/mime_drivers.php.dist.orig
+	@${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:"	\
 		-e "s:/home/httpd/phplib:${PEARDIR}:"					\
@@ -280,29 +297,31 @@ pre-configure:
 		${WRKSRC}/lib/Horde/Auth/mcal.php
 	@${REINPLACE_CMD} -e "s:/usr/local/apache/htdocs:${PREFIX}/www:g"	\
 		${WRKSRC}/docs/INSTALL
-	@${RM} ${WRKSRC}/lib/Horde/Auth/mcal.php.beforeHorde	\
-		${WRKSRC}/config/conf.xml.beforeHorde		\
-		${WRKSRC}/config/mime_drivers.php.dist.beforeHorde	\
-		${WRKSRC}/docs/INSTALL.beforeHorde
+	@${RM} ${SEDIN2RM:S|^|${WRKSRC}/|:S|$|.beforeHorde|}
 
 pre-install:
 .if !defined(WITHOUT_SUPPORTED_DB)
 	@if ! php -m | ${GREP} -q -e "mysql" ; then \
 	 if ! php -m | ${GREP} -q -e "pgsql" ; then \
 	  if ! php -m | ${GREP} -q -e "sybase" ; then \
+	   if ! php -m | ${GREP} -q -e "SQLite" ; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with a database support." ; \
-	    ${ECHO_MSG} "MySQL, PostgreSQL and Sybase (CTLIB or DBLIB)" ; \
+	    ${ECHO_MSG} "MySQL, PostgreSQL, SQLite and Sybase (CTLIB or DBLIB)" ; \
 	    ${ECHO_MSG} "can be used with PHP AND Horde." ; \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "(If everything will run on this machine, do not" ; \
 	    ${ECHO_MSG} " forget to install the database server-side!)" ; \
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
+	   fi ; \
 	  fi ; \
 	 fi ; \
 	fi
 .endif
+.if defined(WITH_SUPHP)
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+.endif
 
 do-install:
 	@${MKDIR}  ${HORDEDIR}
@@ -337,6 +356,9 @@ do-install:
 .endif
 
 post-install:
+.if defined(WITH_SUPHP)
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/www/horde-base/distinfo b/www/horde-base/distinfo
index 5824018951f6..dc27c07836fd 100644
--- a/www/horde-base/distinfo
+++ b/www/horde-base/distinfo
@@ -1,2 +1,2 @@
-MD5 (horde-3.0.4.tar.gz) = e2221d409ba1c8841ce4ecee981d7b61
-SIZE (horde-3.0.4.tar.gz) = 3378143
+MD5 (horde-3.0.5.tar.gz) = 31ee0819be4efe44819f8ffef5db5365
+SIZE (horde-3.0.5.tar.gz) = 3549687
diff --git a/www/horde-base/files/patch-config_registry.php.dist b/www/horde-base/files/patch-config_registry.php.dist
new file mode 100644
index 000000000000..ae787a92685a
--- /dev/null
+++ b/www/horde-base/files/patch-config_registry.php.dist
@@ -0,0 +1,17 @@
+--- config/registry.php.dist.orig	Wed Aug  3 16:27:41 2005
++++ config/registry.php.dist	Wed Aug 17 22:33:03 2005
+@@ -347,6 +347,14 @@
+     'provides' => 'files',
+ );
+ 
++// r1.255.2.9
++$this->applications['gollem-menu'] = array(
++    'status' => 'block',
++    'app' => 'gollem',
++    'blockname' => 'tree_menu',
++    'menu_parent' => 'gollem',
++);
++
+ $this->applications['passwd'] = array(
+     'fileroot' => dirname(__FILE__) . '/../passwd',
+     'webroot' => $this->applications['horde']['webroot'] . '/passwd',
diff --git a/www/horde-base/files/patch-scripts_sql_README b/www/horde-base/files/patch-scripts_sql_README
index 6403c0f8e849..4e727f834c0a 100644
--- a/www/horde-base/files/patch-scripts_sql_README
+++ b/www/horde-base/files/patch-scripts_sql_README
@@ -1,11 +1,11 @@
---- scripts/sql/README.orig	Sat Sep 25 21:55:35 2004
-+++ scripts/sql/README	Mon Nov 22 13:19:52 2004
-@@ -77,7 +77,7 @@
+--- scripts/sql/README.orig	Wed Apr 27 10:56:42 2005
++++ scripts/sql/README	Tue Jul 12 21:30:49 2005
+@@ -84,7 +84,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 create.pgsql.sql
+-  # su - postgres  (or whatever your database runs as... usually postgres)
++  # su - pgsql  (or whatever your database runs as... usually pgsql)
+   $ psql -d template1 -f create.pgsql.sql
  
- This script will create a "horde" database and a "horde" user.  You
+ This script will create a ``horde`` database and a ``horde`` user.  You should
diff --git a/www/horde-base/files/pkg-deinstall.in b/www/horde-base/files/pkg-deinstall.in
new file mode 100644
index 000000000000..47cbca9552a2
--- /dev/null
+++ b/www/horde-base/files/pkg-deinstall.in
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+handle_config() {
+    # Try to restore httpd.conf when deinstalling Horde
+
+    if [ -f %%APACHE_CONF%%.beforeHorde ] ; then
+    	echo "Restoring httpd.conf..."
+    	cp %%APACHE_CONF%% %%APACHE_CONF%%.deinstHorde
+    	sed -i.tmp -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
+    		%%APACHE_CONF%%
+    	rm %%APACHE_CONF%%.tmp
+    fi
+
+    # Backup Horde config files, if needed.
+
+    if [ -z "${PACKAGE_BUILDING}" ]; then
+      for cf in `ls %%HORDEDIR%%/config/*php`; do
+        diff -bBqw $cf $cf.dist >/dev/null 2>&1
+        case $? in
+          0)  # original config file, will be deleted by pkg-plist
+              ;;
+          1)  # config file has been updated, must be backuped
+              cp -p $cf $cf.previous
+              echo "===> Backing-up..."
+              echo "--->   $cf has been saved ***"
+              echo "--->      as $cf.previous ***"
+              ;;
+          *)  # not found?
+              ;;
+        esac
+      done
+    fi
+}
+
+case $2 in
+    DEINSTALL)
+      handle_config
+      ;;
+    POST-DEINSTALL)
+      if [ x%%HORDEADMUSR%% != x ]; then
+            cat <<EOMSG
+The horde port has been deleted.
+If you are not upgrading and don't intend to use
+Horde any more then you may wish to delete
+the %%HORDEADMUSR%% account, which can be done with
+the following command:
+
+    # pw userdel %%HORDEADMUSR%%
+EOMSG
+      if [ -d %%PREFIX%%/%%MYADMDIR%% ] ; then
+	echo "    # rm -rf %%PREFIX%%/%%HORDEDIR%%/"
+      fi
+      echo
+    fi
+    ;;
+esac
diff --git a/www/horde-base/files/pkg-install.in b/www/horde-base/files/pkg-install.in
new file mode 100644
index 000000000000..f7c747d933a9
--- /dev/null
+++ b/www/horde-base/files/pkg-install.in
@@ -0,0 +1,96 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Copied from databases/phpmyadmin.
+# Used if WITH_SUPHP has been defined.
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+hordedir=%%HORDEDIR%%
+hordeusr=%%HORDEADMUSR%%
+hordegrp=%%HORDEGRP%%
+
+hordegcos="Horde Owner"
+hordehome=/nonexistent
+hordeshell=/sbin/nologin
+
+create_group() {
+    local user group gcos home shell
+
+    user=$1
+    group=$2
+    gcos=$3
+    home=$4
+    shell=$5
+
+    if pw groupadd -n $group ; then
+	echo "===> Group $group created"
+    else
+	cat <<-EOERRORMSG
+	*** Failed to create the $group group.
+
+	Please add the $user user and $group group
+	manually with the commands:
+
+	    pw groupadd -n $group
+	    pw useradd -n $user -g $group -c "$gcos" \\
+	        -d $home -s $shell -h -
+
+	and retry installing this package.
+	EOERRORMSG
+	exit 1
+    fi
+}
+
+
+create_user() {
+    local user group gcos home shell
+
+    user=$1
+    group=$2
+    gcos=$3
+    home=$4
+    shell=$5
+
+    if pw useradd -n $user -g $group -c "$gcos" -d $home -s $shell -h - ; then
+	echo "===> Created $user user"
+    else
+	cat <<-EOERRORMSG
+	*** Failed to create the $user user.
+
+	Please add the $user user manually with the command:
+
+	    pw useradd -n $user -g $group -c "$gcos" \\
+		        -d $home -s $shell -h -
+
+	and retry installing this package.
+	EOERRORMSG
+	exit 1
+    fi
+}
+
+
+case $2 in
+    PRE-INSTALL)
+
+        # Create the horde user and group if they do not already exist
+
+        if pw user show -n $hordeusr >/dev/null 2>&1 ; then
+	    echo "===> Using pre-existing user $hordeusr"
+	else
+	    if ! pw group show -n $hordegrp >/dev/null 2>&1 ; then
+		create_group $hordeusr $hordegrp "$hordegcos" $hordehome \
+		    $hordeshell
+	    fi
+	    create_user $hordeusr $hordegrp "$hordegcos" $hordehome $hordeshell
+	fi
+	;;
+    POST-INSTALL)
+
+    	# Change ownership of the Horde directory
+
+        echo "===> Adjusting file ownership in $hordedir"
+        chown -R $hordeusr:$hordegrp $hordedir || exit 1
+	;;
+esac
diff --git a/www/horde-base/pkg-deinstall b/www/horde-base/pkg-deinstall
deleted file mode 100644
index fcecd184cd25..000000000000
--- a/www/horde-base/pkg-deinstall
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Try to restore httpd.conf when deinstalling Horde
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-if [ -d ${PKG_PREFIX}/etc/apache ] ; then
-APACHEDIR=${PKG_PREFIX}/etc/apache
-elif [ -d ${PKG_PREFIX}/etc/apache2 ] ; then
-APACHEDIR=${PKG_PREFIX}/etc/apache2
-fi
-
-if [ -f ${APACHEDIR}/httpd.conf.beforeHorde ] ; then
-	echo "Restoring httpd.conf..."
-	cp ${APACHEDIR}/httpd.conf ${APACHEDIR}/httpd.conf.deinstHorde
-	sed -i.tmp -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
-		${APACHEDIR}/httpd.conf
-	rm ${APACHEDIR}/httpd.conf.tmp
-fi
-
-# Backup Horde config files, if needed.
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/config/*php`; do
-    diff -bBqw $cf $cf.dist >/dev/null 2>&1
-    case $? in
-      0)  # original config file, will be deleted by pkg-plist
-          ;;
-      1)  # config file has been updated, must be backuped
-          cp -p $cf $cf.previous
-          echo "===> Backing-up..."
-          echo "--->   $cf has been saved ***"
-          echo "--->      as $cf.previous ***"
-          ;;
-      *)  # not found?
-          ;;
-    esac
-  done
-fi
diff --git a/www/horde-base/pkg-plist b/www/horde-base/pkg-plist
index fd10e201b310..e7d9c63f290c 100644
--- a/www/horde-base/pkg-plist
+++ b/www/horde-base/pkg-plist
@@ -48,7 +48,9 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/config/registry.php
 %%HORDEDIR%%/config/registry.php.dist
 %%HORDEDIR%%/index.php
+%%HORDEDIR%%/js/addEvent.php
 %%HORDEDIR%%/js/alphaImageLoader.php
+%%HORDEDIR%%/js/ieEscGuard.js
 %%HORDEDIR%%/js/enter_key_trap.js
 %%HORDEDIR%%/js/form_assign.js
 %%HORDEDIR%%/js/form_helpers.js
@@ -58,6 +60,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/js/open_colorpicker.js
 %%HORDEDIR%%/js/popup.js
 %%HORDEDIR%%/js/sorter.js
+%%HORDEDIR%%/js/stripe.js
 %%HORDEDIR%%/js/tooltip.js
 %%HORDEDIR%%/lib/.htaccess
 %%HORDEDIR%%/lib/Block/color.php
@@ -69,6 +72,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Block/sunrise.php
 %%HORDEDIR%%/lib/Block/time.php
 %%HORDEDIR%%/lib/Block/weatherdotcom.php
+%%HORDEDIR%%/lib/Block/weatherdotcom_strings.php
 %%HORDEDIR%%/lib/File/PDF.php
 %%HORDEDIR%%/lib/File/PDF/fonts/courier.php
 %%HORDEDIR%%/lib/File/PDF/fonts/helvetica.php
@@ -211,7 +215,6 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/enriched.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/enscript.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/html.php
-%%HORDEDIR%%/lib/Horde/MIME/Viewer/icalendar.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/images.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/msexcel.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/mspowerpoint.php
@@ -295,7 +298,10 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Horde/Serialize.php
 %%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/mysql.php
+%%HORDEDIR%%/lib/Horde/SessionHandler/none.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/oci8.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/pgsql.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/sapdb.php
@@ -304,29 +310,26 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Horde/Share.php
 %%HORDEDIR%%/lib/Horde/String.php
 %%HORDEDIR%%/lib/Horde/SyncML.php
+%%HORDEDIR%%/lib/Horde/SyncML/Backend.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Alert.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Final.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Get.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Map.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Put.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Replace.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Results.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Status.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Sync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/Add.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/ContentSyncElement.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/Delete.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/Replace.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/SyncElement.php
+%%HORDEDIR%%/lib/Horde/SyncML/Command/SyncElement.php
+%%HORDEDIR%%/lib/Horde/SyncML/Constants.php
+%%HORDEDIR%%/lib/Horde/SyncML/Device.php
+%%HORDEDIR%%/lib/Horde/SyncML/Device/P800.php
+%%HORDEDIR%%/lib/Horde/SyncML/Device/Sync4j.php
+%%HORDEDIR%%/lib/Horde/SyncML/Device/Synthesis.php
+%%HORDEDIR%%/lib/Horde/SyncML/DeviceInfo.php
+%%HORDEDIR%%/lib/Horde/SyncML/ResultsSender.php
 %%HORDEDIR%%/lib/Horde/SyncML/State.php
 %%HORDEDIR%%/lib/Horde/SyncML/Sync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/OneWayFromClientSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/OneWayFromServerSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/RefreshFromClientSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/RefreshFromServerSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/SlowSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/TwoWaySync.php
 %%HORDEDIR%%/lib/Horde/Template.php
 %%HORDEDIR%%/lib/Horde/Text.php
 %%HORDEDIR%%/lib/Horde/Text/Filter.php
@@ -435,6 +438,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/locale/ar_SY/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/bg_BG/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/bg_BG/help.xml
+%%HORDEDIR%%/locale/bs_BA/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/ca_ES/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/cs_CZ/help.xml
@@ -450,6 +454,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/locale/et_EE/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/et_EE/help.xml
 %%HORDEDIR%%/locale/fa_IR/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/fa_IR/help.xml
 %%HORDEDIR%%/locale/fi_FI/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/fi_FI/help.xml
 %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES/horde.mo
@@ -501,6 +506,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/po/README
 %%HORDEDIR%%/po/ar_SY.po
 %%HORDEDIR%%/po/bg_BG.po
+%%HORDEDIR%%/po/bs_BA.po
 %%HORDEDIR%%/po/ca_ES.po
 %%HORDEDIR%%/po/cs_CZ.po
 %%HORDEDIR%%/po/da_DK.po
@@ -551,6 +557,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/scripts/setup.php
 %%HORDEDIR%%/scripts/sql/README
 %%HORDEDIR%%/scripts/sql/README.OCI8
+%%HORDEDIR%%/scripts/sql/create.msde.sql
 %%HORDEDIR%%/scripts/sql/create.mysql.sql
 %%HORDEDIR%%/scripts/sql/create.oci8.sql
 %%HORDEDIR%%/scripts/sql/create.pgsql.sql
@@ -1491,6 +1498,8 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/locale/cs_CZ
 @dirrm %%HORDEDIR%%/locale/ca_ES/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/ca_ES
+@dirrm %%HORDEDIR%%/locale/bs_BA/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/bs_BA
 @dirrm %%HORDEDIR%%/locale/bg_BG/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/bg_BG
 @dirrm %%HORDEDIR%%/locale/ar_SY/LC_MESSAGES
@@ -1531,8 +1540,7 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/lib/Horde/Text/tests
 @dirrm %%HORDEDIR%%/lib/Horde/Text/Filter
 @dirrm %%HORDEDIR%%/lib/Horde/Text
-@dirrm %%HORDEDIR%%/lib/Horde/SyncML/Sync
-@dirrm %%HORDEDIR%%/lib/Horde/SyncML/Command/Sync
+@dirrm %%HORDEDIR%%/lib/Horde/SyncML/Device
 @dirrm %%HORDEDIR%%/lib/Horde/SyncML/Command
 @dirrm %%HORDEDIR%%/lib/Horde/SyncML
 @dirrm %%HORDEDIR%%/lib/Horde/SessionHandler
@@ -1577,6 +1585,7 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/lib/File/PDF
 @dirrm %%HORDEDIR%%/lib/File
 @dirrm %%HORDEDIR%%/lib/Block
+@unexec rmdir %D/%%HORDEDIR%%/lib/data 2>/dev/null || true
 @dirrm %%HORDEDIR%%/lib
 @dirrm %%HORDEDIR%%/js
 @unexec rmdir %D/%%HORDEDIR%%/config 2>/dev/null || true
diff --git a/www/horde/Makefile b/www/horde/Makefile
index d33a5e9dfbb0..523f26a5104f 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	3.0.4
-PORTREVISION=	1
+PORTVERSION=	3.0.5
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.planetmirror.com/pub/horde/horde/		\
@@ -36,7 +35,7 @@ COMMENT=	A common code-base used by Horde applications, written in PHP
 #
 # - WITHOUT_MYSQL:	this port is built with MySQL by default
 #			but you might choose any other database
-#			supported by PHP (e.g. WITH_POSTGRESQL).
+#			supported by PHP (e.g. WITH_POSTGRESQL / WITH_SQLITE).
 #
 # - WITHOUT_IMAP:	this port uses IMAP as a default authentication
 #			backend; use this knob if for
@@ -80,6 +79,8 @@ COMMENT=	A common code-base used by Horde applications, written in PHP
 #
 # - WITH_DEB:		handle Debian packages.
 #
+# - WITH_SUPHP:		Install appropriately for use with the www/suphp port.
+#
 #----------------------------------------------------------------------------
 
 RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date			\
@@ -94,11 +95,21 @@ CONFLICTS=	horde-2.*
 
 NO_BUILD=	yes
 USE_PHP=	ctype gettext session
-WANT_PHP_MOD=	yes
 USE_REINPLACE=	yes
-SUB_FILES=	pkg-message
+SUB_FILES=	pkg-message pkg-deinstall
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
+RUN_DEPENDS+=	${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp
+WANT_PHP_CGI=	yes
+HORDEADMUSR?=	horde
+PKGINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES+=	pkg-install
+.else
+WANT_PHP_MOD=	yes
+.endif
+
 .if !defined(WITHOUT_FILEINFO)
 USE_PHP+=	fileinfo
 .endif
@@ -130,6 +141,9 @@ USE_PHP+=	mysql
 . if defined(WITH_POSTGRESQL)
 USE_PHP+=	pgsql
 . endif
+. if defined(WITH_SQLITE)
+USE_PHP+=	sqlite
+. endif
 .endif
 .if !defined(WITHOUT_ZLIB)
 USE_PHP+=	zlib
@@ -208,7 +222,8 @@ LHORDEDIR?=	www/horde
 LHORDESBIN?=	sbin
 
 PLIST_SUB=	HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN}
-SUB_LIST=	HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} HORDESBIN=${HORDESBIN}
+SUB_LIST=	HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} HORDESBIN=${HORDESBIN}	\
+		HORDEADMUSR=${HORDEADMUSR} HORDEGRP=${WWWGRP}
 
 HORDEDIR=	${PREFIX}/${LHORDEDIR}
 HORDESBIN=	${PREFIX}/${LHORDESBIN}
@@ -233,13 +248,15 @@ USE_PHP+=	mcal
 . endif
 .endif
 
+PATCHES2RM=	po/translation.php config/conf.xml scripts/sql/README	\
+		config/mime_drivers.php.dist config/registry.php.dist
+SEDIN2RM=	lib/Horde/Auth/mcal.php config/conf.xml docs/INSTALL	\
+		config/mime_drivers.php.dist
+
 .include <bsd.port.pre.mk>	# Required to test PHP_VER
 
 pre-configure:
-	@${RM} ${WRKSRC}/po/translation.php.orig	\
-		${WRKSRC}/config/conf.xml.orig		\
-		${WRKSRC}/scripts/sql/README.orig	\
-		${WRKSRC}/config/mime_drivers.php.dist.orig
+	@${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:"	\
 		-e "s:/home/httpd/phplib:${PEARDIR}:"					\
@@ -280,29 +297,31 @@ pre-configure:
 		${WRKSRC}/lib/Horde/Auth/mcal.php
 	@${REINPLACE_CMD} -e "s:/usr/local/apache/htdocs:${PREFIX}/www:g"	\
 		${WRKSRC}/docs/INSTALL
-	@${RM} ${WRKSRC}/lib/Horde/Auth/mcal.php.beforeHorde	\
-		${WRKSRC}/config/conf.xml.beforeHorde		\
-		${WRKSRC}/config/mime_drivers.php.dist.beforeHorde	\
-		${WRKSRC}/docs/INSTALL.beforeHorde
+	@${RM} ${SEDIN2RM:S|^|${WRKSRC}/|:S|$|.beforeHorde|}
 
 pre-install:
 .if !defined(WITHOUT_SUPPORTED_DB)
 	@if ! php -m | ${GREP} -q -e "mysql" ; then \
 	 if ! php -m | ${GREP} -q -e "pgsql" ; then \
 	  if ! php -m | ${GREP} -q -e "sybase" ; then \
+	   if ! php -m | ${GREP} -q -e "SQLite" ; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with a database support." ; \
-	    ${ECHO_MSG} "MySQL, PostgreSQL and Sybase (CTLIB or DBLIB)" ; \
+	    ${ECHO_MSG} "MySQL, PostgreSQL, SQLite and Sybase (CTLIB or DBLIB)" ; \
 	    ${ECHO_MSG} "can be used with PHP AND Horde." ; \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "(If everything will run on this machine, do not" ; \
 	    ${ECHO_MSG} " forget to install the database server-side!)" ; \
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
+	   fi ; \
 	  fi ; \
 	 fi ; \
 	fi
 .endif
+.if defined(WITH_SUPHP)
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+.endif
 
 do-install:
 	@${MKDIR}  ${HORDEDIR}
@@ -337,6 +356,9 @@ do-install:
 .endif
 
 post-install:
+.if defined(WITH_SUPHP)
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/www/horde/distinfo b/www/horde/distinfo
index 5824018951f6..dc27c07836fd 100644
--- a/www/horde/distinfo
+++ b/www/horde/distinfo
@@ -1,2 +1,2 @@
-MD5 (horde-3.0.4.tar.gz) = e2221d409ba1c8841ce4ecee981d7b61
-SIZE (horde-3.0.4.tar.gz) = 3378143
+MD5 (horde-3.0.5.tar.gz) = 31ee0819be4efe44819f8ffef5db5365
+SIZE (horde-3.0.5.tar.gz) = 3549687
diff --git a/www/horde/files/patch-config_registry.php.dist b/www/horde/files/patch-config_registry.php.dist
new file mode 100644
index 000000000000..ae787a92685a
--- /dev/null
+++ b/www/horde/files/patch-config_registry.php.dist
@@ -0,0 +1,17 @@
+--- config/registry.php.dist.orig	Wed Aug  3 16:27:41 2005
++++ config/registry.php.dist	Wed Aug 17 22:33:03 2005
+@@ -347,6 +347,14 @@
+     'provides' => 'files',
+ );
+ 
++// r1.255.2.9
++$this->applications['gollem-menu'] = array(
++    'status' => 'block',
++    'app' => 'gollem',
++    'blockname' => 'tree_menu',
++    'menu_parent' => 'gollem',
++);
++
+ $this->applications['passwd'] = array(
+     'fileroot' => dirname(__FILE__) . '/../passwd',
+     'webroot' => $this->applications['horde']['webroot'] . '/passwd',
diff --git a/www/horde/files/patch-scripts_sql_README b/www/horde/files/patch-scripts_sql_README
index 6403c0f8e849..4e727f834c0a 100644
--- a/www/horde/files/patch-scripts_sql_README
+++ b/www/horde/files/patch-scripts_sql_README
@@ -1,11 +1,11 @@
---- scripts/sql/README.orig	Sat Sep 25 21:55:35 2004
-+++ scripts/sql/README	Mon Nov 22 13:19:52 2004
-@@ -77,7 +77,7 @@
+--- scripts/sql/README.orig	Wed Apr 27 10:56:42 2005
++++ scripts/sql/README	Tue Jul 12 21:30:49 2005
+@@ -84,7 +84,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 create.pgsql.sql
+-  # su - postgres  (or whatever your database runs as... usually postgres)
++  # su - pgsql  (or whatever your database runs as... usually pgsql)
+   $ psql -d template1 -f create.pgsql.sql
  
- This script will create a "horde" database and a "horde" user.  You
+ This script will create a ``horde`` database and a ``horde`` user.  You should
diff --git a/www/horde/files/pkg-deinstall.in b/www/horde/files/pkg-deinstall.in
new file mode 100644
index 000000000000..47cbca9552a2
--- /dev/null
+++ b/www/horde/files/pkg-deinstall.in
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+handle_config() {
+    # Try to restore httpd.conf when deinstalling Horde
+
+    if [ -f %%APACHE_CONF%%.beforeHorde ] ; then
+    	echo "Restoring httpd.conf..."
+    	cp %%APACHE_CONF%% %%APACHE_CONF%%.deinstHorde
+    	sed -i.tmp -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
+    		%%APACHE_CONF%%
+    	rm %%APACHE_CONF%%.tmp
+    fi
+
+    # Backup Horde config files, if needed.
+
+    if [ -z "${PACKAGE_BUILDING}" ]; then
+      for cf in `ls %%HORDEDIR%%/config/*php`; do
+        diff -bBqw $cf $cf.dist >/dev/null 2>&1
+        case $? in
+          0)  # original config file, will be deleted by pkg-plist
+              ;;
+          1)  # config file has been updated, must be backuped
+              cp -p $cf $cf.previous
+              echo "===> Backing-up..."
+              echo "--->   $cf has been saved ***"
+              echo "--->      as $cf.previous ***"
+              ;;
+          *)  # not found?
+              ;;
+        esac
+      done
+    fi
+}
+
+case $2 in
+    DEINSTALL)
+      handle_config
+      ;;
+    POST-DEINSTALL)
+      if [ x%%HORDEADMUSR%% != x ]; then
+            cat <<EOMSG
+The horde port has been deleted.
+If you are not upgrading and don't intend to use
+Horde any more then you may wish to delete
+the %%HORDEADMUSR%% account, which can be done with
+the following command:
+
+    # pw userdel %%HORDEADMUSR%%
+EOMSG
+      if [ -d %%PREFIX%%/%%MYADMDIR%% ] ; then
+	echo "    # rm -rf %%PREFIX%%/%%HORDEDIR%%/"
+      fi
+      echo
+    fi
+    ;;
+esac
diff --git a/www/horde/files/pkg-install.in b/www/horde/files/pkg-install.in
new file mode 100644
index 000000000000..f7c747d933a9
--- /dev/null
+++ b/www/horde/files/pkg-install.in
@@ -0,0 +1,96 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Copied from databases/phpmyadmin.
+# Used if WITH_SUPHP has been defined.
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+hordedir=%%HORDEDIR%%
+hordeusr=%%HORDEADMUSR%%
+hordegrp=%%HORDEGRP%%
+
+hordegcos="Horde Owner"
+hordehome=/nonexistent
+hordeshell=/sbin/nologin
+
+create_group() {
+    local user group gcos home shell
+
+    user=$1
+    group=$2
+    gcos=$3
+    home=$4
+    shell=$5
+
+    if pw groupadd -n $group ; then
+	echo "===> Group $group created"
+    else
+	cat <<-EOERRORMSG
+	*** Failed to create the $group group.
+
+	Please add the $user user and $group group
+	manually with the commands:
+
+	    pw groupadd -n $group
+	    pw useradd -n $user -g $group -c "$gcos" \\
+	        -d $home -s $shell -h -
+
+	and retry installing this package.
+	EOERRORMSG
+	exit 1
+    fi
+}
+
+
+create_user() {
+    local user group gcos home shell
+
+    user=$1
+    group=$2
+    gcos=$3
+    home=$4
+    shell=$5
+
+    if pw useradd -n $user -g $group -c "$gcos" -d $home -s $shell -h - ; then
+	echo "===> Created $user user"
+    else
+	cat <<-EOERRORMSG
+	*** Failed to create the $user user.
+
+	Please add the $user user manually with the command:
+
+	    pw useradd -n $user -g $group -c "$gcos" \\
+		        -d $home -s $shell -h -
+
+	and retry installing this package.
+	EOERRORMSG
+	exit 1
+    fi
+}
+
+
+case $2 in
+    PRE-INSTALL)
+
+        # Create the horde user and group if they do not already exist
+
+        if pw user show -n $hordeusr >/dev/null 2>&1 ; then
+	    echo "===> Using pre-existing user $hordeusr"
+	else
+	    if ! pw group show -n $hordegrp >/dev/null 2>&1 ; then
+		create_group $hordeusr $hordegrp "$hordegcos" $hordehome \
+		    $hordeshell
+	    fi
+	    create_user $hordeusr $hordegrp "$hordegcos" $hordehome $hordeshell
+	fi
+	;;
+    POST-INSTALL)
+
+    	# Change ownership of the Horde directory
+
+        echo "===> Adjusting file ownership in $hordedir"
+        chown -R $hordeusr:$hordegrp $hordedir || exit 1
+	;;
+esac
diff --git a/www/horde/pkg-deinstall b/www/horde/pkg-deinstall
deleted file mode 100644
index fcecd184cd25..000000000000
--- a/www/horde/pkg-deinstall
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Try to restore httpd.conf when deinstalling Horde
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-if [ -d ${PKG_PREFIX}/etc/apache ] ; then
-APACHEDIR=${PKG_PREFIX}/etc/apache
-elif [ -d ${PKG_PREFIX}/etc/apache2 ] ; then
-APACHEDIR=${PKG_PREFIX}/etc/apache2
-fi
-
-if [ -f ${APACHEDIR}/httpd.conf.beforeHorde ] ; then
-	echo "Restoring httpd.conf..."
-	cp ${APACHEDIR}/httpd.conf ${APACHEDIR}/httpd.conf.deinstHorde
-	sed -i.tmp -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
-		${APACHEDIR}/httpd.conf
-	rm ${APACHEDIR}/httpd.conf.tmp
-fi
-
-# Backup Horde config files, if needed.
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/config/*php`; do
-    diff -bBqw $cf $cf.dist >/dev/null 2>&1
-    case $? in
-      0)  # original config file, will be deleted by pkg-plist
-          ;;
-      1)  # config file has been updated, must be backuped
-          cp -p $cf $cf.previous
-          echo "===> Backing-up..."
-          echo "--->   $cf has been saved ***"
-          echo "--->      as $cf.previous ***"
-          ;;
-      *)  # not found?
-          ;;
-    esac
-  done
-fi
diff --git a/www/horde/pkg-plist b/www/horde/pkg-plist
index fd10e201b310..e7d9c63f290c 100644
--- a/www/horde/pkg-plist
+++ b/www/horde/pkg-plist
@@ -48,7 +48,9 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/config/registry.php
 %%HORDEDIR%%/config/registry.php.dist
 %%HORDEDIR%%/index.php
+%%HORDEDIR%%/js/addEvent.php
 %%HORDEDIR%%/js/alphaImageLoader.php
+%%HORDEDIR%%/js/ieEscGuard.js
 %%HORDEDIR%%/js/enter_key_trap.js
 %%HORDEDIR%%/js/form_assign.js
 %%HORDEDIR%%/js/form_helpers.js
@@ -58,6 +60,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/js/open_colorpicker.js
 %%HORDEDIR%%/js/popup.js
 %%HORDEDIR%%/js/sorter.js
+%%HORDEDIR%%/js/stripe.js
 %%HORDEDIR%%/js/tooltip.js
 %%HORDEDIR%%/lib/.htaccess
 %%HORDEDIR%%/lib/Block/color.php
@@ -69,6 +72,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Block/sunrise.php
 %%HORDEDIR%%/lib/Block/time.php
 %%HORDEDIR%%/lib/Block/weatherdotcom.php
+%%HORDEDIR%%/lib/Block/weatherdotcom_strings.php
 %%HORDEDIR%%/lib/File/PDF.php
 %%HORDEDIR%%/lib/File/PDF/fonts/courier.php
 %%HORDEDIR%%/lib/File/PDF/fonts/helvetica.php
@@ -211,7 +215,6 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/enriched.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/enscript.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/html.php
-%%HORDEDIR%%/lib/Horde/MIME/Viewer/icalendar.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/images.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/msexcel.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/mspowerpoint.php
@@ -295,7 +298,10 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Horde/Serialize.php
 %%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/mysql.php
+%%HORDEDIR%%/lib/Horde/SessionHandler/none.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/oci8.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/pgsql.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/sapdb.php
@@ -304,29 +310,26 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Horde/Share.php
 %%HORDEDIR%%/lib/Horde/String.php
 %%HORDEDIR%%/lib/Horde/SyncML.php
+%%HORDEDIR%%/lib/Horde/SyncML/Backend.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Alert.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Final.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Get.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Map.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Put.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Replace.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Results.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Status.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Sync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/Add.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/ContentSyncElement.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/Delete.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/Replace.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/SyncElement.php
+%%HORDEDIR%%/lib/Horde/SyncML/Command/SyncElement.php
+%%HORDEDIR%%/lib/Horde/SyncML/Constants.php
+%%HORDEDIR%%/lib/Horde/SyncML/Device.php
+%%HORDEDIR%%/lib/Horde/SyncML/Device/P800.php
+%%HORDEDIR%%/lib/Horde/SyncML/Device/Sync4j.php
+%%HORDEDIR%%/lib/Horde/SyncML/Device/Synthesis.php
+%%HORDEDIR%%/lib/Horde/SyncML/DeviceInfo.php
+%%HORDEDIR%%/lib/Horde/SyncML/ResultsSender.php
 %%HORDEDIR%%/lib/Horde/SyncML/State.php
 %%HORDEDIR%%/lib/Horde/SyncML/Sync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/OneWayFromClientSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/OneWayFromServerSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/RefreshFromClientSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/RefreshFromServerSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/SlowSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/TwoWaySync.php
 %%HORDEDIR%%/lib/Horde/Template.php
 %%HORDEDIR%%/lib/Horde/Text.php
 %%HORDEDIR%%/lib/Horde/Text/Filter.php
@@ -435,6 +438,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/locale/ar_SY/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/bg_BG/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/bg_BG/help.xml
+%%HORDEDIR%%/locale/bs_BA/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/ca_ES/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/cs_CZ/help.xml
@@ -450,6 +454,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/locale/et_EE/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/et_EE/help.xml
 %%HORDEDIR%%/locale/fa_IR/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/fa_IR/help.xml
 %%HORDEDIR%%/locale/fi_FI/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/fi_FI/help.xml
 %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES/horde.mo
@@ -501,6 +506,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/po/README
 %%HORDEDIR%%/po/ar_SY.po
 %%HORDEDIR%%/po/bg_BG.po
+%%HORDEDIR%%/po/bs_BA.po
 %%HORDEDIR%%/po/ca_ES.po
 %%HORDEDIR%%/po/cs_CZ.po
 %%HORDEDIR%%/po/da_DK.po
@@ -551,6 +557,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/scripts/setup.php
 %%HORDEDIR%%/scripts/sql/README
 %%HORDEDIR%%/scripts/sql/README.OCI8
+%%HORDEDIR%%/scripts/sql/create.msde.sql
 %%HORDEDIR%%/scripts/sql/create.mysql.sql
 %%HORDEDIR%%/scripts/sql/create.oci8.sql
 %%HORDEDIR%%/scripts/sql/create.pgsql.sql
@@ -1491,6 +1498,8 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/locale/cs_CZ
 @dirrm %%HORDEDIR%%/locale/ca_ES/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/ca_ES
+@dirrm %%HORDEDIR%%/locale/bs_BA/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/bs_BA
 @dirrm %%HORDEDIR%%/locale/bg_BG/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/bg_BG
 @dirrm %%HORDEDIR%%/locale/ar_SY/LC_MESSAGES
@@ -1531,8 +1540,7 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/lib/Horde/Text/tests
 @dirrm %%HORDEDIR%%/lib/Horde/Text/Filter
 @dirrm %%HORDEDIR%%/lib/Horde/Text
-@dirrm %%HORDEDIR%%/lib/Horde/SyncML/Sync
-@dirrm %%HORDEDIR%%/lib/Horde/SyncML/Command/Sync
+@dirrm %%HORDEDIR%%/lib/Horde/SyncML/Device
 @dirrm %%HORDEDIR%%/lib/Horde/SyncML/Command
 @dirrm %%HORDEDIR%%/lib/Horde/SyncML
 @dirrm %%HORDEDIR%%/lib/Horde/SessionHandler
@@ -1577,6 +1585,7 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/lib/File/PDF
 @dirrm %%HORDEDIR%%/lib/File
 @dirrm %%HORDEDIR%%/lib/Block
+@unexec rmdir %D/%%HORDEDIR%%/lib/data 2>/dev/null || true
 @dirrm %%HORDEDIR%%/lib
 @dirrm %%HORDEDIR%%/js
 @unexec rmdir %D/%%HORDEDIR%%/config 2>/dev/null || true
diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile
index d33a5e9dfbb0..523f26a5104f 100644
--- a/www/horde4-base/Makefile
+++ b/www/horde4-base/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	3.0.4
-PORTREVISION=	1
+PORTVERSION=	3.0.5
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.planetmirror.com/pub/horde/horde/		\
@@ -36,7 +35,7 @@ COMMENT=	A common code-base used by Horde applications, written in PHP
 #
 # - WITHOUT_MYSQL:	this port is built with MySQL by default
 #			but you might choose any other database
-#			supported by PHP (e.g. WITH_POSTGRESQL).
+#			supported by PHP (e.g. WITH_POSTGRESQL / WITH_SQLITE).
 #
 # - WITHOUT_IMAP:	this port uses IMAP as a default authentication
 #			backend; use this knob if for
@@ -80,6 +79,8 @@ COMMENT=	A common code-base used by Horde applications, written in PHP
 #
 # - WITH_DEB:		handle Debian packages.
 #
+# - WITH_SUPHP:		Install appropriately for use with the www/suphp port.
+#
 #----------------------------------------------------------------------------
 
 RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date			\
@@ -94,11 +95,21 @@ CONFLICTS=	horde-2.*
 
 NO_BUILD=	yes
 USE_PHP=	ctype gettext session
-WANT_PHP_MOD=	yes
 USE_REINPLACE=	yes
-SUB_FILES=	pkg-message
+SUB_FILES=	pkg-message pkg-deinstall
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
+RUN_DEPENDS+=	${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp
+WANT_PHP_CGI=	yes
+HORDEADMUSR?=	horde
+PKGINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES+=	pkg-install
+.else
+WANT_PHP_MOD=	yes
+.endif
+
 .if !defined(WITHOUT_FILEINFO)
 USE_PHP+=	fileinfo
 .endif
@@ -130,6 +141,9 @@ USE_PHP+=	mysql
 . if defined(WITH_POSTGRESQL)
 USE_PHP+=	pgsql
 . endif
+. if defined(WITH_SQLITE)
+USE_PHP+=	sqlite
+. endif
 .endif
 .if !defined(WITHOUT_ZLIB)
 USE_PHP+=	zlib
@@ -208,7 +222,8 @@ LHORDEDIR?=	www/horde
 LHORDESBIN?=	sbin
 
 PLIST_SUB=	HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN}
-SUB_LIST=	HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} HORDESBIN=${HORDESBIN}
+SUB_LIST=	HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} HORDESBIN=${HORDESBIN}	\
+		HORDEADMUSR=${HORDEADMUSR} HORDEGRP=${WWWGRP}
 
 HORDEDIR=	${PREFIX}/${LHORDEDIR}
 HORDESBIN=	${PREFIX}/${LHORDESBIN}
@@ -233,13 +248,15 @@ USE_PHP+=	mcal
 . endif
 .endif
 
+PATCHES2RM=	po/translation.php config/conf.xml scripts/sql/README	\
+		config/mime_drivers.php.dist config/registry.php.dist
+SEDIN2RM=	lib/Horde/Auth/mcal.php config/conf.xml docs/INSTALL	\
+		config/mime_drivers.php.dist
+
 .include <bsd.port.pre.mk>	# Required to test PHP_VER
 
 pre-configure:
-	@${RM} ${WRKSRC}/po/translation.php.orig	\
-		${WRKSRC}/config/conf.xml.orig		\
-		${WRKSRC}/scripts/sql/README.orig	\
-		${WRKSRC}/config/mime_drivers.php.dist.orig
+	@${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:"	\
 		-e "s:/home/httpd/phplib:${PEARDIR}:"					\
@@ -280,29 +297,31 @@ pre-configure:
 		${WRKSRC}/lib/Horde/Auth/mcal.php
 	@${REINPLACE_CMD} -e "s:/usr/local/apache/htdocs:${PREFIX}/www:g"	\
 		${WRKSRC}/docs/INSTALL
-	@${RM} ${WRKSRC}/lib/Horde/Auth/mcal.php.beforeHorde	\
-		${WRKSRC}/config/conf.xml.beforeHorde		\
-		${WRKSRC}/config/mime_drivers.php.dist.beforeHorde	\
-		${WRKSRC}/docs/INSTALL.beforeHorde
+	@${RM} ${SEDIN2RM:S|^|${WRKSRC}/|:S|$|.beforeHorde|}
 
 pre-install:
 .if !defined(WITHOUT_SUPPORTED_DB)
 	@if ! php -m | ${GREP} -q -e "mysql" ; then \
 	 if ! php -m | ${GREP} -q -e "pgsql" ; then \
 	  if ! php -m | ${GREP} -q -e "sybase" ; then \
+	   if ! php -m | ${GREP} -q -e "SQLite" ; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with a database support." ; \
-	    ${ECHO_MSG} "MySQL, PostgreSQL and Sybase (CTLIB or DBLIB)" ; \
+	    ${ECHO_MSG} "MySQL, PostgreSQL, SQLite and Sybase (CTLIB or DBLIB)" ; \
 	    ${ECHO_MSG} "can be used with PHP AND Horde." ; \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "(If everything will run on this machine, do not" ; \
 	    ${ECHO_MSG} " forget to install the database server-side!)" ; \
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
+	   fi ; \
 	  fi ; \
 	 fi ; \
 	fi
 .endif
+.if defined(WITH_SUPHP)
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+.endif
 
 do-install:
 	@${MKDIR}  ${HORDEDIR}
@@ -337,6 +356,9 @@ do-install:
 .endif
 
 post-install:
+.if defined(WITH_SUPHP)
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/www/horde4-base/distinfo b/www/horde4-base/distinfo
index 5824018951f6..dc27c07836fd 100644
--- a/www/horde4-base/distinfo
+++ b/www/horde4-base/distinfo
@@ -1,2 +1,2 @@
-MD5 (horde-3.0.4.tar.gz) = e2221d409ba1c8841ce4ecee981d7b61
-SIZE (horde-3.0.4.tar.gz) = 3378143
+MD5 (horde-3.0.5.tar.gz) = 31ee0819be4efe44819f8ffef5db5365
+SIZE (horde-3.0.5.tar.gz) = 3549687
diff --git a/www/horde4-base/files/patch-config_registry.php.dist b/www/horde4-base/files/patch-config_registry.php.dist
new file mode 100644
index 000000000000..ae787a92685a
--- /dev/null
+++ b/www/horde4-base/files/patch-config_registry.php.dist
@@ -0,0 +1,17 @@
+--- config/registry.php.dist.orig	Wed Aug  3 16:27:41 2005
++++ config/registry.php.dist	Wed Aug 17 22:33:03 2005
+@@ -347,6 +347,14 @@
+     'provides' => 'files',
+ );
+ 
++// r1.255.2.9
++$this->applications['gollem-menu'] = array(
++    'status' => 'block',
++    'app' => 'gollem',
++    'blockname' => 'tree_menu',
++    'menu_parent' => 'gollem',
++);
++
+ $this->applications['passwd'] = array(
+     'fileroot' => dirname(__FILE__) . '/../passwd',
+     'webroot' => $this->applications['horde']['webroot'] . '/passwd',
diff --git a/www/horde4-base/files/patch-scripts_sql_README b/www/horde4-base/files/patch-scripts_sql_README
index 6403c0f8e849..4e727f834c0a 100644
--- a/www/horde4-base/files/patch-scripts_sql_README
+++ b/www/horde4-base/files/patch-scripts_sql_README
@@ -1,11 +1,11 @@
---- scripts/sql/README.orig	Sat Sep 25 21:55:35 2004
-+++ scripts/sql/README	Mon Nov 22 13:19:52 2004
-@@ -77,7 +77,7 @@
+--- scripts/sql/README.orig	Wed Apr 27 10:56:42 2005
++++ scripts/sql/README	Tue Jul 12 21:30:49 2005
+@@ -84,7 +84,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 create.pgsql.sql
+-  # su - postgres  (or whatever your database runs as... usually postgres)
++  # su - pgsql  (or whatever your database runs as... usually pgsql)
+   $ psql -d template1 -f create.pgsql.sql
  
- This script will create a "horde" database and a "horde" user.  You
+ This script will create a ``horde`` database and a ``horde`` user.  You should
diff --git a/www/horde4-base/files/pkg-deinstall.in b/www/horde4-base/files/pkg-deinstall.in
new file mode 100644
index 000000000000..47cbca9552a2
--- /dev/null
+++ b/www/horde4-base/files/pkg-deinstall.in
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+handle_config() {
+    # Try to restore httpd.conf when deinstalling Horde
+
+    if [ -f %%APACHE_CONF%%.beforeHorde ] ; then
+    	echo "Restoring httpd.conf..."
+    	cp %%APACHE_CONF%% %%APACHE_CONF%%.deinstHorde
+    	sed -i.tmp -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
+    		%%APACHE_CONF%%
+    	rm %%APACHE_CONF%%.tmp
+    fi
+
+    # Backup Horde config files, if needed.
+
+    if [ -z "${PACKAGE_BUILDING}" ]; then
+      for cf in `ls %%HORDEDIR%%/config/*php`; do
+        diff -bBqw $cf $cf.dist >/dev/null 2>&1
+        case $? in
+          0)  # original config file, will be deleted by pkg-plist
+              ;;
+          1)  # config file has been updated, must be backuped
+              cp -p $cf $cf.previous
+              echo "===> Backing-up..."
+              echo "--->   $cf has been saved ***"
+              echo "--->      as $cf.previous ***"
+              ;;
+          *)  # not found?
+              ;;
+        esac
+      done
+    fi
+}
+
+case $2 in
+    DEINSTALL)
+      handle_config
+      ;;
+    POST-DEINSTALL)
+      if [ x%%HORDEADMUSR%% != x ]; then
+            cat <<EOMSG
+The horde port has been deleted.
+If you are not upgrading and don't intend to use
+Horde any more then you may wish to delete
+the %%HORDEADMUSR%% account, which can be done with
+the following command:
+
+    # pw userdel %%HORDEADMUSR%%
+EOMSG
+      if [ -d %%PREFIX%%/%%MYADMDIR%% ] ; then
+	echo "    # rm -rf %%PREFIX%%/%%HORDEDIR%%/"
+      fi
+      echo
+    fi
+    ;;
+esac
diff --git a/www/horde4-base/files/pkg-install.in b/www/horde4-base/files/pkg-install.in
new file mode 100644
index 000000000000..f7c747d933a9
--- /dev/null
+++ b/www/horde4-base/files/pkg-install.in
@@ -0,0 +1,96 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Copied from databases/phpmyadmin.
+# Used if WITH_SUPHP has been defined.
+
+PATH=/usr/sbin:/usr/bin:/bin ; export PATH
+
+hordedir=%%HORDEDIR%%
+hordeusr=%%HORDEADMUSR%%
+hordegrp=%%HORDEGRP%%
+
+hordegcos="Horde Owner"
+hordehome=/nonexistent
+hordeshell=/sbin/nologin
+
+create_group() {
+    local user group gcos home shell
+
+    user=$1
+    group=$2
+    gcos=$3
+    home=$4
+    shell=$5
+
+    if pw groupadd -n $group ; then
+	echo "===> Group $group created"
+    else
+	cat <<-EOERRORMSG
+	*** Failed to create the $group group.
+
+	Please add the $user user and $group group
+	manually with the commands:
+
+	    pw groupadd -n $group
+	    pw useradd -n $user -g $group -c "$gcos" \\
+	        -d $home -s $shell -h -
+
+	and retry installing this package.
+	EOERRORMSG
+	exit 1
+    fi
+}
+
+
+create_user() {
+    local user group gcos home shell
+
+    user=$1
+    group=$2
+    gcos=$3
+    home=$4
+    shell=$5
+
+    if pw useradd -n $user -g $group -c "$gcos" -d $home -s $shell -h - ; then
+	echo "===> Created $user user"
+    else
+	cat <<-EOERRORMSG
+	*** Failed to create the $user user.
+
+	Please add the $user user manually with the command:
+
+	    pw useradd -n $user -g $group -c "$gcos" \\
+		        -d $home -s $shell -h -
+
+	and retry installing this package.
+	EOERRORMSG
+	exit 1
+    fi
+}
+
+
+case $2 in
+    PRE-INSTALL)
+
+        # Create the horde user and group if they do not already exist
+
+        if pw user show -n $hordeusr >/dev/null 2>&1 ; then
+	    echo "===> Using pre-existing user $hordeusr"
+	else
+	    if ! pw group show -n $hordegrp >/dev/null 2>&1 ; then
+		create_group $hordeusr $hordegrp "$hordegcos" $hordehome \
+		    $hordeshell
+	    fi
+	    create_user $hordeusr $hordegrp "$hordegcos" $hordehome $hordeshell
+	fi
+	;;
+    POST-INSTALL)
+
+    	# Change ownership of the Horde directory
+
+        echo "===> Adjusting file ownership in $hordedir"
+        chown -R $hordeusr:$hordegrp $hordedir || exit 1
+	;;
+esac
diff --git a/www/horde4-base/pkg-deinstall b/www/horde4-base/pkg-deinstall
deleted file mode 100644
index fcecd184cd25..000000000000
--- a/www/horde4-base/pkg-deinstall
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Try to restore httpd.conf when deinstalling Horde
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-if [ -d ${PKG_PREFIX}/etc/apache ] ; then
-APACHEDIR=${PKG_PREFIX}/etc/apache
-elif [ -d ${PKG_PREFIX}/etc/apache2 ] ; then
-APACHEDIR=${PKG_PREFIX}/etc/apache2
-fi
-
-if [ -f ${APACHEDIR}/httpd.conf.beforeHorde ] ; then
-	echo "Restoring httpd.conf..."
-	cp ${APACHEDIR}/httpd.conf ${APACHEDIR}/httpd.conf.deinstHorde
-	sed -i.tmp -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
-		${APACHEDIR}/httpd.conf
-	rm ${APACHEDIR}/httpd.conf.tmp
-fi
-
-# Backup Horde config files, if needed.
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/config/*php`; do
-    diff -bBqw $cf $cf.dist >/dev/null 2>&1
-    case $? in
-      0)  # original config file, will be deleted by pkg-plist
-          ;;
-      1)  # config file has been updated, must be backuped
-          cp -p $cf $cf.previous
-          echo "===> Backing-up..."
-          echo "--->   $cf has been saved ***"
-          echo "--->      as $cf.previous ***"
-          ;;
-      *)  # not found?
-          ;;
-    esac
-  done
-fi
diff --git a/www/horde4-base/pkg-plist b/www/horde4-base/pkg-plist
index fd10e201b310..e7d9c63f290c 100644
--- a/www/horde4-base/pkg-plist
+++ b/www/horde4-base/pkg-plist
@@ -48,7 +48,9 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/config/registry.php
 %%HORDEDIR%%/config/registry.php.dist
 %%HORDEDIR%%/index.php
+%%HORDEDIR%%/js/addEvent.php
 %%HORDEDIR%%/js/alphaImageLoader.php
+%%HORDEDIR%%/js/ieEscGuard.js
 %%HORDEDIR%%/js/enter_key_trap.js
 %%HORDEDIR%%/js/form_assign.js
 %%HORDEDIR%%/js/form_helpers.js
@@ -58,6 +60,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/js/open_colorpicker.js
 %%HORDEDIR%%/js/popup.js
 %%HORDEDIR%%/js/sorter.js
+%%HORDEDIR%%/js/stripe.js
 %%HORDEDIR%%/js/tooltip.js
 %%HORDEDIR%%/lib/.htaccess
 %%HORDEDIR%%/lib/Block/color.php
@@ -69,6 +72,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Block/sunrise.php
 %%HORDEDIR%%/lib/Block/time.php
 %%HORDEDIR%%/lib/Block/weatherdotcom.php
+%%HORDEDIR%%/lib/Block/weatherdotcom_strings.php
 %%HORDEDIR%%/lib/File/PDF.php
 %%HORDEDIR%%/lib/File/PDF/fonts/courier.php
 %%HORDEDIR%%/lib/File/PDF/fonts/helvetica.php
@@ -211,7 +215,6 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/enriched.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/enscript.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/html.php
-%%HORDEDIR%%/lib/Horde/MIME/Viewer/icalendar.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/images.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/msexcel.php
 %%HORDEDIR%%/lib/Horde/MIME/Viewer/mspowerpoint.php
@@ -295,7 +298,10 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Horde/Serialize.php
 %%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/mysql.php
+%%HORDEDIR%%/lib/Horde/SessionHandler/none.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/oci8.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/pgsql.php
 %%HORDEDIR%%/lib/Horde/SessionHandler/sapdb.php
@@ -304,29 +310,26 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Horde/Share.php
 %%HORDEDIR%%/lib/Horde/String.php
 %%HORDEDIR%%/lib/Horde/SyncML.php
+%%HORDEDIR%%/lib/Horde/SyncML/Backend.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Alert.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Final.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Get.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Map.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Put.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Replace.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Results.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Status.php
 %%HORDEDIR%%/lib/Horde/SyncML/Command/Sync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/Add.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/ContentSyncElement.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/Delete.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/Replace.php
-%%HORDEDIR%%/lib/Horde/SyncML/Command/Sync/SyncElement.php
+%%HORDEDIR%%/lib/Horde/SyncML/Command/SyncElement.php
+%%HORDEDIR%%/lib/Horde/SyncML/Constants.php
+%%HORDEDIR%%/lib/Horde/SyncML/Device.php
+%%HORDEDIR%%/lib/Horde/SyncML/Device/P800.php
+%%HORDEDIR%%/lib/Horde/SyncML/Device/Sync4j.php
+%%HORDEDIR%%/lib/Horde/SyncML/Device/Synthesis.php
+%%HORDEDIR%%/lib/Horde/SyncML/DeviceInfo.php
+%%HORDEDIR%%/lib/Horde/SyncML/ResultsSender.php
 %%HORDEDIR%%/lib/Horde/SyncML/State.php
 %%HORDEDIR%%/lib/Horde/SyncML/Sync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/OneWayFromClientSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/OneWayFromServerSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/RefreshFromClientSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/RefreshFromServerSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/SlowSync.php
-%%HORDEDIR%%/lib/Horde/SyncML/Sync/TwoWaySync.php
 %%HORDEDIR%%/lib/Horde/Template.php
 %%HORDEDIR%%/lib/Horde/Text.php
 %%HORDEDIR%%/lib/Horde/Text/Filter.php
@@ -435,6 +438,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/locale/ar_SY/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/bg_BG/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/bg_BG/help.xml
+%%HORDEDIR%%/locale/bs_BA/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/ca_ES/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/cs_CZ/help.xml
@@ -450,6 +454,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/locale/et_EE/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/et_EE/help.xml
 %%HORDEDIR%%/locale/fa_IR/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/fa_IR/help.xml
 %%HORDEDIR%%/locale/fi_FI/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/fi_FI/help.xml
 %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES/horde.mo
@@ -501,6 +506,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/po/README
 %%HORDEDIR%%/po/ar_SY.po
 %%HORDEDIR%%/po/bg_BG.po
+%%HORDEDIR%%/po/bs_BA.po
 %%HORDEDIR%%/po/ca_ES.po
 %%HORDEDIR%%/po/cs_CZ.po
 %%HORDEDIR%%/po/da_DK.po
@@ -551,6 +557,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/scripts/setup.php
 %%HORDEDIR%%/scripts/sql/README
 %%HORDEDIR%%/scripts/sql/README.OCI8
+%%HORDEDIR%%/scripts/sql/create.msde.sql
 %%HORDEDIR%%/scripts/sql/create.mysql.sql
 %%HORDEDIR%%/scripts/sql/create.oci8.sql
 %%HORDEDIR%%/scripts/sql/create.pgsql.sql
@@ -1491,6 +1498,8 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/locale/cs_CZ
 @dirrm %%HORDEDIR%%/locale/ca_ES/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/ca_ES
+@dirrm %%HORDEDIR%%/locale/bs_BA/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/bs_BA
 @dirrm %%HORDEDIR%%/locale/bg_BG/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/bg_BG
 @dirrm %%HORDEDIR%%/locale/ar_SY/LC_MESSAGES
@@ -1531,8 +1540,7 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/lib/Horde/Text/tests
 @dirrm %%HORDEDIR%%/lib/Horde/Text/Filter
 @dirrm %%HORDEDIR%%/lib/Horde/Text
-@dirrm %%HORDEDIR%%/lib/Horde/SyncML/Sync
-@dirrm %%HORDEDIR%%/lib/Horde/SyncML/Command/Sync
+@dirrm %%HORDEDIR%%/lib/Horde/SyncML/Device
 @dirrm %%HORDEDIR%%/lib/Horde/SyncML/Command
 @dirrm %%HORDEDIR%%/lib/Horde/SyncML
 @dirrm %%HORDEDIR%%/lib/Horde/SessionHandler
@@ -1577,6 +1585,7 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/lib/File/PDF
 @dirrm %%HORDEDIR%%/lib/File
 @dirrm %%HORDEDIR%%/lib/Block
+@unexec rmdir %D/%%HORDEDIR%%/lib/data 2>/dev/null || true
 @dirrm %%HORDEDIR%%/lib
 @dirrm %%HORDEDIR%%/js
 @unexec rmdir %D/%%HORDEDIR%%/config 2>/dev/null || true