summaryrefslogtreecommitdiff
path: root/mail/sendmail
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2004-09-02 21:09:17 +0000
committeradrianp <adrianp@pkgsrc.org>2004-09-02 21:09:17 +0000
commitc2e18332da1537369933777fd513b56997faf4f7 (patch)
tree51d7bd3ab11fdcbc66c58adc6268b6fa6a50a523 /mail/sendmail
parent53c7ed7b146c606308c4ff982d0cd5a6539c5e11 (diff)
downloadpkgsrc-c2e18332da1537369933777fd513b56997faf4f7.tar.gz
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 (limited to 'mail/sendmail')
-rw-r--r--mail/sendmail/Makefile.common5
-rw-r--r--mail/sendmail/options.mk13
2 files changed, 13 insertions, 5 deletions
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index ff2e574e39f..536c13c9c84 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -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 @@ USE_GNU_TOOLS+= m4
MAKE_ENV+= M4="${M4}"
.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS.sendmail?= inet6 tcpwrappers
-
.include "options.mk"
make-sendmail-siteconfig:
diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk
index b8919616354..6a08a66db59 100644
--- a/mail/sendmail/options.mk
+++ b/mail/sendmail/options.mk
@@ -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 @@ PKG_DEFAULT_OPTIONS+= tcpwrappers
.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 @@ PKG_DEFAULT_OPTIONS+= inet6 tcpwrappers
.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)