From 2fe92812bb6f7f71e8b34206a85e1ab488f73748 Mon Sep 17 00:00:00 2001 From: Hajimu UMEMOTO Date: Sun, 30 Apr 2006 19:56:06 +0000 Subject: --with-auth configure option was deprecated. --- mail/cyrus-imapd22/Makefile | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'mail/cyrus-imapd22') diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index 30bf94994476..e3fec36509ff 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -39,49 +39,48 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-openssl=${OPENSSLBASE} \ --with-perl=${PERL5} -OPTIONS= AUTH_KRB5 "Use Kerberos5 authorization module" off .if defined(WITH_BDB_VER) USE_BDB_VER= ${WITH_BDB_VER} .else USE_BDB_VER= 3 .endif .if ${USE_BDB_VER} == 3 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" on \ +OPTIONS= BDB_3 "Use BerkeleyDB v3" on \ BDB_4 "Use BerkeleyDB v4" off \ BDB_41 "Use BerkeleyDB v4.1" off \ BDB_42 "Use BerkeleyDB v4.2" off \ BDB_43 "Use BerkeleyDB v4.3" off \ BDB_44 "Use BerkeleyDB v4.4" off .elif ${USE_BDB_VER} == 4 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ +OPTIONS= BDB_3 "Use BerkeleyDB v3" off \ BDB_4 "Use BerkeleyDB v4" on \ BDB_41 "Use BerkeleyDB v4.1" off \ BDB_42 "Use BerkeleyDB v4.2" off \ BDB_43 "Use BerkeleyDB v4.3" off \ BDB_44 "Use BerkeleyDB v4.4" off .elif ${USE_BDB_VER} == 41 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ +OPTIONS= BDB_3 "Use BerkeleyDB v3" off \ BDB_4 "Use BerkeleyDB v4" off \ BDB_41 "Use BerkeleyDB v4.1" on \ BDB_42 "Use BerkeleyDB v4.2" off \ BDB_43 "Use BerkeleyDB v4.3" off \ BDB_44 "Use BerkeleyDB v4.4" off .elif ${USE_BDB_VER} == 42 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ +OPTIONS= BDB_3 "Use BerkeleyDB v3" off \ BDB_4 "Use BerkeleyDB v4" off \ BDB_41 "Use BerkeleyDB v4.1" off \ BDB_42 "Use BerkeleyDB v4.2" on \ BDB_43 "Use BerkeleyDB v4.3" off \ BDB_44 "Use BerkeleyDB v4.4" off .elif ${USE_BDB_VER} == 43 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ +OPTIONS= BDB_3 "Use BerkeleyDB v3" off \ BDB_4 "Use BerkeleyDB v4" off \ BDB_41 "Use BerkeleyDB v4.1" off \ BDB_42 "Use BerkeleyDB v4.2" off \ BDB_43 "Use BerkeleyDB v4.3" on \ BDB_44 "Use BerkeleyDB v4.4" off .elif ${USE_BDB_VER} == 44 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ +OPTIONS= BDB_3 "Use BerkeleyDB v3" off \ BDB_4 "Use BerkeleyDB v4" off \ BDB_41 "Use BerkeleyDB v4.1" off \ BDB_42 "Use BerkeleyDB v4.2" off \ @@ -206,18 +205,11 @@ CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} CONFIGURE_ARGS+=--with-snmp=no .endif -.if defined(WITH_AUTH_KRB5) && defined(WITH_LDAP_PTLOADER) -BROKEN= "AUTH_KRB5 and LDAP_PTLOADER are exclusive. Run 'make config' again!" -.endif .if defined(WITH_LDAP_PTLOADER) USE_OPENLDAP= yes -CONFIGURE_ARGS+=--with-auth=pts --with-pts=ldap --with-ldap=${LOCALBASE} +CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} PLIST_SUB+= LDAP_PTLOADER="" -.elif defined(WITH_AUTH_KRB5) -CONFIGURE_ARGS+=--with-auth=krb5 -PLIST_SUB+= LDAP_PTLOADER="@comment " .else -CONFIGURE_ARGS+=--with-auth=unix PLIST_SUB+= LDAP_PTLOADER="@comment " .endif -- cgit v1.2.3