From 88f5701a1398a40e3af7120a08b52e2c3e8d6cdd Mon Sep 17 00:00:00 2001
From: seb <seb>
Date: Sat, 16 Nov 2002 10:39:22 +0000
Subject: I forgot to commit this with the new patches yesterday!!! Many thanks
 to Chris Gilbert for noticing it.

Bump PKGREVISION
- Add dependency on autoconf and have auto{header,conf} run at pre-configure
  stage: this is need to avoid conflict between the distribution patch file for
  IPv6 and patch files.
- Pave the way for the removal of PERL5_GENERATE_PLIST from bsd.pkg.mk:
  use perl5/module.mk with PERL5_CONFIGURE=NO.
- Ensure relocatable objects are created so that when the Perl modules are
  linked they are composed wholly from relocatable objects.
  We query perl for how to compile a source file into a relocatable object file.
  Thanks again jlam for this.
---
 mail/cyrus-imapd21/Makefile | 13 +++++++++++--
 mail/cyrus-imapd21/distinfo |  7 ++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'mail')

diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index e1d66808312..993b7465866 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/27 16:08:52 chris Exp $
+# $NetBSD: Makefile,v 1.2 2002/11/16 10:39:22 seb Exp $
 
 DISTNAME=		cyrus-imapd-2.1.9
+PKGREVISION=		1
 SVR4_PKGNAME=		cimap
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -12,6 +13,8 @@ COMMENT=		Cyrus IMAP server
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
+PERL5_CONFIGURE=	NO
+AUTOCONF_REQD=		2.13
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -94,6 +97,11 @@ post-patch:
 		${MV} -f $${file}.fixed $${file};			\
 	done
 
+pre-configure:
+	cd ${WRKSRC};							\
+	${AUTOHEADER};							\
+	${AUTOCONF}
+
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${PREFIX}/cyrus/bin
@@ -105,9 +113,10 @@ post-install:
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html cyrusv2.mc ${HTMLDIR}
 
 .include "../../databases/db3/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../security/cyrus-sasl2/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 .include "../../security/tcp_wrappers/buildlink2.mk"
+.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd21/distinfo b/mail/cyrus-imapd21/distinfo
index d5e4bd7eb92..36d31eddf34 100644
--- a/mail/cyrus-imapd21/distinfo
+++ b/mail/cyrus-imapd21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/10/27 16:08:52 chris Exp $
+$NetBSD: distinfo,v 1.2 2002/11/16 10:39:22 seb Exp $
 
 SHA1 (cyrus-imapd-2.1.9.tar.gz) = 7f9fe16e3cc5f67b97278f3fb2a194482570924a
 Size (cyrus-imapd-2.1.9.tar.gz) = 1633031 bytes
@@ -9,3 +9,8 @@ SHA1 (patch-ab) = 93f8b2a17a2f1267b891f89a6904af6dfc53c904
 SHA1 (patch-ac) = dd29b77fefee4c61dd1fac6d16284e0d1505d4ae
 SHA1 (patch-ad) = 3e07a4e5bd1e496e33f555c9a4004a0097595551
 SHA1 (patch-ae) = 371df78750ef75fba2ff42a17785aea4e3aea724
+SHA1 (patch-af) = 5581025bb08d3e1f29f21f133e32f9cc0b2675fb
+SHA1 (patch-ag) = 55e7bbd00f8fe4b47d48fad3a06e3ad0aa835a4a
+SHA1 (patch-ah) = 99e25634852897f8df72b9af5f35789a0ef4b892
+SHA1 (patch-ai) = df0551cd295d660dcd12601cb1aa2d930f85d2f1
+SHA1 (patch-aj) = df5f4ebee3d971a257c514beda4ca9cf5b315ca0
-- 
cgit v1.2.3