[pkgsrc/trunk]: pkgsrc/mail/turba ------

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/12fbab0c7b8a
branches:  trunk
changeset: 535385:12fbab0c7b8a
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Thu Nov 15 22:24:01 2007 +0000

description:
------
v2.1.5
------

[mjr] Fix some fatal errors caused by the IMSP driver when deleting certain
contacts and while adding contacts to lists in certain cases.
[mjr] Fix adding contacts to a new contact list in a source other than the
source the contacts being added are from.
[jan] Fix paging through search results from another than the default address
book (Bug 5137).
[cjh] Fix copy/moving contacts to a new contact list (Bug 5144).

diffstat:

 mail/turba/Makefile |  32 ++++++++++++++++++++------------
 mail/turba/distinfo |   8 ++++----
 2 files changed, 24 insertions(+), 16 deletions(-)

diffs (91 lines):

diff -r 1b05a745f4b8 -r 12fbab0c7b8a mail/turba/Makefile
--- a/mail/turba/Makefile       Thu Nov 15 22:19:04 2007 +0000
+++ b/mail/turba/Makefile       Thu Nov 15 22:24:01 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/07/04 20:54:47 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/11/15 22:24:01 adrianp Exp $
 
 DISTNAME=      turba-h3-${TURBAVER}
 PKGNAME=       turba-${TURBAVER}
@@ -18,7 +18,7 @@
 EGDIR=         ${PREFIX}/share/examples/turba
 HORDEDIR=      ${PREFIX}/share/horde
 TURBADIR=      ${HORDEDIR}/turba
-TURBAVER=      2.1.4
+TURBAVER=      2.1.5
 PAXDIRS=       lib locale po scripts templates themes
 USE_TOOLS+=    perl:run
 
@@ -29,6 +29,7 @@
 PKG_SYSCONFSUBDIR?=    httpd
 
 PKG_USERS_VARS+=       APACHE_USER
+BUILD_DEFS=            APACHE_USER
 
 SUBST_CLASSES+=                files
 SUBST_STAGE.files=     post-build
@@ -36,6 +37,13 @@
 SUBST_SED.files=       -e "s|@TURBADIR@|${TURBADIR}|g"
 SUBST_MESSAGE.files=   Fixing configuration files.
 
+REPLACE_INTERPRETER+=  php
+REPLACE.php.old=       .*/bin/php
+REPLACE.php.new=       ${PREFIX}/bin/php
+REPLACE_FILES.php=     scripts/import_vcards.php \
+                       scripts/upgrades/create_default_histories.php \
+                       scripts/upgrades/public_to_horde_share.php
+
 CONF_FILES=            ${EGDIR}/turba.conf ${PKG_SYSCONFDIR}/turba.conf
 CONF_FILES_PERMS+=     ${TURBADIR}/config/sources.php.dist \
                        ${TURBADIR}/config/sources.php \
@@ -55,10 +63,10 @@
 .include "options.mk"
 
 do-build:
-       @${CP} ${FILESDIR}/turba.conf.dist ${WRKSRC}/turba.conf.dist
-       @${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
-       @${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
-       @${CHMOD} 0750 ${WRKSRC}/scripts/ldap/addou.pl
+       ${CP} ${FILESDIR}/turba.conf.dist ${WRKSRC}/turba.conf.dist
+       ${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
+       ${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
+       ${CHMOD} 0750 ${WRKSRC}/scripts/ldap/addou.pl
 
 do-install:
        ${INSTALL_DATA_DIR} ${DOCDIR}
@@ -77,16 +85,16 @@
 .      endfor
 
 .      for d in ${PAXDIRS}
-               @cd ${WRKSRC}/${d:Q} && ${PAX} -rwpma . ${TURBADIR}/${d:Q}
+               cd ${WRKSRC}/${d:Q} && ${PAX} -rwpma . ${TURBADIR}/${d:Q}
 .      endfor
 
        ${INSTALL_DATA} ${WRKSRC}/config/*.dist ${TURBADIR}/config
        ${INSTALL_DATA} ${WRKSRC}/*.php ${TURBADIR}
-       @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TURBADIR}
-       @${FIND} ${TURBADIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-       @${FIND} ${TURBADIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
-       @${CHOWN} ${APACHE_USER}:${SHAREGRP} ${TURBADIR}/config
-       @${CHMOD} 0750 ${TURBADIR}/config
+       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TURBADIR}
+       ${FIND} ${TURBADIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+       ${FIND} ${TURBADIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
+       ${CHOWN} ${APACHE_USER}:${SHAREGRP} ${TURBADIR}/config
+       ${CHMOD} 0750 ${TURBADIR}/config
 
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1b05a745f4b8 -r 12fbab0c7b8a mail/turba/distinfo
--- a/mail/turba/distinfo       Thu Nov 15 22:19:04 2007 +0000
+++ b/mail/turba/distinfo       Thu Nov 15 22:24:01 2007 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2007/03/18 12:14:05 adrianp Exp $
+$NetBSD: distinfo,v 1.9 2007/11/15 22:24:01 adrianp Exp $
 
-SHA1 (turba-h3-2.1.4.tar.gz) = 92b462224ef537aa9095bed7bfb72d80a3feb7ea
-RMD160 (turba-h3-2.1.4.tar.gz) = 8b5d8ab08bac54230b29428a4172a48bffe2ea93
-Size (turba-h3-2.1.4.tar.gz) = 1809857 bytes
+SHA1 (turba-h3-2.1.5.tar.gz) = c15a26f6546ef673ce6e203ebb339552b7399cd5
+RMD160 (turba-h3-2.1.5.tar.gz) = 69d4fed1ade543b11fc5d59085374ea2ff21c8fe
+Size (turba-h3-2.1.5.tar.gz) = 1862010 bytes