diff options
| -rw-r--r-- | mail/cyrus-imapd/Makefile | 4 | ||||
| -rw-r--r-- | mail/cyrus-imapd/distinfo | 4 | ||||
| -rw-r--r-- | mail/cyrus-imapd/patches/patch-ca | 13 | ||||
| -rw-r--r-- | mail/cyrus-imapd/patches/patch-cb | 13 | ||||
| -rw-r--r-- | mail/cyrus-imapd21/Makefile | 4 | ||||
| -rw-r--r-- | mail/cyrus-imapd21/distinfo | 4 | ||||
| -rw-r--r-- | mail/cyrus-imapd21/patches/patch-ca | 13 | ||||
| -rw-r--r-- | mail/cyrus-imapd21/patches/patch-cb | 13 |
8 files changed, 62 insertions, 6 deletions
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index d3d3dd1c42f..e868aa8237f 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2005/08/06 06:19:21 jlam Exp $ +# $NetBSD: Makefile,v 1.56 2005/08/08 16:50:59 jlam Exp $ DISTNAME= cyrus-imapd-2.2.12 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/ diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo index a3b6f89e755..b849580e9a1 100644 --- a/mail/cyrus-imapd/distinfo +++ b/mail/cyrus-imapd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2005/05/21 06:56:21 rh Exp $ +$NetBSD: distinfo,v 1.19 2005/08/08 16:50:59 jlam Exp $ SHA1 (cyrus-imapd-2.2.12.tar.gz) = 08adc5dfde1288c0d9e7de44e7ea4d17a7940d06 RMD160 (cyrus-imapd-2.2.12.tar.gz) = ff4a95e519ea066ed9b21b515b18bdacaf0d1852 @@ -14,3 +14,5 @@ SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b SHA1 (patch-ba) = 98bea064fa4d97b0bb1ba2d1fcb4d30611ac706e SHA1 (patch-bb) = 8725d9008617acb392b904d76a353b8829fdfb33 SHA1 (patch-bc) = 3266d52067aef8f4835670cba1be6c190ff94f15 +SHA1 (patch-ca) = cc3e9cb9c56e8d51062bf9d691454ea90ce25b09 +SHA1 (patch-cb) = a8281c11f93f8f91d6c80d43ca9e20bc658d8813 diff --git a/mail/cyrus-imapd/patches/patch-ca b/mail/cyrus-imapd/patches/patch-ca new file mode 100644 index 00000000000..d0706ebc169 --- /dev/null +++ b/mail/cyrus-imapd/patches/patch-ca @@ -0,0 +1,13 @@ +$NetBSD: patch-ca,v 1.1 2005/08/08 16:50:59 jlam Exp $ + +--- perl/Makefile.in.orig 2003-10-22 14:50:17.000000000 -0400 ++++ perl/Makefile.in +@@ -82,7 +82,7 @@ all:: + BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \ + OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \ + SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \ +- $(PERL) Makefile.PL PREFIX=$(prefix); \ ++ $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \ + fi; \ + $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \ + done diff --git a/mail/cyrus-imapd/patches/patch-cb b/mail/cyrus-imapd/patches/patch-cb new file mode 100644 index 00000000000..a3b31554f1f --- /dev/null +++ b/mail/cyrus-imapd/patches/patch-cb @@ -0,0 +1,13 @@ +$NetBSD: patch-cb,v 1.1 2005/08/08 16:50:59 jlam Exp $ + +--- perl/sieve/Makefile.in.orig 2003-10-22 14:50:24.000000000 -0400 ++++ perl/sieve/Makefile.in +@@ -84,7 +84,7 @@ all:: + BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \ + OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \ + SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \ +- $(PERL) Makefile.PL PREFIX=$(prefix); \ ++ $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \ + fi; \ + $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \ + done diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile index 578ef2304ad..4cb83486893 100644 --- a/mail/cyrus-imapd21/Makefile +++ b/mail/cyrus-imapd21/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.33 2005/08/06 06:19:21 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2005/08/08 16:50:59 jlam Exp $ DISTNAME= cyrus-imapd-2.1.18 SVR4_PKGNAME= cimap -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/ diff --git a/mail/cyrus-imapd21/distinfo b/mail/cyrus-imapd21/distinfo index 2f1b854f45c..81922386143 100644 --- a/mail/cyrus-imapd21/distinfo +++ b/mail/cyrus-imapd21/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2005/05/28 17:41:54 adrianp Exp $ +$NetBSD: distinfo,v 1.12 2005/08/08 16:50:59 jlam Exp $ SHA1 (cyrus-imapd-2.1.18.tar.gz) = 2f587645d8589fb876bb6633ae4a7a93f451b89c RMD160 (cyrus-imapd-2.1.18.tar.gz) = 87e521c9fc01e42c4e54b4e2ffb1492abb9f9130 @@ -16,3 +16,5 @@ SHA1 (patch-ah) = 99e25634852897f8df72b9af5f35789a0ef4b892 SHA1 (patch-ai) = df0551cd295d660dcd12601cb1aa2d930f85d2f1 SHA1 (patch-aj) = fcf0ce2c630459ea27c3d950a31ed907f5884de6 SHA1 (patch-ak) = b0c8916d8e427c06625013595c06842544ef2125 +SHA1 (patch-ca) = 953c17733c8802cf965871a11c53e25185aa5935 +SHA1 (patch-cb) = 86a34c56e6494e59b8d9f27a95e435e5e1e62d26 diff --git a/mail/cyrus-imapd21/patches/patch-ca b/mail/cyrus-imapd21/patches/patch-ca new file mode 100644 index 00000000000..aaa648a9df7 --- /dev/null +++ b/mail/cyrus-imapd21/patches/patch-ca @@ -0,0 +1,13 @@ +$NetBSD: patch-ca,v 1.1 2005/08/08 16:50:59 jlam Exp $ + +--- perl/Makefile.in.orig 2003-01-02 12:27:35.000000000 -0500 ++++ perl/Makefile.in +@@ -80,7 +80,7 @@ imap/Makefile: imap/Makefile.PL + (cd imap; \ + OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \ + SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \ +- $(PERL) Makefile.PL PREFIX=$(prefix)) ++ $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix)) + + install:: + @for d in $(SUBDIRS); \ diff --git a/mail/cyrus-imapd21/patches/patch-cb b/mail/cyrus-imapd21/patches/patch-cb new file mode 100644 index 00000000000..f0778922f60 --- /dev/null +++ b/mail/cyrus-imapd21/patches/patch-cb @@ -0,0 +1,13 @@ +$NetBSD: patch-cb,v 1.1 2005/08/08 16:50:59 jlam Exp $ + +--- perl/sieve/Makefile.in.orig 2002-07-22 12:16:09.000000000 -0400 ++++ perl/sieve/Makefile.in +@@ -78,7 +78,7 @@ all:: + if [ -f Makefile.PL ]; then \ + OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \ + SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \ +- $(PERL) Makefile.PL PREFIX=$(prefix); \ ++ $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \ + fi; \ + $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \ + done |