[pkgsrc/trunk]: pkgsrc/mail/postfix If neither USE_SASL or USE_SASL2 are defi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9b3bf49df1f0
branches:  trunk
changeset: 478225:9b3bf49df1f0
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jul 19 20:34:50 2004 +0000

description:
If neither USE_SASL or USE_SASL2 are defined and POSTFIX_OPTIONS includes
"sasl", then use SASLv2 by default.

diffstat:

 mail/postfix/Makefile.options |  15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 49b0fa2d6aca -r 9b3bf49df1f0 mail/postfix/Makefile.options
--- a/mail/postfix/Makefile.options     Mon Jul 19 20:31:49 2004 +0000
+++ b/mail/postfix/Makefile.options     Mon Jul 19 20:34:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.options,v 1.1 2004/07/19 19:59:17 jlam Exp $
+# $NetBSD: Makefile.options,v 1.2 2004/07/19 20:34:50 jlam Exp $
 #
 # POSTFIX_ALL_OPTIONS lists all of the currently-supported optional modules
 # that may be built into Postfix.
@@ -100,10 +100,19 @@
 ## .endif
 
 ###
-### SASL support for SMTP authentication.
+### SASL support for SMTP authentication.  If neither SASLv1 or SASLv2 is
+### explicitly specified, then build with SASLv2.
 ###
 .if !empty(_POSTFIX_OPTIONS:Msasl)
-.  if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
+.  if !defined(USE_SASL2) && !defined(USE_SASL)
+.    include "../../security/cyrus-sasl2/buildlink3.mk"
+SASLLIBDIR=    ${PREFIX}/lib/sasl2
+PWCHECK_METHOD=        auxprop
+CCARGS+=       -DUSE_SASL2_AUTH
+AUXLIBS+=      -L${BUILDLINK_PREFIX.cyrus-sasl}/lib                    \
+               -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib     \
+               -lsasl2
+.  elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
 .    include "../../security/cyrus-sasl2/buildlink3.mk"
 SASLLIBDIR=    ${PREFIX}/lib/sasl2
 PWCHECK_METHOD=        auxprop