8 files changed, 258 insertions, 208 deletions

diff --git a/deskutils/horde4-kronolith/Makefile b/deskutils/horde4-kronolith/Makefile
index 1532103513d9..6f576cc8d166 100644
--- a/deskutils/horde4-kronolith/Makefile
+++ b/deskutils/horde4-kronolith/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kronolith
-PORTVERSION=	1.1.2
+PORTVERSION=	2.0
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/kronolith/				\
 		ftp://ftp.planetmirror.com/pub/horde/kronolith/			\
@@ -17,44 +17,55 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/kronolith/				\
 		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/kronolith/		\
 		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/kronolith/	\
 		http://ftp.horde.org/pub/kronolith/
+DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Kronolith is the Horde calendar application
 
-RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
+#----------------------------------------------------------------------------
+# You may define this option:
+#
+# - WITHOUT_MCAL:	you won't use the MCAL driver but a database backend
+#			(only for PHP4).
+#
+#----------------------------------------------------------------------------
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+RUN_DEPENDS+=	${LOCALBASE}/www/horde/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
-USE_PHP=	mcal
+USE_PHP=	yes	# modules set by Horde, but needed to get PHP_VER
 USE_REINPLACE=	yes
 
-.if defined(WITH_APACHE2)
-HTPASSWD=	${LOCALBASE}/sbin/htpasswd
-.else
-HTPASSWD=	${LOCALBASE}/bin/htpasswd
-.endif
-
-REINPLACE_ARGS=	-i.beforeKronolith
+REINPLACE_ARGS=	-i ""
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/RELEASE_NOTES
-CONFFILE=	conf.php html.php keywords.php menu.php prefs.php
-SUB_DIRS=	config graphics lib locale po scripts templates util
+		docs/RELEASE_NOTES docs/TODO docs/UPGRADING
+CONFFILE=	keywords.php menu.php prefs.php
+SUB_DIRS=	config lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
 LKRONOLITHDIR?=	${LHORDEDIR}/kronolith
 
-PLIST_SUB=	HORDEDIR=${LHORDEDIR} KRONOLITHDIR=${LKRONOLITHDIR}
+PLIST_SUB=	KRONOLITHDIR=${LKRONOLITHDIR}
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
-HORDEDIR=	${PREFIX}/${LHORDEDIR}
 KRONOLITHDIR=	${PREFIX}/${LKRONOLITHDIR}
 CONFDIR=	${KRONOLITHDIR}/config
 VAR_CAL=	/var/calendar
 
 HORDE_INC=	${LOCALBASE}/etc/horde
 
-post-patch:
-	@${RM} ${WRKSRC}/config/conf.php.dist.orig
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/sbin/htpasswd)
+HTPASSWD=	${LOCALBASE}/sbin/htpasswd
+.else
+HTPASSWD=	${LOCALBASE}/bin/htpasswd
+.endif
+
+pre-configure:
+	@${RM} ${WRKSRC}/config/conf.xml.orig
+	@${SED} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:"	\
+		${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd.conf.kronolith
 
 do-install:
 	@${MKDIR}  ${KRONOLITHDIR}
