Index: head/sbin/ping/Makefile
===================================================================
--- head/sbin/ping/Makefile	(revision 349995)
+++ head/sbin/ping/Makefile	(revision 349996)
@@ -1,27 +1,25 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=runtime
 PROG=	ping
 MAN=	ping.8
 BINOWN=	root
 BINMODE=4555
 WARNS?=	3
 LIBADD=	m
 
 .if ${MK_DYNAMICROOT} == "no"
 .warning ${PROG} built without libcasper support
 .elif ${MK_CASPER} != "no" && !defined(RESCUE)
 LIBADD+=	casper
 LIBADD+=	cap_dns
 CFLAGS+=-DWITH_CASPER
 .endif
 
-.if !defined(RELEASE_CRUNCH)
 CFLAGS+=-DIPSEC
 LIBADD+=	ipsec
-.endif
 
 .include <bsd.prog.mk>
Index: head/usr.bin/telnet/Makefile
===================================================================
--- head/usr.bin/telnet/Makefile	(revision 349995)
+++ head/usr.bin/telnet/Makefile	(revision 349996)
@@ -1,44 +1,38 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 TELNETDIR=	${SRCTOP}/contrib/telnet
 .PATH:		${TELNETDIR}/telnet
 
 PROG=		telnet
 
 SRCS=		commands.c main.c network.c ring.c sys_bsd.c \
 		telnet.c terminal.c utilities.c
 
 CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
 		-I${TELNETDIR} -I${TELNETDIR}/libtelnet/
 
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=	-DINET6
 .endif
 
 WARNS?=		2
 
 LIBADD=		telnet ncursesw
 
-.if !defined(RELEASE_CRUNCH)
 CFLAGS+=	-DIPSEC
 LIBADD+=	ipsec
-.else
-.PATH:         ${TELNETDIR}/libtelnet
-SRCS+=		genget.c getent.c misc.c
-CFLAGS+=	-DHAS_CGETENT
-.endif
 
 .if ${MK_OPENSSL} != "no"
 SRCS+=		authenc.c
 CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DIPSEC
 LIBADD+=	mp crypto ipsec pam
 .endif
 
 .if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write
 LIBADD+=	krb5 roken
 .endif
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/inetd/Makefile
===================================================================
--- head/usr.sbin/inetd/Makefile	(revision 349995)
+++ head/usr.sbin/inetd/Makefile	(revision 349996)
@@ -1,33 +1,30 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 CONFS=	inetd.conf
 PROG=	inetd
 MAN=	inetd.8
 MLINKS=	inetd.8 inetd.conf.5
 SRCS=	inetd.c builtins.c
 
 WARNS?=	3
 CFLAGS+= -DLOGIN_CAP
 #CFLAGS+= -DSANITY_CHECK
 
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
 .endif
 
 LIBADD=	util
 
 .if ${MK_TCP_WRAPPERS} != "no"
 CFLAGS+=	-DLIBWRAP
 LIBADD+=	wrap
 .endif
 
-# XXX for src/release/picobsd
-.if !defined(RELEASE_CRUNCH)
 CFLAGS+= -DIPSEC
 LIBADD+=	ipsec
-.endif
 
 .include <bsd.prog.mk>