Upgrade to 2.1.

Changelog at
<http://cvs.horde.org/diff.php/kronolith/docs/CHANGES?r1=1.165.2.69.2.5&r2=1.165.2.102&ty=h>

5 files changed, 45 insertions, 83 deletions

diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index 32bae023c962..e48bf61d91d0 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kronolith
-PORTVERSION=	2.0.6
+PORTVERSION=	2.1
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/kronolith/				\
 		ftp://ftp.planetmirror.com/pub/horde/kronolith/			\
@@ -22,25 +22,18 @@ DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Kronolith is the Horde calendar application
 
-#----------------------------------------------------------------------------
-# You may define this option:
-#
-# - WITH_MCAL:	you want to use the MCAL driver (deprecated, and only for PHP4).
-#
-#----------------------------------------------------------------------------
-
 RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
 USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 USE_PHP=	yes	# modules set by Horde, but needed to get PHP_VER
-USE_REINPLACE=	yes
+USE_GETTEXT=	yes
 
 REINPLACE_ARGS=	-i ""
-DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
+DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES docs/TODO docs/UPGRADING
 CONFFILE=	keywords.php menu.php prefs.php
-SUB_DIRS=	config lib locale po scripts templates themes
+SUB_DIRS=	config js lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
 LKRONOLITHDIR?=	${LHORDEDIR}/kronolith
