[pkgsrc/trunk]: pkgsrc/mail/sendmail - Fix builds with SASLv2 following remov...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/82e3fc1ece50
branches:  trunk
changeset: 491950:82e3fc1ece50
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Fri Apr 01 18:42:08 2005 +0000

description:
- Fix builds with SASLv2 following removal of SASLv1 support
- Patch submitted by Shin'ichiro TAYA in PR 29857, thanks.

diffstat:

 mail/sendmail/Makefile                  |  5 +----
 mail/sendmail/files/site.config.m4-sasl |  5 -----
 2 files changed, 1 insertions(+), 9 deletions(-)

diffs (28 lines):

diff -r 1c0d6c740ec1 -r 82e3fc1ece50 mail/sendmail/Makefile
--- a/mail/sendmail/Makefile    Fri Apr 01 18:38:38 2005 +0000
+++ b/mail/sendmail/Makefile    Fri Apr 01 18:42:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2005/02/10 22:17:24 adrianp Exp $
+# $NetBSD: Makefile,v 1.75 2005/04/01 18:42:08 adrianp Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
@@ -37,9 +37,6 @@
        @${CAT} ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG}
 .endif
 .if !empty(PKG_OPTIONS:Msasl)
-       @${CAT} ${FILESDIR}/site.config.m4-sasl >>${SITECONFIG}
-.endif
-.if !empty(PKG_OPTIONS:Msasl2)
        @${CAT} ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG}
 .endif
 .if !empty(PKG_OPTIONS:Msocketmap)
diff -r 1c0d6c740ec1 -r 82e3fc1ece50 mail/sendmail/files/site.config.m4-sasl
--- a/mail/sendmail/files/site.config.m4-sasl   Fri Apr 01 18:38:38 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-sasl,v 1.2 2002/09/23 12:56:59 markd Exp $
-
-# enable SASL
-APPENDDEF(`confENVDEF', `-DSASL')
-APPENDDEF(`conf_sendmail_LIBS', `-lsasl')