[pkgsrc/trunk]: pkgsrc/mail Drop the "dovecot-sasl" option and instead enable...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb503ae29160
branches:  trunk
changeset: 537813:cb503ae29160
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Wed Jan 16 14:21:39 2008 +0000

description:
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:

 mail/postfix-current/Makefile   |   4 ++--
 mail/postfix-current/options.mk |  17 +++++------------
 mail/postfix/Makefile           |   4 ++--
 mail/postfix/options.mk         |  19 ++++++-------------
 4 files changed, 15 insertions(+), 29 deletions(-)

diffs (126 lines):

diff -r c07eb05cc375 -r cb503ae29160 mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile     Wed Jan 16 14:20:08 2008 +0000
+++ b/mail/postfix-current/Makefile     Wed Jan 16 14:21:39 2008 +0000
@@ -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 @@
 # 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 -r c07eb05cc375 -r cb503ae29160 mail/postfix-current/options.mk
--- a/mail/postfix-current/options.mk   Wed Jan 16 14:20:08 2008 +0000
+++ b/mail/postfix-current/options.mk   Wed Jan 16 14:21:39 2008 +0000
@@ -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 @@
 .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+=        SASLLIBDIR=${SASLLIBDIR}
 .else
 PLIST_SUBST+=  SASL="@comment "
+CCARGS+=       -DDEF_SERVER_SASL_TYPE=\"dovecot\"
 .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\"
-.endif
diff -r c07eb05cc375 -r cb503ae29160 mail/postfix/Makefile
--- a/mail/postfix/Makefile     Wed Jan 16 14:20:08 2008 +0000
+++ b/mail/postfix/Makefile     Wed Jan 16 14:21:39 2008 +0000
@@ -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 @@
 # 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 -r c07eb05cc375 -r cb503ae29160 mail/postfix/options.mk
--- a/mail/postfix/options.mk   Wed Jan 16 14:20:08 2008 +0000
+++ b/mail/postfix/options.mk   Wed Jan 16 14:21:39 2008 +0000
@@ -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 @@
 .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+=        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
 
 ###