@@ -53,7 +46,6 @@ PLIST_SUB=	KRONOLITHDIR=${LKRONOLITHDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/|
 
 KRONOLITHDIR=	${PREFIX}/${LKRONOLITHDIR}
 CONFDIR=	${KRONOLITHDIR}/config
-VAR_CAL=	/var/calendar
 
 .include <bsd.port.pre.mk>
 
@@ -63,14 +55,10 @@ HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
 HORDE_INC=	${LOCALBASE}/etc/horde
 .endif
 
-.if exists(${LOCALBASE}/sbin/htpasswd)
-HTPASSWD=	${LOCALBASE}/sbin/htpasswd
-.else
-HTPASSWD=	${LOCALBASE}/bin/htpasswd
-.endif
-
 pre-configure:
-	@${RM} ${WRKSRC}/config/conf.xml.orig
+	@(cd ${WRKSRC}/scripts &&	\
+		${FIND} . -name "*.php" -exec	\
+		${REINPLACE_CMD} -e "s:/usr/local/bin/php: ${LOCALBASE}/bin/php:;s:/usr/bin/php: ${LOCALBASE}/bin/php:" {} \; )
 	@${SED} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:"	\
 		${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd-kronolith.conf
 
@@ -97,30 +85,6 @@ do-install:
 .endif
 
 post-install:
-.if defined(WITH_MCAL) && (${PHP_VER} == 4)
-	@if [ ! -d ${VAR_CAL} ]; then \
-	  ${ECHO_MSG} "===> Creating ${VAR_CAL}" ; \
-	  ${MKDIR} ${VAR_CAL} ; \
-	  ${CHMOD} 1777 ${VAR_CAL} ; \
-	fi
-. if !defined(BATCH)
-	@if [ ! -f ${LOCALBASE}/etc/mpasswd ] ; then \
-	  ${ECHO_MSG} "===> Creating ${LOCALBASE}/etc/mpasswd" ; \
-	  ${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.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.xml) \
-	else \
-	   ${REINPLACE_CMD} -e "s:%%PASSCAL%%:www_cal_password:" ${CONFDIR}/conf.xml ; \
-	fi
-. endif
-.endif
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/deskutils/horde-kronolith/distinfo b/deskutils/horde-kronolith/distinfo
index ddc40d2de9b9..9d75f2593f1d 100644
--- a/deskutils/horde-kronolith/distinfo
+++ b/deskutils/horde-kronolith/distinfo
@@ -1,3 +1,3 @@
-MD5 (kronolith-h3-2.0.6.tar.gz) = c0c6bad037911ef689bc4f4da5be0047
-SHA256 (kronolith-h3-2.0.6.tar.gz) = d1d6699f398d57dbcca3690194ca9b4e0afdb52cfb81a75fc0cf642299206d0d
-SIZE (kronolith-h3-2.0.6.tar.gz) = 1300965
+MD5 (kronolith-h3-2.1.tar.gz) = 6e9941c86644203aa61df52cf7185f83
+SHA256 (kronolith-h3-2.1.tar.gz) = d5a9092a86a9246abfe05ca9068828a145ce263cd994d7ef99d14b58e9d50b51
+SIZE (kronolith-h3-2.1.tar.gz) = 1411290
diff --git a/deskutils/horde-kronolith/files/patch-config::conf.xml b/deskutils/horde-kronolith/files/patch-config::conf.xml
deleted file mode 100644
index 1a5c0106a654..000000000000
--- a/deskutils/horde-kronolith/files/patch-config::conf.xml
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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/horde-kronolith/files/pkg-message.in b/deskutils/horde-kronolith/files/pkg-message.in
index 54946bd7d451..540684cc4d22 100644
--- a/deskutils/horde-kronolith/files/pkg-message.in
+++ b/deskutils/horde-kronolith/files/pkg-message.in
@@ -4,24 +4,11 @@ blank configuration files.
 
 Horde must be configured; if not, see `pkg_info -D -x horde'.
 
-With PHP4:
-If you choosed the mcal backend, libmcal must be configured with the driver
-mstore for the user www:
+Then you have to create some tables from the SQL scripts in
+%%KRONOLITHDIR%%/scripts/sql.
 
-- 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.
-         Please note that the MCAL back-end is deprecated!
+WARNING! Please note that the MCAL back-end has been deprecated!
+********
          To migrate from MCAL to SQL, you can use the provided script
          %%KRONOLITHDIR%%/scripts/migrate_to_sql_driver.php
 
diff --git a/deskutils/horde-kronolith/pkg-plist b/deskutils/horde-kronolith/pkg-plist
index 327cb9d73a0e..86e9d88a32d9 100644
--- a/deskutils/horde-kronolith/pkg-plist
+++ b/deskutils/horde-kronolith/pkg-plist
@@ -1,5 +1,4 @@
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -8,7 +7,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%KRONOLITHDIR%%/addevent.php
 %%KRONOLITHDIR%%/addeventaction.php
+%%KRONOLITHDIR%%/attend.php
 %%KRONOLITHDIR%%/attendees.php
+%%KRONOLITHDIR%%/calendar_search.php
 %%KRONOLITHDIR%%/calendars.php
 %%KRONOLITHDIR%%/config/.htaccess
 %%KRONOLITHDIR%%/config/conf.xml
@@ -26,18 +27,21 @@
 %%KRONOLITHDIR%%/editevent.php
 %%KRONOLITHDIR%%/editeventaction.php
 %%KRONOLITHDIR%%/fb.php
+%%KRONOLITHDIR%%/ics.php
 %%KRONOLITHDIR%%/index.php
+%%KRONOLITHDIR%%/js/fixUnstyledOptions.js
+%%KRONOLITHDIR%%/js/stripe.js
 %%KRONOLITHDIR%%/lib/Block/month.php
 %%KRONOLITHDIR%%/lib/Block/monthlist.php
 %%KRONOLITHDIR%%/lib/Block/prevmonthlist.php
 %%KRONOLITHDIR%%/lib/Block/summary.php
+%%KRONOLITHDIR%%/lib/Block/tree_alarms.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/FBView.php
 %%KRONOLITHDIR%%/lib/FBView/day.php
@@ -79,10 +83,12 @@
 %%KRONOLITHDIR%%/locale/pl_PL/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/pt_BR/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/pt_BR/help.xml
+%%KRONOLITHDIR%%/locale/pt_PT/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/ro_RO/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/ru_RU/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/sk_SK/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/sv_SE/LC_MESSAGES/kronolith.mo
+%%KRONOLITHDIR%%/locale/tr_TR/help.xml
 %%KRONOLITHDIR%%/locale/zh_CN/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/zh_TW/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/month.php
@@ -108,6 +114,7 @@
 %%KRONOLITHDIR%%/po/nn_NO.po
 %%KRONOLITHDIR%%/po/pl_PL.po
 %%KRONOLITHDIR%%/po/pt_BR.po
+%%KRONOLITHDIR%%/po/pt_PT.po
 %%KRONOLITHDIR%%/po/ro_RO.po
 %%KRONOLITHDIR%%/po/ru_RU.po
 %%KRONOLITHDIR%%/po/sk_SK.po
@@ -115,8 +122,10 @@
 %%KRONOLITHDIR%%/po/zh_CN.po
 %%KRONOLITHDIR%%/po/zh_TW.po
 %%KRONOLITHDIR%%/scripts/.htaccess
+%%KRONOLITHDIR%%/scripts/import_icals.php
 %%KRONOLITHDIR%%/scripts/migrate_to_sql_driver.php
 %%KRONOLITHDIR%%/scripts/reminders.php
+%%KRONOLITHDIR%%/scripts/sql/kronolith.mssql.sql
 %%KRONOLITHDIR%%/scripts/sql/kronolith.mysql.sql
 %%KRONOLITHDIR%%/scripts/sql/kronolith.oci8.sql
 %%KRONOLITHDIR%%/scripts/sql/kronolith.pgsql.sql
@@ -129,35 +138,38 @@
 %%KRONOLITHDIR%%/search.php
 %%KRONOLITHDIR%%/templates/attendees/attendees.inc
 %%KRONOLITHDIR%%/templates/calendars/calendars.inc
+%%KRONOLITHDIR%%/templates/calendars/search.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/day/rows.html
 %%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/fbview/busyblock.tpl
+%%KRONOLITHDIR%%/templates/fbview/emptyblock.tpl
 %%KRONOLITHDIR%%/templates/fbview/header.tpl
-%%KRONOLITHDIR%%/templates/fbview/legend.inc
-%%KRONOLITHDIR%%/templates/fbview/linesblock.tpl
+%%KRONOLITHDIR%%/templates/fbview/legend.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_attendees_win.js
+%%KRONOLITHDIR%%/templates/javascript/open_calendar_search.js
 %%KRONOLITHDIR%%/templates/menu.inc
 %%KRONOLITHDIR%%/templates/month/head.inc
 %%KRONOLITHDIR%%/templates/month/head_side_by_side.inc
+%%KRONOLITHDIR%%/templates/prefs/fb_cals_select.inc
 %%KRONOLITHDIR%%/templates/prefs/remote_cal_management.inc
 %%KRONOLITHDIR%%/templates/prefs/search_abook_select.inc
 %%KRONOLITHDIR%%/templates/prefs/shareselect.inc
@@ -171,30 +183,38 @@
 %%KRONOLITHDIR%%/templates/view/view.inc
 %%KRONOLITHDIR%%/templates/week/head.inc
 %%KRONOLITHDIR%%/templates/week/head_side_by_side.inc
+%%KRONOLITHDIR%%/templates/year/head.inc
 %%KRONOLITHDIR%%/themes/bluewhite/screen.css
 %%KRONOLITHDIR%%/themes/burntorange/screen.css
+%%KRONOLITHDIR%%/themes/categoryCSS.php
+%%KRONOLITHDIR%%/themes/graphics/addressbook_browse.png
+%%KRONOLITHDIR%%/themes/graphics/alarm.png
 %%KRONOLITHDIR%%/themes/graphics/alarm_small.png
 %%KRONOLITHDIR%%/themes/graphics/attendees.png
 %%KRONOLITHDIR%%/themes/graphics/calendars.png
 %%KRONOLITHDIR%%/themes/graphics/dayview.png
+%%KRONOLITHDIR%%/themes/graphics/expand.png
 %%KRONOLITHDIR%%/themes/graphics/favicon.ico
 %%KRONOLITHDIR%%/themes/graphics/goto.png
 %%KRONOLITHDIR%%/themes/graphics/kronolith.png
 %%KRONOLITHDIR%%/themes/graphics/monthview.png
 %%KRONOLITHDIR%%/themes/graphics/new.png
+%%KRONOLITHDIR%%/themes/graphics/new_big.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/graphics/yearview.png
 %%KRONOLITHDIR%%/themes/mozilla/screen.css
 %%KRONOLITHDIR%%/themes/print/screen.css
+%%KRONOLITHDIR%%/themes/screen.css
 %%KRONOLITHDIR%%/themes/simplex/screen.css
 %%KRONOLITHDIR%%/viewevent.php
 %%KRONOLITHDIR%%/week.php
 %%KRONOLITHDIR%%/workweek.php
+%%KRONOLITHDIR%%/year.php
 %%HORDE_INC%%/httpd-kronolith.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%KRONOLITHDIR%%/themes/simplex
@@ -204,6 +224,7 @@
 @dirrm %%KRONOLITHDIR%%/themes/burntorange
 @dirrm %%KRONOLITHDIR%%/themes/bluewhite
 @dirrm %%KRONOLITHDIR%%/themes
+@dirrm %%KRONOLITHDIR%%/templates/year
 @dirrm %%KRONOLITHDIR%%/templates/week
 @dirrm %%KRONOLITHDIR%%/templates/view
 @dirrm %%KRONOLITHDIR%%/templates/search
@@ -228,6 +249,7 @@
 @dirrm %%KRONOLITHDIR%%/locale/zh_CN/LC_MESSAGES
 @dirrm %%KRONOLITHDIR%%/locale/zh_CN
 @dirrm %%KRONOLITHDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/tr_TR
 @dirrm %%KRONOLITHDIR%%/locale/sv_SE
 @dirrm %%KRONOLITHDIR%%/locale/sk_SK/LC_MESSAGES
 @dirrm %%KRONOLITHDIR%%/locale/sk_SK
@@ -235,6 +257,8 @@
 @dirrm %%KRONOLITHDIR%%/locale/ru_RU
 @dirrm %%KRONOLITHDIR%%/locale/ro_RO/LC_MESSAGES
 @dirrm %%KRONOLITHDIR%%/locale/ro_RO
+@dirrm %%KRONOLITHDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%KRONOLITHDIR%%/locale/pt_PT
 @dirrm %%KRONOLITHDIR%%/locale/pt_BR/LC_MESSAGES
 @dirrm %%KRONOLITHDIR%%/locale/pt_BR
 @dirrm %%KRONOLITHDIR%%/locale/pl_PL/LC_MESSAGES
@@ -283,5 +307,6 @@
 @dirrm %%KRONOLITHDIR%%/lib/Driver
 @dirrm %%KRONOLITHDIR%%/lib/Block
 @dirrm %%KRONOLITHDIR%%/lib
+@dirrm %%KRONOLITHDIR%%/js
 @dirrmtry %%KRONOLITHDIR%%/config
 @dirrmtry %%KRONOLITHDIR%%