diff options
| author | ghen <ghen@pkgsrc.org> | 2006-02-06 17:28:09 +0000 |
|---|---|---|
| committer | ghen <ghen@pkgsrc.org> | 2006-02-06 17:28:09 +0000 |
| commit | e868349ff9279193e33315b06cd1940f3ed51d3d (patch) | |
| tree | 10bf6702f795f66adf67d902365ed10b32359329 /mail/dovecot/options.mk | |
| parent | ca47b418b63c8d4e69b3572e80fda7508022624e (diff) | |
| download | pkgsrc-e868349ff9279193e33315b06cd1940f3ed51d3d.tar.gz | |
Import some improvements from the pkgsrc-wip/dovecot package (by tv@) and
correct a mistake in my previous commit:
- add dependency on zlib
- add option for GNU TLS as an alternative to OpenSSL
- drop SASL option, it's no longer supported
- explicitly disable some options with --disable-*
- "s,/usr/pkg,@PREFIX@," in patch-ab -- I accidentally diffed it after the SUBST stage
- change SUBST_STAGE from post-patch to pre-configure to avoid this in the future
- bump PKGREVISION for all this
Thanks to tv@.
Diffstat (limited to 'mail/dovecot/options.mk')
| -rw-r--r-- | mail/dovecot/options.mk | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk index 63b34703899..5aa16eaf9b2 100644 --- a/mail/dovecot/options.mk +++ b/mail/dovecot/options.mk @@ -1,20 +1,24 @@ -# $NetBSD: options.mk,v 1.11 2006/02/06 15:54:37 ghen Exp $ +# $NetBSD: options.mk,v 1.12 2006/02/06 17:28:09 ghen Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot PKG_SUPPORTED_OPTIONS= inet6 ldap mysql pam pgsql sasl ssl sqlite +PKG_OPTIONS_OPTIONAL_GROUPS= ssl +PKG_OPTIONS_GROUP.ssl= gnutls ssl PKG_SUGGESTED_OPTIONS= ssl .include "../../mk/bsd.options.mk" ### -### Build with OpenSSL as the underlying crypto library. +### Build with OpenSSL or GNU TLS as the underlying crypto library. ### -# (gnutls is broken in dovecot 0.99.x) .if !empty(PKG_OPTIONS:Mssl) -CONFIGURE_ARGS+= --enable-ssl=openssl +CONFIGURE_ARGS+= --with-ssl=openssl . include "../../security/openssl/buildlink3.mk" +.elif !empty(PKG_OPTIONS:Mgnutls) +CONFIGURE_ARGS+= --with-ssl=gnutls +. include "../../security/gnutls/buildlink3.mk" .else -CONFIGURE_ARGS+= --disable-ssl +CONFIGURE_ARGS+= --without-ssl .endif ### @@ -39,6 +43,8 @@ CPPFLAGS+= -I${BUILDLINK_DIR}/include/pgsql ### .if !empty(PKG_OPTIONS:Minet6) CONFIGURE_ARGS+= --enable-ipv6 +.else +CONFIGURE_ARGS+= --disable-ipv6 .endif ### @@ -50,14 +56,6 @@ CONFIGURE_ARGS+= --with-ldap .endif ### -### IMAP-AUTH via SASL. -### -.if !empty(PKG_OPTIONS:Msasl) -CONFIGURE_ARGS+= --with-cyrus-sasl2 -. include "../../security/cyrus-sasl2/buildlink3.mk" -.endif - -### ### PAM support. ### .if !empty(PKG_OPTIONS:Mpam) |