ports/64014: deskutils/nag: upgrading to 1.1.1.

Thierry Thomas thierry at pompo.net
Tue Mar 9 23:10:12 UTC 2004 

>Number:         64014
>Category:       ports
>Synopsis:       deskutils/nag: upgrading to 1.1.1.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 09 15:10:12 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.9-STABLE FreeBSD 4.9-STABLE #0: Sat Mar 6 18:18:24 CET 2004 thierry at graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	Upgrade Nag to the latest -RELENG version.

	Changelog available at
	<http://cvs.horde.org/diff.php/nag/docs/CHANGES?r1=1.54.2.21&r2=1.54.2.28&ty=h>

	Since I'm there:

	- SIZE-ify;
	- utilize DOCSDIR;
	- don't install .orig files;
	- remove useless-use-of-cat (suggested by Ulrich Spoerlein).

>How-To-Repeat:
	N/A.

>Fix:
	Related PRs: PR ports/63855 (mail/imp3: upgrading to 3.2.3.)
	and PR ports/63947 (www/horde2: upgrading to 2.2.5).

	Please apply the following patch:

--- nag.diff begins here ---
diff -urN deskutils/nag.orig/Makefile deskutils/nag/Makefile
--- deskutils/nag.orig/Makefile	Wed Feb  4 20:16:45 2004
+++ deskutils/nag/Makefile	Tue Mar  9 22:14:07 2004
@@ -6,11 +6,17 @@
 #
 
 PORTNAME=	nag
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	deskutils www
-MASTER_SITES=	ftp://ftp.horde.org/pub/nag/tarballs/%SUBDIR%/
-MASTER_SITE_SUBDIR=	. old
+MASTER_SITES=	ftp://ftp.horde.org/pub/nag/				\
+		ftp://ftp.planetmirror.com/pub/horde/nag/		\
+		ftp://ftp.au.horde.org/pub/horde/nag/			\
+		ftp://ftp.be.horde.org/nag/				\
+		ftp://ftp.es.horde.org/pub/nag/				\
+		ftp://ftp.it.horde.org/pub/mirror/horde.org/nag/	\
+		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/nag/	\
+		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/nag/	\
+		http://ftp.horde.org/pub/nag/
 
 MAINTAINER=	thierry at pompo.net
 COMMENT=	Nag is a simple, multiuser task list manager
@@ -24,9 +30,9 @@
 
 PLIST_SUB=	HORDEDIR=${LHORDEDIR} NAGDIR=${LNAGDIR}
 
-DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \
-		docs/TODO
-CONFFILE=	conf.php html.php menu.php motd.php prefs.php
+DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
+		docs/RELEASE_NOTES docs/TODO
+CONFFILE=	conf.php html.php menu.php prefs.php
 SUB_DIRS=	config graphics lib locale po scripts templates
 
 LHORDEDIR?=	www/horde
@@ -38,6 +44,10 @@
 
 HORDE_INC=	${LOCALBASE}/etc/horde
 
+post-patch:
+		@${RM} ${WRKSRC}/config/conf.php.dist.orig		\
+			${WRKSRC}/scripts/drivers/nag_tasks.sql.orig
+
 do-install:
 	@${MKDIR}  ${NAGDIR}
 .for REP in ${SUB_DIRS}
@@ -68,8 +78,8 @@
 
 post-install:
 	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE} | \
-	${SED} -e "s:%%NAGDIR%%:${NAGDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%HORDEDIR%%:${HORDEDIR}:"
+	@${SED} -e "s:%%NAGDIR%%:${NAGDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g"	\
+		-e "s:%%CONFDIR%%:${CONFDIR}:g;s:%%HORDEDIR%%:${HORDEDIR}:" ${PKGMESSAGE}
 	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff -urN deskutils/nag.orig/distinfo deskutils/nag/distinfo
--- deskutils/nag.orig/distinfo	Fri Jan  3 23:26:27 2003
+++ deskutils/nag/distinfo	Tue Mar  9 22:01:19 2004
@@ -1 +1,2 @@
-MD5 (nag-1.1.tar.gz) = c435586a62a7e9d85eb4cc8ef92afbe1
+MD5 (nag-1.1.1.tar.gz) = 59843745081fb5d8902bed27206364ee
+SIZE (nag-1.1.1.tar.gz) = 326416
diff -urN deskutils/nag.orig/pkg-plist deskutils/nag/pkg-plist
--- deskutils/nag.orig/pkg-plist	Fri Jan  3 23:26:27 2003
+++ deskutils/nag/pkg-plist	Tue Mar  9 22:19:34 2004
@@ -3,16 +3,14 @@
 %%PORTDOCS%%share/doc/nag/CREDITS
 %%PORTDOCS%%share/doc/nag/INSTALL
 %%PORTDOCS%%share/doc/nag/README
+%%PORTDOCS%%share/doc/nag/RELEASE_NOTES
 %%PORTDOCS%%share/doc/nag/TODO
 %%NAGDIR%%/config/conf.php
 %%NAGDIR%%/config/conf.php.dist
