3 files changed, 31 insertions, 34 deletions

diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index d1b0a80fc87c..79b6d2df37ed 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -1,19 +1,18 @@
-# Ports collection makefile for:  Nag
-# Date created:			  Sun Dec 14, 2001
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
+# Ports collection makefile for:	nag
+# Date created:			Sun Dec 14, 2001
+# Whom:				Thierry Thomas (<thierry@pompo.net>)
 #
 # $FreeBSD$
 #
 
 PORTNAME=	nag
-PORTVERSION=	2.1.2
-PORTREVISION=	1
+PORTVERSION=	2.1.3
+DISTVERSIONPREFIX=	h3-
 CATEGORIES=	deskutils www
 MASTER_SITES=	HORDE
-DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
 MAINTAINER=	beech@alaskaparadise.com
-COMMENT=	Nag is a simple, multiuser task list manager
+COMMENT=	Simple multiuser task list manager
 
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base
 
@@ -28,8 +27,8 @@ SUB_FILES=	pkg-message pkg-install pkg-deinstall
 SUB_LIST=	NAGDIR=${NAGDIR}
 
 REINPLACE_ARGS=	-i ""
-DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/RELEASE_NOTES docs/TODO docs/UPGRADING
+PORTDOCS=	README CHANGES CREDITS INSTALL	\
+		RELEASE_NOTES TODO UPGRADING
 CONFFILE=	menu.php prefs.php
 SUB_DIRS=	config js lib locale po scripts templates themes
 
@@ -47,6 +46,9 @@ HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
 HORDE_INC=	${LOCALBASE}/etc/horde
 .endif
 
+post-extract:
+	@${MV} ${WRKSRC}/README ${WRKSRC}/docs/
+
 pre-configure:
 	@(cd ${WRKSRC}/scripts &&	\
 		${FIND} . -name "*.php" -exec	\
@@ -55,20 +57,16 @@ pre-configure:
 		${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf
 
 do-install:
-	@${MKDIR}  ${NAGDIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${NAGDIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${NAGDIR}
-
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC}
+	@${INSTALL} -d ${NAGDIR}/
+	@${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${NAGDIR}/
+	@${CP} -p ${WRKSRC}/*.php ${NAGDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
+	@${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC}/
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR}/
+	@${CHMOD} -R o-rwx ${CONFDIR}/
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
+	@${INSTALL} -d ${DOCSDIR}/
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
diff --git a/deskutils/horde-nag/distinfo b/deskutils/horde-nag/distinfo
index 726a66997b61..b95041efa495 100644
--- a/deskutils/horde-nag/distinfo
+++ b/deskutils/horde-nag/distinfo
@@ -1,3 +1,3 @@
-MD5 (nag-h3-2.1.2.tar.gz) = 0c0e7c5ef3282ede867647055d5343b0
-SHA256 (nag-h3-2.1.2.tar.gz) = 75139f763324ce6dde7d1244d7f43587b551279f48c703dff268064c9b424bd7
-SIZE (nag-h3-2.1.2.tar.gz) = 1335576
+MD5 (nag-h3-2.1.3.tar.gz) = 8d4f4874a1e77f0562516a13a6097028
+SHA256 (nag-h3-2.1.3.tar.gz) = 64fc3bc3528687195c5f09299d25edb0fff6aa936bcdb78135ad7d756047a2b1
+SIZE (nag-h3-2.1.3.tar.gz) = 1415038
diff --git a/deskutils/horde-nag/pkg-plist b/deskutils/horde-nag/pkg-plist
index f783a64aa4a5..1f60eedfab6b 100644
--- a/deskutils/horde-nag/pkg-plist
+++ b/deskutils/horde-nag/pkg-plist
@@ -1,11 +1,3 @@
-%%HORDE_INC%%/httpd-nag.conf
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%NAGDIR%%/config/.htaccess
 %%NAGDIR%%/config/conf.xml
 %%NAGDIR%%/config/menu.php.dist
@@ -15,6 +7,7 @@
 %%NAGDIR%%/index.php
 %%NAGDIR%%/js/fixUnstyledOptions.js
 %%NAGDIR%%/js/tables.js
+%%NAGDIR%%/js/prototype.js
 %%NAGDIR%%/lib/.htaccess
 %%NAGDIR%%/lib/Block/summary.php
 %%NAGDIR%%/lib/Driver.php
@@ -30,6 +23,8 @@
 %%NAGDIR%%/list.php
 %%NAGDIR%%/locale/ar_SY/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/bg_BG/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/ca_ES/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/ca_ES/help.xml
 %%NAGDIR%%/locale/cs_CZ/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/da_DK/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/de_DE/LC_MESSAGES/nag.mo
@@ -69,6 +64,7 @@
 %%NAGDIR%%/po/README
 %%NAGDIR%%/po/ar_SY.po
 %%NAGDIR%%/po/bg_BG.po
+%%NAGDIR%%/po/ca_ES.po
 %%NAGDIR%%/po/cs_CZ.po
 %%NAGDIR%%/po/da_DK.po
 %%NAGDIR%%/po/de_DE.po
@@ -97,6 +93,7 @@
 %%NAGDIR%%/po/sv_SE.po
 %%NAGDIR%%/po/zh_CN.po
 %%NAGDIR%%/po/zh_TW.po
+%%NAGDIR%%/pref_api.php
 %%NAGDIR%%/scripts/.htaccess
 %%NAGDIR%%/scripts/import_vtodos.php
 %%NAGDIR%%/scripts/sql/nag.mssql.sql
@@ -139,7 +136,7 @@
 %%NAGDIR%%/themes/graphics/za.png
 %%NAGDIR%%/themes/screen.css
 %%NAGDIR%%/view.php
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%HORDE_INC%%/httpd-nag.conf
 @dirrm %%NAGDIR%%/themes/graphics
 @dirrm %%NAGDIR%%/themes
 @dirrm %%NAGDIR%%/templates/view
@@ -210,6 +207,8 @@
 @dirrm %%NAGDIR%%/locale/da_DK
 @dirrm %%NAGDIR%%/locale/cs_CZ/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/cs_CZ
+@dirrm %%NAGDIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%NAGDIR%%/locale/ca_ES
 @dirrm %%NAGDIR%%/locale/bg_BG/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/bg_BG
 @dirrm %%NAGDIR%%/locale/ar_SY/LC_MESSAGES