Upgrade to 2.1.

Changelog at
<http://cvs.horde.org/diff.php/mnemo/docs/CHANGES?r1=1.63.2.17.2.2&r2=1.63.2.31&ty=h>

4 files changed, 19 insertions, 9 deletions

diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index e5e46cdc2342..e3177f0c9118 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mnemo
-PORTVERSION=	2.0.3
+PORTVERSION=	2.1
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/mnemo/				\
 		ftp://ftp.planetmirror.com/pub/horde/mnemo/		\
@@ -25,6 +25,7 @@ RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
 USE_APACHE=	1.3+	# needed to test APACHE_VERSION
+USE_GETTEXT=	yes
 
 PLIST_SUB=	MNEMODIR=${LMNEMODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -32,10 +33,11 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	MNEMODIR=${MNEMODIR}
 
+REINPLACE_ARGS=	-i ""
 DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES  docs/TODO docs/UPGRADING
 CONFFILE=	prefs.php
-SUB_DIRS=	config lib locale po scripts templates themes
+SUB_DIRS=	config js lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
 LMNEMODIR?=	${LHORDEDIR}/mnemo
@@ -52,6 +54,9 @@ HORDE_INC=	${LOCALBASE}/etc/horde
 .endif
 
 pre-configure:
+	@(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/mnemo:${MNEMODIR}:g"	\
 		${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd-mnemo.conf
 
diff --git a/deskutils/horde-mnemo/distinfo b/deskutils/horde-mnemo/distinfo
index c7a1649b65aa..84b5a8f94af5 100644
--- a/deskutils/horde-mnemo/distinfo
+++ b/deskutils/horde-mnemo/distinfo
@@ -1,3 +1,3 @@
-MD5 (mnemo-h3-2.0.3.tar.gz) = 5fbc596ad7373205a5389db919c47bea
-SHA256 (mnemo-h3-2.0.3.tar.gz) = c9479a1b544e3d313cc3192da510aa8f64ebcaf0e71bfd98a734b35c6f7b981d
-SIZE (mnemo-h3-2.0.3.tar.gz) = 949740
+MD5 (mnemo-h3-2.1.tar.gz) = 9dc9d19ffdc7dfd332f6667fef630e29
+SHA256 (mnemo-h3-2.1.tar.gz) = 9ff42bf5458144bfcf3425f1a1942e9143f952dedfb683c50ac043d3eff26b11
+SIZE (mnemo-h3-2.1.tar.gz) = 963758
diff --git a/deskutils/horde-mnemo/files/pkg-message.in b/deskutils/horde-mnemo/files/pkg-message.in
index fa0bdcaab8ca..db86ecf84943 100644
--- a/deskutils/horde-mnemo/files/pkg-message.in
+++ b/deskutils/horde-mnemo/files/pkg-message.in
@@ -9,9 +9,6 @@ Then, you have to create the table mnemo_memos, from the SQL script
 For example, if your database is MySQL, you may run
 mysql --user=root --password=yourpass horde < mnemo.sql
 
-WARNING! if you are upgrading from Mnemo v. 1.1.x, you have to alter your
-******** schema. Please read the doc %%DOCSDIR%%/UPGRADING.
-
 Finally, you must login to Horde as a Horde Administrator to finish the
 configuration.
 
diff --git a/deskutils/horde-mnemo/pkg-plist b/deskutils/horde-mnemo/pkg-plist
index 35a4a06d49d8..e7120e10d320 100644
--- a/deskutils/horde-mnemo/pkg-plist
+++ b/deskutils/horde-mnemo/pkg-plist
@@ -13,6 +13,8 @@
 %%MNEMODIR%%/config/prefs.php.dist
 %%MNEMODIR%%/data.php
 %%MNEMODIR%%/index.php
+%%MNEMODIR%%/js/fixUnstyledOptions.js
+%%MNEMODIR%%/js/tables.js
 %%MNEMODIR%%/lib/Block/summary.php
 %%MNEMODIR%%/lib/Driver.php
 %%MNEMODIR%%/lib/Driver/kolab.php
@@ -51,6 +53,7 @@
 %%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/ru_RU/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
@@ -81,14 +84,16 @@
 %%MNEMODIR%%/po/pt_BR.po
 %%MNEMODIR%%/po/pt_PT.po
 %%MNEMODIR%%/po/ro_RO.po
+%%MNEMODIR%%/po/ru_RU.po
 %%MNEMODIR%%/po/sk_SK.po
 %%MNEMODIR%%/po/sv_SE.po
 %%MNEMODIR%%/po/zh_CN.po
 %%MNEMODIR%%/po/zh_TW.po
 %%MNEMODIR%%/scripts/.htaccess
 %%MNEMODIR%%/scripts/import_vnotes.php
-%%MNEMODIR%%/scripts/sql/mnemo.sql
+%%MNEMODIR%%/scripts/sql/mnemo.mssql.sql
 %%MNEMODIR%%/scripts/sql/mnemo.oci8.sql
+%%MNEMODIR%%/scripts/sql/mnemo.sql
 %%MNEMODIR%%/scripts/upgrades/1.1_to_2.0.mysql.sql
 %%MNEMODIR%%/scripts/upgrades/1.1_to_2.0.pgsq.sql
 %%MNEMODIR%%/scripts/upgrades/2004-12-21_add_memo_uid.sql
@@ -140,6 +145,8 @@
 @dirrm %%MNEMODIR%%/locale/sv_SE
 @dirrm %%MNEMODIR%%/locale/sk_SK/LC_MESSAGES
 @dirrm %%MNEMODIR%%/locale/sk_SK
+@dirrm %%MNEMODIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/ru_RU
 @dirrm %%MNEMODIR%%/locale/ro_RO/LC_MESSAGES
 @dirrm %%MNEMODIR%%/locale/ro_RO
 @dirrm %%MNEMODIR%%/locale/pt_PT/LC_MESSAGES
@@ -185,5 +192,6 @@
 @dirrm %%MNEMODIR%%/lib/Driver
 @dirrm %%MNEMODIR%%/lib/Block
 @dirrm %%MNEMODIR%%/lib
+@dirrm %%MNEMODIR%%/js
 @dirrmtry %%MNEMODIR%%/config
 @dirrmtry %%MNEMODIR%%