diff options
| author | obache <obache> | 2011-12-20 11:59:46 +0000 |
|---|---|---|
| committer | obache <obache> | 2011-12-20 11:59:46 +0000 |
| commit | d8fde774a315c9a334b7de351a33183ffa520687 (patch) | |
| tree | 9314fd106b46066a9e7dcfe9b21c74b617862e42 /mail | |
| parent | 234bedc293613929f66355da31a0d795c5d51cb8 (diff) | |
| download | pkgsrc-d8fde774a315c9a334b7de351a33183ffa520687.tar.gz | |
Back to use builtin com_err if builtin krb5 is preferred.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/cyrus-imapd/Makefile | 15 | ||||
| -rw-r--r-- | mail/cyrus-imapd23/options.mk | 15 | ||||
| -rw-r--r-- | mail/cyrus-imapd24/options.mk | 15 |
3 files changed, 42 insertions, 3 deletions
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index eb8e6c789c1..47ec552b726 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.91 2011/12/17 07:29:49 sbd Exp $ +# $NetBSD: Makefile,v 1.92 2011/12/20 11:59:46 obache Exp $ DISTNAME= cyrus-imapd-2.2.13p1 PKGREVISION= 5 @@ -75,7 +75,20 @@ CONFIGURE_ENV+= COMPILE_ET=${KRB5BASE}/bin/compile_et .else CONFIGURE_ARGS+= --without-krb CONFIGURE_ARGS+= --disable-gssapi +CHECK_BUILTIN.heimdal:= yes +. include "../../security/heimdal/builtin.mk" +CHECK_BUILTIN.heimdal:= no +CHECK_BUILTIN.mit-krb5:= yes +. include "../../security/mit-krb5/builtin.mk" +CHECK_BUILTIN.mit-krb5:= no +. if ( !empty(USE_BUILTIN.heimdal:M[Yy][Ee][Ss]) || \ + !empty(USE_BUILTIN.mit-krb5:M[Yy][Ee][Ss])) && \ + exists(/usr/bin/compile_et) && exists(/usr/include/krb5/com_err.h) +CPPFLAGS+= -I/usr/include/krb5 +CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et +. else CONFIGURE_ARGS+= --with-com-err=yes +. endif .endif PLIST_VARS+= ldap diff --git a/mail/cyrus-imapd23/options.mk b/mail/cyrus-imapd23/options.mk index 80d23d1d4bb..f28eca8bc56 100644 --- a/mail/cyrus-imapd23/options.mk +++ b/mail/cyrus-imapd23/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2011/12/17 07:29:49 sbd Exp $ +# $NetBSD: options.mk,v 1.4 2011/12/20 11:59:46 obache Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd @@ -31,7 +31,20 @@ CONFIGURE_ENV+= COMPILE_ET=${KRB5BASE}/bin/compile_et .else CONFIGURE_ARGS+= --without-krb CONFIGURE_ARGS+= --disable-gssapi +CHECK_BUILTIN.heimdal:= yes +. include "../../security/heimdal/builtin.mk" +CHECK_BUILTIN.heimdal:= no +CHECK_BUILTIN.mit-krb5:= yes +. include "../../security/mit-krb5/builtin.mk" +CHECK_BUILTIN.mit-krb5:= no +. if ( !empty(USE_BUILTIN.heimdal:M[Yy][Ee][Ss]) || \ + !empty(USE_BUILTIN.mit-krb5:M[Yy][Ee][Ss])) && \ + exists(/usr/bin/compile_et) && exists(/usr/include/krb5/com_err.h) +CPPFLAGS+= -I/usr/include/krb5 +CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et +. else CONFIGURE_ARGS+= --with-com-err=yes +. endif .endif .if !empty(PKG_OPTIONS:Mldap) diff --git a/mail/cyrus-imapd24/options.mk b/mail/cyrus-imapd24/options.mk index d313dd01181..820b83121c2 100644 --- a/mail/cyrus-imapd24/options.mk +++ b/mail/cyrus-imapd24/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2011/12/17 07:29:49 sbd Exp $ +# $NetBSD: options.mk,v 1.5 2011/12/20 11:59:46 obache Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd @@ -31,7 +31,20 @@ CONFIGURE_ENV+= COMPILE_ET=${KRB5BASE}/bin/compile_et .else CONFIGURE_ARGS+= --without-krb CONFIGURE_ARGS+= --disable-gssapi +CHECK_BUILTIN.heimdal:= yes +. include "../../security/heimdal/builtin.mk" +CHECK_BUILTIN.heimdal:= no +CHECK_BUILTIN.mit-krb5:= yes +. include "../../security/mit-krb5/builtin.mk" +CHECK_BUILTIN.mit-krb5:= no +. if ( !empty(USE_BUILTIN.heimdal:M[Yy][Ee][Ss]) || \ + !empty(USE_BUILTIN.mit-krb5:M[Yy][Ee][Ss])) && \ + exists(/usr/bin/compile_et) && exists(/usr/include/krb5/com_err.h) +CPPFLAGS+= -I/usr/include/krb5 +CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et +. else CONFIGURE_ARGS+= --with-com-err=yes +. endif .endif .if !empty(PKG_OPTIONS:Mldap) |