9 files changed, 78 insertions, 12 deletions

diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index b095464749fd..2f997563f112 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	nag
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
-MASTER_SITES=	ftp://ftp.horde.org/pub/nag/tarballs/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-RC3
+MASTER_SITES=	ftp://ftp.horde.org/pub/nag/tarballs/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. old
 
 MAINTAINER=	thierry@pompo.net
 
@@ -50,7 +50,11 @@ do-install:
 	@${CP} -p ${FILESDIR}/httpd.conf.nag ${HORDE_INC}
 	@${PERL} -pi -e "s:/home/httpd/html/horde/nag:${NAGDIR}:g" \
 		${HORDE_INC}/httpd.conf.nag
+	@${CP} -p ${HORDEDIR}/config/registry.php		\
+		${HORDEDIR}/config/registry.php.beforeNag
 	@${PERL} -pi -e "s://UNCOMMENTWHENINSTNAG::" ${HORDEDIR}/config/registry.php
+	@${CP} -p ${HORDEDIR}/config/registry.php		\
+		${HORDEDIR}/config/registry.php.afterNag
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
diff --git a/deskutils/horde-nag/distinfo b/deskutils/horde-nag/distinfo
index 956c7ffc9a34..1002357ab6b3 100644
--- a/deskutils/horde-nag/distinfo
+++ b/deskutils/horde-nag/distinfo
@@ -1 +1 @@
-MD5 (nag-1.0-RC3.tar.gz) = b5ac807a01cdfed212ea4eff9eaffad8
+MD5 (nag-1.0.tar.gz) = c62d4a1fe20d9badac5a4f0446c9cf1f
diff --git a/deskutils/horde-nag/pkg-plist b/deskutils/horde-nag/pkg-plist
index 26d8b393427e..c69cf5c9a25a 100644
--- a/deskutils/horde-nag/pkg-plist
+++ b/deskutils/horde-nag/pkg-plist
@@ -39,13 +39,18 @@
 %%NAGDIR%%/locale/en_US/help.xml
 %%NAGDIR%%/locale/es_ES/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/fi_FI/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/fi_FI/help.xml
 %%NAGDIR%%/locale/fr_FR/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/hu_HU/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/it_IT/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/ko_KR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/nl_NL/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/nn_NO/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/pt_BR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ru_RU/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/sv_SE/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/zh_CN/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/zh_TW/LC_MESSAGES/nag.mo
 %%NAGDIR%%/menu.php
 %%NAGDIR%%/po/Makefile
@@ -56,12 +61,16 @@
 %%NAGDIR%%/po/extract.pl
 %%NAGDIR%%/po/fi_FI.po
 %%NAGDIR%%/po/fr_FR.po
+%%NAGDIR%%/po/hu_HU.po
 %%NAGDIR%%/po/it_IT.po
+%%NAGDIR%%/po/ko_KR.po
 %%NAGDIR%%/po/nl_NL.po
+%%NAGDIR%%/po/nn_NO.po
 %%NAGDIR%%/po/pt_BR.po
 %%NAGDIR%%/po/ru_RU.po
 %%NAGDIR%%/po/ru_RU.KOI8-R.po
 %%NAGDIR%%/po/sv_SE.po
+%%NAGDIR%%/po/zh_CN.po
 %%NAGDIR%%/po/zh_TW.po
 %%NAGDIR%%/po/shtool
 %%NAGDIR%%/po/xgettext.sh
@@ -109,10 +118,16 @@
 @dirrm %%NAGDIR%%/locale/fi_FI
 @dirrm %%NAGDIR%%/locale/fr_FR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/fr_FR
+@dirrm %%NAGDIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/hu_HU
 @dirrm %%NAGDIR%%/locale/it_IT/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/it_IT
+@dirrm %%NAGDIR%%/locale/ko_KR/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/ko_KR
 @dirrm %%NAGDIR%%/locale/nl_NL/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/nl_NL
+@dirrm %%NAGDIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/nn_NO
 @dirrm %%NAGDIR%%/locale/pt_BR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/pt_BR
 @dirrm %%NAGDIR%%/locale/ru_RU/LC_MESSAGES
@@ -121,6 +136,8 @@
 @dirrm %%NAGDIR%%/locale/ru_RU.KOI8-R
 @dirrm %%NAGDIR%%/locale/sv_SE/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/sv_SE
+@dirrm %%NAGDIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/zh_CN
 @dirrm %%NAGDIR%%/locale/zh_TW/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/zh_TW
 @dirrm %%NAGDIR%%/locale
@@ -137,3 +154,4 @@
 @dirrm %%NAGDIR%%
 etc/horde/httpd.conf.nag
 %%PORTDOCS%%@dirrm share/doc/nag
