ports/110786: [Maintainer Update] mail/turba - Update to 2.1.4

Sun Mar 25 05:50:08 UTC 2007

>Number:         110786
>Category:       ports
>Synopsis:       [Maintainer Update] mail/turba - Update to 2.1.4
>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 05:50:05 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 at stargate.alaskaparadise.com:/usr/obj/usr/src/sys/STARGATE



>Description:


Update to 2.1.4

[Changes]

Fix character set encoding of exported vCards.
Fix fatal error when exporting to vCard.
Organize basic search form from left to right (Request #4914).
Fix links to only show contacts or lists, or both. Don't remember the lastly selected address book in the session, if it was not browseable.
Fix bug that caused counting the number of contacts in a shared SQL source to return the count of the user's default address book instead.
Fix bug that caused the wrong address book to be deleted when replacing an address book during import.


>How-To-Repeat:





>Fix:


diff -ruN --exclude=CVS /usr/ports/mail/turba.orig/Makefile /usr/ports/mail/turba/Makefile

--- /usr/ports/mail/turba.orig/Makefile	Sat Feb 24 20:31:49 2007
+++ /usr/ports/mail/turba/Makefile	Sat Mar 24 20:53:51 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	turba
-PORTVERSION=	2.1.3
+PORTVERSION=	2.1.4
 CATEGORIES=	mail www
 MASTER_SITES=	HORDE
 DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
@@ -34,8 +34,8 @@
 USE_GETTEXT=	yes
 
 REINPLACE_ARGS=	-i ""
-DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING
+PORTDOCS=		README CHANGES CREDITS INSTALL	\
+		LDAP RELEASE_NOTES TODO UPGRADING
 CONFFILE=	attributes.php menu.php mime_drivers.php prefs.php sources.php
 SUB_DIRS=	config lib locale po scripts templates themes
 
@@ -66,6 +66,9 @@
 HORDE_INC=	${LOCALBASE}/etc/horde
 .endif
 
+post-extract:
+	@${MV} ${WRKSRC}/README ${WRKSRC}/docs/
+
 pre-configure:
 	@${RM} ${WRKSRC}/config/sources.php.dist.orig
 	@${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g"	\
@@ -77,20 +80,16 @@
 .endif
 
 do-install:
-	@${MKDIR}  ${TURBADIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${TURBADIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${TURBADIR}
-
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}
+	@${INSTALL} -d ${TURBADIR}/
+	@${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${TURBADIR}/
+	@${CP} -p ${WRKSRC}/*.php ${TURBADIR}/
+	@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
+	@${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}/
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}/
+	@${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/mail/turba.orig/distinfo /usr/ports/mail/turba/distinfo
--- /usr/ports/mail/turba.orig/distinfo	Thu Feb  1 09:55:07 2007
+++ /usr/ports/mail/turba/distinfo	Sat Mar 24 20:55:46 2007
@@ -1,3 +1,3 @@
-MD5 (turba-h3-2.1.3.tar.gz) = a0407717f3f64fb33f6a57e2244a12b4
-SHA256 (turba-h3-2.1.3.tar.gz) = d12032c43e488fd5a4fe4e3bf30e95394136db04cedde9a865a4fb806b8c6367
-SIZE (turba-h3-2.1.3.tar.gz) = 1790717
+MD5 (turba-h3-2.1.4.tar.gz) = 950b5645ee75ed0df7a0f594c5e7d285
+SHA256 (turba-h3-2.1.4.tar.gz) = 46d31dd0f5e0e55ad78f82de1b001e4d8ba82a3294bd4205012e0680a62dda8a
+SIZE (turba-h3-2.1.4.tar.gz) = 1809857
diff -ruN --exclude=CVS /usr/ports/mail/turba.orig/pkg-plist /usr/ports/mail/turba/pkg-plist
--- /usr/ports/mail/turba.orig/pkg-plist	Thu Feb  1 09:55:08 2007
+++ /usr/ports/mail/turba/pkg-plist	Sat Mar 24 21:23:04 2007
@@ -1,11 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LDAP
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%TURBADIR%%/add.php
 %%TURBADIR%%/addressbooks.php
 %%TURBADIR%%/browse.php
@@ -15,7 +7,9 @@
 %%TURBADIR%%/config/menu.php.dist
 %%TURBADIR%%/config/mime_drivers.php.dist
 %%TURBADIR%%/config/prefs.php.dist
+%%TURBADIR%%/config/prefs.php
 %%TURBADIR%%/config/sources.php.dist
+%%TURBADIR%%/config/sources.php
 %%TURBADIR%%/data.php
 %%TURBADIR%%/delete.php
 %%TURBADIR%%/display.php
@@ -38,6 +32,7 @@
 %%TURBADIR%%/lib/Object/Group.php
 %%TURBADIR%%/lib/ObjectView.php
 %%TURBADIR%%/lib/Renderer.php
+%%TURBADIR%%/lib/tests/tovcard.phpt
 %%TURBADIR%%/lib/Turba.php
 %%TURBADIR%%/lib/api.php
 %%TURBADIR%%/lib/base.php
@@ -47,6 +42,7 @@
 %%TURBADIR%%/locale/ar_SY/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/ca_ES/help.xml
 %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/da_DK/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
@@ -61,6 +57,7 @@
 %%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/fi_FI/help.xml
 %%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fr_FR/help.xml
 %%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/is_IS/LC_MESSAGES/turba.mo
@@ -183,7 +180,6 @@
 %%TURBADIR%%/vcard.php
 %%TURBADIR%%/view.php
 %%HORDE_INC%%/httpd-turba.conf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%TURBADIR%%/themes/ideas
 @dirrm %%TURBADIR%%/themes/graphics/menu
 @dirrm %%TURBADIR%%/themes/graphics
@@ -272,6 +268,7 @@
 @dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/ar_SY
 @dirrm %%TURBADIR%%/locale
+ at dirrm %%TURBADIR%%/lib/tests
 @dirrm %%TURBADIR%%/lib/Object
 @dirrm %%TURBADIR%%/lib/Driver
 @dirrm %%TURBADIR%%/lib/Block



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

