whack last feature, put in main Makefile

2 files changed, 10 insertions, 66 deletions

diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index 7fd011adc54..1d2490a6644 100644
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.75 2005/04/08 20:04:57 hshoexer Exp $
+#	$OpenBSD: Makefile,v 1.76 2005/04/08 21:09:36 deraadt Exp $
 #	$EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $
 
 #
@@ -30,19 +30,7 @@
 # This code was written under funding by Ericsson Radio Systems.
 #
 
-#
-# This makefile is a "pmake" one, i.e. the make variant commonly found in
-# BSD derived systems, where it is indeed named "make".  Other systems
-# may provide this make variant as "pmake" or maybe "bsdmake".
-#
-
-OS=		openbsd
-
-# Compile-time configuration of otherwise optional features
-#FEATURES+=	dnssec
-FEATURES+=	
-
-.PATH:		${.CURDIR}/sysdep/${OS}
+.PATH:		${.CURDIR}/sysdep/openbsd
 
 PROG=		isakmpd
 SRCS=		app.c attribute.c cert.c connection.c constants.c conf.c \
@@ -52,7 +40,9 @@ SRCS=		app.c attribute.c cert.c connection.c constants.c conf.c \
 		ipsec_num.c isakmpd.c isakmp_doi.c isakmp_fld.c isakmp_num.c \
 		key.c libcrypto.c log.c message.c math_2n.c math_group.c \
 		prf.c sa.c sysdep.c timer.c transport.c virtual.c udp.c \
-		ui.c util.c x509.c
+		ui.c util.c x509.c \
+		pf_key_v2.c policy.c math_ec2n.c ike_aggressive.c isakmp_cfg.c \
+		dpd.c monitor.c monitor_fdpass.c nat_traversal.c udp_encap.c
 
 GENERATED=	exchange_num.h ipsec_fld.h ipsec_num.h isakmp_fld.h \
 		isakmp_num.h
@@ -66,9 +56,6 @@ CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes \
 # Include symbolic debugging info
 #DEBUG=		-g
 
-# Do execution time profiles
-#CFLAGS+=	-pg
-
 # If you have ElectricFence available, you can spot abuses of the heap.
 # (/usr/ports/devel/ElectricFence)
 #LDADD+=		-L/usr/local/lib -lefence
@@ -83,25 +70,15 @@ CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes \
 
 SUBDIR=		apps
 
-.if ${FEATURES} != ""
-FEATURES_UC!=	echo ${FEATURES} | tr '[:lower:]' '[:upper:]'
-CFLAGS+=	${FEATURES_UC:S/^/-DUSE_/g}
-.endif
-
 .if make(install)
 SUBDIR+=	samples
 .endif
 
-.for FEATURE in ${FEATURES}
-.if exists(features/${FEATURE})
-.include "features/${FEATURE}"
-.endif
-.endfor
-
-SRCS+=		${DNSSEC} \
-		pf_key_v2.c policy.c math_ec2n.c ike_aggressive.c isakmp_cfg.c \
-		dpd.c monitor.c monitor_fdpass.c nat_traversal.c udp_encap.c
-CFLAGS+=	${DNSSEC_CFLAGS}
+# Enable for DNSSEC use
+#CFLAGS+=	USE_DNSSEC
+#SRCS+=		dnssec.c
+#LWRESLIB=      /usr/local/lib/liblwres.a
+#DNSSEC_CFLAGS= -I/usr/local/include -DLWRES
 
 LDADD+=		${LWRESLIB} -lkeynote -lcrypto -ldes -lm
 DPADD+=		${LWRESLIB} ${LIBKEYNOTE} ${LIBCRYPTO} ${LIBDES} ${LIBM}
@@ -125,6 +102,3 @@ ${PROG} beforedepend: ${GENERATED}
 
 .include <bsd.prog.mk>
 .include <bsd.subdir.mk>
-
-debug:
-	(cd ${.CURDIR}; ${MAKE} DEBUG="-g -Werror")
diff --git a/sbin/isakmpd/features/dnssec b/sbin/isakmpd/features/dnssec
deleted file mode 100644
index aab768dedb1..00000000000
--- a/sbin/isakmpd/features/dnssec
+++ /dev/null
@@ -1,30 +0,0 @@
-#	$OpenBSD: dnssec,v 1.3 2003/06/03 14:29:41 ho Exp $
-
-#
-# Copyright (c) 2001 Håkan Olsson.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-DNSSEC=		dnssec.c
-
-#LWRESLIB=	/usr/local/lib/liblwres.a
-#DNSSEC_CFLAGS=	-I/usr/local/include -DLWRES