@@ -62,22 +73,14 @@ do-install:
 	@${CP} -Rp ${WRKSRC}/${REP} ${KRONOLITHDIR}
 .endfor
 	@${CP} -p  ${WRKSRC}/*.php ${KRONOLITHDIR}
-	@${MKDIR} ${KRONOLITHDIR}/scripts
 .for FILE in ${CONFFILE}
 	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
 	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
 	fi
 .endfor
-	@${CHOWN} -R www:www ${KRONOLITHDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${CP} -p ${FILESDIR}/httpd.conf.kronolith ${HORDE_INC}
-	@${REINPLACE_CMD} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:g" \
-		${HORDE_INC}/httpd.conf.kronolith
-	@${RM} ${HORDE_INC}/httpd.conf.kronolith.beforeKronolith
-	@${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTKRONOLITH::" \
-		${HORDEDIR}/config/registry.php
-	@${CP} -p ${HORDEDIR}/config/registry.php		\
-		${HORDEDIR}/config/registry.php.afterKronolith
+	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.kronolith ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -87,6 +90,7 @@ do-install:
 .endif
 
 post-install:
+.if !defined(WITHOUT_MCAL) && (${PHP_VER} == 4)
 	@if [ ! -d ${VAR_CAL} ]; then \
 	  ${ECHO_MSG} "===> Creating ${VAR_CAL}" ; \
 	  ${MKDIR} ${VAR_CAL} ; \
@@ -98,21 +102,23 @@ post-install:
 	  ${ECHO} -n "Please enter a password for www's calendar: " ; \
 	  (read PASSCAL;						\
 	   ${HTPASSWD} -bc ${LOCALBASE}/etc/mpasswd www $${PASSCAL}; \
-	   ${REINPLACE_CMD} -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.php) \
+	   ${REINPLACE_CMD} -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.xml) \
 	elif ! ${GREP} -q -e "^www" ${LOCALBASE}/etc/mpasswd ; then \
 	  ${ECHO_MSG} "===> Adding www into ${LOCALBASE}/etc/mpasswd" ; \
 	  ${ECHO} -n "Please enter a password for www's calendar: " ; \
 	  (read PASSCAL;						\
 	   ${HTPASSWD} -b ${LOCALBASE}/etc/mpasswd www $${PASSCAL} ; \
-	   ${REINPLACE_CMD} -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.php) \
+	   ${REINPLACE_CMD} -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.xml) \
 	else \
-	   ${REINPLACE_CMD} -e "s:%%PASSCAL%%:www_cal_password:" ${CONFDIR}/conf.php ; \
+	   ${REINPLACE_CMD} -e "s:%%PASSCAL%%:www_cal_password:" ${CONFDIR}/conf.xml ; \
 	fi
-	@${RM} ${CONFDIR}/conf.php.beforeKronolith
+. endif
 .endif
+	@${SED} -e "s:%%KRONOLITHDIR%%:${KRONOLITHDIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
+		-e "s:%%LOCALBASE%%:${LOCALBASE}:" < ${FILESDIR}/pkg-message.in		\
+		 > ${PKGMESSAGE}
 	@${ECHO_MSG}
-	@${SED} -e "s:%%KRONOLITHDIR%%:${KRONOLITHDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g"	\
-		-e "s:%%CONFDIR%%:${CONFDIR}:g;s:%%LOCALBASE%%:${LOCALBASE}:" ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/horde4-kronolith/distinfo b/deskutils/horde4-kronolith/distinfo
index b1f9051b2d07..449496bdd344 100644
--- a/deskutils/horde4-kronolith/distinfo
+++ b/deskutils/horde4-kronolith/distinfo
@@ -1,2 +1,2 @@
-MD5 (kronolith-1.1.2.tar.gz) = bb81207fe39000ab9030b3e283216dfc
-SIZE (kronolith-1.1.2.tar.gz) = 505727
+MD5 (kronolith-h3-2.0.tar.gz) = 7ee17a4a4ed1882381c9ae093685621c
+SIZE (kronolith-h3-2.0.tar.gz) = 1175123
diff --git a/deskutils/horde4-kronolith/files/patch-aa b/deskutils/horde4-kronolith/files/patch-aa
deleted file mode 100644
index 654e4ad1020a..000000000000
--- a/deskutils/horde4-kronolith/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- config/conf.php.dist.orig	Fri Apr  4 21:23:54 2003
-+++ config/conf.php.dist	Sat Apr  5 17:57:35 2003
-@@ -28,9 +28,9 @@
- $conf['calendar']['params']['driver'] = 'mstore';
- 
- // The mstore driver requires a username and a password that is in 
--// /etc/mpasswd in order to access local calendars.
--$conf['calendar']['params']['username'] = '';
--$conf['calendar']['params']['password'] = '';
-+// /usr/local/etc/mpasswd in order to access local calendars.
-+$conf['calendar']['params']['username'] = 'www';
-+$conf['calendar']['params']['password'] = '%%PASSCAL%%';
- 
- // This is an example configuration for an sql driver, in this case MySQL.
- // $conf['calendar']['params']['phptype'] = 'mysql';
-@@ -48,7 +48,7 @@
- // If this is true, then an array of keywords will be read from
- // config/keywords.php and you will be able to assign any or all of
- // them to events.
--$conf['metadata']['keywords'] = false;
-+$conf['metadata']['keywords'] = true;
- 
- 
- /**
diff --git a/deskutils/horde4-kronolith/files/patch-config::conf.xml b/deskutils/horde4-kronolith/files/patch-config::conf.xml
new file mode 100644
index 000000000000..1a5c0106a654
--- /dev/null
+++ b/deskutils/horde4-kronolith/files/patch-config::conf.xml
@@ -0,0 +1,14 @@
+--- config/conf.xml.orig	Sun Oct  3 15:24:09 2004
++++ config/conf.xml	Mon Nov 29 21:48:21 2004
+@@ -13,9 +13,9 @@
+      <configstring name="driver" desc="What MCAL driver is being
+       used?">mstore</configstring>
+      <configstring name="username" desc="Connect to MCAL
+-      as">horde</configstring>
++      as">www</configstring>
+      <configstring name="password" required="false" desc="Password to connect
+-      with">****</configstring>
++      with">%%PASSCAL%%</configstring>
+     </configsection>
+    </case>
+ 
diff --git a/deskutils/horde4-kronolith/files/pkg-message.in b/deskutils/horde4-kronolith/files/pkg-message.in
new file mode 100644
index 000000000000..e7f0e3401e17
--- /dev/null
+++ b/deskutils/horde4-kronolith/files/pkg-message.in
@@ -0,0 +1,29 @@
+**************************************************************************
+Kronolith has been installed in %%KRONOLITHDIR%% with your
+blank configuration files.
+
+Horde must be configured; if not, see `pkg_info -D -x horde'.
+
+With PHP4:
+If you choose the mcal backend, libmcal must be configured with the driver
+mstore for the user www:
+
+- mkdir /var/calendar
+- chmod 1777 /var/calendar
+- htpasswd -c %%LOCALBASE%%/etc/mpasswd www
+
+(this port has tried to make it for you, perhaps you'll just have to
+check - see `pkg_info -D -x libmcal')
+
+If you choose a database backend, you have to create some tables from the
+SQL scripts in %%KRONOLITHDIR%%/scripts/sql.
+
+WARNING! if you are upgrading from Kronolith v. 1.1.x, you have to alter
+******** your schemas.
+         Please read the doc %%DOCSDIR%%/UPGRADING.
+
+Finally, you must login to Horde as a Horde Administrator to finish the
+configuration.
+
+To protect your configuration files, you have to restart Apache.
+**************************************************************************
diff --git a/deskutils/horde4-kronolith/pkg-descr b/deskutils/horde4-kronolith/pkg-descr
index e0b09f28cca7..43d8a72eee24 100644
--- a/deskutils/horde4-kronolith/pkg-descr
+++ b/deskutils/horde4-kronolith/pkg-descr
@@ -1,11 +1,7 @@
-Kronolith is the Horde calendar application. It is currently in the
-development stages, and makes heavy use of the Horde framework to
-provide integration with other applications.
+Kronolith is the Horde calendar application.
 
 Right now, Kronolith implements a solid, stand-alone calendar system,
 allowing repeating events, all-day events, custom fields, keywords,
-and managing multiple users through Horde Authentication. The calendar
-API that Kronolith uses is abstracted such that it could work with any
-backend, but right now it uses the MCAL calendar library for a backend.
+and managing multiple users through Horde Authentication.
 
 WWW: http://horde.org/kronolith/
diff --git a/deskutils/horde4-kronolith/pkg-message b/deskutils/horde4-kronolith/pkg-message
deleted file mode 100644
index 1f3a6212b696..000000000000
--- a/deskutils/horde4-kronolith/pkg-message
+++ /dev/null
@@ -1,22 +0,0 @@
-************************************************************************
-Kronolith has been installed in %%KRONOLITHDIR%% with your
-blank configuration files.
-
-Horde and IMP must be configured; if not, see:
-- %%PORTSDIR%%/www/horde2/pkg-message
-- %%PORTSDIR%%/mail/imp3/pkg-message
-
-libmcal must be configured with the driver mstore for the user www:
-
-- mkdir /var/calendar
-- chmod 1777 /var/calendar
-- htpasswd -c %%LOCALBASE%%/etc/mpasswd www
-
-(this port has tried to make it for you, perhaps you'll just have to
-check - see %%PORTSDIR%%/misc/libmcal/pkg-message)
-
-Then, you may have to tune the configuration files located in
-%%CONFDIR%%/, specially the files conf.php.
-
-To protect your configuration files, you have to restart Apache.
-************************************************************************
diff --git a/deskutils/horde4-kronolith/pkg-plist b/deskutils/horde4-kronolith/pkg-plist
index aa3ec94e4a47..2b1ebaf4ec3b 100644
--- a/deskutils/horde4-kronolith/pkg-plist
+++ b/deskutils/horde4-kronolith/pkg-plist
@@ -4,66 +4,65 @@
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%KRONOLITHDIR%%/addevent.php
 %%KRONOLITHDIR%%/addeventaction.php
+%%KRONOLITHDIR%%/attendees.php
+%%KRONOLITHDIR%%/calendars.php
 %%KRONOLITHDIR%%/config/.htaccess
-%%KRONOLITHDIR%%/config/conf.php
-%%KRONOLITHDIR%%/config/conf.php.dist
-%%KRONOLITHDIR%%/config/html.php
-%%KRONOLITHDIR%%/config/html.php.dist
+%%KRONOLITHDIR%%/config/conf.xml
 %%KRONOLITHDIR%%/config/keywords.php
 %%KRONOLITHDIR%%/config/keywords.php.dist
 %%KRONOLITHDIR%%/config/menu.php
 %%KRONOLITHDIR%%/config/menu.php.dist
 %%KRONOLITHDIR%%/config/prefs.php
 %%KRONOLITHDIR%%/config/prefs.php.dist
+%%KRONOLITHDIR%%/contacts.php
 %%KRONOLITHDIR%%/data.php
 %%KRONOLITHDIR%%/day.php
 %%KRONOLITHDIR%%/delevent.php
 %%KRONOLITHDIR%%/deleventaction.php
 %%KRONOLITHDIR%%/editevent.php
 %%KRONOLITHDIR%%/editeventaction.php
-%%KRONOLITHDIR%%/graphics/alarm.gif
-%%KRONOLITHDIR%%/graphics/alarm_small.gif
-%%KRONOLITHDIR%%/graphics/bullet.gif
-%%KRONOLITHDIR%%/graphics/clear.gif
-%%KRONOLITHDIR%%/graphics/colorpicker.gif
-%%KRONOLITHDIR%%/graphics/colorpicker.png
-%%KRONOLITHDIR%%/graphics/dayview.gif
-%%KRONOLITHDIR%%/graphics/delete.gif
-%%KRONOLITHDIR%%/graphics/event.gif
-%%KRONOLITHDIR%%/graphics/goto.gif
-%%KRONOLITHDIR%%/graphics/kronolith.gif
-%%KRONOLITHDIR%%/graphics/monthview.gif
-%%KRONOLITHDIR%%/graphics/new.gif
-%%KRONOLITHDIR%%/graphics/next.gif
-%%KRONOLITHDIR%%/graphics/prev.gif
-%%KRONOLITHDIR%%/graphics/print.gif
-%%KRONOLITHDIR%%/graphics/recur.gif
-%%KRONOLITHDIR%%/graphics/today.gif
-%%KRONOLITHDIR%%/graphics/weekview.gif
-%%KRONOLITHDIR%%/graphics/workweekview.gif
+%%KRONOLITHDIR%%/fb.php
 %%KRONOLITHDIR%%/index.php
+%%KRONOLITHDIR%%/lib/Block/month.php
+%%KRONOLITHDIR%%/lib/Block/monthlist.php
+%%KRONOLITHDIR%%/lib/Block/prevmonthlist.php
+%%KRONOLITHDIR%%/lib/Block/summary.php
+%%KRONOLITHDIR%%/lib/Block/tree_menu.php
 %%KRONOLITHDIR%%/lib/Day.php
 %%KRONOLITHDIR%%/lib/DayView.php
 %%KRONOLITHDIR%%/lib/Driver.php
+%%KRONOLITHDIR%%/lib/Driver/ical.php
+%%KRONOLITHDIR%%/lib/Driver/kolab.php
 %%KRONOLITHDIR%%/lib/Driver/mcal.php
 %%KRONOLITHDIR%%/lib/Driver/sql.php
-%%KRONOLITHDIR%%/lib/Event.php
+%%KRONOLITHDIR%%/lib/FBView.php
+%%KRONOLITHDIR%%/lib/FBView/day.php
+%%KRONOLITHDIR%%/lib/FBView/week.php
+%%KRONOLITHDIR%%/lib/FBView/workweek.php
 %%KRONOLITHDIR%%/lib/Kronolith.php
-%%KRONOLITHDIR%%/lib/Notification/kronolith.php
+%%KRONOLITHDIR%%/lib/Scheduler/kronolith.php
+%%KRONOLITHDIR%%/lib/Storage.php
+%%KRONOLITHDIR%%/lib/Storage/kolab.php
+%%KRONOLITHDIR%%/lib/Storage/sql.php
 %%KRONOLITHDIR%%/lib/WeekView.php
 %%KRONOLITHDIR%%/lib/api.php
 %%KRONOLITHDIR%%/lib/base.php
+%%KRONOLITHDIR%%/lib/prefs.php
 %%KRONOLITHDIR%%/lib/version.php
 %%KRONOLITHDIR%%/locale/ar_SY/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/bg_BG/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/cs_CZ/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/da_DK/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/de_DE/LC_MESSAGES/kronolith.mo
+%%KRONOLITHDIR%%/locale/de_DE/help.xml
 %%KRONOLITHDIR%%/locale/el_GR/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/en_US/help.xml
 %%KRONOLITHDIR%%/locale/es_ES/LC_MESSAGES/kronolith.mo
+%%KRONOLITHDIR%%/locale/es_ES/help.xml
 %%KRONOLITHDIR%%/locale/fi_FI/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/fi_FI/help.xml
 %%KRONOLITHDIR%%/locale/fr_FR/LC_MESSAGES/kronolith.mo
@@ -72,21 +71,20 @@
 %%KRONOLITHDIR%%/locale/it_IT/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/ko_KR/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/lt_LT/LC_MESSAGES/kronolith.mo
+%%KRONOLITHDIR%%/locale/lv_LV/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/nb_NO/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/nl_NL/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/nn_NO/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/pl_PL/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/pt_BR/LC_MESSAGES/kronolith.mo
+%%KRONOLITHDIR%%/locale/pt_BR/help.xml
 %%KRONOLITHDIR%%/locale/ro_RO/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/ru_RU/LC_MESSAGES/kronolith.mo
-%%KRONOLITHDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/sk_SK/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/sv_SE/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/zh_CN/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/zh_TW/LC_MESSAGES/kronolith.mo
-%%KRONOLITHDIR%%/menu.php
 %%KRONOLITHDIR%%/month.php
-%%KRONOLITHDIR%%/po/Makefile
 %%KRONOLITHDIR%%/po/README
 %%KRONOLITHDIR%%/po/ar_SY.po
 %%KRONOLITHDIR%%/po/bg_BG.po
@@ -95,7 +93,6 @@
 %%KRONOLITHDIR%%/po/de_DE.po
 %%KRONOLITHDIR%%/po/el_GR.po
 %%KRONOLITHDIR%%/po/es_ES.po
-%%KRONOLITHDIR%%/po/extract.pl
 %%KRONOLITHDIR%%/po/fi_FI.po
 %%KRONOLITHDIR%%/po/fr_FR.po
 %%KRONOLITHDIR%%/po/hu_HU.po
@@ -103,6 +100,7 @@
 %%KRONOLITHDIR%%/po/ko_KR.po
 %%KRONOLITHDIR%%/po/kronolith.pot
 %%KRONOLITHDIR%%/po/lt_LT.po
+%%KRONOLITHDIR%%/po/lv_LV.po
 %%KRONOLITHDIR%%/po/nb_NO.po
 %%KRONOLITHDIR%%/po/nl_NL.po
 %%KRONOLITHDIR%%/po/nn_NO.po
@@ -110,118 +108,171 @@
 %%KRONOLITHDIR%%/po/pt_BR.po
 %%KRONOLITHDIR%%/po/ro_RO.po
 %%KRONOLITHDIR%%/po/ru_RU.po
-%%KRONOLITHDIR%%/po/ru_RU.KOI8-R.po
-%%KRONOLITHDIR%%/po/shtool
 %%KRONOLITHDIR%%/po/sk_SK.po
 %%KRONOLITHDIR%%/po/sv_SE.po
-%%KRONOLITHDIR%%/po/xgettext.sh
 %%KRONOLITHDIR%%/po/zh_CN.po
 %%KRONOLITHDIR%%/po/zh_TW.po
-%%KRONOLITHDIR%%/prefs.php
-%%KRONOLITHDIR%%/scripts/drivers/kronolith.oracle.sql
-%%KRONOLITHDIR%%/scripts/drivers/kronolith.sql
-%%KRONOLITHDIR%%/status.php
-%%KRONOLITHDIR%%/templates/common-footer.inc
+%%KRONOLITHDIR%%/scripts/.htaccess
+%%KRONOLITHDIR%%/scripts/migrate_to_sql_driver.php
+%%KRONOLITHDIR%%/scripts/reminders.php
+%%KRONOLITHDIR%%/scripts/sql/kronolith.mysql.sql
+%%KRONOLITHDIR%%/scripts/sql/kronolith.oci8.sql
+%%KRONOLITHDIR%%/scripts/sql/kronolith.pgsql.sql
+%%KRONOLITHDIR%%/scripts/sql/kronolith.sql
+%%KRONOLITHDIR%%/scripts/upgrades/1.1_to_2.0.mysql.sql
+%%KRONOLITHDIR%%/scripts/upgrades/2004-05-19_convert_categories_to_strings.php
+%%KRONOLITHDIR%%/scripts/upgrades/2004-12-21_add_event_uid.sql
+%%KRONOLITHDIR%%/search.php
+%%KRONOLITHDIR%%/templates/attendees/attendees.inc
+%%KRONOLITHDIR%%/templates/calendars/calendars.inc
+%%KRONOLITHDIR%%/templates/category_legend.inc
 %%KRONOLITHDIR%%/templates/common-header.inc
+%%KRONOLITHDIR%%/templates/contacts/contacts.inc
 %%KRONOLITHDIR%%/templates/data/export.inc
 %%KRONOLITHDIR%%/templates/data/import.inc
 %%KRONOLITHDIR%%/templates/day/all_day.inc
 %%KRONOLITHDIR%%/templates/day/foot.inc
 %%KRONOLITHDIR%%/templates/day/head.inc
+%%KRONOLITHDIR%%/templates/day/head_side_by_side.inc
 %%KRONOLITHDIR%%/templates/day/row.inc
 %%KRONOLITHDIR%%/templates/day/row_half.inc
 %%KRONOLITHDIR%%/templates/delete/delete.inc
 %%KRONOLITHDIR%%/templates/delete/one.inc
 %%KRONOLITHDIR%%/templates/edit/edit.inc
+%%KRONOLITHDIR%%/templates/edit/edit_timespan.inc
 %%KRONOLITHDIR%%/templates/edit/javascript.inc
-%%KRONOLITHDIR%%/templates/index/css.inc
-%%KRONOLITHDIR%%/templates/index/notconfigured.inc
+%%KRONOLITHDIR%%/templates/fbview/busyblock.tpl
+%%KRONOLITHDIR%%/templates/fbview/header.tpl
+%%KRONOLITHDIR%%/templates/fbview/legend.inc
+%%KRONOLITHDIR%%/templates/fbview/linesblock.tpl
+%%KRONOLITHDIR%%/templates/fbview/meetingblock.tpl
+%%KRONOLITHDIR%%/templates/fbview/row.tpl
+%%KRONOLITHDIR%%/templates/fbview/section.tpl
+%%KRONOLITHDIR%%/templates/fbview/unknownblock.tpl
 %%KRONOLITHDIR%%/templates/javascript/goto.inc
-%%KRONOLITHDIR%%/templates/javascript/open_print_win.js
-%%KRONOLITHDIR%%/templates/javascript/print.inc
-%%KRONOLITHDIR%%/templates/menu/menu.inc
+%%KRONOLITHDIR%%/templates/javascript/open_attendees_win.js
+%%KRONOLITHDIR%%/templates/menu.inc
 %%KRONOLITHDIR%%/templates/month/head.inc
-%%KRONOLITHDIR%%/templates/prefs/category_management.inc
+%%KRONOLITHDIR%%/templates/month/head_side_by_side.inc
+%%KRONOLITHDIR%%/templates/prefs/remote_cal_management.inc
+%%KRONOLITHDIR%%/templates/prefs/search_abook_select.inc
+%%KRONOLITHDIR%%/templates/prefs/shareselect.inc
+%%KRONOLITHDIR%%/templates/search/empty.inc
+%%KRONOLITHDIR%%/templates/search/event_footers.inc
+%%KRONOLITHDIR%%/templates/search/event_headers.inc
+%%KRONOLITHDIR%%/templates/search/event_summaries.inc
+%%KRONOLITHDIR%%/templates/search/header.inc
+%%KRONOLITHDIR%%/templates/search/search.inc
+%%KRONOLITHDIR%%/templates/search/search_advanced.inc
 %%KRONOLITHDIR%%/templates/view/view.inc
 %%KRONOLITHDIR%%/templates/week/head.inc
-%%KRONOLITHDIR%%/util/colorpicker.php
+%%KRONOLITHDIR%%/templates/week/head_side_by_side.inc
+%%KRONOLITHDIR%%/themes/bluewhite/screen.css
+%%KRONOLITHDIR%%/themes/graphics/alarm_small.png
+%%KRONOLITHDIR%%/themes/graphics/attendees.png
+%%KRONOLITHDIR%%/themes/graphics/calendars.png
+%%KRONOLITHDIR%%/themes/graphics/dayview.png
+%%KRONOLITHDIR%%/themes/graphics/goto.png
+%%KRONOLITHDIR%%/themes/graphics/kronolith.png
+%%KRONOLITHDIR%%/themes/graphics/monthview.png
+%%KRONOLITHDIR%%/themes/graphics/new.png
+%%KRONOLITHDIR%%/themes/graphics/new_small.png
+%%KRONOLITHDIR%%/themes/graphics/recur.png
+%%KRONOLITHDIR%%/themes/graphics/today.png
+%%KRONOLITHDIR%%/themes/graphics/unknown-background.png
+%%KRONOLITHDIR%%/themes/graphics/weekview.png
+%%KRONOLITHDIR%%/themes/graphics/workweekview.png
+%%KRONOLITHDIR%%/themes/screen.css
+%%KRONOLITHDIR%%/themes/mozilla/screen.css
+%%KRONOLITHDIR%%/themes/print/screen.css
+%%KRONOLITHDIR%%/themes/simplex/screen.css
 %%KRONOLITHDIR%%/viewevent.php
 %%KRONOLITHDIR%%/week.php
 %%KRONOLITHDIR%%/workweek.php
-@dirrm %%KRONOLITHDIR%%/config
-@dirrm %%KRONOLITHDIR%%/graphics
-@dirrm %%KRONOLITHDIR%%/lib/Driver
-@dirrm %%KRONOLITHDIR%%/lib/Notification
-@dirrm %%KRONOLITHDIR%%/lib
-@dirrm %%KRONOLITHDIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/ar_SY
-@dirrm %%KRONOLITHDIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/bg_BG
-@dirrm %%KRONOLITHDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/cs_CZ
-@dirrm %%KRONOLITHDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/da_DK
-@dirrm %%KRONOLITHDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/de_DE
-@dirrm %%KRONOLITHDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/el_GR
-@dirrm %%KRONOLITHDIR%%/locale/en_US
-@dirrm %%KRONOLITHDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/es_ES
-@dirrm %%KRONOLITHDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/fi_FI
-@dirrm %%KRONOLITHDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/fr_FR
-@dirrm %%KRONOLITHDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/hu_HU
-@dirrm %%KRONOLITHDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/it_IT
-@dirrm %%KRONOLITHDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/ko_KR
-@dirrm %%KRONOLITHDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/lt_LT
-@dirrm %%KRONOLITHDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/nb_NO
-@dirrm %%KRONOLITHDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/nl_NL
-@dirrm %%KRONOLITHDIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/nn_NO
-@dirrm %%KRONOLITHDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/pl_PL
-@dirrm %%KRONOLITHDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/pt_BR
-@dirrm %%KRONOLITHDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/ro_RO
-@dirrm %%KRONOLITHDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/ru_RU
-@dirrm %%KRONOLITHDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/ru_RU.KOI8-R
-@dirrm %%KRONOLITHDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/sk_SK
-@dirrm %%KRONOLITHDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/sv_SE
-@dirrm %%KRONOLITHDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/zh_CN
+etc/horde/httpd.conf.kronolith
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%KRONOLITHDIR%%/themes/simplex
+@dirrm %%KRONOLITHDIR%%/themes/print
+@dirrm %%KRONOLITHDIR%%/themes/mozilla
+@dirrm %%KRONOLITHDIR%%/themes/graphics
+@dirrm %%KRONOLITHDIR%%/themes/bluewhite
+@dirrm %%KRONOLITHDIR%%/themes
+@dirrm %%KRONOLITHDIR%%/templates/week
+@dirrm %%KRONOLITHDIR%%/templates/view
+@dirrm %%KRONOLITHDIR%%/templates/search
+@dirrm %%KRONOLITHDIR%%/templates/prefs
+@dirrm %%KRONOLITHDIR%%/templates/month
+@dirrm %%KRONOLITHDIR%%/templates/javascript
+@dirrm %%KRONOLITHDIR%%/templates/fbview
+@dirrm %%KRONOLITHDIR%%/templates/edit
+@dirrm %%KRONOLITHDIR%%/templates/delete
+@dirrm %%KRONOLITHDIR%%/templates/day
+@dirrm %%KRONOLITHDIR%%/templates/data
+@dirrm %%KRONOLITHDIR%%/templates/contacts
+@dirrm %%KRONOLITHDIR%%/templates/calendars
+@dirrm %%KRONOLITHDIR%%/templates/attendees
+@dirrm %%KRONOLITHDIR%%/templates
+@dirrm %%KRONOLITHDIR%%/scripts/upgrades
+@dirrm %%KRONOLITHDIR%%/scripts/sql
+@dirrm %%KRONOLITHDIR%%/scripts
+@dirrm %%KRONOLITHDIR%%/po
 @dirrm %%KRONOLITHDIR%%/locale/zh_TW/LC_MESSAGES
 @dirrm %%KRONOLITHDIR%%/locale/zh_TW
+@dirrm %%KRONOLITHDIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/zh_CN
+@dirrm %%KRONOLITHDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/sv_SE
+@dirrm %%KRONOLITHDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/sk_SK
+@dirrm %%KRONOLITHDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/ru_RU
+@dirrm %%KRONOLITHDIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/ro_RO
+@dirrm %%KRONOLITHDIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/pt_BR
+@dirrm %%KRONOLITHDIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/pl_PL
+@dirrm %%KRONOLITHDIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/nn_NO
+@dirrm %%KRONOLITHDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/nl_NL
+@dirrm %%KRONOLITHDIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/nb_NO
+@dirrm %%KRONOLITHDIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/lv_LV
+@dirrm %%KRONOLITHDIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/lt_LT
+@dirrm %%KRONOLITHDIR%%/locale/ko_KR/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/ko_KR
+@dirrm %%KRONOLITHDIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/it_IT
+@dirrm %%KRONOLITHDIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/hu_HU
+@dirrm %%KRONOLITHDIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/fr_FR
+@dirrm %%KRONOLITHDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/fi_FI
+@dirrm %%KRONOLITHDIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/es_ES
+@dirrm %%KRONOLITHDIR%%/locale/en_US
+@dirrm %%KRONOLITHDIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/el_GR
+@dirrm %%KRONOLITHDIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/de_DE
+@dirrm %%KRONOLITHDIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/da_DK
+@dirrm %%KRONOLITHDIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/cs_CZ
+@dirrm %%KRONOLITHDIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/bg_BG
+@dirrm %%KRONOLITHDIR%%/locale/ar_SY/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/ar_SY
 @dirrm %%KRONOLITHDIR%%/locale
-@dirrm %%KRONOLITHDIR%%/po
-@dirrm %%KRONOLITHDIR%%/scripts/drivers
-@dirrm %%KRONOLITHDIR%%/scripts
-@dirrm %%KRONOLITHDIR%%/templates/data
-@dirrm %%KRONOLITHDIR%%/templates/day
-@dirrm %%KRONOLITHDIR%%/templates/delete
-@dirrm %%KRONOLITHDIR%%/templates/edit
-@dirrm %%KRONOLITHDIR%%/templates/index
-@dirrm %%KRONOLITHDIR%%/templates/javascript
-@dirrm %%KRONOLITHDIR%%/templates/menu
-@dirrm %%KRONOLITHDIR%%/templates/month
-@dirrm %%KRONOLITHDIR%%/templates/prefs
-@dirrm %%KRONOLITHDIR%%/templates/view
-@dirrm %%KRONOLITHDIR%%/templates/week
-@dirrm %%KRONOLITHDIR%%/templates
-@dirrm %%KRONOLITHDIR%%/util
-@dirrm %%KRONOLITHDIR%%
-etc/horde/httpd.conf.kronolith
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterKronolith; then rm -f %D/www/horde/config/registry.php.afterKronolith; mv %D/www/horde/config/registry.php.beforeKronolith %D/www/horde/config/registry.php; fi
+@dirrm %%KRONOLITHDIR%%/lib/Storage
+@dirrm %%KRONOLITHDIR%%/lib/Scheduler
+@dirrm %%KRONOLITHDIR%%/lib/FBView
+@dirrm %%KRONOLITHDIR%%/lib/Driver
+@dirrm %%KRONOLITHDIR%%/lib/Block
+@dirrm %%KRONOLITHDIR%%/lib
+@unexec rmdir %D/%%KRONOLITHDIR%%/config 2>/dev/null || true
+@unexec rmdir %D/%%KRONOLITHDIR%% 2>/dev/null || true