ports/64013: mail/turba: upgrading to 1.2.2.

Tue Mar 9 23:10:12 UTC 2004

>Number:         64013
>Category:       ports
>Synopsis:       mail/turba: upgrading to 1.2.2.
>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:11 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 Turba to the latest -RELENG version.

	Changelog available at
	<http://cvs.horde.org/diff.php/turba/docs/CHANGES?r1=1.61.2.59&r2=1.61.2.62&ty=h>

	Since I'm there:

	- SIZE-ify;
	- utilize DOCSDIR;
	- 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:

--- turba.diff begins here ---
diff -urN mail/turba.orig/Makefile mail/turba/Makefile
--- mail/turba.orig/Makefile	Wed Feb  4 20:19:06 2004
+++ mail/turba/Makefile	Tue Mar  9 21:09:44 2004
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	turba
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
+		ftp://ftp.planetmirror.com/pub/horde/turba/		\
 		ftp://ftp.au.horde.org/pub/horde/turba/			\
+		ftp://ftp.be.horde.org/turba/				\
 		ftp://ftp.es.horde.org/pub/turba/			\
 		ftp://ftp.it.horde.org/pub/mirror/horde.org/turba/	\
 		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/turba/	\
-		ftp://ftp.pt.horde.org/pub/horde-ftp/turba/
+		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/turba/	\
+		http://ftp.horde.org/pub/turba/
 
 MAINTAINER=	thierry at pompo.net
 COMMENT=	The Horde contact management application
@@ -38,10 +40,11 @@
 LDD=		/usr/bin/ldd
 
 REINPLACE_ARGS=	-i.beforeTurba
-DOCS=		COPYING README docs/CHANGES docs/CREDITS \
-		docs/INSTALL docs/LDAP docs/UPDATE docs/turba.dia docs/turba.pdf
-CONFFILE=	attributes.php conf.php html.php menu.php \
-		prefs.php sources.php
+DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
+		docs/INSTALL docs/LDAP docs/RELEASE_NOTES docs/UPDATE	\
+		docs/turba.dia docs/turba.pdf
+CONFFILE=	attributes.php conf.php html.php menu.php prefs.php	\
+		sources.php
 SUB_DIRS=	config graphics lib locale scripts templates po
 
 LHORDEDIR?=	www/horde
@@ -103,7 +106,7 @@
 	@${RM} ${HORDE_INC}/httpd.conf.turba.beforeTurba
 	@${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTTURBA::"			\
 		${HORDEDIR}/config/registry.php
-	@${CP} -p ${HORDEDIR}/config/registry.php			\
+	@${CP} -p ${HORDEDIR}/config/registry.php				\
 		${HORDEDIR}/config/registry.php.afterTurba
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -115,8 +118,8 @@
 
 post-install:
 	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE} | \
-	${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g"
+	@${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g"	\
+		-e "s:%%CONFDIR%%:${CONFDIR}:g" ${PKGMESSAGE}
 	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff -urN mail/turba.orig/distinfo mail/turba/distinfo
--- mail/turba.orig/distinfo	Wed Sep 24 22:53:56 2003
+++ mail/turba/distinfo	Tue Mar  9 20:55:20 2004
@@ -1 +1,2 @@
-MD5 (turba-1.2.1.tar.gz) = 1101266f404db0f4639cf41c25a64c35
+MD5 (turba-1.2.2.tar.gz) = 27d9ebbe6723dcb0e4aa61045feb60b0
+SIZE (turba-1.2.2.tar.gz) = 508914
diff -urN mail/turba.orig/pkg-plist mail/turba/pkg-plist
--- mail/turba.orig/pkg-plist	Wed Sep 24 22:53:56 2003
+++ mail/turba/pkg-plist	Tue Mar  9 21:13:31 2004
@@ -1,12 +1,13 @@
-%%PORTDOCS%%share/doc/turba/CHANGES
-%%PORTDOCS%%share/doc/turba/COPYING
-%%PORTDOCS%%share/doc/turba/CREDITS
-%%PORTDOCS%%share/doc/turba/INSTALL
-%%PORTDOCS%%share/doc/turba/LDAP
-%%PORTDOCS%%share/doc/turba/README
-%%PORTDOCS%%share/doc/turba/UPDATE
-%%PORTDOCS%%share/doc/turba/turba.dia
-%%PORTDOCS%%share/doc/turba/turba.pdf
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LDAP
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/UPDATE
+%%PORTDOCS%%%%DOCSDIR%%/turba.dia
+%%PORTDOCS%%%%DOCSDIR%%/turba.pdf
 %%TURBADIR%%/add.php
 %%TURBADIR%%/addobject.php
 %%TURBADIR%%/addobjectaction.php
@@ -83,6 +84,7 @@
 %%TURBADIR%%/locale/fi_FI/help.xml
 %%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/hu_HU/help.xml
 %%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
@@ -124,6 +126,7 @@
 %%TURBADIR%%/po/extract.pl
 %%TURBADIR%%/po/fi_FI.po
 %%TURBADIR%%/po/fr_FR.po
+%%TURBADIR%%/po/gl_ES.po
 %%TURBADIR%%/po/hu_HU.po
 %%TURBADIR%%/po/it_IT.po
 %%TURBADIR%%/po/ja_JP.po
@@ -195,7 +198,7 @@
 %%TURBADIR%%/templates/search/row.inc
 %%TURBADIR%%/miniwindow.php
 etc/horde/httpd.conf.turba
-%%PORTDOCS%%@dirrm share/doc/turba
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%TURBADIR%%/config
 @dirrm %%TURBADIR%%/graphics
 @dirrm %%TURBADIR%%/lib/Driver
@@ -226,6 +229,8 @@
 @dirrm %%TURBADIR%%/locale/fi_FI
 @dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/fr_FR
+ at dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES
+ at dirrm %%TURBADIR%%/locale/gl_ES
 @dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/hu_HU
 @dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
--- turba.diff ends here ---

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

