Upgrade to 2.1.

Changelog at
<http://cvs.horde.org/diff.php/nag/docs/CHANGES?r1=1.115.2.21.2.2&r2=1.115.2.36&ty=h>

12 files changed, 84 insertions, 39 deletions

diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index 378160e55120..9ca5aacb4119 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nag
-PORTVERSION=	2.0.4
+PORTVERSION=	2.1
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/nag/				\
 		ftp://ftp.planetmirror.com/pub/horde/nag/		\
@@ -26,6 +26,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=	NAGDIR=${LNAGDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -33,10 +34,11 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	NAGDIR=${NAGDIR}
 
-DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
+REINPLACE_ARGS=	-i ""
+DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES docs/TODO docs/UPGRADING
 CONFFILE=	menu.php prefs.php
-SUB_DIRS=	config lib locale po scripts templates themes
+SUB_DIRS=	config js lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
 LNAGDIR?=	${LHORDEDIR}/nag
@@ -53,6 +55,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/nag:${NAGDIR}:g"		\
 		${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf
 
diff --git a/deskutils/horde-nag/distinfo b/deskutils/horde-nag/distinfo
index e71d5f678eec..ca75c69371cc 100644
--- a/deskutils/horde-nag/distinfo
+++ b/deskutils/horde-nag/distinfo
@@ -1,3 +1,3 @@
-MD5 (nag-h3-2.0.4.tar.gz) = bc405088672f0118c2e27f35dfff1a67
-SHA256 (nag-h3-2.0.4.tar.gz) = bbbc5a23926c775d0cf7ec298247ecc579214e8d4b35c1c5a0466952d0225be7
-SIZE (nag-h3-2.0.4.tar.gz) = 1074058
+MD5 (nag-h3-2.1.tar.gz) = 3d6c93edabf7dc29e896d3ac5c8d9115
+SHA256 (nag-h3-2.1.tar.gz) = 4534df2af6aac5c62dc46cdb67b93a3e767a54c52ce819df11970883f8092f8a
+SIZE (nag-h3-2.1.tar.gz) = 1085942
diff --git a/deskutils/horde-nag/files/pkg-message.in b/deskutils/horde-nag/files/pkg-message.in
index db8489feb386..4713eea2cb00 100644
--- a/deskutils/horde-nag/files/pkg-message.in
+++ b/deskutils/horde-nag/files/pkg-message.in
@@ -9,9 +9,6 @@ Then, you have to create the table nag_tasks, from the SQL script
 For example, if your database is MySQL, you may run
 mysql --user=root --password=yourpass horde < nag.sql
 
-WARNING! if you are upgrading from Nag v. 1.1.x, you have to alter your
-******** schemas. 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-nag/pkg-plist b/deskutils/horde-nag/pkg-plist
index 2cf660b6f809..a886f7e308a1 100644
--- a/deskutils/horde-nag/pkg-plist
+++ b/deskutils/horde-nag/pkg-plist
@@ -1,6 +1,5 @@
 %%HORDE_INC%%/httpd-nag.conf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -14,11 +13,13 @@
 %%NAGDIR%%/config/prefs.php
 %%NAGDIR%%/config/prefs.php.dist
 %%NAGDIR%%/data.php
+%%NAGDIR%%/ics.php
 %%NAGDIR%%/index.php
+%%NAGDIR%%/js/fixUnstyledOptions.js
+%%NAGDIR%%/js/tables.js
 %%NAGDIR%%/lib/.htaccess
 %%NAGDIR%%/lib/Block/summary.php
 %%NAGDIR%%/lib/Driver.php
-%%NAGDIR%%/lib/Driver/datatree.php
 %%NAGDIR%%/lib/Driver/kolab.php
 %%NAGDIR%%/lib/Driver/sql.php
 %%NAGDIR%%/lib/Nag.php
@@ -33,8 +34,8 @@
 %%NAGDIR%%/locale/bg_BG/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/cs_CZ/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/da_DK/LC_MESSAGES/nag.mo
-%%NAGDIR%%/locale/de_DE/help.xml
 %%NAGDIR%%/locale/de_DE/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/de_DE/help.xml
 %%NAGDIR%%/locale/el_GR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/en_US/help.xml
 %%NAGDIR%%/locale/es_ES/LC_MESSAGES/nag.mo
@@ -57,11 +58,13 @@
 %%NAGDIR%%/locale/nn_NO/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/pl_PL/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/pt_BR/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/pt_PT/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ro_RO/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ru_RU/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/sk_SK/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/sk_SK/help.xml
 %%NAGDIR%%/locale/sv_SE/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/tr_TR/help.xml
 %%NAGDIR%%/locale/zh_CN/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/zh_TW/LC_MESSAGES/nag.mo
 %%NAGDIR%%/po/README
@@ -87,6 +90,7 @@
 %%NAGDIR%%/po/nn_NO.po
 %%NAGDIR%%/po/pl_PL.po
 %%NAGDIR%%/po/pt_BR.po
+%%NAGDIR%%/po/pt_PT.po
 %%NAGDIR%%/po/ro_RO.po
 %%NAGDIR%%/po/ru_RU.po
 %%NAGDIR%%/po/sk_SK.po
@@ -94,7 +98,9 @@
 %%NAGDIR%%/po/zh_CN.po
 %%NAGDIR%%/po/zh_TW.po
 %%NAGDIR%%/scripts/.htaccess
-%%NAGDIR%%/scripts/migrate_to_datatree_driver.php
+%%NAGDIR%%/scripts/import_vtodos.php
+%%NAGDIR%%/scripts/sql/nag.mssql.sql
+%%NAGDIR%%/scripts/sql/nag.oci8.sql
 %%NAGDIR%%/scripts/sql/nag.sql
 %%NAGDIR%%/scripts/upgrades/1.1_to_2.0.mysql.sql
 %%NAGDIR%%/scripts/upgrades/1.1_to_2.0.pgsql.sql
@@ -116,9 +122,11 @@
 %%NAGDIR%%/templates/task/task.inc
 %%NAGDIR%%/templates/tasklists/tasklists.inc
 %%NAGDIR%%/templates/view/task.inc
+%%NAGDIR%%/themes/categoryCSS.php
 %%NAGDIR%%/themes/graphics/add.png
 %%NAGDIR%%/themes/graphics/alarm.png
 %%NAGDIR%%/themes/graphics/alarm_small.png
+%%NAGDIR%%/themes/graphics/az.png
 %%NAGDIR%%/themes/graphics/checkbox.png
 %%NAGDIR%%/themes/graphics/checked.png
 %%NAGDIR%%/themes/graphics/favicon.ico
@@ -126,6 +134,7 @@
 %%NAGDIR%%/themes/graphics/note.png
 %%NAGDIR%%/themes/graphics/tasklists.png
 %%NAGDIR%%/themes/graphics/unchecked.png
+%%NAGDIR%%/themes/graphics/za.png
 %%NAGDIR%%/themes/screen.css
 %%NAGDIR%%/view.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
@@ -147,6 +156,7 @@
 @dirrm %%NAGDIR%%/locale/zh_TW
 @dirrm %%NAGDIR%%/locale/zh_CN/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/zh_CN
+@dirrm %%NAGDIR%%/locale/tr_TR
 @dirrm %%NAGDIR%%/locale/sv_SE/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/sv_SE
 @dirrm %%NAGDIR%%/locale/sk_SK/LC_MESSAGES
@@ -155,6 +165,8 @@
 @dirrm %%NAGDIR%%/locale/ru_RU
 @dirrm %%NAGDIR%%/locale/ro_RO/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/ro_RO
+@dirrm %%NAGDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/pt_PT
 @dirrm %%NAGDIR%%/locale/pt_BR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/pt_BR
 @dirrm %%NAGDIR%%/locale/pl_PL/LC_MESSAGES
@@ -204,5 +216,6 @@
 @dirrm %%NAGDIR%%/lib/Driver
 @dirrm %%NAGDIR%%/lib/Block
 @dirrm %%NAGDIR%%/lib
+@dirrm %%NAGDIR%%/js
 @dirrmtry %%NAGDIR%%/config
 @dirrmtry %%NAGDIR%%
diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde4-nag/Makefile
index 378160e55120..9ca5aacb4119 100644
--- a/deskutils/horde4-nag/Makefile
+++ b/deskutils/horde4-nag/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nag
-PORTVERSION=	2.0.4
+PORTVERSION=	2.1
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/nag/				\
 		ftp://ftp.planetmirror.com/pub/horde/nag/		\
@@ -26,6 +26,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=	NAGDIR=${LNAGDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -33,10 +34,11 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	NAGDIR=${NAGDIR}
 
-DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
+REINPLACE_ARGS=	-i ""
+DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES docs/TODO docs/UPGRADING
 CONFFILE=	menu.php prefs.php
-SUB_DIRS=	config lib locale po scripts templates themes
+SUB_DIRS=	config js lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
 LNAGDIR?=	${LHORDEDIR}/nag
@@ -53,6 +55,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/nag:${NAGDIR}:g"		\
 		${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf
 
diff --git a/deskutils/horde4-nag/distinfo b/deskutils/horde4-nag/distinfo
index e71d5f678eec..ca75c69371cc 100644
--- a/deskutils/horde4-nag/distinfo
+++ b/deskutils/horde4-nag/distinfo
@@ -1,3 +1,3 @@
-MD5 (nag-h3-2.0.4.tar.gz) = bc405088672f0118c2e27f35dfff1a67
-SHA256 (nag-h3-2.0.4.tar.gz) = bbbc5a23926c775d0cf7ec298247ecc579214e8d4b35c1c5a0466952d0225be7
-SIZE (nag-h3-2.0.4.tar.gz) = 1074058
+MD5 (nag-h3-2.1.tar.gz) = 3d6c93edabf7dc29e896d3ac5c8d9115
+SHA256 (nag-h3-2.1.tar.gz) = 4534df2af6aac5c62dc46cdb67b93a3e767a54c52ce819df11970883f8092f8a
+SIZE (nag-h3-2.1.tar.gz) = 1085942
diff --git a/deskutils/horde4-nag/files/pkg-message.in b/deskutils/horde4-nag/files/pkg-message.in
index db8489feb386..4713eea2cb00 100644
--- a/deskutils/horde4-nag/files/pkg-message.in
+++ b/deskutils/horde4-nag/files/pkg-message.in
@@ -9,9 +9,6 @@ Then, you have to create the table nag_tasks, from the SQL script
 For example, if your database is MySQL, you may run
 mysql --user=root --password=yourpass horde < nag.sql
 
-WARNING! if you are upgrading from Nag v. 1.1.x, you have to alter your
-******** schemas. Please read the doc %%DOCSDIR%%/UPGRADING.
-
 Finally, you must login to Horde as a Horde Administrator to finish the
 configuration.
 
diff --git a/deskutils/horde4-nag/pkg-plist b/deskutils/horde4-nag/pkg-plist
index 2cf660b6f809..a886f7e308a1 100644
--- a/deskutils/horde4-nag/pkg-plist
+++ b/deskutils/horde4-nag/pkg-plist
@@ -1,6 +1,5 @@
 %%HORDE_INC%%/httpd-nag.conf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -14,11 +13,13 @@
 %%NAGDIR%%/config/prefs.php
 %%NAGDIR%%/config/prefs.php.dist
 %%NAGDIR%%/data.php
+%%NAGDIR%%/ics.php
 %%NAGDIR%%/index.php
+%%NAGDIR%%/js/fixUnstyledOptions.js
+%%NAGDIR%%/js/tables.js
 %%NAGDIR%%/lib/.htaccess
 %%NAGDIR%%/lib/Block/summary.php
 %%NAGDIR%%/lib/Driver.php
-%%NAGDIR%%/lib/Driver/datatree.php
 %%NAGDIR%%/lib/Driver/kolab.php
 %%NAGDIR%%/lib/Driver/sql.php
 %%NAGDIR%%/lib/Nag.php
@@ -33,8 +34,8 @@
 %%NAGDIR%%/locale/bg_BG/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/cs_CZ/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/da_DK/LC_MESSAGES/nag.mo
-%%NAGDIR%%/locale/de_DE/help.xml
 %%NAGDIR%%/locale/de_DE/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/de_DE/help.xml
 %%NAGDIR%%/locale/el_GR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/en_US/help.xml
 %%NAGDIR%%/locale/es_ES/LC_MESSAGES/nag.mo
@@ -57,11 +58,13 @@
 %%NAGDIR%%/locale/nn_NO/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/pl_PL/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/pt_BR/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/pt_PT/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ro_RO/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ru_RU/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/sk_SK/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/sk_SK/help.xml
 %%NAGDIR%%/locale/sv_SE/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/tr_TR/help.xml
 %%NAGDIR%%/locale/zh_CN/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/zh_TW/LC_MESSAGES/nag.mo
 %%NAGDIR%%/po/README
@@ -87,6 +90,7 @@
 %%NAGDIR%%/po/nn_NO.po
 %%NAGDIR%%/po/pl_PL.po
 %%NAGDIR%%/po/pt_BR.po
+%%NAGDIR%%/po/pt_PT.po
 %%NAGDIR%%/po/ro_RO.po
 %%NAGDIR%%/po/ru_RU.po
 %%NAGDIR%%/po/sk_SK.po
@@ -94,7 +98,9 @@
 %%NAGDIR%%/po/zh_CN.po
 %%NAGDIR%%/po/zh_TW.po
 %%NAGDIR%%/scripts/.htaccess
-%%NAGDIR%%/scripts/migrate_to_datatree_driver.php
+%%NAGDIR%%/scripts/import_vtodos.php
+%%NAGDIR%%/scripts/sql/nag.mssql.sql
+%%NAGDIR%%/scripts/sql/nag.oci8.sql
 %%NAGDIR%%/scripts/sql/nag.sql
 %%NAGDIR%%/scripts/upgrades/1.1_to_2.0.mysql.sql
 %%NAGDIR%%/scripts/upgrades/1.1_to_2.0.pgsql.sql
@@ -116,9 +122,11 @@
 %%NAGDIR%%/templates/task/task.inc
 %%NAGDIR%%/templates/tasklists/tasklists.inc
 %%NAGDIR%%/templates/view/task.inc
+%%NAGDIR%%/themes/categoryCSS.php
 %%NAGDIR%%/themes/graphics/add.png
 %%NAGDIR%%/themes/graphics/alarm.png
 %%NAGDIR%%/themes/graphics/alarm_small.png
+%%NAGDIR%%/themes/graphics/az.png
 %%NAGDIR%%/themes/graphics/checkbox.png
 %%NAGDIR%%/themes/graphics/checked.png
 %%NAGDIR%%/themes/graphics/favicon.ico
@@ -126,6 +134,7 @@
 %%NAGDIR%%/themes/graphics/note.png
 %%NAGDIR%%/themes/graphics/tasklists.png
 %%NAGDIR%%/themes/graphics/unchecked.png
+%%NAGDIR%%/themes/graphics/za.png
 %%NAGDIR%%/themes/screen.css
 %%NAGDIR%%/view.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
@@ -147,6 +156,7 @@
 @dirrm %%NAGDIR%%/locale/zh_TW
 @dirrm %%NAGDIR%%/locale/zh_CN/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/zh_CN
+@dirrm %%NAGDIR%%/locale/tr_TR
 @dirrm %%NAGDIR%%/locale/sv_SE/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/sv_SE
 @dirrm %%NAGDIR%%/locale/sk_SK/LC_MESSAGES
@@ -155,6 +165,8 @@
 @dirrm %%NAGDIR%%/locale/ru_RU
 @dirrm %%NAGDIR%%/locale/ro_RO/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/ro_RO
+@dirrm %%NAGDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/pt_PT
 @dirrm %%NAGDIR%%/locale/pt_BR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/pt_BR
 @dirrm %%NAGDIR%%/locale/pl_PL/LC_MESSAGES
@@ -204,5 +216,6 @@
 @dirrm %%NAGDIR%%/lib/Driver
 @dirrm %%NAGDIR%%/lib/Block
 @dirrm %%NAGDIR%%/lib
+@dirrm %%NAGDIR%%/js
 @dirrmtry %%NAGDIR%%/config
 @dirrmtry %%NAGDIR%%
diff --git a/deskutils/nag/Makefile b/deskutils/nag/Makefile
index 378160e55120..9ca5aacb4119 100644
--- a/deskutils/nag/Makefile
+++ b/deskutils/nag/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nag
-PORTVERSION=	2.0.4
+PORTVERSION=	2.1
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/nag/				\
 		ftp://ftp.planetmirror.com/pub/horde/nag/		\
@@ -26,6 +26,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=	NAGDIR=${LNAGDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -33,10 +34,11 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	NAGDIR=${NAGDIR}
 
-DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
+REINPLACE_ARGS=	-i ""
+DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES docs/TODO docs/UPGRADING
 CONFFILE=	menu.php prefs.php
-SUB_DIRS=	config lib locale po scripts templates themes
+SUB_DIRS=	config js lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
 LNAGDIR?=	${LHORDEDIR}/nag
@@ -53,6 +55,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/nag:${NAGDIR}:g"		\
 		${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf
 
diff --git a/deskutils/nag/distinfo b/deskutils/nag/distinfo
index e71d5f678eec..ca75c69371cc 100644
--- a/deskutils/nag/distinfo
+++ b/deskutils/nag/distinfo
@@ -1,3 +1,3 @@
-MD5 (nag-h3-2.0.4.tar.gz) = bc405088672f0118c2e27f35dfff1a67
-SHA256 (nag-h3-2.0.4.tar.gz) = bbbc5a23926c775d0cf7ec298247ecc579214e8d4b35c1c5a0466952d0225be7
-SIZE (nag-h3-2.0.4.tar.gz) = 1074058
+MD5 (nag-h3-2.1.tar.gz) = 3d6c93edabf7dc29e896d3ac5c8d9115
+SHA256 (nag-h3-2.1.tar.gz) = 4534df2af6aac5c62dc46cdb67b93a3e767a54c52ce819df11970883f8092f8a
+SIZE (nag-h3-2.1.tar.gz) = 1085942
diff --git a/deskutils/nag/files/pkg-message.in b/deskutils/nag/files/pkg-message.in
index db8489feb386..4713eea2cb00 100644
--- a/deskutils/nag/files/pkg-message.in
+++ b/deskutils/nag/files/pkg-message.in
@@ -9,9 +9,6 @@ Then, you have to create the table nag_tasks, from the SQL script
 For example, if your database is MySQL, you may run
 mysql --user=root --password=yourpass horde < nag.sql
 
-WARNING! if you are upgrading from Nag v. 1.1.x, you have to alter your
-******** schemas. Please read the doc %%DOCSDIR%%/UPGRADING.
-
 Finally, you must login to Horde as a Horde Administrator to finish the
 configuration.
 
diff --git a/deskutils/nag/pkg-plist b/deskutils/nag/pkg-plist
index 2cf660b6f809..a886f7e308a1 100644
--- a/deskutils/nag/pkg-plist
+++ b/deskutils/nag/pkg-plist
@@ -1,6 +1,5 @@
 %%HORDE_INC%%/httpd-nag.conf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -14,11 +13,13 @@
 %%NAGDIR%%/config/prefs.php
 %%NAGDIR%%/config/prefs.php.dist
 %%NAGDIR%%/data.php
+%%NAGDIR%%/ics.php
 %%NAGDIR%%/index.php
+%%NAGDIR%%/js/fixUnstyledOptions.js
+%%NAGDIR%%/js/tables.js
 %%NAGDIR%%/lib/.htaccess
 %%NAGDIR%%/lib/Block/summary.php
 %%NAGDIR%%/lib/Driver.php
-%%NAGDIR%%/lib/Driver/datatree.php
 %%NAGDIR%%/lib/Driver/kolab.php
 %%NAGDIR%%/lib/Driver/sql.php
 %%NAGDIR%%/lib/Nag.php
@@ -33,8 +34,8 @@
 %%NAGDIR%%/locale/bg_BG/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/cs_CZ/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/da_DK/LC_MESSAGES/nag.mo
-%%NAGDIR%%/locale/de_DE/help.xml
 %%NAGDIR%%/locale/de_DE/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/de_DE/help.xml
 %%NAGDIR%%/locale/el_GR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/en_US/help.xml
 %%NAGDIR%%/locale/es_ES/LC_MESSAGES/nag.mo
@@ -57,11 +58,13 @@
 %%NAGDIR%%/locale/nn_NO/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/pl_PL/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/pt_BR/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/pt_PT/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ro_RO/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ru_RU/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/sk_SK/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/sk_SK/help.xml
 %%NAGDIR%%/locale/sv_SE/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/tr_TR/help.xml
 %%NAGDIR%%/locale/zh_CN/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/zh_TW/LC_MESSAGES/nag.mo
 %%NAGDIR%%/po/README
@@ -87,6 +90,7 @@
 %%NAGDIR%%/po/nn_NO.po
 %%NAGDIR%%/po/pl_PL.po
 %%NAGDIR%%/po/pt_BR.po
+%%NAGDIR%%/po/pt_PT.po
 %%NAGDIR%%/po/ro_RO.po
 %%NAGDIR%%/po/ru_RU.po
 %%NAGDIR%%/po/sk_SK.po
@@ -94,7 +98,9 @@
 %%NAGDIR%%/po/zh_CN.po
 %%NAGDIR%%/po/zh_TW.po
 %%NAGDIR%%/scripts/.htaccess
-%%NAGDIR%%/scripts/migrate_to_datatree_driver.php
+%%NAGDIR%%/scripts/import_vtodos.php
+%%NAGDIR%%/scripts/sql/nag.mssql.sql
+%%NAGDIR%%/scripts/sql/nag.oci8.sql
 %%NAGDIR%%/scripts/sql/nag.sql
 %%NAGDIR%%/scripts/upgrades/1.1_to_2.0.mysql.sql
 %%NAGDIR%%/scripts/upgrades/1.1_to_2.0.pgsql.sql
@@ -116,9 +122,11 @@
 %%NAGDIR%%/templates/task/task.inc
 %%NAGDIR%%/templates/tasklists/tasklists.inc
 %%NAGDIR%%/templates/view/task.inc
+%%NAGDIR%%/themes/categoryCSS.php
 %%NAGDIR%%/themes/graphics/add.png
 %%NAGDIR%%/themes/graphics/alarm.png
 %%NAGDIR%%/themes/graphics/alarm_small.png
+%%NAGDIR%%/themes/graphics/az.png
 %%NAGDIR%%/themes/graphics/checkbox.png
 %%NAGDIR%%/themes/graphics/checked.png
 %%NAGDIR%%/themes/graphics/favicon.ico
@@ -126,6 +134,7 @@
 %%NAGDIR%%/themes/graphics/note.png
 %%NAGDIR%%/themes/graphics/tasklists.png
 %%NAGDIR%%/themes/graphics/unchecked.png
+%%NAGDIR%%/themes/graphics/za.png
 %%NAGDIR%%/themes/screen.css
 %%NAGDIR%%/view.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
@@ -147,6 +156,7 @@
 @dirrm %%NAGDIR%%/locale/zh_TW
 @dirrm %%NAGDIR%%/locale/zh_CN/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/zh_CN
+@dirrm %%NAGDIR%%/locale/tr_TR
 @dirrm %%NAGDIR%%/locale/sv_SE/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/sv_SE
 @dirrm %%NAGDIR%%/locale/sk_SK/LC_MESSAGES
@@ -155,6 +165,8 @@
 @dirrm %%NAGDIR%%/locale/ru_RU
 @dirrm %%NAGDIR%%/locale/ro_RO/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/ro_RO
+@dirrm %%NAGDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/pt_PT
 @dirrm %%NAGDIR%%/locale/pt_BR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/pt_BR
 @dirrm %%NAGDIR%%/locale/pl_PL/LC_MESSAGES
@@ -204,5 +216,6 @@
 @dirrm %%NAGDIR%%/lib/Driver
 @dirrm %%NAGDIR%%/lib/Block
 @dirrm %%NAGDIR%%/lib
+@dirrm %%NAGDIR%%/js
 @dirrmtry %%NAGDIR%%/config
 @dirrmtry %%NAGDIR%%