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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd7b90375444
branches:  trunk
changeset: 535387:cd7b90375444
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Thu Nov 15 22:30:49 2007 +0000

description:
------
v1.1.4
------

[jan] Add Simplified Chinese translation (Anna Chen
<annachen2008%yahoo.com.cn@localhost>).
[cjh] Fix check for bulk or list precedence in Sieve vacation (Bug 5543).
[jan] Add additional checks to avoid adding empty test values (Bug 5392).
[jan] Fix multiline vacation messages with procmail driver (Bug 5273).

diffstat:

 mail/ingo/Makefile |  23 ++++++++++++-----------
 mail/ingo/PLIST    |   6 +++++-
 mail/ingo/distinfo |   8 ++++----
 3 files changed, 21 insertions(+), 16 deletions(-)

diffs (109 lines):

diff -r 13d3f756f209 -r cd7b90375444 mail/ingo/Makefile
--- a/mail/ingo/Makefile        Thu Nov 15 22:24:28 2007 +0000
+++ b/mail/ingo/Makefile        Thu Nov 15 22:30:49 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/07/04 20:54:44 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/11/15 22:30:49 adrianp Exp $
 
 DISTNAME=      ingo-h3-${INGOVER}
 PKGNAME=       ingo-${INGOVER}
@@ -18,7 +18,7 @@
 EGDIR=         ${PREFIX}/share/examples/ingo
 HORDEDIR=      ${PREFIX}/share/horde
 INGODIR=       ${HORDEDIR}/ingo
-INGOVER=       1.1.3
+INGOVER=       1.1.4
 PAXDIRS=       lib locale po scripts templates themes
 
 MESSAGE_SUBST+=        INGODIR=${INGODIR:Q}
@@ -34,6 +34,7 @@
 SUBST_MESSAGE.files=   Fixing configuration files.
 
 PKG_USERS_VARS+=       APACHE_USER
+BUILD_DEFS=            APACHE_USER
 
 CONF_FILES=            ${EGDIR}/ingo.conf ${PKG_SYSCONFDIR}/ingo.conf
 CONF_FILES_PERMS+=     ${INGODIR}/config/conf.xml.dist \
@@ -52,9 +53,9 @@
 .include "options.mk"
 
 do-build:
-       @${CP} ${FILESDIR}/ingo.conf.dist ${WRKSRC}/ingo.conf.dist
-       @${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
-       @${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
+       ${CP} ${FILESDIR}/ingo.conf.dist ${WRKSRC}/ingo.conf.dist
+       ${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
+       ${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
 
 do-install:
        ${INSTALL_DATA_DIR} ${DOCDIR}
@@ -72,16 +73,16 @@
 .      endfor
 
 .      for d in ${PAXDIRS}
-               @cd ${WRKSRC}/${d:Q} && ${PAX} -rwpma . ${INGODIR}/${d:Q}
+               cd ${WRKSRC}/${d:Q} && ${PAX} -rwpma . ${INGODIR}/${d:Q}
 .      endfor
 
        ${INSTALL_DATA} ${WRKSRC}/config/*.dist ${INGODIR}/config
        ${INSTALL_DATA} ${WRKSRC}/*.php ${INGODIR}
-       @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INGODIR}
-       @${FIND} ${INGODIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-       @${FIND} ${INGODIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
-       @${CHOWN} ${APACHE_USER}:${SHAREGRP} ${INGODIR}/config
-       @${CHMOD} 0750 ${INGODIR}/config
+       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INGODIR}
+       ${FIND} ${INGODIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+       ${FIND} ${INGODIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
+       ${CHOWN} ${APACHE_USER}:${SHAREGRP} ${INGODIR}/config
+       ${CHMOD} 0750 ${INGODIR}/config
 
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 13d3f756f209 -r cd7b90375444 mail/ingo/PLIST
--- a/mail/ingo/PLIST   Thu Nov 15 22:24:28 2007 +0000
+++ b/mail/ingo/PLIST   Thu Nov 15 22:30:49 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/03/18 12:09:33 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/11/15 22:30:49 adrianp Exp $
 share/doc/ingo/INSTALL
 share/doc/ingo/README
 share/doc/ingo/RELEASE_NOTES
@@ -62,6 +62,7 @@
 share/horde/ingo/locale/sv_SE/LC_MESSAGES/ingo.mo
 share/horde/ingo/locale/tr_TR/LC_MESSAGES/ingo.mo
 share/horde/ingo/locale/zh_TW/LC_MESSAGES/ingo.mo
+share/horde/ingo/locale/zh_CN/LC_MESSAGES/ingo.mo
 share/horde/ingo/po/README
 share/horde/ingo/po/ca_ES.po
 share/horde/ingo/po/cs_CZ.po
@@ -81,6 +82,7 @@
 share/horde/ingo/po/nb_NO.po
 share/horde/ingo/po/nl_NL.po
 share/horde/ingo/po/pl_PL.po
+share/horde/ingo/po/zh_CN.po
 share/horde/ingo/po/pt_BR.po
 share/horde/ingo/po/pt_PT.po
 share/horde/ingo/po/ro_RO.po
@@ -138,6 +140,8 @@
 @dirrm share/horde/ingo/templates
 @dirrm share/horde/ingo/scripts
 @dirrm share/horde/ingo/po
+@dirrm share/horde/ingo/locale/zh_CN/LC_MESSAGES
+@dirrm share/horde/ingo/locale/zh_CN
 @dirrm share/horde/ingo/locale/zh_TW/LC_MESSAGES
 @dirrm share/horde/ingo/locale/zh_TW
 @dirrm share/horde/ingo/locale/tr_TR/LC_MESSAGES
diff -r 13d3f756f209 -r cd7b90375444 mail/ingo/distinfo
--- a/mail/ingo/distinfo        Thu Nov 15 22:24:28 2007 +0000
+++ b/mail/ingo/distinfo        Thu Nov 15 22:30:49 2007 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2007/03/18 12:09:33 adrianp Exp $
+$NetBSD: distinfo,v 1.5 2007/11/15 22:30:49 adrianp Exp $
 
-SHA1 (ingo-h3-1.1.3.tar.gz) = 3fbfc9a72a26e4e4016edee39cfe3d1610551859
-RMD160 (ingo-h3-1.1.3.tar.gz) = b1582021e41155188f3608019e1864c6bb08cdda
-Size (ingo-h3-1.1.3.tar.gz) = 1356658 bytes
+SHA1 (ingo-h3-1.1.4.tar.gz) = d726444a37837bc73d4fbf753449687f621cb05a
+RMD160 (ingo-h3-1.1.4.tar.gz) = 5b2e60aca8c32ff334da895a3bd2bd9dfa1eae1e
+Size (ingo-h3-1.1.4.tar.gz) = 1432591 bytes