Upgrade to 2.0.

The major changes compared to the Mnemo 1.x versions are:
	* Shared notepads.
	* vNote support.
	* Kolab server support.
	* Access keys.

15 files changed, 357 insertions, 486 deletions

diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index 0de63b50f4c3..de5164a4ada1 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mnemo
-PORTVERSION=	1.1.2
+PORTVERSION=	2.0
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/mnemo/				\
 		ftp://ftp.planetmirror.com/pub/horde/mnemo/		\
@@ -16,36 +16,35 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/mnemo/				\
 		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/mnemo/	\
 		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/mnemo/	\
 		http://ftp.horde.org/pub/mnemo/
+DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Mnemo is the Horde notes and memos application
 
-RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
+RUN_DEPENDS=	${LOCALBASE}/www/horde/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 
-REINPLACE_ARGS=	-i.beforeMnemo
-
-PLIST_SUB=	HORDEDIR=${LHORDEDIR} MNEMODIR=${LMNEMODIR}
+PLIST_SUB=	MNEMODIR=${LMNEMODIR}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 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
+		docs/RELEASE_NOTES  docs/TODO docs/UPGRADING
+CONFFILE=	prefs.php
+SUB_DIRS=	config lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
 LMNEMODIR?=	${LHORDEDIR}/mnemo
 
