4 files changed, 55 insertions, 35 deletions

diff --git a/deskutils/kronolith/Makefile b/deskutils/kronolith/Makefile
index 6603381949f4..ad44afd0a1cf 100644
--- a/deskutils/kronolith/Makefile
+++ b/deskutils/kronolith/Makefile
@@ -6,20 +6,23 @@
 #
 
 PORTNAME=	kronolith
-PORTVERSION=	0.0.3.011209
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	deskutils www
-MASTER_SITES=	http://pompo.net/horde/kronolith/
+MASTER_SITES=	ftp://ftp.horde.org/pub/kronolith/tarballs/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-RC1
 
 MAINTAINER=	thierry@pompo.net
 
 RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 IS_INTERACTIVE=	'need to build mod_php4 with mcrypt option set.'
 NO_BUILD=	yes
 
-DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
+DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL docs/TODO
 CONFFILE=	conf.php html.php keywords.php menu.php prefs.php
+SUB_DIRS=	config graphics lib locale po scripts templates
 
 LHORDEDIR?=	www/horde
 LKRONOLITHDIR?=	${LHORDEDIR}/kronolith
@@ -43,11 +46,11 @@ pre-install:
 
 do-install:
 	@${MKDIR}  ${KRONOLITHDIR}
-	@${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${KRONOLITHDIR}
-	@${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/po ${WRKSRC}/templates ${KRONOLITHDIR}
+.for REP in ${SUB_DIRS}
+	@${CP} -Rp ${WRKSRC}/${REP} ${KRONOLITHDIR}
+.endfor
 	@${CP} -p  ${WRKSRC}/*.php ${KRONOLITHDIR}
 	@${MKDIR} ${KRONOLITHDIR}/scripts
-	@${CP} -p  ${WRKSRC}/docs/kronolith.sql ${KRONOLITHDIR}/scripts
 .for FILE in ${CONFFILE}
 	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
 	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
diff --git a/deskutils/kronolith/distinfo b/deskutils/kronolith/distinfo
index ebbb973b836d..262a8f0255a1 100644
--- a/deskutils/kronolith/distinfo
+++ b/deskutils/kronolith/distinfo
@@ -1 +1 @@
-MD5 (kronolith-0.0.3.011209.tar.gz) = a5fed26d6011c226fce9feaa75809f94
+MD5 (kronolith-1.0-RC1.tar.gz) = 81969bd97b089d87df591cca734867b7
diff --git a/deskutils/kronolith/files/patch-aa b/deskutils/kronolith/files/patch-aa
index b1fd780ad002..f726fc9117b3 100644
--- a/deskutils/kronolith/files/patch-aa
+++ b/deskutils/kronolith/files/patch-aa
@@ -1,15 +1,15 @@
---- config/conf.php.dist.orig	Fri Sep 28 23:36:52 2001
-+++ config/conf.php.dist	Sun Dec  9 22:46:55 2001
-@@ -29,10 +29,10 @@
+--- config/conf.php.dist.orig	Tue Feb 19 19:00:40 2002
++++ config/conf.php.dist	Fri May 10 18:20:09 2002
+@@ -28,9 +28,9 @@
+ $conf['calendar']['params']['driver'] = 'mstore';
  
- // The mstore driver requires a username that is in /etc/mpasswd in
- // order to access local calendars.
+ // 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']['username'] = 'www';
- 
- // This is the password of the user defined above.
 -$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';
diff --git a/deskutils/kronolith/pkg-plist b/deskutils/kronolith/pkg-plist
index 2227cd89a78f..f8a3cbd941c1 100644
--- a/deskutils/kronolith/pkg-plist
+++ b/deskutils/kronolith/pkg-plist
@@ -3,6 +3,7 @@
 %%PORTDOCS%%share/doc/kronolith/CREDITS
 %%PORTDOCS%%share/doc/kronolith/INSTALL
 %%PORTDOCS%%share/doc/kronolith/README
+%%PORTDOCS%%share/doc/kronolith/TODO
 %%KRONOLITHDIR%%/addevent.php
 %%KRONOLITHDIR%%/addeventaction.php
 %%KRONOLITHDIR%%/config/conf.php
@@ -19,6 +20,7 @@
 %%KRONOLITHDIR%%/data.php
 %%KRONOLITHDIR%%/day.php
 %%KRONOLITHDIR%%/delevent.php
+%%KRONOLITHDIR%%/deleventaction.php
 %%KRONOLITHDIR%%/editevent.php
 %%KRONOLITHDIR%%/editeventaction.php
 %%KRONOLITHDIR%%/graphics/alarm.gif
@@ -49,6 +51,7 @@
 %%KRONOLITHDIR%%/lib/Kronolith.php
 %%KRONOLITHDIR%%/lib/Month.php
 %%KRONOLITHDIR%%/lib/MonthView.php
+%%KRONOLITHDIR%%/lib/Notification/kronolith.php
 %%KRONOLITHDIR%%/lib/WeekView.php
 %%KRONOLITHDIR%%/lib/api.php
 %%KRONOLITHDIR%%/lib/base.php
@@ -57,14 +60,18 @@
 %%KRONOLITHDIR%%/locale/de_DE/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/el_GR/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/es_ES/LC_MESSAGES/kronolith.mo
+%%KRONOLITHDIR%%/locale/fi_FI/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/fr_FR/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/it_IT/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/nl_NL/LC_MESSAGES/kronolith.mo
+%%KRONOLITHDIR%%/locale/pl_PL/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/pt_BR/LC_MESSAGES/kronolith.mo
-%%KRONOLITHDIR%%/locale/ru_win/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_TW/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/menu.php
-%%KRONOLITHDIR%%/mini_month.php
 %%KRONOLITHDIR%%/month.php
 %%KRONOLITHDIR%%/po/Makefile
 %%KRONOLITHDIR%%/po/README
@@ -73,16 +80,21 @@
 %%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/it_IT.po
 %%KRONOLITHDIR%%/po/nl_NL.po
+%%KRONOLITHDIR%%/po/pl_PL.po
 %%KRONOLITHDIR%%/po/pt_BR.po
-%%KRONOLITHDIR%%/po/ru_win.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_TW.po
 %%KRONOLITHDIR%%/prefs.php
-%%KRONOLITHDIR%%/scripts/kronolith.sql
+%%KRONOLITHDIR%%/scripts/drivers/kronolith.sql
 %%KRONOLITHDIR%%/status.php
 %%KRONOLITHDIR%%/templates/common-footer.inc
 %%KRONOLITHDIR%%/templates/common-header.inc
@@ -93,13 +105,14 @@
 %%KRONOLITHDIR%%/templates/day/head.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/javascript.inc
 %%KRONOLITHDIR%%/templates/index/css.inc
 %%KRONOLITHDIR%%/templates/index/index.inc
 %%KRONOLITHDIR%%/templates/index/notconfigured.inc
-%%KRONOLITHDIR%%/templates/javascript/delete.inc
-%%KRONOLITHDIR%%/templates/menu/goto.inc
+%%KRONOLITHDIR%%/templates/javascript/goto.inc
 %%KRONOLITHDIR%%/templates/menu/menu.inc
 %%KRONOLITHDIR%%/templates/month/head.inc
 %%KRONOLITHDIR%%/templates/month_begin_week.inc
@@ -111,46 +124,50 @@
 %%KRONOLITHDIR%%/week.php
 %%KRONOLITHDIR%%/workweek.php
 @dirrm %%KRONOLITHDIR%%/config
-@dirrm %%KRONOLITHDIR%%/graphics/alerts
 @dirrm %%KRONOLITHDIR%%/graphics
 @dirrm %%KRONOLITHDIR%%/lib/Driver
-@dirrm %%KRONOLITHDIR%%/lib/scripts
+@dirrm %%KRONOLITHDIR%%/lib/Notification
 @dirrm %%KRONOLITHDIR%%/lib
 @dirrm %%KRONOLITHDIR%%/locale/cs_CZ/LC_MESSAGES
 @dirrm %%KRONOLITHDIR%%/locale/cs_CZ
-@dirrm %%KRONOLITHDIR%%/locale/de/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/de
 @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
 @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/it_IT/LC_MESSAGES
 @dirrm %%KRONOLITHDIR%%/locale/it_IT
-@dirrm %%KRONOLITHDIR%%/locale/local
-@dirrm %%KRONOLITHDIR%%/locale/nl/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/nl
 @dirrm %%KRONOLITHDIR%%/locale/nl_NL/LC_MESSAGES
 @dirrm %%KRONOLITHDIR%%/locale/nl_NL
+@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/ru_win/LC_MESSAGES
-@dirrm %%KRONOLITHDIR%%/locale/ru_win
+@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_TW/LC_MESSAGES
 @dirrm %%KRONOLITHDIR%%/locale/zh_TW
 @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/login
 @dirrm %%KRONOLITHDIR%%/templates/menu
 @dirrm %%KRONOLITHDIR%%/templates/month
 @dirrm %%KRONOLITHDIR%%/templates/week