Upgrade to 2.0.2.

9 files changed, 33 insertions, 27 deletions

diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index 9d6860cbcabb..33b044495007 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nag
-PORTVERSION=	2.0
+PORTVERSION=	2.0.2
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/nag/				\
 		ftp://ftp.planetmirror.com/pub/horde/nag/		\
@@ -29,6 +29,8 @@ USE_REINPLACE=	yes
 
 PLIST_SUB=	NAGDIR=${LNAGDIR}
 PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+SUB_LIST=	NAGDIR=${NAGDIR}
 
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES docs/TODO docs/UPGRADING
@@ -70,8 +72,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%NAGDIR%%:${NAGDIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/deskutils/horde-nag/distinfo b/deskutils/horde-nag/distinfo
index 5c4c4d5bfcee..4bc6e657659e 100644
--- a/deskutils/horde-nag/distinfo
+++ b/deskutils/horde-nag/distinfo
@@ -1,2 +1,2 @@
-MD5 (nag-h3-2.0.tar.gz) = 0db47fde7d618311831a525fe784588c
-SIZE (nag-h3-2.0.tar.gz) = 936114
+MD5 (nag-h3-2.0.2.tar.gz) = 7aa928522dadda94f02dfcbc5fb90058
+SIZE (nag-h3-2.0.2.tar.gz) = 1050906
diff --git a/deskutils/horde-nag/pkg-plist b/deskutils/horde-nag/pkg-plist
index 28b6869a8424..14695a512690 100644
--- a/deskutils/horde-nag/pkg-plist
+++ b/deskutils/horde-nag/pkg-plist
@@ -46,6 +46,7 @@ etc/horde/httpd.conf.nag
 %%NAGDIR%%/locale/hu_HU/help.xml
 %%NAGDIR%%/locale/id_ID/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/it_IT/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/ja_JP/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ko_KR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/lt_LT/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/lv_LV/LC_MESSAGES/nag.mo
@@ -76,6 +77,7 @@ etc/horde/httpd.conf.nag
 %%NAGDIR%%/po/hu_HU.po
 %%NAGDIR%%/po/id_ID.po
 %%NAGDIR%%/po/it_IT.po
+%%NAGDIR%%/po/ja_JP.po
 %%NAGDIR%%/po/ko_KR.po
 %%NAGDIR%%/po/lt_LT.po
 %%NAGDIR%%/po/lv_LV.po
@@ -95,6 +97,7 @@ etc/horde/httpd.conf.nag
 %%NAGDIR%%/scripts/migrate_to_datatree_driver.php
 %%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
 %%NAGDIR%%/scripts/upgrades/2004-09-13_add_uid_field.php
 %%NAGDIR%%/search.php
 %%NAGDIR%%/task.php
@@ -113,23 +116,20 @@ etc/horde/httpd.conf.nag
 %%NAGDIR%%/templates/task/task.inc
 %%NAGDIR%%/templates/tasklists/tasklists.inc
 %%NAGDIR%%/templates/view/task.inc
-%%NAGDIR%%/themes/grey/screen.css
 %%NAGDIR%%/themes/graphics/add.png
 %%NAGDIR%%/themes/graphics/alarm.png
 %%NAGDIR%%/themes/graphics/alarm_small.png
 %%NAGDIR%%/themes/graphics/checkbox.png
 %%NAGDIR%%/themes/graphics/checked.png
+%%NAGDIR%%/themes/graphics/favicon.ico
 %%NAGDIR%%/themes/graphics/nag.png
 %%NAGDIR%%/themes/graphics/note.png
 %%NAGDIR%%/themes/graphics/tasklists.png
 %%NAGDIR%%/themes/graphics/unchecked.png
 %%NAGDIR%%/themes/screen.css
-%%NAGDIR%%/themes/simplex/screen.css
 %%NAGDIR%%/view.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%NAGDIR%%/themes/simplex
 @dirrm %%NAGDIR%%/themes/graphics
-@dirrm %%NAGDIR%%/themes/grey
 @dirrm %%NAGDIR%%/themes
 @dirrm %%NAGDIR%%/templates/view
 @dirrm %%NAGDIR%%/templates/tasklists
@@ -171,6 +171,8 @@ etc/horde/httpd.conf.nag
 @dirrm %%NAGDIR%%/locale/lt_LT
 @dirrm %%NAGDIR%%/locale/ko_KR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/ko_KR
+@dirrm %%NAGDIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/ja_JP
 @dirrm %%NAGDIR%%/locale/it_IT/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/it_IT
 @dirrm %%NAGDIR%%/locale/id_ID/LC_MESSAGES
diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde4-nag/Makefile
index 9d6860cbcabb..33b044495007 100644
--- a/deskutils/horde4-nag/Makefile
+++ b/deskutils/horde4-nag/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nag
-PORTVERSION=	2.0
+PORTVERSION=	2.0.2
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/nag/				\
 		ftp://ftp.planetmirror.com/pub/horde/nag/		\
@@ -29,6 +29,8 @@ USE_REINPLACE=	yes
 
 PLIST_SUB=	NAGDIR=${LNAGDIR}
 PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+SUB_LIST=	NAGDIR=${NAGDIR}
 
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES docs/TODO docs/UPGRADING
@@ -70,8 +72,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%NAGDIR%%:${NAGDIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/deskutils/horde4-nag/distinfo b/deskutils/horde4-nag/distinfo
index 5c4c4d5bfcee..4bc6e657659e 100644
--- a/deskutils/horde4-nag/distinfo
+++ b/deskutils/horde4-nag/distinfo
@@ -1,2 +1,2 @@
-MD5 (nag-h3-2.0.tar.gz) = 0db47fde7d618311831a525fe784588c
-SIZE (nag-h3-2.0.tar.gz) = 936114
+MD5 (nag-h3-2.0.2.tar.gz) = 7aa928522dadda94f02dfcbc5fb90058
+SIZE (nag-h3-2.0.2.tar.gz) = 1050906
diff --git a/deskutils/horde4-nag/pkg-plist b/deskutils/horde4-nag/pkg-plist
index 28b6869a8424..14695a512690 100644
--- a/deskutils/horde4-nag/pkg-plist
+++ b/deskutils/horde4-nag/pkg-plist
@@ -46,6 +46,7 @@ etc/horde/httpd.conf.nag
 %%NAGDIR%%/locale/hu_HU/help.xml
 %%NAGDIR%%/locale/id_ID/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/it_IT/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/ja_JP/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ko_KR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/lt_LT/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/lv_LV/LC_MESSAGES/nag.mo
@@ -76,6 +77,7 @@ etc/horde/httpd.conf.nag
 %%NAGDIR%%/po/hu_HU.po
 %%NAGDIR%%/po/id_ID.po
 %%NAGDIR%%/po/it_IT.po
+%%NAGDIR%%/po/ja_JP.po
 %%NAGDIR%%/po/ko_KR.po
 %%NAGDIR%%/po/lt_LT.po
 %%NAGDIR%%/po/lv_LV.po
@@ -95,6 +97,7 @@ etc/horde/httpd.conf.nag
 %%NAGDIR%%/scripts/migrate_to_datatree_driver.php
 %%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
 %%NAGDIR%%/scripts/upgrades/2004-09-13_add_uid_field.php
 %%NAGDIR%%/search.php
 %%NAGDIR%%/task.php
@@ -113,23 +116,20 @@ etc/horde/httpd.conf.nag
 %%NAGDIR%%/templates/task/task.inc
 %%NAGDIR%%/templates/tasklists/tasklists.inc
 %%NAGDIR%%/templates/view/task.inc
-%%NAGDIR%%/themes/grey/screen.css
 %%NAGDIR%%/themes/graphics/add.png
 %%NAGDIR%%/themes/graphics/alarm.png
 %%NAGDIR%%/themes/graphics/alarm_small.png
 %%NAGDIR%%/themes/graphics/checkbox.png
 %%NAGDIR%%/themes/graphics/checked.png
+%%NAGDIR%%/themes/graphics/favicon.ico
 %%NAGDIR%%/themes/graphics/nag.png
 %%NAGDIR%%/themes/graphics/note.png
 %%NAGDIR%%/themes/graphics/tasklists.png
 %%NAGDIR%%/themes/graphics/unchecked.png
 %%NAGDIR%%/themes/screen.css
-%%NAGDIR%%/themes/simplex/screen.css
 %%NAGDIR%%/view.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%NAGDIR%%/themes/simplex
 @dirrm %%NAGDIR%%/themes/graphics
-@dirrm %%NAGDIR%%/themes/grey
 @dirrm %%NAGDIR%%/themes
 @dirrm %%NAGDIR%%/templates/view
 @dirrm %%NAGDIR%%/templates/tasklists
@@ -171,6 +171,8 @@ etc/horde/httpd.conf.nag
 @dirrm %%NAGDIR%%/locale/lt_LT
 @dirrm %%NAGDIR%%/locale/ko_KR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/ko_KR
+@dirrm %%NAGDIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/ja_JP
 @dirrm %%NAGDIR%%/locale/it_IT/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/it_IT
 @dirrm %%NAGDIR%%/locale/id_ID/LC_MESSAGES
diff --git a/deskutils/nag/Makefile b/deskutils/nag/Makefile
index 9d6860cbcabb..33b044495007 100644
--- a/deskutils/nag/Makefile
+++ b/deskutils/nag/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nag
-PORTVERSION=	2.0
+PORTVERSION=	2.0.2
 CATEGORIES=	deskutils www
 MASTER_SITES=	ftp://ftp.horde.org/pub/nag/				\
 		ftp://ftp.planetmirror.com/pub/horde/nag/		\
@@ -29,6 +29,8 @@ USE_REINPLACE=	yes
 
 PLIST_SUB=	NAGDIR=${LNAGDIR}
 PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+SUB_LIST=	NAGDIR=${NAGDIR}
 
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES docs/TODO docs/UPGRADING
@@ -70,8 +72,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%NAGDIR%%:${NAGDIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/deskutils/nag/distinfo b/deskutils/nag/distinfo
index 5c4c4d5bfcee..4bc6e657659e 100644
--- a/deskutils/nag/distinfo
+++ b/deskutils/nag/distinfo
@@ -1,2 +1,2 @@
-MD5 (nag-h3-2.0.tar.gz) = 0db47fde7d618311831a525fe784588c
-SIZE (nag-h3-2.0.tar.gz) = 936114
+MD5 (nag-h3-2.0.2.tar.gz) = 7aa928522dadda94f02dfcbc5fb90058
+SIZE (nag-h3-2.0.2.tar.gz) = 1050906
diff --git a/deskutils/nag/pkg-plist b/deskutils/nag/pkg-plist
index 28b6869a8424..14695a512690 100644
--- a/deskutils/nag/pkg-plist
+++ b/deskutils/nag/pkg-plist
@@ -46,6 +46,7 @@ etc/horde/httpd.conf.nag
 %%NAGDIR%%/locale/hu_HU/help.xml
 %%NAGDIR%%/locale/id_ID/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/it_IT/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/ja_JP/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ko_KR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/lt_LT/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/lv_LV/LC_MESSAGES/nag.mo
@@ -76,6 +77,7 @@ etc/horde/httpd.conf.nag
 %%NAGDIR%%/po/hu_HU.po
 %%NAGDIR%%/po/id_ID.po
 %%NAGDIR%%/po/it_IT.po
+%%NAGDIR%%/po/ja_JP.po
 %%NAGDIR%%/po/ko_KR.po
 %%NAGDIR%%/po/lt_LT.po
 %%NAGDIR%%/po/lv_LV.po
@@ -95,6 +97,7 @@ etc/horde/httpd.conf.nag
 %%NAGDIR%%/scripts/migrate_to_datatree_driver.php
 %%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
 %%NAGDIR%%/scripts/upgrades/2004-09-13_add_uid_field.php
 %%NAGDIR%%/search.php
 %%NAGDIR%%/task.php
@@ -113,23 +116,20 @@ etc/horde/httpd.conf.nag
 %%NAGDIR%%/templates/task/task.inc
 %%NAGDIR%%/templates/tasklists/tasklists.inc
 %%NAGDIR%%/templates/view/task.inc
-%%NAGDIR%%/themes/grey/screen.css
 %%NAGDIR%%/themes/graphics/add.png
 %%NAGDIR%%/themes/graphics/alarm.png
 %%NAGDIR%%/themes/graphics/alarm_small.png
 %%NAGDIR%%/themes/graphics/checkbox.png
 %%NAGDIR%%/themes/graphics/checked.png
+%%NAGDIR%%/themes/graphics/favicon.ico
 %%NAGDIR%%/themes/graphics/nag.png
 %%NAGDIR%%/themes/graphics/note.png
 %%NAGDIR%%/themes/graphics/tasklists.png
 %%NAGDIR%%/themes/graphics/unchecked.png
 %%NAGDIR%%/themes/screen.css
-%%NAGDIR%%/themes/simplex/screen.css
 %%NAGDIR%%/view.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%NAGDIR%%/themes/simplex
 @dirrm %%NAGDIR%%/themes/graphics
-@dirrm %%NAGDIR%%/themes/grey
 @dirrm %%NAGDIR%%/themes
 @dirrm %%NAGDIR%%/templates/view
 @dirrm %%NAGDIR%%/templates/tasklists
@@ -171,6 +171,8 @@ etc/horde/httpd.conf.nag
 @dirrm %%NAGDIR%%/locale/lt_LT
 @dirrm %%NAGDIR%%/locale/ko_KR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/ko_KR
+@dirrm %%NAGDIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/ja_JP
 @dirrm %%NAGDIR%%/locale/it_IT/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/it_IT
 @dirrm %%NAGDIR%%/locale/id_ID/LC_MESSAGES