5 files changed, 262 insertions, 273 deletions

diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde4-nag/Makefile
index 7cc6df700ad3..53a6f9f6c216 100644
--- a/deskutils/horde4-nag/Makefile
+++ b/deskutils/horde4-nag/Makefile
@@ -6,18 +6,24 @@
 #
 
 PORTNAME=	nag
-PORTVERSION=	2.3.6
+PORTVERSION=	3.0.1
+DISTVERSIONPREFIX=
 DISTVERSIONSUFFIX=
-PORTREVISION=	1
-PORTEPOCH=	1
 CATEGORIES=	deskutils www
+MASTER_SITES=		http://pear.horde.org/get/ \
+			LOCAL/beech
+PKGNAMEPREFIX=	horde4-
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	Simple multiuser task list manager
 
+CONFLICTS=	nag-2.*
 USE_HORDE=	base
 USE_GETTEXT=	yes
-PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO UPGRADING
+PORTDOCS=	README CHANGES CREDITS INSTALL \
+		RELEASE_NOTES UPGRADING
+LATEST_LINK=	horde4-nag
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../www/horde4-base/bsd.horde4.mk"
+.include <bsd.port.mk>
\ No newline at end of file
diff --git a/deskutils/horde4-nag/distinfo b/deskutils/horde4-nag/distinfo
index 862c75a698a6..5b945d34162c 100644
--- a/deskutils/horde4-nag/distinfo
+++ b/deskutils/horde4-nag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nag-h3-2.3.6.tar.gz) = c516124694a2c74af21a7d7b0373d24f565ba7056b6e1ef7fc0e01f7eac54314
-SIZE (nag-h3-2.3.6.tar.gz) = 2118662
+SHA256 (nag-3.0.1.tgz) = 3f88e13267df1a5b6b41ca2bc5d4b482c9006ae842d584b1cc72eece7e830609
+SIZE (nag-3.0.1.tgz) = 1868133
diff --git a/deskutils/horde4-nag/files/pkg-message.in b/deskutils/horde4-nag/files/pkg-message.in
index 2a7122633db6..1ec450c9ae4f 100644
--- a/deskutils/horde4-nag/files/pkg-message.in
+++ b/deskutils/horde4-nag/files/pkg-message.in
@@ -3,13 +3,4 @@ Nag has been installed in %%HORDIR%% with your blank
 configuration files.
 
 Horde must be configured; if not, see `pkg_info -Dx horde-base'.
-
-Then, you have to create the table nag_tasks, from the SQL script
-%%HORDIR%%/scripts/sql/nag.sql.
-For example, if your database is MySQL, you may run
-mysql --user=root --password=yourpass horde < nag.sql
-
-Finally, you must login to Horde as a Horde Administrator to finish the
-configuration.
-
 ************************************************************************
diff --git a/deskutils/horde4-nag/pkg-descr b/deskutils/horde4-nag/pkg-descr
index 6eeeb953967c..a196f4c2ee40 100644
--- a/deskutils/horde4-nag/pkg-descr
+++ b/deskutils/horde4-nag/pkg-descr
@@ -1,3 +1,6 @@
-Nag is the Horde task list manager.
+Nag is a web-based application built upon the Horde Application Framework which
+provides a simple, clean interface for managing online task lists (i.e., todo
+lists). It also includes strong integration with the other Horde applications
+and allows users to share task lists or enable light-weight project management.
 
-WWW: http://horde.org/nag/
+WWW: http://horde.org/
diff --git a/deskutils/horde4-nag/pkg-plist b/deskutils/horde4-nag/pkg-plist
index 2e6fd9d75421..71daddf5d83b 100644
--- a/deskutils/horde4-nag/pkg-plist
+++ b/deskutils/horde4-nag/pkg-plist
@@ -1,145 +1,136 @@
+%%HORDIR%%/bin/nag-convert-datatree-shares-to-sql
+%%HORDIR%%/bin/nag-convert-sql-shares-to-sqlng
+%%HORDIR%%/bin/nag-create-missing-add-histories-sql
+%%HORDIR%%/bin/nag-import-vtodos
 %%HORDIR%%/config/.htaccess
 %%HORDIR%%/config/conf.xml
 %%HORDIR%%/config/hooks.php.dist
 %%HORDIR%%/config/menu.php.dist
-%%HORDIR%%/config/prefs.php.dist
+%%HORDIR%%/config/prefs.php
 %%HORDIR%%/data.php
-%%HORDIR%%/ics.php
 %%HORDIR%%/index.php
-%%HORDIR%%/js/QuickFinder.js
-%%HORDIR%%/js/effects.js
-%%HORDIR%%/js/prototype.js
-%%HORDIR%%/js/redbox.js
-%%HORDIR%%/js/scriptaculous.js
-%%HORDIR%%/js/src/QuickFinder.js
-%%HORDIR%%/js/src/effects.js
-%%HORDIR%%/js/src/prototype.js
-%%HORDIR%%/js/src/redbox.js
-%%HORDIR%%/js/src/scriptaculous.js
-%%HORDIR%%/js/src/tables.js
-%%HORDIR%%/js/tables.js
+%%HORDIR%%/js/calendar.js
 %%HORDIR%%/lib/.htaccess
-%%HORDIR%%/lib/Block/summary.php
-%%HORDIR%%/lib/Block/tree_alarms.php
-%%HORDIR%%/lib/Block/tree_menu.php
-%%HORDIR%%/lib/Driver/kolab.php
-%%HORDIR%%/lib/Driver/sql.php
+%%HORDIR%%/lib/Ajax/Application.php
+%%HORDIR%%/lib/Api.php
+%%HORDIR%%/lib/Application.php
+%%HORDIR%%/lib/Block/Summary.php
 %%HORDIR%%/lib/Driver.php
-%%HORDIR%%/lib/Forms/CreateTaskList.php
-%%HORDIR%%/lib/Forms/DeleteTaskList.php
-%%HORDIR%%/lib/Forms/EditTaskList.php
-%%HORDIR%%/lib/Forms/task.php
+%%HORDIR%%/lib/Driver/Kolab.php
+%%HORDIR%%/lib/Driver/Sql.php
+%%HORDIR%%/lib/Exception.php
+%%HORDIR%%/lib/Form/CreateTaskList.php
+%%HORDIR%%/lib/Form/DeleteTaskList.php
+%%HORDIR%%/lib/Form/EditTaskList.php
+%%HORDIR%%/lib/Form/Renderer/Task.php
+%%HORDIR%%/lib/Form/Task.php
+%%HORDIR%%/lib/Form/Type/NagAlarm.php
+%%HORDIR%%/lib/Form/Type/NagDue.php
+%%HORDIR%%/lib/Form/Type/NagMethod.php
+%%HORDIR%%/lib/Form/Type/NagStart.php
 %%HORDIR%%/lib/Nag.php
-%%HORDIR%%/lib/Notification/Listener/status.php
-%%HORDIR%%/lib/Recurrence.php
-%%HORDIR%%/lib/UI/VarRenderer/nag.php
-%%HORDIR%%/lib/api.php
-%%HORDIR%%/lib/base.php
-%%HORDIR%%/lib/prefs.php
-%%HORDIR%%/lib/version.php
+%%HORDIR%%/lib/QuickParser.php
+%%HORDIR%%/lib/Task.php
+%%HORDIR%%/lib/Ui/VarRenderer/Nag.php
+%%HORDIR%%/lib/test/Nag/AllTests.php
+%%HORDIR%%/lib/test/Nag/Autoload.php
+%%HORDIR%%/lib/test/Nag/Stub/Registry.php
+%%HORDIR%%/lib/test/Nag/TestCase.php
+%%HORDIR%%/lib/test/Nag/Unit/Driver/KolabTest.php
+%%HORDIR%%/lib/test/Nag/phpunit.xml
 %%HORDIR%%/list.php
-%%HORDIR%%/locale/ar_SY/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/bg_BG/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/ca_ES/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/ca_ES/help.xml
-%%HORDIR%%/locale/cs_CZ/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/da_DK/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/de_DE/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/de_DE/help.xml
-%%HORDIR%%/locale/el_GR/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/en_US/help.xml
-%%HORDIR%%/locale/es_ES/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/es_ES/help.xml
-%%HORDIR%%/locale/et_EE/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/eu_ES/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/eu_ES/help.xml
-%%HORDIR%%/locale/fi_FI/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/fi_FI/help.xml
-%%HORDIR%%/locale/fr_FR/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/hr_HR/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/hr_HR/help.xml
-%%HORDIR%%/locale/hu_HU/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/hu_HU/help.xml
-%%HORDIR%%/locale/id_ID/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/it_IT/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/ja_JP/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/ko_KR/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/lt_LT/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/lv_LV/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/lv_LV/help.xml
-%%HORDIR%%/locale/nb_NO/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/nl_NL/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/nl_NL/help.xml
-%%HORDIR%%/locale/nn_NO/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/pl_PL/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/.htaccess
+%%HORDIR%%/locale/ar/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/ar/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/bg/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/bg/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/ca/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/ca/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/ca/help.xml
+%%HORDIR%%/locale/cs/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/cs/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/da/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/da/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/de/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/de/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/de/help.xml
+%%HORDIR%%/locale/el/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/el/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/en/help.xml
+%%HORDIR%%/locale/es/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/es/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/es/help.xml
+%%HORDIR%%/locale/et/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/et/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/eu/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/eu/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/eu/help.xml
+%%HORDIR%%/locale/fi/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/fi/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/fi/help.xml
+%%HORDIR%%/locale/fr/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/fr/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/hr/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/hr/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/hr/help.xml
+%%HORDIR%%/locale/hu/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/hu/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/hu/help.xml
+%%HORDIR%%/locale/id/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/id/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/it/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/it/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/ja/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/ja/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/ko/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/ko/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/lt/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/lt/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/lv/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/lv/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/lv/help.xml
+%%HORDIR%%/locale/nag.pot
+%%HORDIR%%/locale/nb/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/nb/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/nl/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/nl/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/nl/help.xml
+%%HORDIR%%/locale/nn/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/nn/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/pl/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/pl/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/pt/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/pt/LC_MESSAGES/nag.po
 %%HORDIR%%/locale/pt_BR/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/pt_PT/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/ro_RO/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/ru_RU/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/sk_SK/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/sk_SK/help.xml
-%%HORDIR%%/locale/sl_SI/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/sv_SE/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/tr_TR/LC_MESSAGES/nag.mo
-%%HORDIR%%/locale/tr_TR/help.xml
+%%HORDIR%%/locale/pt_BR/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/ro/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/ro/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/ru/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/ru/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/sk/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/sk/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/sk/help.xml
+%%HORDIR%%/locale/sl/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/sl/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/sv/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/sv/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/tr/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/tr/LC_MESSAGES/nag.po
+%%HORDIR%%/locale/tr/help.xml
 %%HORDIR%%/locale/zh_CN/LC_MESSAGES/nag.mo
+%%HORDIR%%/locale/zh_CN/LC_MESSAGES/nag.po
 %%HORDIR%%/locale/zh_TW/LC_MESSAGES/nag.mo
-%%HORDIR%%/po/README
-%%HORDIR%%/po/ar_SY.po
-%%HORDIR%%/po/bg_BG.po
-%%HORDIR%%/po/ca_ES.po
-%%HORDIR%%/po/cs_CZ.po
-%%HORDIR%%/po/da_DK.po
-%%HORDIR%%/po/de_DE.po
-%%HORDIR%%/po/el_GR.po
-%%HORDIR%%/po/es_ES.po
-%%HORDIR%%/po/et_EE.po
-%%HORDIR%%/po/eu_ES.po
-%%HORDIR%%/po/fi_FI.po
-%%HORDIR%%/po/fr_FR.po
-%%HORDIR%%/po/hr_HR.po
-%%HORDIR%%/po/hu_HU.po
-%%HORDIR%%/po/id_ID.po
-%%HORDIR%%/po/it_IT.po
-%%HORDIR%%/po/ja_JP.po
-%%HORDIR%%/po/ko_KR.po
-%%HORDIR%%/po/lt_LT.po
-%%HORDIR%%/po/lv_LV.po
-%%HORDIR%%/po/nag.pot
-%%HORDIR%%/po/nb_NO.po
-%%HORDIR%%/po/nl_NL.po
-%%HORDIR%%/po/nn_NO.po
-%%HORDIR%%/po/pl_PL.po
-%%HORDIR%%/po/pt_BR.po
-%%HORDIR%%/po/pt_PT.po
-%%HORDIR%%/po/ro_RO.po
-%%HORDIR%%/po/ru_RU.po
-%%HORDIR%%/po/sk_SK.po
-%%HORDIR%%/po/sl_SI.po
-%%HORDIR%%/po/sv_SE.po
-%%HORDIR%%/po/tr_TR.po
-%%HORDIR%%/po/zh_CN.po
-%%HORDIR%%/po/zh_TW.po
-%%HORDIR%%/pref_api.php
-%%HORDIR%%/scripts/.htaccess
-%%HORDIR%%/scripts/import_vtodos.php
-%%HORDIR%%/scripts/sql/nag.mssql.sql
-%%HORDIR%%/scripts/sql/nag.oci8.sql
-%%HORDIR%%/scripts/sql/nag.sql
-%%HORDIR%%/scripts/sql/nag.xml
-%%HORDIR%%/scripts/upgrades/1.1_to_2.0.mysql.sql
-%%HORDIR%%/scripts/upgrades/1.1_to_2.0.oci8.sql
-%%HORDIR%%/scripts/upgrades/1.1_to_2.0.pgsql.sql
-%%HORDIR%%/scripts/upgrades/2.1_to_2.2.oci8.sql
-%%HORDIR%%/scripts/upgrades/2.1_to_2.2.sql
-%%HORDIR%%/scripts/upgrades/2.2_to_2.3.oci8.sql
-%%HORDIR%%/scripts/upgrades/2.2_to_2.3.pgsql.sql
-%%HORDIR%%/scripts/upgrades/2.2_to_2.3.sql
-%%HORDIR%%/scripts/upgrades/2004-09-13_add_uid_field.php
-%%HORDIR%%/scripts/upgrades/2006-04-18_add_creator_and_assignee_fields.php
-%%HORDIR%%/scripts/upgrades/2008-09-23_fix_group_uid.sql
-%%HORDIR%%/scripts/upgrades/convert_datatree_shares_to_sql.php
-%%HORDIR%%/scripts/upgrades/create_missing_add_histories_sql.php
+%%HORDIR%%/locale/zh_TW/LC_MESSAGES/nag.po
+%%HORDIR%%/migration/1_nag_base_tables.php
+%%HORDIR%%/migration/2_nag_upgrade_autoincrement.php
+%%HORDIR%%/migration/3_nag_upgrade_addalarmmethods.php
+%%HORDIR%%/migration/4_nag_upgrade_addcolor.php
+%%HORDIR%%/migration/5_nag_upgrade_systemshares.php
+%%HORDIR%%/migration/6_nag_upgrade_sqlng.php
+%%HORDIR%%/migration/7_nag_upgrade_sqlhierarchical.php
+%%HORDIR%%/migration/8_nag_upgrade_sqlnghierarchical.php
+%%HORDIR%%/mobile.php
+%%HORDIR%%/quick.php
 %%HORDIR%%/search.php
 %%HORDIR%%/task.php
 %%HORDIR%%/tasklists/create.php
@@ -148,43 +139,41 @@
 %%HORDIR%%/tasklists/index.php
 %%HORDIR%%/tasklists/info.php
 %%HORDIR%%/tasks/index.php
-%%HORDIR%%/templates/common-header.inc
+%%HORDIR%%/templates/alarm/mail.html.php
+%%HORDIR%%/templates/alarm/mail.plain.php
 %%HORDIR%%/templates/data/export.inc
 %%HORDIR%%/templates/data/import.inc
+%%HORDIR%%/templates/list.html.php
 %%HORDIR%%/templates/list/empty.inc
 %%HORDIR%%/templates/list/header.inc
 %%HORDIR%%/templates/list/task_footers.inc
 %%HORDIR%%/templates/list/task_headers.inc
 %%HORDIR%%/templates/list/task_summaries.inc
-%%HORDIR%%/templates/list.html.php
-%%HORDIR%%/templates/menu.inc
 %%HORDIR%%/templates/panel.inc
-%%HORDIR%%/templates/prefs/defaultduetimeselect.inc
-%%HORDIR%%/templates/prefs/tasklistselect.inc
+%%HORDIR%%/templates/quick.inc
 %%HORDIR%%/templates/search/search.inc
 %%HORDIR%%/templates/tasklist_info.php
 %%HORDIR%%/templates/tasklist_list.php
 %%HORDIR%%/templates/view/task.inc
 %%HORDIR%%/themes/bluewhite/screen.css
-%%HORDIR%%/themes/categoryCSS.php
+%%HORDIR%%/themes/default/graphics/add.png
+%%HORDIR%%/themes/default/graphics/alarm.png
+%%HORDIR%%/themes/default/graphics/alarm_small.png
+%%HORDIR%%/themes/default/graphics/az.png
+%%HORDIR%%/themes/default/graphics/big_alarm.png
+%%HORDIR%%/themes/default/graphics/checkbox.png
+%%HORDIR%%/themes/default/graphics/checked.png
+%%HORDIR%%/themes/default/graphics/favicon.ico
+%%HORDIR%%/themes/default/graphics/minus.png
+%%HORDIR%%/themes/default/graphics/nag.png
+%%HORDIR%%/themes/default/graphics/note.png
+%%HORDIR%%/themes/default/graphics/plus.png
+%%HORDIR%%/themes/default/graphics/search.png
+%%HORDIR%%/themes/default/graphics/tasklists.png
+%%HORDIR%%/themes/default/graphics/unchecked.png
+%%HORDIR%%/themes/default/graphics/za.png
+%%HORDIR%%/themes/default/screen.css
 %%HORDIR%%/themes/fadetogreen/screen.css
-%%HORDIR%%/themes/graphics/add.png
-%%HORDIR%%/themes/graphics/alarm.png
-%%HORDIR%%/themes/graphics/alarm_small.png
-%%HORDIR%%/themes/graphics/az.png
-%%HORDIR%%/themes/graphics/checkbox.png
-%%HORDIR%%/themes/graphics/checked.png
-%%HORDIR%%/themes/graphics/favicon.ico
-%%HORDIR%%/themes/graphics/minus.png
-%%HORDIR%%/themes/graphics/nag.png
-%%HORDIR%%/themes/graphics/note.png
-%%HORDIR%%/themes/graphics/plus.png
-%%HORDIR%%/themes/graphics/redbox_spinner.gif
-%%HORDIR%%/themes/graphics/search.png
-%%HORDIR%%/themes/graphics/tasklists.png
-%%HORDIR%%/themes/graphics/unchecked.png
-%%HORDIR%%/themes/graphics/za.png
-%%HORDIR%%/themes/screen.css
 %%HORDIR%%/themes/silver/graphics/add.png
 %%HORDIR%%/themes/silver/graphics/alarm.png
 %%HORDIR%%/themes/silver/graphics/alarm_small.png
@@ -201,8 +190,6 @@
 %%HORDIR%%/themes/silver/graphics/unchecked.png
 %%HORDIR%%/themes/silver/graphics/za.png
 %%HORDIR%%/themes/silver/screen.css
-%%HORDIR%%/themes/silver/themed_graphics
-%%HORDIR%%/themes/sounds/theetone.wav
 %%HORDIR%%/themes/tango-blue/graphics/add.png
 %%HORDIR%%/themes/tango-blue/graphics/alarm.png
 %%HORDIR%%/themes/tango-blue/graphics/alarm_small.png
@@ -213,109 +200,111 @@
 %%HORDIR%%/themes/tango-blue/graphics/note.png
 %%HORDIR%%/themes/tango-blue/graphics/tasklists.png
 %%HORDIR%%/themes/tango-blue/graphics/unchecked.png
-%%HORDIR%%/themes/tango-blue/themed_graphics
 %%HORDIR%%/view.php
-@dirrmtry %%HORDIR%%/config
-@dirrm %%HORDIR%%/js/src
-@dirrm %%HORDIR%%/js
-@dirrm %%HORDIR%%/lib/Block
-@dirrm %%HORDIR%%/lib/Driver
-@dirrm %%HORDIR%%/lib/Forms
-@dirrm %%HORDIR%%/lib/Notification/Listener
-@dirrm %%HORDIR%%/lib/Notification
-@dirrm %%HORDIR%%/lib/UI/VarRenderer
-@dirrm %%HORDIR%%/lib/UI
-@dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ar_SY
-@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/bg_BG
-@dirrm %%HORDIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ca_ES
-@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/cs_CZ
-@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/da_DK
-@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/de_DE
-@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/el_GR
-@dirrm %%HORDIR%%/locale/en_US
-@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/es_ES
-@dirrm %%HORDIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/et_EE
-@dirrm %%HORDIR%%/locale/eu_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/eu_ES
-@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fi_FI
-@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fr_FR
-@dirrm %%HORDIR%%/locale/hr_HR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/hr_HR
-@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/hu_HU
-@dirrm %%HORDIR%%/locale/id_ID/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/id_ID
-@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/it_IT
-@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ja_JP
-@dirrm %%HORDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ko_KR
-@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lt_LT
-@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lv_LV
-@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nb_NO
-@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nn_NO
-@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pl_PL
-@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_BR
-@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_PT
-@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ro_RO
-@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ru_RU
-@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sk_SK
-@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sl_SI
-@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sv_SE
-@dirrm %%HORDIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/tr_TR
-@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_CN
-@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_TW
-@dirrm %%HORDIR%%/locale
-@dirrm %%HORDIR%%/po
-@dirrm %%HORDIR%%/scripts/sql
-@dirrm %%HORDIR%%/scripts/upgrades
-@dirrm %%HORDIR%%/scripts
-@dirrm %%HORDIR%%/tasklists
-@dirrm %%HORDIR%%/tasks
-@dirrm %%HORDIR%%/templates/data
-@dirrm %%HORDIR%%/templates/list
-@dirrm %%HORDIR%%/templates/prefs
-@dirrm %%HORDIR%%/templates/search
-@dirrm %%HORDIR%%/templates/view
-@dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/themes/bluewhite
-@dirrm %%HORDIR%%/themes/fadetogreen
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes/silver/graphics
-@dirrm %%HORDIR%%/themes/silver
-@dirrm %%HORDIR%%/themes/sounds
 @dirrm %%HORDIR%%/themes/tango-blue/graphics
 @dirrm %%HORDIR%%/themes/tango-blue
+@dirrm %%HORDIR%%/themes/silver/graphics
+@dirrm %%HORDIR%%/themes/silver
+@dirrm %%HORDIR%%/themes/fadetogreen
+@dirrm %%HORDIR%%/themes/default/graphics
+@dirrm %%HORDIR%%/themes/default
+@dirrm %%HORDIR%%/themes/bluewhite
 @dirrm %%HORDIR%%/themes
+@dirrm %%HORDIR%%/templates/view
+@dirrm %%HORDIR%%/templates/search
+@dirrm %%HORDIR%%/templates/list
+@dirrm %%HORDIR%%/templates/data
+@dirrm %%HORDIR%%/templates/alarm
+@dirrm %%HORDIR%%/templates
+@dirrm %%HORDIR%%/tasks
+@dirrm %%HORDIR%%/tasklists
+@dirrm %%HORDIR%%/migration
+@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/zh_TW
+@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/zh_CN
+@dirrm %%HORDIR%%/locale/tr/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/tr
+@dirrm %%HORDIR%%/locale/sv/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sv
+@dirrm %%HORDIR%%/locale/sl/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sl
+@dirrm %%HORDIR%%/locale/sk/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sk
+@dirrm %%HORDIR%%/locale/ru/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ru
+@dirrm %%HORDIR%%/locale/ro/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ro
+@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_BR
+@dirrm %%HORDIR%%/locale/pt/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt
+@dirrm %%HORDIR%%/locale/pl/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pl
+@dirrm %%HORDIR%%/locale/nn/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nn
+@dirrm %%HORDIR%%/locale/nl/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nl
+@dirrm %%HORDIR%%/locale/nb/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nb
+@dirrm %%HORDIR%%/locale/lv/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lv
+@dirrm %%HORDIR%%/locale/lt/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lt
+@dirrm %%HORDIR%%/locale/ko/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ko
+@dirrm %%HORDIR%%/locale/ja/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ja
+@dirrm %%HORDIR%%/locale/it/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/it
+@dirrm %%HORDIR%%/locale/id/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/id
+@dirrm %%HORDIR%%/locale/hu/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hu
+@dirrm %%HORDIR%%/locale/hr/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hr
+@dirrm %%HORDIR%%/locale/fr/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fr
+@dirrm %%HORDIR%%/locale/fi/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fi
+@dirrm %%HORDIR%%/locale/eu/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/eu
+@dirrm %%HORDIR%%/locale/et/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/et
+@dirrm %%HORDIR%%/locale/es/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/es
+@dirrm %%HORDIR%%/locale/en
+@dirrm %%HORDIR%%/locale/el/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/el
+@dirrm %%HORDIR%%/locale/de/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/de
+@dirrm %%HORDIR%%/locale/da/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/da
+@dirrm %%HORDIR%%/locale/cs/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/cs
+@dirrm %%HORDIR%%/locale/ca/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ca
+@dirrm %%HORDIR%%/locale/bg/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/bg
+@dirrm %%HORDIR%%/locale/ar/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ar
+@dirrm %%HORDIR%%/locale
+@dirrm %%HORDIR%%/lib/test/Nag/Unit/Driver
+@dirrm %%HORDIR%%/lib/test/Nag/Unit
+@dirrm %%HORDIR%%/lib/test/Nag/Stub
+@dirrm %%HORDIR%%/lib/test/Nag
+@dirrm %%HORDIR%%/lib/test
+@dirrm %%HORDIR%%/lib/Ui/VarRenderer
+@dirrm %%HORDIR%%/lib/Ui
+@dirrm %%HORDIR%%/lib/Form/Type
+@dirrm %%HORDIR%%/lib/Form/Renderer
+@dirrm %%HORDIR%%/lib/Form
+@dirrm %%HORDIR%%/lib/Driver
+@dirrm %%HORDIR%%/lib/Block
+@dirrm %%HORDIR%%/lib/Ajax
+@dirrm %%HORDIR%%/lib
+@dirrm %%HORDIR%%/js
+@dirrm %%HORDIR%%/config
+@dirrm %%HORDIR%%/bin
 @dirrmtry %%HORDIR%%
 @dirrmtry %%HORBAS%%