- remove kerberos FLAVOR ('-with-auth' configure option was deprecated)

and add GSSAPI support by default
- add more configuration entries in the provided imapd.conf and
cyrus.conf sample files

mail/cyrus-imapd/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2007/12/11 11:04:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2008/03/15 10:07:20 ajacoutot Exp $
 
 COMMENT-main=	Cyrus IMAP server
 COMMENT-perl=	perl utils for the Cyrus IMAP server
 
 V=		2.3.11
 DISTNAME=	cyrus-imapd-${V}
-PKGNAME-main=	${DISTNAME}
+PKGNAME-main=	${DISTNAME}p0
 FULLPKGNAME-perl=cyrus-imapd-perl-${V}
 FULLPKGPATH-perl=mail/cyrus-imapd,-perl
 CATEGORIES=	mail
@@ -32,7 +32,7 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \
 PATCH_LIST=	patch-*
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I/usr/include/kerberosV" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		ac_cv_lib_resolv_res_search=no \
 		ac_cv_sys_long_file_names=yes \
@@ -50,6 +50,8 @@ CONFIGURE_ARGS=	--with-service-path=${LOCALBASE}/libexec/cyrus-imapd \
 		--with-lock=fcntl \
 		--with-com_err=/usr \
 		--with-libwrap=/usr \
+		--with-gss_impl=heimdal \
+		--enable-gssapi=/usr \
 		--enable-idled \
 		--enable-listext \
 		--enable-murder \
@@ -60,7 +62,7 @@ CONFIGURE_ARGS=	--with-service-path=${LOCALBASE}/libexec/cyrus-imapd \
 MULTI_PACKAGES=	-main ${NO_SHARED_LIBS:S/Yes//:S/No/-perl/}
 CONFIGURE_ARGS+=--with${NO_SHARED_LIBS:S/Yes/out/:S/No//}-perl
 
-FLAVORS=	drac kerberos
+FLAVORS=	drac
 FLAVOR?=
 
 .if ${FLAVOR:L:Mdrac}
@@ -69,18 +71,7 @@ PATCH_LIST+=	${WRKSRC}/contrib/drac_auth.patch \
 		drac-patch-imap_Makefile.in
 .endif
 
-.if ${FLAVOR:L:Mkerberos}
-WANTLIB+=	com_err krb5 gssapi asn1
-CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/kerberosV" \
-CONFIGURE_ARGS+=--with-auth=krb5 \
-		--enable-gssapi=/usr \
-		--with-gss_impl=heimdal
-.else
-CONFIGURE_ARGS+=--with-auth=unix \
-		--disable-gssapi
-.endif
-
-WANTLIB-main=	${WANTLIB} wrap c pthread
+WANTLIB-main=	${WANTLIB} asn1 c com_err gssapi krb5 pthread wrap
 WANTLIB-perl=	crypto ssl
 
 NO_REGRESS=	Yes

mail/cyrus-imapd/files/imapd.conf

@@ -1,4 +1,4 @@
-# $OpenBSD: imapd.conf,v 1.2 2007/08/29 20:08:17 ajacoutot Exp $
+# $OpenBSD: imapd.conf,v 1.3 2008/03/15 10:07:20 ajacoutot Exp $
 # imapd.conf(5)
 
 configdirectory: /var/imap
@@ -6,8 +6,13 @@ partition-default: /var/spool/imap
 sievedir: /var/sieve
 sendmail: /usr/sbin/sendmail
 #admins:
-#sasl_pwcheck_method:
-#sasl_mech_list:
+
+#sasl_pwcheck_method: saslauthd
+#sasl_mech_list: GSSAPI PLAIN
+#sasl_keytab:
+
+# uncomment to use '/' instead of '.' as hierarchy separator character
+#unixhierarchysep: 1
 
 # uncomment to allow plaintext authentication
 #allowplaintext: 1

mail/cyrus-imapd/patches/patch-master_conf_normal_conf

@@ -1,6 +1,6 @@
-$OpenBSD: patch-master_conf_normal_conf,v 1.1 2007/05/04 08:05:00 ajacoutot Exp $
---- master/conf/normal.conf.orig	Fri May  4 09:47:10 2007
-+++ master/conf/normal.conf	Fri May  4 09:50:57 2007
+$OpenBSD: patch-master_conf_normal_conf,v 1.2 2008/03/15 10:07:20 ajacoutot Exp $
+--- master/conf/normal.conf.orig	Thu Mar 30 18:01:39 2006
++++ master/conf/normal.conf	Tue Mar  4 09:13:24 2008
 @@ -5,17 +5,17 @@ START {
    recover	cmd="ctl_cyrusdb -r"
  
@@ -23,3 +23,11 @@ $OpenBSD: patch-master_conf_normal_conf,v 1.1 2007/05/04 08:05:00 ajacoutot Exp
  
    # these are only necessary if receiving/exporting usenet via NNTP
  #  nntp		cmd="nntpd" listen="nntp" prefork=0
+@@ -39,4 +39,7 @@ EVENTS {
+ 
+   # this is only necessary if caching TLS sessions
+   tlsprune	cmd="tls_prune" at=0400
++
++  # create SQUAT indexes for all mailboxes
++#  squatter	cmd="squatter -s -r user" at=0540
+ }

mail/cyrus-imapd/pkg/DESCR-main

@@ -23,6 +23,5 @@ packages:
 Cyrus-imapd uses the LOG_LOCAL6 syslog facility for logging. This port
 of cyrus-imapd uses idled for IMAP IDLE.
 
-Available flavors:
+Available flavor:
     drac     - Build drac support (for roaming users relay)
-    kerberos - Build support for KerberosV authentication

mail/cyrus-imapd/pkg/PLIST-main

@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST-main,v 1.5 2007/10/25 09:42:40 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.6 2008/03/15 10:07:20 ajacoutot Exp $
 @pkgpath ${BASE_PKGPATH}
+@pkgpath ${BASE_PKGPATH},-main,kerberos
 @newgroup _cyrus:543
 @newuser _cyrus:543:_cyrus:daemon:Cyrus Account:/var/empty:/sbin/nologin
 bin/imtest