summaryrefslogtreecommitdiff
path: root/mail/sendmail
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2005-07-18 21:33:24 +0000
committeradrianp <adrianp@pkgsrc.org>2005-07-18 21:33:24 +0000
commitd34190732e8a2d07b53f1abe8277744aab1256e5 (patch)
tree26d22dbad9e0fb21854ca3c5fc935879af25a2d4 /mail/sendmail
parentfc3822a7a88d0bc1b80f65b4c2726f54ac1d528a (diff)
downloadpkgsrc-d34190732e8a2d07b53f1abe8277744aab1256e5.tar.gz
- Move option from "starttls" to "tls" as pointed out by schmonz@ in private
email. - Use PKG_OPTIONS_LEGACY_OPTS to deal with the change.
Diffstat (limited to 'mail/sendmail')
-rw-r--r--mail/sendmail/Makefile4
-rw-r--r--mail/sendmail/options.mk9
2 files changed, 7 insertions, 6 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index bd008c45056..52a9e2dd601 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2005/05/21 04:10:17 jlam Exp $
+# $NetBSD: Makefile,v 1.77 2005/07/18 21:33:24 adrianp Exp $
.include "../../mail/sendmail/Makefile.common"
@@ -33,7 +33,7 @@ post-patch: make-sendmail-siteconfig
.if !empty(PKG_OPTIONS:Mdb4)
@${CAT} ${FILESDIR}/site.config.m4-db4 >>${SITECONFIG}
.endif
-.if !empty(PKG_OPTIONS:Mstarttls)
+.if !empty(PKG_OPTIONS:Mtls)
@${CAT} ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG}
.endif
.if !empty(PKG_OPTIONS:Msasl)
diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk
index ab83ca44633..c2130ab5fed 100644
--- a/mail/sendmail/options.mk
+++ b/mail/sendmail/options.mk
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.8 2005/07/16 01:19:13 jlam Exp $
+# $NetBSD: options.mk,v 1.9 2005/07/18 21:33:24 adrianp Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail
-PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl starttls tcpwrappers \
- socketmap
+PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl tls tcpwrappers socketmap
PKG_SUGGESTED_OPTIONS= tcpwrappers
+PKG_OPTIONS_LEGACY_OPTS= starttls:tls
+
.include "../../mk/bsd.options.mk"
###
@@ -33,7 +34,7 @@ PKG_SUGGESTED_OPTIONS= tcpwrappers
###
### Use OpenSSL libraries for SMTP STARTTLS support
###
-.if !empty(PKG_OPTIONS:Mstarttls)
+.if !empty(PKG_OPTIONS:Mtls)
. include "../../security/openssl/buildlink3.mk"
.endif