Date: Sat, 24 Mar 2007 23:42:01 -0800 From: "Beech Rintoul" <beech@alaskaparadise.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: infofarmer@FreeBSD.org Subject: ports/110792: [Maintainer Update] deskutils/nag - Update to 2.1.3 Message-ID: <1174808521.38228@stargate.alaskaparadise.com> Resent-Message-ID: <200703250750.l2P7o4oa008308@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110792
>Category: ports
>Synopsis: [Maintainer Update] deskutils/nag - Update to 2.1.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 25 07:50:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Beech Rintoul
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
Alaska Paradise
>Environment:
System: FreeBSD 7.0-CURRENT #111: Sat Mar 24 08:52:58 AKDT 2007
root@stargate.alaskaparadise.com:/usr/obj/usr/src/sys/STARGATE
>Description:
Update to 2.1.3
[Changes]
Show alarms for overdue tasks.
Add Catalan translation.
>How-To-Repeat:
>Fix:
diff -ruN --exclude=CVS /usr/ports/deskutils/nag.orig/Makefile /usr/ports/deskutils/nag/Makefile
--- /usr/ports/deskutils/nag.orig/Makefile Sat Feb 24 20:31:48 2007
+++ /usr/ports/deskutils/nag/Makefile Sat Mar 24 23:21:20 2007
@@ -6,8 +6,8 @@
#
PORTNAME= nag
-PORTVERSION= 2.1.2
-PORTREVISION= 1
+PORTVERSION= 2.1.3
+PORTREVISION=
CATEGORIES= deskutils www
MASTER_SITES= HORDE
DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
@@ -28,8 +28,8 @@
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 +47,9 @@
HORDE_INC= ${LOCALBASE}/etc/horde
.endif
+post-extract:
+ @${MV} ${WRKSRC}/README ${WRKSRC}/docs/
+
pre-configure:
@(cd ${WRKSRC}/scripts && \
${FIND} . -name "*.php" -exec \
@@ -55,20 +58,16 @@
${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 -ruN --exclude=CVS /usr/ports/deskutils/nag.orig/distinfo /usr/ports/deskutils/nag/distinfo
--- /usr/ports/deskutils/nag.orig/distinfo Mon Jan 29 00:29:53 2007
+++ /usr/ports/deskutils/nag/distinfo Sat Mar 24 22:50:52 2007
@@ -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 -ruN --exclude=CVS /usr/ports/deskutils/nag.orig/pkg-plist /usr/ports/deskutils/nag/pkg-plist
--- /usr/ports/deskutils/nag.orig/pkg-plist Thu Feb 1 09:43:56 2007
+++ /usr/ports/deskutils/nag/pkg-plist Sat Mar 24 23:20:07 2007
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1174808521.38228>