+@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterNag; then rm -f %D/www/horde/config/registry.php.afterNag; mv %D/www/horde/config/registry.php.beforeNag %D/www/horde/config/registry.php; fi
diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde4-nag/Makefile
index b095464749fd..2f997563f112 100644
--- a/deskutils/horde4-nag/Makefile
+++ b/deskutils/horde4-nag/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	nag
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
-MASTER_SITES=	ftp://ftp.horde.org/pub/nag/tarballs/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-RC3
+MASTER_SITES=	ftp://ftp.horde.org/pub/nag/tarballs/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. old
 
 MAINTAINER=	thierry@pompo.net
 
@@ -50,7 +50,11 @@ do-install:
 	@${CP} -p ${FILESDIR}/httpd.conf.nag ${HORDE_INC}
 	@${PERL} -pi -e "s:/home/httpd/html/horde/nag:${NAGDIR}:g" \
 		${HORDE_INC}/httpd.conf.nag
+	@${CP} -p ${HORDEDIR}/config/registry.php		\
+		${HORDEDIR}/config/registry.php.beforeNag
 	@${PERL} -pi -e "s://UNCOMMENTWHENINSTNAG::" ${HORDEDIR}/config/registry.php
+	@${CP} -p ${HORDEDIR}/config/registry.php		\
+		${HORDEDIR}/config/registry.php.afterNag
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
diff --git a/deskutils/horde4-nag/distinfo b/deskutils/horde4-nag/distinfo
index 956c7ffc9a34..1002357ab6b3 100644
--- a/deskutils/horde4-nag/distinfo
+++ b/deskutils/horde4-nag/distinfo
@@ -1 +1 @@
-MD5 (nag-1.0-RC3.tar.gz) = b5ac807a01cdfed212ea4eff9eaffad8
+MD5 (nag-1.0.tar.gz) = c62d4a1fe20d9badac5a4f0446c9cf1f
diff --git a/deskutils/horde4-nag/pkg-plist b/deskutils/horde4-nag/pkg-plist
index 26d8b393427e..c69cf5c9a25a 100644
--- a/deskutils/horde4-nag/pkg-plist
+++ b/deskutils/horde4-nag/pkg-plist
@@ -39,13 +39,18 @@
 %%NAGDIR%%/locale/en_US/help.xml
 %%NAGDIR%%/locale/es_ES/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/fi_FI/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/fi_FI/help.xml
 %%NAGDIR%%/locale/fr_FR/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/hu_HU/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/it_IT/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/ko_KR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/nl_NL/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/nn_NO/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/pt_BR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ru_RU/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/sv_SE/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/zh_CN/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/zh_TW/LC_MESSAGES/nag.mo
 %%NAGDIR%%/menu.php
 %%NAGDIR%%/po/Makefile
@@ -56,12 +61,16 @@
 %%NAGDIR%%/po/extract.pl
 %%NAGDIR%%/po/fi_FI.po
 %%NAGDIR%%/po/fr_FR.po
+%%NAGDIR%%/po/hu_HU.po
 %%NAGDIR%%/po/it_IT.po
+%%NAGDIR%%/po/ko_KR.po
 %%NAGDIR%%/po/nl_NL.po
+%%NAGDIR%%/po/nn_NO.po
 %%NAGDIR%%/po/pt_BR.po
 %%NAGDIR%%/po/ru_RU.po
 %%NAGDIR%%/po/ru_RU.KOI8-R.po
 %%NAGDIR%%/po/sv_SE.po
+%%NAGDIR%%/po/zh_CN.po
 %%NAGDIR%%/po/zh_TW.po
 %%NAGDIR%%/po/shtool
 %%NAGDIR%%/po/xgettext.sh
@@ -109,10 +118,16 @@
 @dirrm %%NAGDIR%%/locale/fi_FI
 @dirrm %%NAGDIR%%/locale/fr_FR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/fr_FR
+@dirrm %%NAGDIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/hu_HU
 @dirrm %%NAGDIR%%/locale/it_IT/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/it_IT
+@dirrm %%NAGDIR%%/locale/ko_KR/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/ko_KR
 @dirrm %%NAGDIR%%/locale/nl_NL/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/nl_NL
+@dirrm %%NAGDIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/nn_NO
 @dirrm %%NAGDIR%%/locale/pt_BR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/pt_BR
 @dirrm %%NAGDIR%%/locale/ru_RU/LC_MESSAGES
@@ -121,6 +136,8 @@
 @dirrm %%NAGDIR%%/locale/ru_RU.KOI8-R
 @dirrm %%NAGDIR%%/locale/sv_SE/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/sv_SE
+@dirrm %%NAGDIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/zh_CN
 @dirrm %%NAGDIR%%/locale/zh_TW/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/zh_TW
 @dirrm %%NAGDIR%%/locale
@@ -137,3 +154,4 @@
 @dirrm %%NAGDIR%%
 etc/horde/httpd.conf.nag
 %%PORTDOCS%%@dirrm share/doc/nag