-HORDEDIR=	${PREFIX}/${LHORDEDIR}
 MNEMODIR=	${PREFIX}/${LMNEMODIR}
 CONFDIR=	${MNEMODIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
 
-post-patch:
-	@${RM} ${WRKSRC}/config/conf.php.dist.orig
+pre-configure:
+	@${SED} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g"	\
+		${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd.conf.mnemo
 
 do-install:
 	@${MKDIR}  ${MNEMODIR}
@@ -58,18 +57,9 @@ do-install:
 	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ;	\
 	fi
 .endfor
-	@${CHOWN} -R www:www ${MNEMODIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${CP} -p ${FILESDIR}/httpd.conf.mnemo ${HORDE_INC}
-	@${REINPLACE_CMD} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g"	\
-		${HORDE_INC}/httpd.conf.mnemo
-	@${RM} ${HORDE_INC}/httpd.conf.mnemo.beforeMnemo
-	@${CP} -p ${HORDEDIR}/config/registry.php		\
-		${HORDEDIR}/config/registry.php.beforeMnemo
-	@${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTMNEMO::"	\
-		${HORDEDIR}/config/registry.php
-	@${CP} -p ${HORDEDIR}/config/registry.php		\
-		${HORDEDIR}/config/registry.php.afterMnemo
+	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.mnemo ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -79,10 +69,9 @@ do-install:
 .endif
 
 post-install:
-	@${ECHO_MSG}
-	@${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g"	\
-		-e "s:%%CONFDIR%%:${CONFDIR}:g;s:%%HORDEDIR%%:${HORDEDIR}:"	\
+	@${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
 		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
diff --git a/deskutils/horde-mnemo/distinfo b/deskutils/horde-mnemo/distinfo
index c3ab27135e22..903e1c544238 100644
--- a/deskutils/horde-mnemo/distinfo
+++ b/deskutils/horde-mnemo/distinfo
@@ -1,2 +1,2 @@
-MD5 (mnemo-1.1.2.tar.gz) = 5712907caa5a755bb7564f0e5b970d88
-SIZE (mnemo-1.1.2.tar.gz) = 268416
+MD5 (mnemo-h3-2.0.tar.gz) = 466abb98bb8be1d15a26413da4816e7a
+SIZE (mnemo-h3-2.0.tar.gz) = 843379
diff --git a/deskutils/horde-mnemo/files/patch-config_conf.php.dist b/deskutils/horde-mnemo/files/patch-config_conf.php.dist
deleted file mode 100644
index d3a504dd3711..000000000000
--- a/deskutils/horde-mnemo/files/patch-config_conf.php.dist
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/conf.php.dist.orig	Mon Apr 22 20:39:23 2002
-+++ config/conf.php.dist	Sun May 19 11:10:29 2002
-@@ -42,12 +42,12 @@
- // Below is an example configuration for an sql driver, in this case
- // MySQL.
- $conf['storage']['params'] = array();
--// $conf['storage']['params']['phptype'] = 'mysql';
--// $conf['storage']['params']['hostspec'] = 'localhost';
--// $conf['storage']['params']['username'] = 'horde';
--// $conf['storage']['params']['password'] = '*****';
--// $conf['storage']['params']['database'] = 'horde';
--// $conf['storage']['params']['table'] = 'mnemo_memos';
-+$conf['storage']['params']['phptype'] = 'mysql';
-+$conf['storage']['params']['hostspec'] = 'localhost';
-+$conf['storage']['params']['username'] = 'hordemgr';
-+$conf['storage']['params']['password'] = 'hordemgr';
-+$conf['storage']['params']['database'] = 'horde';
-+$conf['storage']['params']['table'] = 'mnemo_memos';
- 
- 
- /**
diff --git a/deskutils/horde-mnemo/files/pkg-message.in b/deskutils/horde-mnemo/files/pkg-message.in
index df8570e3f82c..e2d09d0f1130 100644
--- a/deskutils/horde-mnemo/files/pkg-message.in
+++ b/deskutils/horde-mnemo/files/pkg-message.in
@@ -2,20 +2,18 @@
 Mnemo has been installed in %%MNEMODIR%% with your blank
 configuration files.
 
-Horde and IMP must be configured; if not, see:
-- %%PORTSDIR%%/www/horde2/pkg-message
-- %%PORTSDIR%%/mail/imp3/pkg-message
+Horde must be configured; if not, see `pkg_info -D -x horde'.
 
 Then, you have to create the table mnemo_memos, from the SQL script
-%%MNEMODIR%%/scripts/drivers/mnemo_memos.sql.
+%%MNEMODIR%%/scripts/sql/mnemo.sql
 For example, if your database is MySQL, you may run
-mysql --user=hordemgr --password=yourpass horde < mnemo_memos.sql
-(If you run another database server, see
- %%HORDEDIR%%/scripts/db/README
- for more explanations.)
+mysql --user=root --password=yourpass horde < mnemo_memos.sql
 
-Finally, you may have to tune the configuration files located in
-%%CONFDIR%%/, specially the files conf.php.
+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.
 
 To protect your configuration files, you have to restart Apache.
 ************************************************************************
diff --git a/deskutils/horde-mnemo/pkg-plist b/deskutils/horde-mnemo/pkg-plist
index 617238943638..f1f5fbdb9b2e 100644
--- a/deskutils/horde-mnemo/pkg-plist
+++ b/deskutils/horde-mnemo/pkg-plist
@@ -1,44 +1,38 @@
+etc/horde/httpd.conf.mnemo
 %%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/menu.php
-%%MNEMODIR%%/config/menu.php.dist
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
+%%MNEMODIR%%/config/.htaccess
+%%MNEMODIR%%/config/conf.xml
 %%MNEMODIR%%/config/prefs.php
 %%MNEMODIR%%/config/prefs.php.dist
-%%MNEMODIR%%/graphics/add.gif
-%%MNEMODIR%%/graphics/checkbox.gif
-%%MNEMODIR%%/graphics/colorpicker.gif
-%%MNEMODIR%%/graphics/colorpicker.png
-%%MNEMODIR%%/graphics/down.gif
-%%MNEMODIR%%/graphics/list.gif
-%%MNEMODIR%%/graphics/mnemo.gif
-%%MNEMODIR%%/graphics/print.gif
-%%MNEMODIR%%/graphics/refresh.gif
-%%MNEMODIR%%/graphics/search.gif
-%%MNEMODIR%%/graphics/up.gif
+%%MNEMODIR%%/data.php
 %%MNEMODIR%%/index.php
+%%MNEMODIR%%/lib/Block/summary.php
 %%MNEMODIR%%/lib/Driver.php
+%%MNEMODIR%%/lib/Driver/kolab.php
 %%MNEMODIR%%/lib/Driver/sql.php
 %%MNEMODIR%%/lib/Mnemo.php
 %%MNEMODIR%%/lib/api.php
 %%MNEMODIR%%/lib/base.php
-%%MNEMODIR%%/lib/constants.php
+%%MNEMODIR%%/lib/prefs.php
 %%MNEMODIR%%/lib/version.php
 %%MNEMODIR%%/list.php
 %%MNEMODIR%%/locale/bg_BG/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/cs_CZ/LC_MESSAGES/mnemo.mo
-%%MNEMODIR%%/locale/da_DK/help.xml
 %%MNEMODIR%%/locale/da_DK/LC_MESSAGES/mnemo.mo
-%%MNEMODIR%%/locale/de_DE/help.xml
+%%MNEMODIR%%/locale/da_DK/help.xml
 %%MNEMODIR%%/locale/de_DE/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/de_DE/help.xml
 %%MNEMODIR%%/locale/el_GR/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/en_US/help.xml
 %%MNEMODIR%%/locale/es_ES/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/es_ES/help.xml
 %%MNEMODIR%%/locale/fi_FI/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/fi_FI/help.xml
 %%MNEMODIR%%/locale/fr_FR/LC_MESSAGES/mnemo.mo
@@ -47,9 +41,12 @@
 %%MNEMODIR%%/locale/it_IT/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/it_IT/help.xml
 %%MNEMODIR%%/locale/lt_LT/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/lv_LV/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/lv_LV/help.xml
 %%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/pl_PL/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
@@ -59,8 +56,7 @@
 %%MNEMODIR%%/locale/zh_CN/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/zh_TW/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/memo.php
-%%MNEMODIR%%/menu.php
-%%MNEMODIR%%/po/Makefile
+%%MNEMODIR%%/notepads.php
 %%MNEMODIR%%/po/README
 %%MNEMODIR%%/po/bg_BG.po
 %%MNEMODIR%%/po/cs_CZ.po
@@ -68,118 +64,113 @@
 %%MNEMODIR%%/po/de_DE.po
 %%MNEMODIR%%/po/el_GR.po
 %%MNEMODIR%%/po/es_ES.po
-%%MNEMODIR%%/po/extract.pl
 %%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/lv_LV.po
 %%MNEMODIR%%/po/mnemo.pot
 %%MNEMODIR%%/po/nb_NO.po
 %%MNEMODIR%%/po/nl_NL.po
 %%MNEMODIR%%/po/nn_NO.po
+%%MNEMODIR%%/po/pl_PL.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
-%%MNEMODIR%%/po/xgettext.sh
 %%MNEMODIR%%/po/zh_CN.po
 %%MNEMODIR%%/po/zh_TW.po
-%%MNEMODIR%%/prefs.php
-%%MNEMODIR%%/scripts/drivers/mnemo_memos.sql
+%%MNEMODIR%%/scripts/.htaccess
+%%MNEMODIR%%/scripts/sql/mnemo.sql
+%%MNEMODIR%%/scripts/upgrades/1.1_to_2.0.mysql.sql
+%%MNEMODIR%%/scripts/upgrades/2004-12-21_add_memo_uid.sql
 %%MNEMODIR%%/search.php
-%%MNEMODIR%%/templates/common-footer.inc
 %%MNEMODIR%%/templates/common-header.inc
-%%MNEMODIR%%/templates/index/css.inc
-%%MNEMODIR%%/templates/index/notconfigured.inc
-%%MNEMODIR%%/templates/javascript/open_print_win.js
-%%MNEMODIR%%/templates/javascript/print.js
-%%MNEMODIR%%/templates/list/actions.inc
+%%MNEMODIR%%/templates/data/export.inc
+%%MNEMODIR%%/templates/data/import.inc
 %%MNEMODIR%%/templates/list/empty.inc
-%%MNEMODIR%%/templates/list/footer.inc
 %%MNEMODIR%%/templates/list/header.inc
-%%MNEMODIR%%/templates/list/javascript.inc
 %%MNEMODIR%%/templates/list/memo_footers.inc
 %%MNEMODIR%%/templates/list/memo_headers.inc
 %%MNEMODIR%%/templates/list/memo_summaries.inc
-%%MNEMODIR%%/templates/memo/begin.inc
-%%MNEMODIR%%/templates/memo/end.inc
 %%MNEMODIR%%/templates/memo/memo.inc
-%%MNEMODIR%%/templates/menu/menu.inc
-%%MNEMODIR%%/templates/prefs/category_management.inc
-%%MNEMODIR%%/templates/search/begin.inc
-%%MNEMODIR%%/templates/search/end.inc
+%%MNEMODIR%%/templates/menu.inc
+%%MNEMODIR%%/templates/notepads/notepads.inc
+%%MNEMODIR%%/templates/prefs/notepadselect.inc
+%%MNEMODIR%%/templates/prefs/showsummaryselect.inc
 %%MNEMODIR%%/templates/search/search.inc
-%%MNEMODIR%%/templates/view/description.inc
-%%MNEMODIR%%/templates/view/headers.inc
-%%MNEMODIR%%/templates/view/navbar.inc
-%%MNEMODIR%%/templates/view/no-memo.inc
-%%MNEMODIR%%/util/colorpicker.php
+%%MNEMODIR%%/templates/view/memo.inc
+%%MNEMODIR%%/themes/graphics/add.png
+%%MNEMODIR%%/themes/graphics/mnemo.png
+%%MNEMODIR%%/themes/graphics/notepads.png
 %%MNEMODIR%%/view.php
-@dirrm %%MNEMODIR%%/config
-@dirrm %%MNEMODIR%%/graphics
-@dirrm %%MNEMODIR%%/lib/Driver
-@dirrm %%MNEMODIR%%/lib
-@dirrm %%MNEMODIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/bg_BG
-@dirrm %%MNEMODIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/cs_CZ
-@dirrm %%MNEMODIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/da_DK
-@dirrm %%MNEMODIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/de_DE
-@dirrm %%MNEMODIR%%/locale/en_US
-@dirrm %%MNEMODIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/el_GR
-@dirrm %%MNEMODIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/es_ES
-@dirrm %%MNEMODIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/fi_FI
-@dirrm %%MNEMODIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/fr_FR
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%MNEMODIR%%/themes/graphics
+@dirrm %%MNEMODIR%%/themes
+@dirrm %%MNEMODIR%%/templates/view
+@dirrm %%MNEMODIR%%/templates/search
+@dirrm %%MNEMODIR%%/templates/prefs
+@dirrm %%MNEMODIR%%/templates/notepads
+@dirrm %%MNEMODIR%%/templates/memo
+@dirrm %%MNEMODIR%%/templates/list
+@dirrm %%MNEMODIR%%/templates/data
+@dirrm %%MNEMODIR%%/templates
+@dirrm %%MNEMODIR%%/scripts/upgrades
+@dirrm %%MNEMODIR%%/scripts/sql
+@dirrm %%MNEMODIR%%/scripts
+@dirrm %%MNEMODIR%%/po
+@dirrm %%MNEMODIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/zh_TW
+@dirrm %%MNEMODIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/zh_CN
+@dirrm %%MNEMODIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/sv_SE
+@dirrm %%MNEMODIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/sk_SK
+@dirrm %%MNEMODIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/ro_RO
+@dirrm %%MNEMODIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/pt_PT
+@dirrm %%MNEMODIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/pt_BR
+@dirrm %%MNEMODIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/pl_PL
+@dirrm %%MNEMODIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/nn_NO
+@dirrm %%MNEMODIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/nl_NL
+@dirrm %%MNEMODIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/nb_NO
+@dirrm %%MNEMODIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/lv_LV
 @dirrm %%MNEMODIR%%/locale/lt_LT/LC_MESSAGES
 @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
-@dirrm %%MNEMODIR%%/locale/nl_NL
-@dirrm %%MNEMODIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/nn_NO
-@dirrm %%MNEMODIR%%/locale/pt_BR/LC_MESSAGES
-@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
-@dirrm %%MNEMODIR%%/locale/sv_SE
-@dirrm %%MNEMODIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/zh_CN
-@dirrm %%MNEMODIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/zh_TW
+@dirrm %%MNEMODIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/hu_HU
+@dirrm %%MNEMODIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/fr_FR
+@dirrm %%MNEMODIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/fi_FI
+@dirrm %%MNEMODIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/es_ES
+@dirrm %%MNEMODIR%%/locale/en_US
+@dirrm %%MNEMODIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/el_GR
+@dirrm %%MNEMODIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/de_DE
+@dirrm %%MNEMODIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/da_DK
+@dirrm %%MNEMODIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/cs_CZ
+@dirrm %%MNEMODIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/bg_BG
 @dirrm %%MNEMODIR%%/locale
-@dirrm %%MNEMODIR%%/po
-@dirrm %%MNEMODIR%%/scripts/drivers
-@dirrm %%MNEMODIR%%/scripts
-@dirrm %%MNEMODIR%%/templates/index
-@dirrm %%MNEMODIR%%/templates/javascript
-@dirrm %%MNEMODIR%%/templates/list
-@dirrm %%MNEMODIR%%/templates/memo
-@dirrm %%MNEMODIR%%/templates/menu
-@dirrm %%MNEMODIR%%/templates/prefs
-@dirrm %%MNEMODIR%%/templates/search
-@dirrm %%MNEMODIR%%/templates/view
-@dirrm %%MNEMODIR%%/templates
-@dirrm %%MNEMODIR%%/util
-@dirrm %%MNEMODIR%%
-etc/horde/httpd.conf.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
+@dirrm %%MNEMODIR%%/lib/Driver
+@dirrm %%MNEMODIR%%/lib/Block
+@dirrm %%MNEMODIR%%/lib
+@unexec rmdir %D/%%MNEMODIR%%/config 2>/dev/null || true
+@unexec rmdir %D/%%MNEMODIR%% 2>/dev/null || true
diff --git a/deskutils/horde4-mnemo/Makefile b/deskutils/horde4-mnemo/Makefile
index 0de63b50f4c3..de5164a4ada1 100644
--- a/deskutils/horde4-mnemo/Makefile
+++ b/deskutils/horde4-mnemo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mnemo
-PORTVERSION=	1.1.2
+PORTVERSION=	2.0
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/mnemo/				\
 		ftp://ftp.planetmirror.com/pub/horde/mnemo/		\
@@ -16,36 +16,35 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/mnemo/				\
 		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/mnemo/	\
 		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/mnemo/	\
 		http://ftp.horde.org/pub/mnemo/
+DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Mnemo is the Horde notes and memos application
 
-RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
+RUN_DEPENDS=	${LOCALBASE}/www/horde/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 
-REINPLACE_ARGS=	-i.beforeMnemo
-
-PLIST_SUB=	HORDEDIR=${LHORDEDIR} MNEMODIR=${LMNEMODIR}
+PLIST_SUB=	MNEMODIR=${LMNEMODIR}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 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
+		docs/RELEASE_NOTES  docs/TODO docs/UPGRADING
+CONFFILE=	prefs.php
+SUB_DIRS=	config lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
 LMNEMODIR?=	${LHORDEDIR}/mnemo
 
-HORDEDIR=	${PREFIX}/${LHORDEDIR}
 MNEMODIR=	${PREFIX}/${LMNEMODIR}
 CONFDIR=	${MNEMODIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
 
-post-patch:
-	@${RM} ${WRKSRC}/config/conf.php.dist.orig
+pre-configure:
+	@${SED} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g"	\
+		${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd.conf.mnemo
 
 do-install:
 	@${MKDIR}  ${MNEMODIR}
@@ -58,18 +57,9 @@ do-install:
 	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ;	\
 	fi
 .endfor
-	@${CHOWN} -R www:www ${MNEMODIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${CP} -p ${FILESDIR}/httpd.conf.mnemo ${HORDE_INC}
-	@${REINPLACE_CMD} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g"	\
-		${HORDE_INC}/httpd.conf.mnemo
-	@${RM} ${HORDE_INC}/httpd.conf.mnemo.beforeMnemo
-	@${CP} -p ${HORDEDIR}/config/registry.php		\
-		${HORDEDIR}/config/registry.php.beforeMnemo
-	@${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTMNEMO::"	\
-		${HORDEDIR}/config/registry.php
-	@${CP} -p ${HORDEDIR}/config/registry.php		\
-		${HORDEDIR}/config/registry.php.afterMnemo
+	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.mnemo ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -79,10 +69,9 @@ do-install:
 .endif
 
 post-install:
-	@${ECHO_MSG}
-	@${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g"	\
-		-e "s:%%CONFDIR%%:${CONFDIR}:g;s:%%HORDEDIR%%:${HORDEDIR}:"	\
+	@${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
 		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
diff --git a/deskutils/horde4-mnemo/distinfo b/deskutils/horde4-mnemo/distinfo
index c3ab27135e22..903e1c544238 100644
--- a/deskutils/horde4-mnemo/distinfo
+++ b/deskutils/horde4-mnemo/distinfo
@@ -1,2 +1,2 @@
-MD5 (mnemo-1.1.2.tar.gz) = 5712907caa5a755bb7564f0e5b970d88
-SIZE (mnemo-1.1.2.tar.gz) = 268416
+MD5 (mnemo-h3-2.0.tar.gz) = 466abb98bb8be1d15a26413da4816e7a
+SIZE (mnemo-h3-2.0.tar.gz) = 843379
diff --git a/deskutils/horde4-mnemo/files/patch-config_conf.php.dist b/deskutils/horde4-mnemo/files/patch-config_conf.php.dist
deleted file mode 100644
index d3a504dd3711..000000000000
--- a/deskutils/horde4-mnemo/files/patch-config_conf.php.dist
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/conf.php.dist.orig	Mon Apr 22 20:39:23 2002
-+++ config/conf.php.dist	Sun May 19 11:10:29 2002
-@@ -42,12 +42,12 @@
- // Below is an example configuration for an sql driver, in this case
- // MySQL.
- $conf['storage']['params'] = array();
--// $conf['storage']['params']['phptype'] = 'mysql';
--// $conf['storage']['params']['hostspec'] = 'localhost';
--// $conf['storage']['params']['username'] = 'horde';
--// $conf['storage']['params']['password'] = '*****';
--// $conf['storage']['params']['database'] = 'horde';
--// $conf['storage']['params']['table'] = 'mnemo_memos';
-+$conf['storage']['params']['phptype'] = 'mysql';
-+$conf['storage']['params']['hostspec'] = 'localhost';
-+$conf['storage']['params']['username'] = 'hordemgr';
-+$conf['storage']['params']['password'] = 'hordemgr';
-+$conf['storage']['params']['database'] = 'horde';
-+$conf['storage']['params']['table'] = 'mnemo_memos';
- 
- 
- /**
diff --git a/deskutils/horde4-mnemo/files/pkg-message.in b/deskutils/horde4-mnemo/files/pkg-message.in
index df8570e3f82c..e2d09d0f1130 100644
--- a/deskutils/horde4-mnemo/files/pkg-message.in
+++ b/deskutils/horde4-mnemo/files/pkg-message.in
@@ -2,20 +2,18 @@
 Mnemo has been installed in %%MNEMODIR%% with your blank
 configuration files.
 
-Horde and IMP must be configured; if not, see:
-- %%PORTSDIR%%/www/horde2/pkg-message
-- %%PORTSDIR%%/mail/imp3/pkg-message
+Horde must be configured; if not, see `pkg_info -D -x horde'.
 
 Then, you have to create the table mnemo_memos, from the SQL script
-%%MNEMODIR%%/scripts/drivers/mnemo_memos.sql.
+%%MNEMODIR%%/scripts/sql/mnemo.sql
 For example, if your database is MySQL, you may run
-mysql --user=hordemgr --password=yourpass horde < mnemo_memos.sql
-(If you run another database server, see
- %%HORDEDIR%%/scripts/db/README
- for more explanations.)
+mysql --user=root --password=yourpass horde < mnemo_memos.sql
 
-Finally, you may have to tune the configuration files located in
-%%CONFDIR%%/, specially the files conf.php.
+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.
 
 To protect your configuration files, you have to restart Apache.
 ************************************************************************
diff --git a/deskutils/horde4-mnemo/pkg-plist b/deskutils/horde4-mnemo/pkg-plist
index 617238943638..f1f5fbdb9b2e 100644
--- a/deskutils/horde4-mnemo/pkg-plist
+++ b/deskutils/horde4-mnemo/pkg-plist
@@ -1,44 +1,38 @@
+etc/horde/httpd.conf.mnemo
 %%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/menu.php
-%%MNEMODIR%%/config/menu.php.dist
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
+%%MNEMODIR%%/config/.htaccess
+%%MNEMODIR%%/config/conf.xml
 %%MNEMODIR%%/config/prefs.php
 %%MNEMODIR%%/config/prefs.php.dist
-%%MNEMODIR%%/graphics/add.gif
-%%MNEMODIR%%/graphics/checkbox.gif
-%%MNEMODIR%%/graphics/colorpicker.gif
-%%MNEMODIR%%/graphics/colorpicker.png
-%%MNEMODIR%%/graphics/down.gif
-%%MNEMODIR%%/graphics/list.gif
-%%MNEMODIR%%/graphics/mnemo.gif
-%%MNEMODIR%%/graphics/print.gif
-%%MNEMODIR%%/graphics/refresh.gif
-%%MNEMODIR%%/graphics/search.gif
-%%MNEMODIR%%/graphics/up.gif
+%%MNEMODIR%%/data.php
 %%MNEMODIR%%/index.php
+%%MNEMODIR%%/lib/Block/summary.php
 %%MNEMODIR%%/lib/Driver.php
+%%MNEMODIR%%/lib/Driver/kolab.php
 %%MNEMODIR%%/lib/Driver/sql.php
 %%MNEMODIR%%/lib/Mnemo.php
 %%MNEMODIR%%/lib/api.php
 %%MNEMODIR%%/lib/base.php
-%%MNEMODIR%%/lib/constants.php
+%%MNEMODIR%%/lib/prefs.php
 %%MNEMODIR%%/lib/version.php
 %%MNEMODIR%%/list.php
 %%MNEMODIR%%/locale/bg_BG/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/cs_CZ/LC_MESSAGES/mnemo.mo
-%%MNEMODIR%%/locale/da_DK/help.xml
 %%MNEMODIR%%/locale/da_DK/LC_MESSAGES/mnemo.mo
-%%MNEMODIR%%/locale/de_DE/help.xml
+%%MNEMODIR%%/locale/da_DK/help.xml
 %%MNEMODIR%%/locale/de_DE/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/de_DE/help.xml
 %%MNEMODIR%%/locale/el_GR/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/en_US/help.xml
 %%MNEMODIR%%/locale/es_ES/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/es_ES/help.xml
 %%MNEMODIR%%/locale/fi_FI/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/fi_FI/help.xml
 %%MNEMODIR%%/locale/fr_FR/LC_MESSAGES/mnemo.mo
@@ -47,9 +41,12 @@
 %%MNEMODIR%%/locale/it_IT/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/it_IT/help.xml
 %%MNEMODIR%%/locale/lt_LT/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/lv_LV/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/lv_LV/help.xml
 %%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/pl_PL/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
@@ -59,8 +56,7 @@
 %%MNEMODIR%%/locale/zh_CN/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/zh_TW/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/memo.php
-%%MNEMODIR%%/menu.php
-%%MNEMODIR%%/po/Makefile
+%%MNEMODIR%%/notepads.php
 %%MNEMODIR%%/po/README
 %%MNEMODIR%%/po/bg_BG.po
 %%MNEMODIR%%/po/cs_CZ.po
@@ -68,118 +64,113 @@
 %%MNEMODIR%%/po/de_DE.po
 %%MNEMODIR%%/po/el_GR.po
 %%MNEMODIR%%/po/es_ES.po
-%%MNEMODIR%%/po/extract.pl
 %%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/lv_LV.po
 %%MNEMODIR%%/po/mnemo.pot
 %%MNEMODIR%%/po/nb_NO.po
 %%MNEMODIR%%/po/nl_NL.po
 %%MNEMODIR%%/po/nn_NO.po
+%%MNEMODIR%%/po/pl_PL.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
-%%MNEMODIR%%/po/xgettext.sh
 %%MNEMODIR%%/po/zh_CN.po
 %%MNEMODIR%%/po/zh_TW.po
-%%MNEMODIR%%/prefs.php
-%%MNEMODIR%%/scripts/drivers/mnemo_memos.sql
+%%MNEMODIR%%/scripts/.htaccess
+%%MNEMODIR%%/scripts/sql/mnemo.sql
+%%MNEMODIR%%/scripts/upgrades/1.1_to_2.0.mysql.sql
+%%MNEMODIR%%/scripts/upgrades/2004-12-21_add_memo_uid.sql
 %%MNEMODIR%%/search.php
-%%MNEMODIR%%/templates/common-footer.inc
 %%MNEMODIR%%/templates/common-header.inc
-%%MNEMODIR%%/templates/index/css.inc
-%%MNEMODIR%%/templates/index/notconfigured.inc
-%%MNEMODIR%%/templates/javascript/open_print_win.js
-%%MNEMODIR%%/templates/javascript/print.js
-%%MNEMODIR%%/templates/list/actions.inc
+%%MNEMODIR%%/templates/data/export.inc
+%%MNEMODIR%%/templates/data/import.inc
 %%MNEMODIR%%/templates/list/empty.inc
-%%MNEMODIR%%/templates/list/footer.inc
 %%MNEMODIR%%/templates/list/header.inc
-%%MNEMODIR%%/templates/list/javascript.inc
 %%MNEMODIR%%/templates/list/memo_footers.inc
 %%MNEMODIR%%/templates/list/memo_headers.inc
 %%MNEMODIR%%/templates/list/memo_summaries.inc
-%%MNEMODIR%%/templates/memo/begin.inc
-%%MNEMODIR%%/templates/memo/end.inc
 %%MNEMODIR%%/templates/memo/memo.inc
-%%MNEMODIR%%/templates/menu/menu.inc
-%%MNEMODIR%%/templates/prefs/category_management.inc
-%%MNEMODIR%%/templates/search/begin.inc
-%%MNEMODIR%%/templates/search/end.inc
+%%MNEMODIR%%/templates/menu.inc
+%%MNEMODIR%%/templates/notepads/notepads.inc
+%%MNEMODIR%%/templates/prefs/notepadselect.inc
+%%MNEMODIR%%/templates/prefs/showsummaryselect.inc
 %%MNEMODIR%%/templates/search/search.inc
-%%MNEMODIR%%/templates/view/description.inc
-%%MNEMODIR%%/templates/view/headers.inc
-%%MNEMODIR%%/templates/view/navbar.inc
-%%MNEMODIR%%/templates/view/no-memo.inc
-%%MNEMODIR%%/util/colorpicker.php
+%%MNEMODIR%%/templates/view/memo.inc
+%%MNEMODIR%%/themes/graphics/add.png
+%%MNEMODIR%%/themes/graphics/mnemo.png
+%%MNEMODIR%%/themes/graphics/notepads.png
 %%MNEMODIR%%/view.php
-@dirrm %%MNEMODIR%%/config
-@dirrm %%MNEMODIR%%/graphics
-@dirrm %%MNEMODIR%%/lib/Driver
-@dirrm %%MNEMODIR%%/lib
-@dirrm %%MNEMODIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/bg_BG
-@dirrm %%MNEMODIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/cs_CZ
-@dirrm %%MNEMODIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/da_DK
-@dirrm %%MNEMODIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/de_DE
-@dirrm %%MNEMODIR%%/locale/en_US
-@dirrm %%MNEMODIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/el_GR
-@dirrm %%MNEMODIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/es_ES
-@dirrm %%MNEMODIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/fi_FI
-@dirrm %%MNEMODIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/fr_FR
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%MNEMODIR%%/themes/graphics
+@dirrm %%MNEMODIR%%/themes
+@dirrm %%MNEMODIR%%/templates/view
+@dirrm %%MNEMODIR%%/templates/search
+@dirrm %%MNEMODIR%%/templates/prefs
+@dirrm %%MNEMODIR%%/templates/notepads
+@dirrm %%MNEMODIR%%/templates/memo
+@dirrm %%MNEMODIR%%/templates/list
+@dirrm %%MNEMODIR%%/templates/data
+@dirrm %%MNEMODIR%%/templates
+@dirrm %%MNEMODIR%%/scripts/upgrades
+@dirrm %%MNEMODIR%%/scripts/sql
+@dirrm %%MNEMODIR%%/scripts
+@dirrm %%MNEMODIR%%/po
+@dirrm %%MNEMODIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/zh_TW
+@dirrm %%MNEMODIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/zh_CN
+@dirrm %%MNEMODIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/sv_SE
+@dirrm %%MNEMODIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/sk_SK
+@dirrm %%MNEMODIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/ro_RO
+@dirrm %%MNEMODIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/pt_PT
+@dirrm %%MNEMODIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/pt_BR
+@dirrm %%MNEMODIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/pl_PL
+@dirrm %%MNEMODIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/nn_NO
+@dirrm %%MNEMODIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/nl_NL
+@dirrm %%MNEMODIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/nb_NO
+@dirrm %%MNEMODIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/lv_LV
 @dirrm %%MNEMODIR%%/locale/lt_LT/LC_MESSAGES
 @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
-@dirrm %%MNEMODIR%%/locale/nl_NL
-@dirrm %%MNEMODIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/nn_NO
-@dirrm %%MNEMODIR%%/locale/pt_BR/LC_MESSAGES
-@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
-@dirrm %%MNEMODIR%%/locale/sv_SE
-@dirrm %%MNEMODIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/zh_CN
-@dirrm %%MNEMODIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/zh_TW
+@dirrm %%MNEMODIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/hu_HU
+@dirrm %%MNEMODIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/fr_FR
+@dirrm %%MNEMODIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/fi_FI
+@dirrm %%MNEMODIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/es_ES
+@dirrm %%MNEMODIR%%/locale/en_US
+@dirrm %%MNEMODIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/el_GR
+@dirrm %%MNEMODIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/de_DE
+@dirrm %%MNEMODIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/da_DK
+@dirrm %%MNEMODIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/cs_CZ
+@dirrm %%MNEMODIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/bg_BG
 @dirrm %%MNEMODIR%%/locale
-@dirrm %%MNEMODIR%%/po
-@dirrm %%MNEMODIR%%/scripts/drivers
-@dirrm %%MNEMODIR%%/scripts
-@dirrm %%MNEMODIR%%/templates/index
-@dirrm %%MNEMODIR%%/templates/javascript
-@dirrm %%MNEMODIR%%/templates/list
-@dirrm %%MNEMODIR%%/templates/memo
-@dirrm %%MNEMODIR%%/templates/menu
-@dirrm %%MNEMODIR%%/templates/prefs
-@dirrm %%MNEMODIR%%/templates/search
-@dirrm %%MNEMODIR%%/templates/view
-@dirrm %%MNEMODIR%%/templates
-@dirrm %%MNEMODIR%%/util
-@dirrm %%MNEMODIR%%
-etc/horde/httpd.conf.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
+@dirrm %%MNEMODIR%%/lib/Driver
+@dirrm %%MNEMODIR%%/lib/Block
+@dirrm %%MNEMODIR%%/lib
+@unexec rmdir %D/%%MNEMODIR%%/config 2>/dev/null || true
+@unexec rmdir %D/%%MNEMODIR%% 2>/dev/null || true
diff --git a/deskutils/mnemo/Makefile b/deskutils/mnemo/Makefile
index 0de63b50f4c3..de5164a4ada1 100644
--- a/deskutils/mnemo/Makefile
+++ b/deskutils/mnemo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mnemo
-PORTVERSION=	1.1.2
+PORTVERSION=	2.0
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/mnemo/				\
 		ftp://ftp.planetmirror.com/pub/horde/mnemo/		\
@@ -16,36 +16,35 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/mnemo/				\
 		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/mnemo/	\
 		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/mnemo/	\
 		http://ftp.horde.org/pub/mnemo/
+DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Mnemo is the Horde notes and memos application
 
-RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
+RUN_DEPENDS=	${LOCALBASE}/www/horde/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 
-REINPLACE_ARGS=	-i.beforeMnemo
-
-PLIST_SUB=	HORDEDIR=${LHORDEDIR} MNEMODIR=${LMNEMODIR}
+PLIST_SUB=	MNEMODIR=${LMNEMODIR}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 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
+		docs/RELEASE_NOTES  docs/TODO docs/UPGRADING
+CONFFILE=	prefs.php
+SUB_DIRS=	config lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
 LMNEMODIR?=	${LHORDEDIR}/mnemo
 
-HORDEDIR=	${PREFIX}/${LHORDEDIR}
 MNEMODIR=	${PREFIX}/${LMNEMODIR}
 CONFDIR=	${MNEMODIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
 
-post-patch:
-	@${RM} ${WRKSRC}/config/conf.php.dist.orig
+pre-configure:
+	@${SED} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g"	\
+		${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd.conf.mnemo
 
 do-install:
 	@${MKDIR}  ${MNEMODIR}
@@ -58,18 +57,9 @@ do-install:
 	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ;	\
 	fi
 .endfor
-	@${CHOWN} -R www:www ${MNEMODIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${CP} -p ${FILESDIR}/httpd.conf.mnemo ${HORDE_INC}
-	@${REINPLACE_CMD} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g"	\
-		${HORDE_INC}/httpd.conf.mnemo
-	@${RM} ${HORDE_INC}/httpd.conf.mnemo.beforeMnemo
-	@${CP} -p ${HORDEDIR}/config/registry.php		\
-		${HORDEDIR}/config/registry.php.beforeMnemo
-	@${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTMNEMO::"	\
-		${HORDEDIR}/config/registry.php
-	@${CP} -p ${HORDEDIR}/config/registry.php		\
-		${HORDEDIR}/config/registry.php.afterMnemo
+	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.mnemo ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -79,10 +69,9 @@ do-install:
 .endif
 
 post-install:
-	@${ECHO_MSG}
-	@${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g"	\
-		-e "s:%%CONFDIR%%:${CONFDIR}:g;s:%%HORDEDIR%%:${HORDEDIR}:"	\
+	@${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
 		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
diff --git a/deskutils/mnemo/distinfo b/deskutils/mnemo/distinfo
index c3ab27135e22..903e1c544238 100644
--- a/deskutils/mnemo/distinfo
+++ b/deskutils/mnemo/distinfo
@@ -1,2 +1,2 @@
-MD5 (mnemo-1.1.2.tar.gz) = 5712907caa5a755bb7564f0e5b970d88
-SIZE (mnemo-1.1.2.tar.gz) = 268416
+MD5 (mnemo-h3-2.0.tar.gz) = 466abb98bb8be1d15a26413da4816e7a
+SIZE (mnemo-h3-2.0.tar.gz) = 843379
diff --git a/deskutils/mnemo/files/patch-config_conf.php.dist b/deskutils/mnemo/files/patch-config_conf.php.dist
deleted file mode 100644
index d3a504dd3711..000000000000
--- a/deskutils/mnemo/files/patch-config_conf.php.dist
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/conf.php.dist.orig	Mon Apr 22 20:39:23 2002
-+++ config/conf.php.dist	Sun May 19 11:10:29 2002
-@@ -42,12 +42,12 @@
- // Below is an example configuration for an sql driver, in this case
- // MySQL.
- $conf['storage']['params'] = array();
--// $conf['storage']['params']['phptype'] = 'mysql';
--// $conf['storage']['params']['hostspec'] = 'localhost';
--// $conf['storage']['params']['username'] = 'horde';
--// $conf['storage']['params']['password'] = '*****';
--// $conf['storage']['params']['database'] = 'horde';
--// $conf['storage']['params']['table'] = 'mnemo_memos';
-+$conf['storage']['params']['phptype'] = 'mysql';
-+$conf['storage']['params']['hostspec'] = 'localhost';
-+$conf['storage']['params']['username'] = 'hordemgr';
-+$conf['storage']['params']['password'] = 'hordemgr';
-+$conf['storage']['params']['database'] = 'horde';
-+$conf['storage']['params']['table'] = 'mnemo_memos';
- 
- 
- /**
diff --git a/deskutils/mnemo/files/pkg-message.in b/deskutils/mnemo/files/pkg-message.in
index df8570e3f82c..e2d09d0f1130 100644
--- a/deskutils/mnemo/files/pkg-message.in
+++ b/deskutils/mnemo/files/pkg-message.in
@@ -2,20 +2,18 @@
 Mnemo has been installed in %%MNEMODIR%% with your blank
 configuration files.
 
-Horde and IMP must be configured; if not, see:
-- %%PORTSDIR%%/www/horde2/pkg-message
-- %%PORTSDIR%%/mail/imp3/pkg-message
+Horde must be configured; if not, see `pkg_info -D -x horde'.
 
 Then, you have to create the table mnemo_memos, from the SQL script
-%%MNEMODIR%%/scripts/drivers/mnemo_memos.sql.
+%%MNEMODIR%%/scripts/sql/mnemo.sql
 For example, if your database is MySQL, you may run
-mysql --user=hordemgr --password=yourpass horde < mnemo_memos.sql
-(If you run another database server, see
- %%HORDEDIR%%/scripts/db/README
- for more explanations.)
+mysql --user=root --password=yourpass horde < mnemo_memos.sql
 
-Finally, you may have to tune the configuration files located in
-%%CONFDIR%%/, specially the files conf.php.
+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.
 
 To protect your configuration files, you have to restart Apache.
 ************************************************************************
diff --git a/deskutils/mnemo/pkg-plist b/deskutils/mnemo/pkg-plist
index 617238943638..f1f5fbdb9b2e 100644
--- a/deskutils/mnemo/pkg-plist
+++ b/deskutils/mnemo/pkg-plist
@@ -1,44 +1,38 @@
+etc/horde/httpd.conf.mnemo
 %%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/menu.php
-%%MNEMODIR%%/config/menu.php.dist
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
+%%MNEMODIR%%/config/.htaccess
+%%MNEMODIR%%/config/conf.xml
 %%MNEMODIR%%/config/prefs.php
 %%MNEMODIR%%/config/prefs.php.dist
-%%MNEMODIR%%/graphics/add.gif
-%%MNEMODIR%%/graphics/checkbox.gif
-%%MNEMODIR%%/graphics/colorpicker.gif
-%%MNEMODIR%%/graphics/colorpicker.png
-%%MNEMODIR%%/graphics/down.gif
-%%MNEMODIR%%/graphics/list.gif
-%%MNEMODIR%%/graphics/mnemo.gif
-%%MNEMODIR%%/graphics/print.gif
-%%MNEMODIR%%/graphics/refresh.gif
-%%MNEMODIR%%/graphics/search.gif
-%%MNEMODIR%%/graphics/up.gif
+%%MNEMODIR%%/data.php
 %%MNEMODIR%%/index.php
+%%MNEMODIR%%/lib/Block/summary.php
 %%MNEMODIR%%/lib/Driver.php
+%%MNEMODIR%%/lib/Driver/kolab.php
 %%MNEMODIR%%/lib/Driver/sql.php
 %%MNEMODIR%%/lib/Mnemo.php
 %%MNEMODIR%%/lib/api.php
 %%MNEMODIR%%/lib/base.php
-%%MNEMODIR%%/lib/constants.php
+%%MNEMODIR%%/lib/prefs.php
 %%MNEMODIR%%/lib/version.php
 %%MNEMODIR%%/list.php
 %%MNEMODIR%%/locale/bg_BG/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/cs_CZ/LC_MESSAGES/mnemo.mo
-%%MNEMODIR%%/locale/da_DK/help.xml
 %%MNEMODIR%%/locale/da_DK/LC_MESSAGES/mnemo.mo
-%%MNEMODIR%%/locale/de_DE/help.xml
+%%MNEMODIR%%/locale/da_DK/help.xml
 %%MNEMODIR%%/locale/de_DE/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/de_DE/help.xml
 %%MNEMODIR%%/locale/el_GR/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/en_US/help.xml
 %%MNEMODIR%%/locale/es_ES/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/es_ES/help.xml
 %%MNEMODIR%%/locale/fi_FI/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/fi_FI/help.xml
 %%MNEMODIR%%/locale/fr_FR/LC_MESSAGES/mnemo.mo
@@ -47,9 +41,12 @@
 %%MNEMODIR%%/locale/it_IT/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/it_IT/help.xml
 %%MNEMODIR%%/locale/lt_LT/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/lv_LV/LC_MESSAGES/mnemo.mo
+%%MNEMODIR%%/locale/lv_LV/help.xml
 %%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/pl_PL/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
@@ -59,8 +56,7 @@
 %%MNEMODIR%%/locale/zh_CN/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/locale/zh_TW/LC_MESSAGES/mnemo.mo
 %%MNEMODIR%%/memo.php
-%%MNEMODIR%%/menu.php
-%%MNEMODIR%%/po/Makefile
+%%MNEMODIR%%/notepads.php
 %%MNEMODIR%%/po/README
 %%MNEMODIR%%/po/bg_BG.po
 %%MNEMODIR%%/po/cs_CZ.po
@@ -68,118 +64,113 @@
 %%MNEMODIR%%/po/de_DE.po
 %%MNEMODIR%%/po/el_GR.po
 %%MNEMODIR%%/po/es_ES.po
-%%MNEMODIR%%/po/extract.pl
 %%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/lv_LV.po
 %%MNEMODIR%%/po/mnemo.pot
 %%MNEMODIR%%/po/nb_NO.po
 %%MNEMODIR%%/po/nl_NL.po
 %%MNEMODIR%%/po/nn_NO.po
+%%MNEMODIR%%/po/pl_PL.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
-%%MNEMODIR%%/po/xgettext.sh
 %%MNEMODIR%%/po/zh_CN.po
 %%MNEMODIR%%/po/zh_TW.po
-%%MNEMODIR%%/prefs.php
-%%MNEMODIR%%/scripts/drivers/mnemo_memos.sql
+%%MNEMODIR%%/scripts/.htaccess
+%%MNEMODIR%%/scripts/sql/mnemo.sql
+%%MNEMODIR%%/scripts/upgrades/1.1_to_2.0.mysql.sql
+%%MNEMODIR%%/scripts/upgrades/2004-12-21_add_memo_uid.sql
 %%MNEMODIR%%/search.php
-%%MNEMODIR%%/templates/common-footer.inc
 %%MNEMODIR%%/templates/common-header.inc
-%%MNEMODIR%%/templates/index/css.inc
-%%MNEMODIR%%/templates/index/notconfigured.inc
-%%MNEMODIR%%/templates/javascript/open_print_win.js
-%%MNEMODIR%%/templates/javascript/print.js
-%%MNEMODIR%%/templates/list/actions.inc
+%%MNEMODIR%%/templates/data/export.inc
+%%MNEMODIR%%/templates/data/import.inc
 %%MNEMODIR%%/templates/list/empty.inc
-%%MNEMODIR%%/templates/list/footer.inc
 %%MNEMODIR%%/templates/list/header.inc
-%%MNEMODIR%%/templates/list/javascript.inc
 %%MNEMODIR%%/templates/list/memo_footers.inc
 %%MNEMODIR%%/templates/list/memo_headers.inc
 %%MNEMODIR%%/templates/list/memo_summaries.inc
-%%MNEMODIR%%/templates/memo/begin.inc
-%%MNEMODIR%%/templates/memo/end.inc
 %%MNEMODIR%%/templates/memo/memo.inc
-%%MNEMODIR%%/templates/menu/menu.inc
-%%MNEMODIR%%/templates/prefs/category_management.inc
-%%MNEMODIR%%/templates/search/begin.inc
-%%MNEMODIR%%/templates/search/end.inc
+%%MNEMODIR%%/templates/menu.inc
+%%MNEMODIR%%/templates/notepads/notepads.inc
+%%MNEMODIR%%/templates/prefs/notepadselect.inc
+%%MNEMODIR%%/templates/prefs/showsummaryselect.inc
 %%MNEMODIR%%/templates/search/search.inc
-%%MNEMODIR%%/templates/view/description.inc
-%%MNEMODIR%%/templates/view/headers.inc
-%%MNEMODIR%%/templates/view/navbar.inc
-%%MNEMODIR%%/templates/view/no-memo.inc
-%%MNEMODIR%%/util/colorpicker.php
+%%MNEMODIR%%/templates/view/memo.inc
+%%MNEMODIR%%/themes/graphics/add.png
+%%MNEMODIR%%/themes/graphics/mnemo.png
+%%MNEMODIR%%/themes/graphics/notepads.png
 %%MNEMODIR%%/view.php
-@dirrm %%MNEMODIR%%/config
-@dirrm %%MNEMODIR%%/graphics
-@dirrm %%MNEMODIR%%/lib/Driver
-@dirrm %%MNEMODIR%%/lib
-@dirrm %%MNEMODIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/bg_BG
-@dirrm %%MNEMODIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/cs_CZ
-@dirrm %%MNEMODIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/da_DK
-@dirrm %%MNEMODIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/de_DE
-@dirrm %%MNEMODIR%%/locale/en_US
-@dirrm %%MNEMODIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/el_GR
-@dirrm %%MNEMODIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/es_ES
-@dirrm %%MNEMODIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/fi_FI
-@dirrm %%MNEMODIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/fr_FR
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%MNEMODIR%%/themes/graphics
+@dirrm %%MNEMODIR%%/themes
+@dirrm %%MNEMODIR%%/templates/view
+@dirrm %%MNEMODIR%%/templates/search
+@dirrm %%MNEMODIR%%/templates/prefs
+@dirrm %%MNEMODIR%%/templates/notepads
+@dirrm %%MNEMODIR%%/templates/memo
+@dirrm %%MNEMODIR%%/templates/list
+@dirrm %%MNEMODIR%%/templates/data
+@dirrm %%MNEMODIR%%/templates
+@dirrm %%MNEMODIR%%/scripts/upgrades
+@dirrm %%MNEMODIR%%/scripts/sql
+@dirrm %%MNEMODIR%%/scripts
+@dirrm %%MNEMODIR%%/po
+@dirrm %%MNEMODIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/zh_TW
+@dirrm %%MNEMODIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/zh_CN
+@dirrm %%MNEMODIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/sv_SE
+@dirrm %%MNEMODIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/sk_SK
+@dirrm %%MNEMODIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/ro_RO
+@dirrm %%MNEMODIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/pt_PT
+@dirrm %%MNEMODIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/pt_BR
+@dirrm %%MNEMODIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/pl_PL
+@dirrm %%MNEMODIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/nn_NO
+@dirrm %%MNEMODIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/nl_NL
+@dirrm %%MNEMODIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/nb_NO
+@dirrm %%MNEMODIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/lv_LV
 @dirrm %%MNEMODIR%%/locale/lt_LT/LC_MESSAGES
 @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
-@dirrm %%MNEMODIR%%/locale/nl_NL
-@dirrm %%MNEMODIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/nn_NO
-@dirrm %%MNEMODIR%%/locale/pt_BR/LC_MESSAGES
-@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
-@dirrm %%MNEMODIR%%/locale/sv_SE
-@dirrm %%MNEMODIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/zh_CN
-@dirrm %%MNEMODIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%MNEMODIR%%/locale/zh_TW
+@dirrm %%MNEMODIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/hu_HU
+@dirrm %%MNEMODIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/fr_FR
+@dirrm %%MNEMODIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/fi_FI
+@dirrm %%MNEMODIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/es_ES
+@dirrm %%MNEMODIR%%/locale/en_US
+@dirrm %%MNEMODIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/el_GR
+@dirrm %%MNEMODIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/de_DE
+@dirrm %%MNEMODIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/da_DK
+@dirrm %%MNEMODIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/cs_CZ
+@dirrm %%MNEMODIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%MNEMODIR%%/locale/bg_BG
 @dirrm %%MNEMODIR%%/locale
-@dirrm %%MNEMODIR%%/po
-@dirrm %%MNEMODIR%%/scripts/drivers
-@dirrm %%MNEMODIR%%/scripts
-@dirrm %%MNEMODIR%%/templates/index
-@dirrm %%MNEMODIR%%/templates/javascript
-@dirrm %%MNEMODIR%%/templates/list
-@dirrm %%MNEMODIR%%/templates/memo
-@dirrm %%MNEMODIR%%/templates/menu
-@dirrm %%MNEMODIR%%/templates/prefs
-@dirrm %%MNEMODIR%%/templates/search
-@dirrm %%MNEMODIR%%/templates/view
-@dirrm %%MNEMODIR%%/templates
-@dirrm %%MNEMODIR%%/util
-@dirrm %%MNEMODIR%%
-etc/horde/httpd.conf.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
+@dirrm %%MNEMODIR%%/lib/Driver
+@dirrm %%MNEMODIR%%/lib/Block
+@dirrm %%MNEMODIR%%/lib
+@unexec rmdir %D/%%MNEMODIR%%/config 2>/dev/null || true
+@unexec rmdir %D/%%MNEMODIR%% 2>/dev/null || true