From 6aeecf59e86def3108afc0b6736f4beb06053633 Mon Sep 17 00:00:00 2001
From: bz <bz@FreeBSD.org>
Date: Thu, 5 Jul 2007 08:56:46 +0000
Subject: Remove the -DFAST_IPSEC from Makefiles again.

This was needed during the IPSEC->FAST_IPSEC->IPSEC transition
period to not break the build after picking up netipsec header
files. Now that the FAST_IPSEC kernel option is gone and the
default is IPSEC again those defines are superfluous.

Approved by:	re (rwatson)
---
 sbin/ping6/Makefile           | 2 +-
 usr.bin/telnet/Makefile       | 4 ++--
 usr.sbin/inetd/Makefile       | 2 +-
 usr.sbin/rrenumd/Makefile     | 2 +-
 usr.sbin/traceroute6/Makefile | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index e7a1e1d..89e7fbe 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -3,7 +3,7 @@
 PROG=	ping6
 MAN=	ping6.8
 
-CFLAGS+=-DIPSEC -DFAST_IPSEC -DKAME_SCOPEID -DUSE_RFC2292BIS \
+CFLAGS+=-DIPSEC -DKAME_SCOPEID -DUSE_RFC2292BIS \
 	-DHAVE_POLL_H -DHAVE_ARC4RANDOM
 WARNS?=	2
 
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 14829c1..c5525b3 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -23,7 +23,7 @@ DPADD=		${LIBTERMCAP} ${LIBTELNET}
 LDADD=		-ltermcap ${LIBTELNET}
 
 .if !defined(RELEASE_CRUNCH)
-CFLAGS+=	-DIPSEC -DFAST_IPSEC
+CFLAGS+=	-DIPSEC
 DPADD+=		${LIBIPSEC}
 LDADD+=		-lipsec
 .else
@@ -35,7 +35,7 @@ CFLAGS+=	-DHAS_CGETENT
 .if !defined(RELEASE_CRUNCH)
 .if ${MK_OPENSSL} != "no"
 SRCS+=		authenc.c 
-CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DIPSEC -DFAST_IPSEC
+CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DIPSEC
 DPADD+=		${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
 LDADD+=		-lmp -lcrypto -lcrypt -lipsec ${MINUSLPAM}
 .endif
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index 9156afc..35f2c22 100644
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@@ -21,7 +21,7 @@ LDADD=	-lutil -lwrap
 
 # XXX for src/release/picobsd
 .if !defined(RELEASE_CRUNCH)
-CFLAGS+= -DIPSEC -DFAST_IPSEC
+CFLAGS+= -DIPSEC
 DPADD+=	${LIBIPSEC}
 LDADD+=	-lipsec
 .endif
diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile
index 52452d0..c31a7c7 100644
--- a/usr.sbin/rrenumd/Makefile
+++ b/usr.sbin/rrenumd/Makefile
@@ -18,7 +18,7 @@ PROG=	rrenumd
 MAN=	rrenumd.conf.5 rrenumd.8
 SRCS=	rrenumd.c  parser.y lexer.l
 
-CFLAGS+= -DIPSEC -DFAST_IPSEC -I. -I${.CURDIR}
+CFLAGS+= -DIPSEC -I. -I${.CURDIR}
 YFLAGS=	-d
 
 LDADD=	-lipsec -ll -ly
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index cecd20d..6ff72d2 100644
--- a/usr.sbin/traceroute6/Makefile
+++ b/usr.sbin/traceroute6/Makefile
@@ -18,7 +18,7 @@ MAN=	traceroute6.8
 BINOWN=	root
 BINMODE= 4555
 
-CFLAGS+= -DIPSEC -DFAST_IPSEC -DUSE_RFC2292BIS -DHAVE_POLL
+CFLAGS+= -DIPSEC -DUSE_RFC2292BIS -DHAVE_POLL
 
 DPADD=	${LIBIPSEC}
 LDADD=	-lipsec
-- 
cgit v1.1