[pkgsrc/trunk]: pkgsrc/mail/sendmail options.mk fixes for this package includ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3132dd58d814
branches:  trunk
changeset: 480255:3132dd58d814
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Thu Sep 02 21:09:17 2004 +0000

description:
options.mk fixes for this package including:
- Option handling was ignoring old USE_* statements
- Don't try and compile sendmail with SASLv1 _and_ SASLv2 support
- Add missing migration option for USE_STARTTLS

diffstat:

 mail/sendmail/Makefile.common |   5 +----
 mail/sendmail/options.mk      |  13 ++++++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 231fbda3e472 -r 3132dd58d814 mail/sendmail/Makefile.common
--- a/mail/sendmail/Makefile.common     Thu Sep 02 20:46:17 2004 +0000
+++ b/mail/sendmail/Makefile.common     Thu Sep 02 21:09:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2004/08/31 10:51:22 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.21 2004/09/02 21:09:17 adrianp Exp $
 #
 # Makefile fragment shared with libmilter
 #
@@ -34,9 +34,6 @@
 MAKE_ENV+=     M4="${M4}"
 
 .include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS.sendmail?= inet6 tcpwrappers
-
 .include "options.mk"
 
 make-sendmail-siteconfig:
diff -r 231fbda3e472 -r 3132dd58d814 mail/sendmail/options.mk
--- a/mail/sendmail/options.mk  Thu Sep 02 20:46:17 2004 +0000
+++ b/mail/sendmail/options.mk  Thu Sep 02 21:09:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/08/30 20:16:28 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2004/09/02 21:09:17 adrianp Exp $
 
 # Global and legacy options
 .if defined(USE_DB2) && !empty(USE_DB2:M[yY][eE][sS])
@@ -20,6 +20,9 @@
 .if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
 PKG_DEFAULT_OPTIONS+=  inet6
 .endif
+.if defined(USE_STARTTLS) && !empty(USE_STARTTLS:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=  starttls
+.endif
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.sendmail
 PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl sasl2 starttls tcpwrappers \
@@ -32,6 +35,14 @@
 .include "../../mk/bsd.options.mk"
 
 ###
+### Can't support SASLv1 and SASLv2
+###
+.if !empty(PKG_OPTIONS:Msasl) && !empty(PKG_OPTIONS:Msasl2)
+PKG_FAIL_REASON+=      "SASLv1 and SASLv2 cannot both be compiled in." \
+                       "Please change ${PKG_OPTIONS_VAR} to one or the other."
+.endif
+
+###
 ### Berkeley DB version 2/4 format for on disk databases e.g. aliases
 ###
 .if !empty(PKG_OPTIONS:Mdb2)