3 files changed, 31 insertions, 14 deletions

diff --git a/deskutils/horde4-mnemo/Makefile b/deskutils/horde4-mnemo/Makefile
index 2fc47c5708ef..9d2a8fd2382d 100644
--- a/deskutils/horde4-mnemo/Makefile
+++ b/deskutils/horde4-mnemo/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	mnemo
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/mnemo/				\
+		ftp://ftp.planetmirror.com/pub/horde/mnemo/		\
 		ftp://ftp.au.horde.org/pub/horde/mnemo/			\
+		ftp://ftp.be.horde.org/mnemo/				\
 		ftp://ftp.es.horde.org/pub/mnemo/			\
 		ftp://ftp.it.horde.org/pub/mirror/horde.org/mnemo/	\
 		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/mnemo/	\
-		ftp://ftp.pt.horde.org/pub/horde-ftp/mnemo/
+		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/mnemo/	\
+		http://ftp.horde.org/pub/mnemo/
 
 MAINTAINER=	thierry@pompo.net
 COMMENT=	Mnemo is the Horde notes and memos application
@@ -28,7 +30,8 @@ REINPLACE_ARGS=	-i.beforeMnemo
 
 PLIST_SUB=	HORDEDIR=${LHORDEDIR} MNEMODIR=${LMNEMODIR}
 
-DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL
+DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL	\
+		docs/RELEASE_NOTES
 CONFFILE=	conf.php menu.php prefs.php
 SUB_DIRS=	config graphics lib locale po scripts templates util
 
@@ -41,6 +44,9 @@ CONFDIR=	${MNEMODIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
 
+post-patch:
+	@${RM} ${WRKSRC}/config/conf.php.dist.orig
+
 do-install:
 	@${MKDIR}  ${MNEMODIR}
 .for REP in ${SUB_DIRS}
@@ -73,8 +79,8 @@ do-install:
 
 post-install:
 	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE} | \
-	${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%HORDEDIR%%:${HORDEDIR}:"
+	@${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g"	\
+		-e "s:%%CONFDIR%%:${CONFDIR}:g;s:%%HORDEDIR%%:${HORDEDIR}:" ${PKGMESSAGE}
 	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/deskutils/horde4-mnemo/distinfo b/deskutils/horde4-mnemo/distinfo
index b7e7f46129ef..b5479303f98a 100644
--- a/deskutils/horde4-mnemo/distinfo
+++ b/deskutils/horde4-mnemo/distinfo
@@ -1 +1,2 @@
-MD5 (mnemo-1.1.tar.gz) = d442371b0fda93406bcf0ddbe912b137
+MD5 (mnemo-1.1.1.tar.gz) = dab994b5c963b02050c6159271bf2eef
+SIZE (mnemo-1.1.1.tar.gz) = 264897
diff --git a/deskutils/horde4-mnemo/pkg-plist b/deskutils/horde4-mnemo/pkg-plist
index 60e0afee37ef..617238943638 100644
--- a/deskutils/horde4-mnemo/pkg-plist
+++ b/deskutils/horde4-mnemo/pkg-plist
@@ -1,11 +1,11 @@
-%%PORTDOCS%%share/doc/mnemo/LICENSE
-%%PORTDOCS%%share/doc/mnemo/README
-%%PORTDOCS%%share/doc/mnemo/CHANGES
-%%PORTDOCS%%share/doc/mnemo/CREDITS
-%%PORTDOCS%%share/doc/mnemo/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%MNEMODIR%%/config/conf.php
 %%MNEMODIR%%/config/conf.php.dist
-%%MNEMODIR%%/config/conf.php.dist.orig
 %%MNEMODIR%%/config/menu.php
 %%MNEMODIR%%/config/menu.php.dist
 %%MNEMODIR%%/config/prefs.php
@@ -43,12 +43,16 @@
 %%MNEMODIR%%/locale/fi_FI/help.xml
 %%MNEMODIR%%/locale/fr_FR/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/hu_HU/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/hu_HU/help.xml
+%%MNEMODIR%%/locale/it_IT/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/it_IT/help.xml
 %%MNEMODIR%%/locale/lt_LT/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/nb_NO/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/nl_NL/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/nn_NO/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/pt_BR/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/pt_PT/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/ro_RO/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/sk_SK/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/sk_SK/help.xml
 %%MNEMODIR%%/locale/sv_SE/LC_MESSAGES/mnemo.mo
@@ -68,6 +72,7 @@
 %%MNEMODIR%%/po/fi_FI.po
 %%MNEMODIR%%/po/fr_FR.po
 %%MNEMODIR%%/po/hu_HU.po
+%%MNEMODIR%%/po/it_IT.po
 %%MNEMODIR%%/po/lt_LT.po
 %%MNEMODIR%%/po/mnemo.pot
 %%MNEMODIR%%/po/nb_NO.po
@@ -75,6 +80,7 @@
 %%MNEMODIR%%/po/nn_NO.po
 %%MNEMODIR%%/po/pt_BR.po
 %%MNEMODIR%%/po/pt_PT.po
+%%MNEMODIR%%/po/ro_RO.po
 %%MNEMODIR%%/po/shtool
 %%MNEMODIR%%/po/sk_SK.po
 %%MNEMODIR%%/po/sv_SE.po
@@ -137,6 +143,8 @@
 @dirrm %%MNEMODIR%%/locale/lt_LT
 @dirrm %%MNEMODIR%%/locale/hu_HU/LC_MESSAGES
 @dirrm %%MNEMODIR%%/locale/hu_HU
+@dirrm %%MNEMODIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/it_IT
 @dirrm %%MNEMODIR%%/locale/nb_NO/LC_MESSAGES
 @dirrm %%MNEMODIR%%/locale/nb_NO
 @dirrm %%MNEMODIR%%/locale/nl_NL/LC_MESSAGES
@@ -147,6 +155,8 @@
 @dirrm %%MNEMODIR%%/locale/pt_BR
 @dirrm %%MNEMODIR%%/locale/pt_PT/LC_MESSAGES
 @dirrm %%MNEMODIR%%/locale/pt_PT
+@dirrm %%MNEMODIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/ro_RO
 @dirrm %%MNEMODIR%%/locale/sk_SK/LC_MESSAGES
 @dirrm %%MNEMODIR%%/locale/sk_SK
 @dirrm %%MNEMODIR%%/locale/sv_SE/LC_MESSAGES
@@ -171,5 +181,5 @@
 @dirrm %%MNEMODIR%%/util
 @dirrm %%MNEMODIR%%
 etc/horde/httpd.conf.mnemo
-%%PORTDOCS%%@dirrm share/doc/mnemo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterMnemo; then rm -f %D/www/horde/config/registry.php.afterMnemo; mv %D/www/horde/config/registry.php.beforeMnemo %D/www/horde/config/registry.php; fi