4 files changed, 34 insertions, 21 deletions

diff --git a/deskutils/kronolith/Makefile b/deskutils/kronolith/Makefile
index 1f40b8fd4346..1d526af4d7f7 100644
--- a/deskutils/kronolith/Makefile
+++ b/deskutils/kronolith/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	kronolith
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	1.1.1
 CATEGORIES=	deskutils www
-MASTER_SITES=	ftp://ftp.horde.org/pub/kronolith/			\
-		ftp://ftp.au.horde.org/pub/horde/kronolith/		\
-		ftp://ftp.es.horde.org/pub/kronolith/			\
-		ftp://ftp.it.horde.org/pub/mirror/horde.org/kronolith/	\
-		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/kronolith/	\
-		ftp://ftp.pt.horde.org/pub/horde-ftp/kronolith/
+MASTER_SITES=	ftp://ftp.horde.org/pub/kronolith/				\
+		ftp://ftp.planetmirror.com/pub/horde/kronolith/			\
+		ftp://ftp.au.horde.org/pub/horde/kronolith/			\
+		ftp://ftp.be.horde.org/kronolith/				\
+		ftp://ftp.es.horde.org/pub/kronolith/				\
+		ftp://ftp.it.horde.org/pub/mirror/horde.org/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/
 
 MAINTAINER=	thierry@pompo.net
 COMMENT=	Kronolith is the Horde calendar application
@@ -33,7 +35,8 @@ HTPASSWD=	${LOCALBASE}/bin/htpasswd
 .endif
 
 REINPLACE_ARGS=	-i.beforeKronolith
-DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
+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
 
@@ -49,6 +52,9 @@ VAR_CAL=	/var/calendar
 
 HORDE_INC=	${LOCALBASE}/etc/horde
 
+post-patch:
+	@${RM} ${WRKSRC}/config/conf.php.dist.orig
+
 pre-install:
 	@if ! ${LDCONFIG} -r | ${GREP} -q -e "mcal.0" ; then \
 	  ${ECHO_MSG} "" ; \
@@ -112,8 +118,8 @@ post-install:
 	@${RM} ${CONFDIR}/conf.php.beforeKronolith
 .endif
 	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE} | \
-	${SED} -e "s:%%KRONOLITHDIR%%:${KRONOLITHDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%LOCALBASE%%:${LOCALBASE}:"
+	@${SED} -e "s:%%KRONOLITHDIR%%:${KRONOLITHDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g"	\
+		-e "s:%%CONFDIR%%:${CONFDIR}:g;s:%%LOCALBASE%%:${LOCALBASE}:" ${PKGMESSAGE}
 	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/deskutils/kronolith/distinfo b/deskutils/kronolith/distinfo
index 50fbc879cae2..de09127ed2b1 100644
--- a/deskutils/kronolith/distinfo
+++ b/deskutils/kronolith/distinfo
@@ -1 +1,2 @@
-MD5 (kronolith-1.1.tar.gz) = a4081e8fdf241dca2fe6707e9ce77850
+MD5 (kronolith-1.1.1.tar.gz) = 986960e0d4ba6ddfb8fed072887b9daf
+SIZE (kronolith-1.1.1.tar.gz) = 505946
diff --git a/deskutils/kronolith/pkg-message b/deskutils/kronolith/pkg-message
index 6d5aedb7aabd..1f3a6212b696 100644
--- a/deskutils/kronolith/pkg-message
+++ b/deskutils/kronolith/pkg-message
@@ -1,6 +1,6 @@
 ************************************************************************
-Kronolith has been installed in %%KRONOLITHDIR%% with your blank
-configuration files.
+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
diff --git a/deskutils/kronolith/pkg-plist b/deskutils/kronolith/pkg-plist
index 6021281d7c25..aa3ec94e4a47 100644
--- a/deskutils/kronolith/pkg-plist
+++ b/deskutils/kronolith/pkg-plist
@@ -1,13 +1,14 @@
-%%PORTDOCS%%share/doc/kronolith/CHANGES
-%%PORTDOCS%%share/doc/kronolith/COPYING
-%%PORTDOCS%%share/doc/kronolith/CREDITS
-%%PORTDOCS%%share/doc/kronolith/INSTALL
-%%PORTDOCS%%share/doc/kronolith/README
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%KRONOLITHDIR%%/addevent.php
 %%KRONOLITHDIR%%/addeventaction.php
+%%KRONOLITHDIR%%/config/.htaccess
 %%KRONOLITHDIR%%/config/conf.php
 %%KRONOLITHDIR%%/config/conf.php.dist
-%%KRONOLITHDIR%%/config/conf.php.dist.orig
 %%KRONOLITHDIR%%/config/html.php
 %%KRONOLITHDIR%%/config/html.php.dist
 %%KRONOLITHDIR%%/config/keywords.php
@@ -55,6 +56,7 @@
 %%KRONOLITHDIR%%/lib/api.php
 %%KRONOLITHDIR%%/lib/base.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
@@ -66,6 +68,7 @@
 %%KRONOLITHDIR%%/locale/fi_FI/help.xml
 %%KRONOLITHDIR%%/locale/fr_FR/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/hu_HU/LC_MESSAGES/kronolith.mo
+%%KRONOLITHDIR%%/locale/hu_HU/help.xml
 %%KRONOLITHDIR%%/locale/it_IT/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/ko_KR/LC_MESSAGES/kronolith.mo
 %%KRONOLITHDIR%%/locale/lt_LT/LC_MESSAGES/kronolith.mo
@@ -85,6 +88,7 @@
 %%KRONOLITHDIR%%/month.php
 %%KRONOLITHDIR%%/po/Makefile
 %%KRONOLITHDIR%%/po/README
+%%KRONOLITHDIR%%/po/ar_SY.po
 %%KRONOLITHDIR%%/po/bg_BG.po
 %%KRONOLITHDIR%%/po/cs_CZ.po
 %%KRONOLITHDIR%%/po/da_DK.po
@@ -149,6 +153,8 @@
 @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
@@ -217,5 +223,5 @@
 @dirrm %%KRONOLITHDIR%%/util
 @dirrm %%KRONOLITHDIR%%
 etc/horde/httpd.conf.kronolith
-%%PORTDOCS%%@dirrm share/doc/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