-%%NAGDIR%%/config/conf.php.dist.orig
 %%NAGDIR%%/config/html.php
 %%NAGDIR%%/config/html.php.dist
 %%NAGDIR%%/config/menu.php
 %%NAGDIR%%/config/menu.php.dist
-%%NAGDIR%%/config/motd.php
-%%NAGDIR%%/config/motd.php.dist
 %%NAGDIR%%/config/prefs.php
 %%NAGDIR%%/config/prefs.php.dist
 %%NAGDIR%%/graphics/add.gif
@@ -35,10 +33,12 @@
 %%NAGDIR%%/lib/constants.php
 %%NAGDIR%%/lib/version.php
 %%NAGDIR%%/list.php
+%%NAGDIR%%/locale/ar_SY/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/bg_BG/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/cs_CZ/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/da_DK/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/de_DE/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/de_DE/help.xml
 %%NAGDIR%%/locale/el_GR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/en_US/help.xml
 %%NAGDIR%%/locale/es_ES/LC_MESSAGES/nag.mo
@@ -46,22 +46,28 @@
 %%NAGDIR%%/locale/fi_FI/help.xml
 %%NAGDIR%%/locale/fr_FR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/hu_HU/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/hu_HU/help.xml
+%%NAGDIR%%/locale/id_ID/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/it_IT/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ko_KR/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/lt_LT/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/nb_NO/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/nl_NL/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/nl_NL/help.xml
 %%NAGDIR%%/locale/nn_NO/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/pt_BR/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/ro_RO/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ru_RU/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/nag.mo
 %%NAGDIR%%/locale/sk_SK/LC_MESSAGES/nag.mo
+%%NAGDIR%%/locale/sk_SK/help.xml
 %%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
 %%NAGDIR%%/po/README
+%%NAGDIR%%/po/ar_SY.po
 %%NAGDIR%%/po/bg_BG.po
 %%NAGDIR%%/po/cs_CZ.po
 %%NAGDIR%%/po/da_DK.po
@@ -72,6 +78,7 @@
 %%NAGDIR%%/po/fi_FI.po
 %%NAGDIR%%/po/fr_FR.po
 %%NAGDIR%%/po/hu_HU.po
+%%NAGDIR%%/po/id_ID.po
 %%NAGDIR%%/po/it_IT.po
 %%NAGDIR%%/po/ko_KR.po
 %%NAGDIR%%/po/lt_LT.po
@@ -80,6 +87,7 @@
 %%NAGDIR%%/po/nl_NL.po
 %%NAGDIR%%/po/nn_NO.po
 %%NAGDIR%%/po/pt_BR.po
+%%NAGDIR%%/po/ro_RO.po
 %%NAGDIR%%/po/ru_RU.po
 %%NAGDIR%%/po/ru_RU.KOI8-R.po
 %%NAGDIR%%/po/sk_SK.po
@@ -90,7 +98,6 @@
 %%NAGDIR%%/po/xgettext.sh
 %%NAGDIR%%/prefs.php
 %%NAGDIR%%/scripts/drivers/nag_tasks.sql
-%%NAGDIR%%/scripts/drivers/nag_tasks.sql.orig
 %%NAGDIR%%/search.php
 %%NAGDIR%%/task.php
 %%NAGDIR%%/templates/common-footer.inc
@@ -124,6 +131,8 @@
 @dirrm %%NAGDIR%%/graphics
 @dirrm %%NAGDIR%%/lib/Driver
 @dirrm %%NAGDIR%%/lib
+ at dirrm %%NAGDIR%%/locale/ar_SY/LC_MESSAGES
+ at dirrm %%NAGDIR%%/locale/ar_SY
 @dirrm %%NAGDIR%%/locale/bg_BG/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/bg_BG
 @dirrm %%NAGDIR%%/locale/cs_CZ/LC_MESSAGES
@@ -143,6 +152,8 @@
 @dirrm %%NAGDIR%%/locale/fr_FR
 @dirrm %%NAGDIR%%/locale/hu_HU/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/hu_HU
+ at dirrm %%NAGDIR%%/locale/id_ID/LC_MESSAGES
+ at dirrm %%NAGDIR%%/locale/id_ID
 @dirrm %%NAGDIR%%/locale/it_IT/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/it_IT
 @dirrm %%NAGDIR%%/locale/ko_KR/LC_MESSAGES
@@ -157,6 +168,8 @@
 @dirrm %%NAGDIR%%/locale/nn_NO
 @dirrm %%NAGDIR%%/locale/pt_BR/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/pt_BR
+ at dirrm %%NAGDIR%%/locale/ro_RO/LC_MESSAGES
+ at dirrm %%NAGDIR%%/locale/ro_RO
 @dirrm %%NAGDIR%%/locale/ru_RU/LC_MESSAGES
 @dirrm %%NAGDIR%%/locale/ru_RU
 @dirrm %%NAGDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES
--- nag.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list