Give milter the ghost of a chance of working; still not supported in any way.

4 files changed, 14 insertions, 26 deletions

diff --git a/gnu/usr.sbin/sendmail/Makefile b/gnu/usr.sbin/sendmail/Makefile
index 84e8c2475bb..149f7e22fff 100644
--- a/gnu/usr.sbin/sendmail/Makefile
+++ b/gnu/usr.sbin/sendmail/Makefile
@@ -1,11 +1,8 @@
-#	$OpenBSD: Makefile,v 1.5 2002/07/20 17:30:26 millert Exp $
+#	$OpenBSD: Makefile,v 1.6 2003/02/19 06:18:10 millert Exp $
 
 # We only use these libs internally
 .if !make(install)
 SUBDIR= libsmutil libsmdb libsm
-.if defined(WANT_LIBMILTER)
-SUBDIR+= libmilter
-.endif
 .else
 SUBDIR=
 .endif
@@ -13,8 +10,12 @@ 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"
+
 # Extra bits we don't build/install right now
-#SUBDIR+= libmilter mail.local rmail vacation
+#SUBDIR+= mail.local rmail vacation
 
 # These just get installed verbatim
 .if make(install)
diff --git a/gnu/usr.sbin/sendmail/Makefile.inc b/gnu/usr.sbin/sendmail/Makefile.inc
index ea9eeeb65ef..f524912f873 100644
--- a/gnu/usr.sbin/sendmail/Makefile.inc
+++ b/gnu/usr.sbin/sendmail/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.10 2002/07/20 17:30:26 millert Exp $
+#	$OpenBSD: Makefile.inc,v 1.11 2003/02/19 06:18:10 millert Exp $
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
@@ -45,18 +45,6 @@ LDFLAGS+=-L${.CURDIR}/../libsm
 .endif
 .endif
 
-.if defined(WANT_LIBMILTER)
-ENVDEF+=-DMILTER -D_FFR_MILTER_ROOT_UNSAFE
-LDADD+= -lmilter
-.if exists(${.CURDIR}/../libmilter/${__objdir})
-DPADD+= ${.CURDIR}/../libmilter/${__objdir}/libmilter.a
-LDFLAGS+=-L${.CURDIR}/../libmilter/${__objdir}
-.else
-DPADD+= ${.CURDIR}/../libmilter/libmilter.a
-LDFLAGS+=-L${.CURDIR}/../libmilter
-.endif
-.endif
-
 .if defined(WANT_LIBWRAP)
 .if (${TCP_WRAPPERS:L} == "yes")
 ENVDEF+=-DTCPWRAPPERS
diff --git a/gnu/usr.sbin/sendmail/libmilter/Makefile b/gnu/usr.sbin/sendmail/libmilter/Makefile
index 759b2b45e89..56bda2ca722 100644
--- a/gnu/usr.sbin/sendmail/libmilter/Makefile
+++ b/gnu/usr.sbin/sendmail/libmilter/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.4 2002/01/14 03:21:40 millert Exp $
+#	$OpenBSD: Makefile,v 1.5 2003/02/19 06:18:10 millert Exp $
 
 LIB=		milter
 SRCS=		main.c engine.c listener.c handler.c comm.c smfi.c signal.c \
 		sm_gethost.c errstring.c strl.c
-CPPFLAGS+=	-pthread -Dsm_snprintf=snprintf
+CPPFLAGS+=	-D_FFR_MILTER_ROOT_UNSAFE -pthread -Dsm_snprintf=snprintf
 .PATH:		${.CURDIR}/../libsm
 
 # This is not a library that gets installed so only build the .a version
diff --git a/gnu/usr.sbin/sendmail/sendmail/Makefile b/gnu/usr.sbin/sendmail/sendmail/Makefile
index ab377f29fca..0796c82a46f 100644
--- a/gnu/usr.sbin/sendmail/sendmail/Makefile
+++ b/gnu/usr.sbin/sendmail/sendmail/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2002/06/03 17:25:46 millert Exp $
+#	$OpenBSD: Makefile,v 1.18 2003/02/19 06:18:10 millert Exp $
 
 PROG=	sendmail
 
@@ -15,11 +15,10 @@ DPADD=	${LIBSSL} ${LIBCRYPTO}
 #ENVDEF+= -DSASL
 #LDADD+= -lsasl
 
-# To build with mail filter support (untested)
-#WANT_LIBMILTER=1
-#ENVDEF+= -DMILTER
-#CPPFLAGS+= -pthread
-#LDFLAGS+= -pthread
+# For mail filter support (untested)
+.if defined(WANT_LIBMILTER)
+ENVDEF+= -DMILTER
+.endif
 
 # Since we have random PIDs we need to be careful to avoid filename collisions
 ENVDEF+= -DFAST_PID_RECYCLE