From 2331d1600bb51bded8fc03fd075a2c8174450db8 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 28 Mar 1999 10:55:03 +0000
Subject: [PATCH] Enable tcp_wrapper support by default.

---
 secure/usr.sbin/sendmail/Makefile | 14 ++++----------
 usr.sbin/portmap/Makefile         |  6 ++++--
 usr.sbin/sendmail/Makefile        | 14 ++++----------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/secure/usr.sbin/sendmail/Makefile b/secure/usr.sbin/sendmail/Makefile
index df6213e2ad9e..9b2ac5ed1fcf 100644
--- a/secure/usr.sbin/sendmail/Makefile
+++ b/secure/usr.sbin/sendmail/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	8.8 (Berkeley) 3/28/97
+#	$Id$
 
 SMDIR=	${.CURDIR}/../../contrib/sendmail/src
 .PATH:	${SMDIR}
@@ -14,11 +15,7 @@ NIS=	-DNIS
 # Map extensions
 MAPS=	-DMAP_REGEX
 
-# If you want tcp wrapper support, uncomment the following two lines
-#TCPWRAPPERSBASEDIR=	/usr/local
-#TCPWRAPPERS=		-DTCPWRAPPERS -I${TCPWRAPPERSBASEDIR}/include
-
-CFLAGS+=-I${SMDIR} ${DBMDEF} ${NIS} ${TCPWRAPPERS} ${MAPS}
+CFLAGS+=-I${SMDIR} ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
 CFLAGS+=-D_FFR_MAX_MIME_HEADER_LENGTH
 CFLAGS+=-D_FFR_MAX_HEADERS_LENGTH
 
@@ -27,11 +24,8 @@ SRCS=	alias.c arpadate.c clock.c collect.c conf.c control.c convtime.c \
 	main.c map.c mci.c mime.c parseaddr.c queue.c readcf.c recipient.c \
 	safefile.c savemail.c snprintf.c srvrsmtp.c stab.c stats.c \
 	sysexits.c trace.c udb.c usersmtp.c util.c version.c
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
-.if defined(TCPWRAPPERS)
-LDADD+=	-L${TCPWRAPPERSBASEDIR}/lib -lwrap
-.endif
+DPADD=	${LIBUTIL} ${LIBWRAP}
+LDADD=	-lutil -lwrap
 MAN1=	mailq.1 newaliases.1
 MAN5=	aliases.5
 MAN8=	sendmail.8 
diff --git a/usr.sbin/portmap/Makefile b/usr.sbin/portmap/Makefile
index 1fe7220492d8..cca9f5dd9423 100644
--- a/usr.sbin/portmap/Makefile
+++ b/usr.sbin/portmap/Makefile
@@ -1,11 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	$Id$
 
 PROG=	portmap
 MAN8=	portmap.8
 SRCS=	portmap.c from_local.c pmap_check.c
 SUBDIR= pmap_set pmap_dump
 
-# -DHOSTS_ACCESS (requires tcpwrapper libraries)
-CFLAGS+=-DCHECK_PORT
+CFLAGS+=-DCHECK_PORT -DHOSTS_ACCESS 
+DPADD+=	${LIBWRAP}
+LDFLAGS+=-lwrap
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index df6213e2ad9e..9b2ac5ed1fcf 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	8.8 (Berkeley) 3/28/97
+#	$Id$
 
 SMDIR=	${.CURDIR}/../../contrib/sendmail/src
 .PATH:	${SMDIR}
@@ -14,11 +15,7 @@ NIS=	-DNIS
 # Map extensions
 MAPS=	-DMAP_REGEX
 
-# If you want tcp wrapper support, uncomment the following two lines
-#TCPWRAPPERSBASEDIR=	/usr/local
-#TCPWRAPPERS=		-DTCPWRAPPERS -I${TCPWRAPPERSBASEDIR}/include
-
-CFLAGS+=-I${SMDIR} ${DBMDEF} ${NIS} ${TCPWRAPPERS} ${MAPS}
+CFLAGS+=-I${SMDIR} ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
 CFLAGS+=-D_FFR_MAX_MIME_HEADER_LENGTH
 CFLAGS+=-D_FFR_MAX_HEADERS_LENGTH
 
@@ -27,11 +24,8 @@ SRCS=	alias.c arpadate.c clock.c collect.c conf.c control.c convtime.c \
 	main.c map.c mci.c mime.c parseaddr.c queue.c readcf.c recipient.c \
 	safefile.c savemail.c snprintf.c srvrsmtp.c stab.c stats.c \
 	sysexits.c trace.c udb.c usersmtp.c util.c version.c
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
-.if defined(TCPWRAPPERS)
-LDADD+=	-L${TCPWRAPPERSBASEDIR}/lib -lwrap
-.endif
+DPADD=	${LIBUTIL} ${LIBWRAP}
+LDADD=	-lutil -lwrap
 MAN1=	mailq.1 newaliases.1
 MAN5=	aliases.5
 MAN8=	sendmail.8