+@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterNag; then rm -f %D/www/horde/config/registry.php.afterNag; mv %D/www/horde/config/registry.php.beforeNag %D/www/horde/config/registry.php; fi
diff --git a/deskutils/nag/Makefile b/deskutils/nag/Makefile
index b095464749fd..2f997563f112 100644
--- a/deskutils/nag/Makefile
+++ b/deskutils/nag/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	nag
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
-MASTER_SITES=	ftp://ftp.horde.org/pub/nag/tarballs/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-RC3
+MASTER_SITES=	ftp://ftp.horde.org/pub/nag/tarballs/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. old
 
 MAINTAINER=	thierry@pompo.net
 
@@ -50,7 +50,11 @@ do-install:
 	@${CP} -p ${FILESDIR}/httpd.conf.nag ${HORDE_INC}
 	@${PERL} -pi -e "s:/home/httpd/html/horde/nag:${NAGDIR}:g" \
 		${HORDE_INC}/httpd.conf.nag
+	@${CP} -p ${HORDEDIR}/config/registry.php		\
+		${HORDEDIR}/config/registry.php.beforeNag
 	@${PERL} -pi -e "s://UNCOMMENTWHENINSTNAG::" ${HORDEDIR}/config/registry.php
+	@${CP} -p ${HORDEDIR}/config/registry.php		\
+		${HORDEDIR}/config/registry.php.afterNag
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
diff --git a/deskutils/nag/distinfo b/deskutils/nag/distinfo
index 956c7ffc9a34..1002357ab6b3 100644
--- a/deskutils/nag/distinfo
+++ b/deskutils/nag/distinfo
@@ -1 +1 @@
-MD5 (nag-1.0-RC3.tar.gz) = b5ac807a01cdfed212ea4eff9eaffad8
+MD5 (nag-1.0.tar.gz) = c62d4a1fe20d9badac5a4f0446c9cf1f
diff --git a/deskutils/nag/pkg-plist b/deskutils/nag/pkg-plist
index 26d8b393427e..c69cf5c9a25a 100644
--- a/deskutils/nag/pkg-plist
+++ b/deskutils/nag/pkg-plist
@@ -39,13 +39,18 @@
 %%NAGDIR%%/locale/en_US/help.xml
 %%NAGDIR%%/locale/es_ES/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/fi_FI/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/fi_FI/help.xml
 %%NAGDIR%%/locale/fr_FR/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/hu_HU/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/it_IT/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/ko_KR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/nl_NL/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/nn_NO/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/pt_BR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ru_RU/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/sv_SE/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/zh_CN/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/zh_TW/LC_MESSAGES/nag.mo
 %%NAGDIR%%/menu.php
 %%NAGDIR%%/po/Makefile
@@ -56,12 +61,16 @@
 %%NAGDIR%%/po/extract.pl
 %%NAGDIR%%/po/fi_FI.po
 %%NAGDIR%%/po/fr_FR.po
+%%NAGDIR%%/po/hu_HU.po
 %%NAGDIR%%/po/it_IT.po
+%%NAGDIR%%/po/ko_KR.po
 %%NAGDIR%%/po/nl_NL.po
+%%NAGDIR%%/po/nn_NO.po
 %%NAGDIR%%/po/pt_BR.po
 %%NAGDIR%%/po/ru_RU.po
 %%NAGDIR%%/po/ru_RU.KOI8-R.po
 %%NAGDIR%%/po/sv_SE.po
+%%NAGDIR%%/po/zh_CN.po
 %%NAGDIR%%/po/zh_TW.po
 %%NAGDIR%%/po/shtool
 %%NAGDIR%%/po/xgettext.sh
@@ -109,10 +118,16 @@
 @dirrm %%NAGDIR%%/locale/fi_FI
 @dirrm %%NAGDIR%%/locale/fr_FR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/fr_FR
+@dirrm %%NAGDIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/hu_HU
 @dirrm %%NAGDIR%%/locale/it_IT/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/it_IT
+@dirrm %%NAGDIR%%/locale/ko_KR/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/ko_KR
 @dirrm %%NAGDIR%%/locale/nl_NL/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/nl_NL
+@dirrm %%NAGDIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/nn_NO
 @dirrm %%NAGDIR%%/locale/pt_BR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/pt_BR
 @dirrm %%NAGDIR%%/locale/ru_RU/LC_MESSAGES
@@ -121,6 +136,8 @@
 @dirrm %%NAGDIR%%/locale/ru_RU.KOI8-R
 @dirrm %%NAGDIR%%/locale/sv_SE/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/sv_SE
+@dirrm %%NAGDIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/zh_CN
 @dirrm %%NAGDIR%%/locale/zh_TW/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/zh_TW
 @dirrm %%NAGDIR%%/locale
@@ -137,3 +154,4 @@
 @dirrm %%NAGDIR%%
 etc/horde/httpd.conf.nag
 %%PORTDOCS%%@dirrm share/doc/nag
+@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterNag; then rm -f %D/www/horde/config/registry.php.afterNag; mv %D/www/horde/config/registry.php.beforeNag %D/www/horde/config/registry.php; fi