diff options
| author | ghen <ghen@pkgsrc.org> | 2008-01-16 14:21:39 +0000 |
|---|---|---|
| committer | ghen <ghen@pkgsrc.org> | 2008-01-16 14:21:39 +0000 |
| commit | 42408282f442086270409eb495520f73dccc6b6b (patch) | |
| tree | bd45034bf924bf064dea6c782553b9659f9efbd5 /mail/postfix-current | |
| parent | 4498fe021cddbaf4a226e80bf4b64a1f5ce13ade (diff) | |
| download | pkgsrc-42408282f442086270409eb495520f73dccc6b6b.tar.gz | |
Drop the "dovecot-sasl" option and instead enable dovecot SASL support by
default (this doesn't actually depend on Dovecot for building, the code is
shipped with Postfix).
Set the default value for smtpd_sasl_type to "dovecot" unless cyrus SASL is
enabled, too. This ensures backwards compatibility for most cases.
Ok with martti, joerg.
Diffstat (limited to 'mail/postfix-current')
| -rw-r--r-- | mail/postfix-current/Makefile | 4 | ||||
| -rw-r--r-- | mail/postfix-current/options.mk | 17 |
2 files changed, 7 insertions, 14 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index cfa79299a58..823b7fc21b9 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2007/10/30 19:31:40 martti Exp $ +# $NetBSD: Makefile,v 1.88 2008/01/16 14:21:44 ghen Exp $ DISTNAME= postfix-2.5-20071006 #PKGREVISION= 1 @@ -30,7 +30,7 @@ BUILD_DEFS+= VARBASE POSTFIX_QUEUE_DIR # CCARGS is a list of options to pass to the preprocessor/compiler. # AUXLIBS is a list of options to pass to the linker. # -CCARGS= # empty +CCARGS= -DUSE_SASL_AUTH AUXLIBS= ${LDFLAGS} FIX_RPATH+= AUXLIBS diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk index fda06dada81..c629577b77e 100644 --- a/mail/postfix-current/options.mk +++ b/mail/postfix-current/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.16 2007/04/29 19:27:36 tron Exp $ +# $NetBSD: options.mk,v 1.17 2008/01/16 14:21:48 ghen Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.postfix -PKG_SUPPORTED_OPTIONS= bdb ldap mysql mysql4 pcre pgsql sasl tls dovecot-sasl +PKG_SUPPORTED_OPTIONS= bdb ldap mysql mysql4 pcre pgsql sasl tls PKG_SUGGESTED_OPTIONS= tls .include "../../mk/bsd.options.mk" @@ -83,7 +83,8 @@ AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ .endif ### -### SASL support for SMTP authentication. +### Cyrus SASL support for SMTP authentication. +### (Dovcot SASL support is built in by default.) ### .if !empty(PKG_OPTIONS:Msasl) . include "../../security/cyrus-sasl/buildlink3.mk" @@ -100,13 +101,5 @@ MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR} .else PLIST_SUBST+= SASL="@comment " -.endif - -### -### SASL support for SMTP authentication (via Dovecot). -### -.if !empty(PKG_OPTIONS:Mdovecot-sasl) -DEPENDS+= dovecot-[0-9]*:../../mail/dovecot - -CCARGS+= -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\" +CCARGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\" .endif |