diff options
author | ghen <ghen> | 2008-01-16 14:21:39 +0000 |
---|---|---|
committer | ghen <ghen> | 2008-01-16 14:21:39 +0000 |
commit | ad0f4fc8b3bb1cfedfd2d6fab0bbc47bd707b2a2 (patch) | |
tree | bd45034bf924bf064dea6c782553b9659f9efbd5 /mail/postfix | |
parent | dd887f3f2441cc69e9a5eb4eec3c05f971dc72de (diff) | |
download | pkgsrc-ad0f4fc8b3bb1cfedfd2d6fab0bbc47bd707b2a2.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')
-rw-r--r-- | mail/postfix/Makefile | 4 | ||||
-rw-r--r-- | mail/postfix/options.mk | 19 |
2 files changed, 8 insertions, 15 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 53cb820a889..56f8d252b16 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.211 2007/12/02 02:17:24 gdt Exp $ +# $NetBSD: Makefile,v 1.212 2008/01/16 14:21:39 ghen Exp $ DISTNAME= postfix-2.4.6 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/options.mk b/mail/postfix/options.mk index 3b5d1d0e4b0..c58e789441f 100644 --- a/mail/postfix/options.mk +++ b/mail/postfix/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.26 2008/01/14 13:29:25 ghen Exp $ +# $NetBSD: options.mk,v 1.27 2008/01/16 14:21:43 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 postfix-stress +PKG_SUPPORTED_OPTIONS= bdb ldap mysql mysql4 pcre pgsql sasl tls postfix-stress PKG_SUGGESTED_OPTIONS= tls .include "../../mk/bsd.options.mk" @@ -83,14 +83,15 @@ 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" BUILDLINK_INCDIRS.cyrus-sasl= include/sasl SASLLIBDIR= ${PREFIX}/lib/sasl2 PWCHECK_METHOD= auxprop -CCARGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL +CCARGS+= -DUSE_CYRUS_SASL AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ -lsasl2 @@ -100,15 +101,7 @@ 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 ### |