From 9392fe2f69c330d2d2df4287e99a5e9f304a826d Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 2 Sep 2011 08:24:28 +0000
Subject: [PATCH] Disable libwrap support, doesn't work properly and is from
 the past...

---
 mail/cyrus-imapd/Makefile                | 8 ++++----
 mail/cyrus-imapd/patches/patch-configure | 9 ---------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 7be4fbaa36a..247f5e8bf32 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.60 2011/07/22 05:58:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.61 2011/09/02 08:24:28 ajacoutot Exp $
 
 COMMENT-main=	Cyrus IMAP server
 COMMENT-perl=	perl utils for the Cyrus IMAP server
@@ -9,7 +9,7 @@ PKGNAME-main=	${DISTNAME}
 FULLPKGNAME-perl=cyrus-imapd-perl-${V}
 FULLPKGPATH-perl=mail/cyrus-imapd,-perl
 
-REVISION-main=	0
+REVISION-main=	1
 
 CATEGORIES=	mail
 
@@ -55,12 +55,12 @@ CONFIGURE_ARGS=	--with-service-path=${LOCALBASE}/libexec/cyrus-imapd \
 		--with-openssl=/usr \
 		--with-lock=fcntl \
 		--with-com_err=/usr \
-		--with-libwrap=/usr \
 		--with-gss_impl=heimdal \
 		--enable-gssapi=/usr \
 		--enable-idled \
 		--enable-murder \
 		--enable-nntp \
+		--without-libwrap \
 		--without-zephyr \
 		--without-snmp \
 		--with-ldap=no \
@@ -84,7 +84,7 @@ pre-patch:
 	cd ${WRKSRC} && ${PATCH} -s -z .drac -p1 < contrib/drac_auth.patch
 .endif
 
-WANTLIB-main +=	${WANTLIB} asn1 c com_err gssapi krb5 pthread wrap
+WANTLIB-main +=	${WANTLIB} asn1 c com_err gssapi krb5 pthread
 WANTLIB-main +=	pcre pcreposix
 WANTLIB-perl +=	${WANTLIB}
 
diff --git a/mail/cyrus-imapd/patches/patch-configure b/mail/cyrus-imapd/patches/patch-configure
index 602ac36a8dc..b13458ff8ae 100644
--- a/mail/cyrus-imapd/patches/patch-configure
+++ b/mail/cyrus-imapd/patches/patch-configure
@@ -49,12 +49,3 @@
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5
  $as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
              eval `${PERL} -V:cccdlflags`
-@@ -10556,6 +10554,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- extern "C"
- #endif
- char request_init ();
-+int allow_severity = 1;
-+int deny_severity = 1;
- int
- main ()
- {