[pkgsrc/trunk]: pkgsrc/mail/sendmail - Move option from "starttls" to "tls" a...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bbef12b4f0ca
branches:  trunk
changeset: 496998:bbef12b4f0ca
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Mon Jul 18 21:33:24 2005 +0000

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

 mail/sendmail/Makefile   |  4 ++--
 mail/sendmail/options.mk |  9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r 56cd1e388eac -r bbef12b4f0ca mail/sendmail/Makefile
--- a/mail/sendmail/Makefile    Mon Jul 18 20:00:22 2005 +0000
+++ b/mail/sendmail/Makefile    Mon Jul 18 21:33:24 2005 +0000
@@ -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 @@
 .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 -r 56cd1e388eac -r bbef12b4f0ca mail/sendmail/options.mk
--- a/mail/sendmail/options.mk  Mon Jul 18 20:00:22 2005 +0000
+++ b/mail/sendmail/options.mk  Mon Jul 18 21:33:24 2005 +0000
@@ -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 @@
 ###
 ### Use OpenSSL libraries for SMTP STARTTLS support
 ###
-.if !empty(PKG_OPTIONS:Mstarttls)
+.if !empty(PKG_OPTIONS:Mtls)
 .  include "../../security/openssl/buildlink3.mk"
 .endif