Upgrading to Chora 1.2.1.

The full list of changes (from version 1.2) can be viewed here:
<http://cvs.horde.org/diff.php/chora/docs/CHANGES?r1=1.45.2.22&r2=1.45.2.31&ty=h>.

Approved by:	mat (mentor).

3 files changed, 34 insertions, 16 deletions

diff --git a/devel/chora/Makefile b/devel/chora/Makefile
index 5fb9f9208975..43bdb5a74413 100644
--- a/devel/chora/Makefile
+++ b/devel/chora/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	chora
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	devel www
 MASTER_SITES=	ftp://ftp.horde.org/pub/chora/				\
+		ftp://ftp.planetmirror.com/pub/horde/chora/		\
 		ftp://ftp.au.horde.org/pub/horde/chora/			\
+		ftp://ftp.be.horde.org/chora/				\
 		ftp://ftp.es.horde.org/pub/chora/			\
 		ftp://ftp.it.horde.org/pub/mirror/horde.org/chora/	\
 		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/chora/	\
-		ftp://ftp.pt.horde.org/pub/horde-ftp/chora/
+		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/chora/	\
+		http://ftp.horde.org/pub/chora/
 
 MAINTAINER=	thierry@pompo.net
 COMMENT=	The Horde CVS web-viewer
@@ -50,7 +52,7 @@ CVSROOT=	/home/cvs
 .endif
 
 DOCS=		COPYING README  docs/BUGS docs/CHANGES docs/CREDITS \
-		docs/GOALS docs/INSTALL
+		docs/GOALS docs/INSTALL docs/RELEASE_NOTES
 CONFFILE=	conf.php cvsroots.php html.php longIntro.txt \
 		mime_drivers.php prefs.php
 SUB_DIRS=	config graphics lib locale po templates
@@ -66,6 +68,9 @@ CONFDIR=	${CHORADIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
 
+post-patch:
+	@${RM} ${WRKSRC}/config/cvsroots.php.dist.orig
+
 do-install:
 	@${MKDIR}  ${CHORADIR}
 .for REP in ${SUB_DIRS}
@@ -106,8 +111,8 @@ do-install:
 
 post-install:
 	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE} | \
-	${SED} -e "s:%%CHORADIR%%:${CHORADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g"
+	@${SED} -e "s:%%CHORADIR%%:${CHORADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g"	\
+		-e "s:%%CONFDIR%%:${CONFDIR}:g" ${PKGMESSAGE}
 	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/devel/chora/distinfo b/devel/chora/distinfo
index 0ae3903a9fd9..b6f78f368842 100644
--- a/devel/chora/distinfo
+++ b/devel/chora/distinfo
@@ -1 +1,2 @@
-MD5 (chora-1.2.tar.gz) = 27438aa6319c408d93c52e1b25536f95
+MD5 (chora-1.2.1.tar.gz) = c74f9102e383ee4b72835eacb3c38790
+SIZE (chora-1.2.1.tar.gz) = 196305
diff --git a/devel/chora/pkg-plist b/devel/chora/pkg-plist
index 0b89e2318b32..173e9399000d 100644
--- a/devel/chora/pkg-plist
+++ b/devel/chora/pkg-plist
@@ -1,10 +1,11 @@
-%%PORTDOCS%%share/doc/chora/BUGS
-%%PORTDOCS%%share/doc/chora/CHANGES
-%%PORTDOCS%%share/doc/chora/COPYING
-%%PORTDOCS%%share/doc/chora/CREDITS
-%%PORTDOCS%%share/doc/chora/GOALS
-%%PORTDOCS%%share/doc/chora/INSTALL
-%%PORTDOCS%%share/doc/chora/README
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/GOALS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%CHORADIR%%/annotate.php
 %%CHORADIR%%/co.php
 %%CHORADIR%%/config/.htaccess
@@ -13,7 +14,6 @@
 %%CHORADIR%%/config/conf.php.dist
 %%CHORADIR%%/config/cvsroots.php
 %%CHORADIR%%/config/cvsroots.php.dist
-%%CHORADIR%%/config/cvsroots.php.dist.orig
 %%CHORADIR%%/config/html.php
 %%CHORADIR%%/config/html.php.dist
 %%CHORADIR%%/config/longIntro.txt
@@ -60,7 +60,10 @@
 %%CHORADIR%%/locale/nl_NL/LC_MESSAGES/chora.mo
 %%CHORADIR%%/locale/pl_PL/LC_MESSAGES/chora.mo
 %%CHORADIR%%/locale/pt_BR/LC_MESSAGES/chora.mo
+%%CHORADIR%%/locale/ro_RO/LC_MESSAGES/chora.mo
 %%CHORADIR%%/locale/sv_SE/LC_MESSAGES/chora.mo
+%%CHORADIR%%/locale/zh_CN/LC_MESSAGES/chora.mo
+%%CHORADIR%%/locale/zh_TW/LC_MESSAGES/chora.mo
 %%CHORADIR%%/menu.php
 %%CHORADIR%%/po/.htaccess
 %%CHORADIR%%/po/Makefile
@@ -76,8 +79,11 @@
 %%CHORADIR%%/po/nl_NL.po
 %%CHORADIR%%/po/pl_PL.po
 %%CHORADIR%%/po/pt_BR.po
+%%CHORADIR%%/po/ro_RO.po
 %%CHORADIR%%/po/shtool
 %%CHORADIR%%/po/sv_SE.po
+%%CHORADIR%%/po/zh_CN.po
+%%CHORADIR%%/po/zh_TW.po
 %%CHORADIR%%/po/xgettext.sh
 %%CHORADIR%%/prefs.php
 %%CHORADIR%%/status.php
@@ -118,7 +124,7 @@
 %%CHORADIR%%/templates/log/rev.inc
 %%CHORADIR%%/templates/menu/menu.inc
 etc/horde/httpd.conf.chora
-%%PORTDOCS%%@dirrm share/doc/chora
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%CHORADIR%%/config
 @dirrm %%CHORADIR%%/graphics/mime
 @dirrm %%CHORADIR%%/graphics
@@ -145,8 +151,14 @@ etc/horde/httpd.conf.chora
 @dirrm %%CHORADIR%%/locale/pl_PL
 @dirrm %%CHORADIR%%/locale/pt_BR/LC_MESSAGES
 @dirrm %%CHORADIR%%/locale/pt_BR
+@dirrm %%CHORADIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%CHORADIR%%/locale/ro_RO
 @dirrm %%CHORADIR%%/locale/sv_SE/LC_MESSAGES
 @dirrm %%CHORADIR%%/locale/sv_SE
+@dirrm %%CHORADIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%CHORADIR%%/locale/zh_CN
+@dirrm %%CHORADIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%CHORADIR%%/locale/zh_TW
 @dirrm %%CHORADIR%%/locale
 @dirrm %%CHORADIR%%/po
 @dirrm %%CHORADIR%%/templates/annotate