Change things back such that defining WANT_LIBMILTER in mk.conf

will build with libmilter support since that appears to be what
people do (though it was not actually intended to work that way).

Also add WANT_SMTPAUTH for SASL support and WANT_LDAP for LDAP map support.
These last two from Chuck Yerkes.

3 files changed, 23 insertions, 10 deletions

diff --git a/gnu/usr.sbin/sendmail/Makefile b/gnu/usr.sbin/sendmail/Makefile
index 149f7e22fff..d022ef55bc9 100644
--- a/gnu/usr.sbin/sendmail/Makefile
+++ b/gnu/usr.sbin/sendmail/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2003/02/19 06:18:10 millert Exp $
+#	$OpenBSD: Makefile,v 1.7 2003/02/27 21:22:14 millert Exp $
 
 # We only use these libs internally
 .if !make(install)
@@ -10,9 +10,10 @@ SUBDIR=
 # The bits we install
 SUBDIR+=sendmail mailstats makemap praliases smrsh editmap cf/cf
 
-# To build with mail filter support (untested)
-#SUBDIR+= libmilter
-#.MAKEFLAGS+="WANT_LIBMILTER=1"
+# To build milter support define WANT_LIBMILTER in /etc/mk.conf (unsupported)
+.if defined(WANT_LIBMILTER)
+SUBDIR+= libmilter
+.endif
 
 # Extra bits we don't build/install right now
 #SUBDIR+= mail.local rmail vacation
diff --git a/gnu/usr.sbin/sendmail/Makefile.inc b/gnu/usr.sbin/sendmail/Makefile.inc
index f524912f873..e9a3955df02 100644
--- a/gnu/usr.sbin/sendmail/Makefile.inc
+++ b/gnu/usr.sbin/sendmail/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.11 2003/02/19 06:18:10 millert Exp $
+#	$OpenBSD: Makefile.inc,v 1.12 2003/02/27 21:22:14 millert Exp $
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
@@ -53,4 +53,12 @@ LDADD+= -lwrap
 .endif
 .endif
 
+# To build with LDAP map support define WANT_LDAP in /etc/mk.conf (unsupported)
+.if defined(WANT_LDAP)
+ENVDEF+= -DLDAPMAP
+LDADD+=-lldap -llber
+CFLAGS+=-I/usr/local/include
+LDFLAGS+=-L/usr/local/lib
+.endif
+
 CFLAGS+=${ENVDEF} -I${.CURDIR}/../sendmail -I${.CURDIR}/../include
diff --git a/gnu/usr.sbin/sendmail/sendmail/Makefile b/gnu/usr.sbin/sendmail/sendmail/Makefile
index 0796c82a46f..5b1a8f5ac23 100644
--- a/gnu/usr.sbin/sendmail/sendmail/Makefile
+++ b/gnu/usr.sbin/sendmail/sendmail/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2003/02/19 06:18:10 millert Exp $
+#	$OpenBSD: Makefile,v 1.19 2003/02/27 21:22:14 millert Exp $
 
 PROG=	sendmail
 
@@ -11,11 +11,15 @@ ENVDEF+= -DSTARTTLS
 LDADD+= -lssl -lcrypto
 DPADD=	${LIBSSL} ${LIBCRYPTO}
 
-# To build with Cyrus SASL support (untested)
-#ENVDEF+= -DSASL
-#LDADD+= -lsasl
+# To build with SASL support define WANT_SMTPAUTH in /etc/mk.conf (unsupported)
+.if defined(WANT_SMTPAUTH)
+ENVDEF+= -DSASL
+CFLAGS+= -I/usr/local/include/sasl
+LDADD+= -lsasl2
+LDFLAGS+=-L/usr/local/lib
+.endif
 
-# For mail filter support (untested)
+# To build milter support define WANT_LIBMILTER in /etc/mk.conf (unsupported)
 .if defined(WANT_LIBMILTER)
 ENVDEF+= -DMILTER
 .endif