diff options
| -rw-r--r-- | mail/cyrus-imapd/Makefile | 26 | ||||
| -rw-r--r-- | mail/cyrus-imapd/distinfo | 4 | ||||
| -rw-r--r-- | mail/cyrus-imapd/patches/patch-aq | 11 |
3 files changed, 26 insertions, 15 deletions
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index b4bf3ba75be..1f51b46502e 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.78 2008/10/19 19:18:11 he Exp $ +# $NetBSD: Makefile,v 1.79 2009/05/15 23:29:01 obache Exp $ DISTNAME= cyrus-imapd-2.2.13 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= mail MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/ @@ -10,6 +10,8 @@ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://cyrusimap.web.cmu.edu/imapd/ COMMENT= Cyrus IMAP server +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= perl USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes @@ -165,19 +167,19 @@ post-patch: done post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec ${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${PREFIX}/cyrus/bin - ${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${PREFIX}/cyrus/bin - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EGDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec ${DESTDIR}${PREFIX}/cyrus/bin + ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${DESTDIR}${PREFIX}/cyrus/bin + ${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${DESTDIR}${PREFIX}/cyrus/bin + ${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${DESTDIR}${PREFIX}/cyrus/bin + ${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${DESTDIR}${PREFIX}/cyrus/bin + ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${FILESDIR}/imapd.conf ${DESTDIR}${EGDIR} cd ${WRKSRC}/master/conf; for file in *.conf; do \ - ${INSTALL_DATA} $$file ${EGDIR}; \ + ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}; \ done - ${INSTALL_DATA_DIR} ${HTMLDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR} cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do \ - ${INSTALL_DATA} $$file ${HTMLDIR}; \ + ${INSTALL_DATA} $$file ${DESTDIR}${HTMLDIR}; \ done .include "../../mk/bsd.pkg.mk" diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo index 62b1d5a6ec1..f12a238b837 100644 --- a/mail/cyrus-imapd/distinfo +++ b/mail/cyrus-imapd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2007/06/12 11:34:29 obache Exp $ +$NetBSD: distinfo,v 1.29 2009/05/15 23:29:01 obache Exp $ SHA1 (cyrus-imapd-2.2.13.tar.gz) = ba84b67a1cae4c15d5a588d010764031167970c4 RMD160 (cyrus-imapd-2.2.13.tar.gz) = 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2 @@ -13,7 +13,7 @@ SHA1 (patch-ag) = 85d931a197d9185cbcff592efd67c2090724d7fd SHA1 (patch-al) = d28a0e604f0ddcf22c6753be333216780558e05c SHA1 (patch-am) = 0804e6fa6694ed820861b740ac1bead29b3eeb4b SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b -SHA1 (patch-aq) = 0d764585dc2af05964b03723c29ff127ebe3c25d +SHA1 (patch-aq) = f0be966a4219db43ba51c7f25a088addb036a0c0 SHA1 (patch-ba) = 98bea064fa4d97b0bb1ba2d1fcb4d30611ac706e SHA1 (patch-bb) = 8725d9008617acb392b904d76a353b8829fdfb33 SHA1 (patch-bc) = 3266d52067aef8f4835670cba1be6c190ff94f15 diff --git a/mail/cyrus-imapd/patches/patch-aq b/mail/cyrus-imapd/patches/patch-aq index efd5a002d73..59e75ac339f 100644 --- a/mail/cyrus-imapd/patches/patch-aq +++ b/mail/cyrus-imapd/patches/patch-aq @@ -1,7 +1,16 @@ -$NetBSD: patch-aq,v 1.3 2006/12/01 13:36:59 joerg Exp $ +$NetBSD: patch-aq,v 1.4 2009/05/15 23:29:01 obache Exp $ --- imap/fetchnews.c.orig 2005-03-23 00:40:11.000000000 +0000 +++ imap/fetchnews.c +@@ -268,7 +268,7 @@ int main(int argc, char *argv[]) + + if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE); + +- while ((opt = getopt(argc, argv, "C:s:w:f:a:p:n:y")) != EOF) { ++ while ((opt = getopt(argc, argv, "C:s:w:f:a:p:ny")) != EOF) { + switch (opt) { + case 'C': /* alt config file */ + alt_config = optarg; @@ -371,7 +371,8 @@ int main(int argc, char *argv[]) prot_fgets(buf, sizeof(buf), pin); |