From 491bafe5c696c5d69dd48d51e45231b948433c23 Mon Sep 17 00:00:00 2001
From: Yaroslav Tykhiy <ytykhiy@gmail.com>
Date: Thu, 27 Jul 2006 13:26:29 +0000
Subject: [PATCH] Obey MK_INET6_SUPPORT. This is also a good chance to apply
 style.Makefile(5) in some cases.

---
 sbin/route/Makefile  | 12 ++++++++++--
 sbin/rtsol/Makefile  | 22 ++++++++++++++--------
 sbin/setkey/Makefile | 11 ++++++++---
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index fede01d4dcc4..ef56dfd9286a 100644
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -1,14 +1,22 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	route
 MAN=	route.8
 SRCS=	route.c keywords.h
-CFLAGS+=-I. -Wall -DNS
-CFLAGS+=-DINET6
 WARNS?=	0
 CLEANFILES+=keywords.h _keywords.tmp
 
+CFLAGS+= -DNS
+
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+= -DINET6
+.endif
+
+CFLAGS+= -I.
+
 keywords.h: keywords
 	sed -e '/^#/d' -e '/^$$/d' ${.CURDIR}/keywords > _keywords.tmp
 	LC_ALL=C tr 'a-z' 'A-Z' < _keywords.tmp | paste _keywords.tmp - | \
diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile
index d3d40e871e0e..250f804817aa 100644
--- a/sbin/rtsol/Makefile
+++ b/sbin/rtsol/Makefile
@@ -15,14 +15,20 @@
 
 SRCDIR=	${.CURDIR}/../../usr.sbin/rtsold
 
-PROG=	rtsol
-SRCS=	rtsold.c rtsol.c if.c probe.c rtsock.c
-
-CFLAGS+=-DINET6 -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DSMALL
-WARNS?=	0
-
-NO_MAN=
-
 .PATH:	${SRCDIR}
 
+PROG=	rtsol
+SRCS=	rtsold.c rtsol.c if.c probe.c rtsock.c
+NO_MAN=
+WARNS?=	0
+
+# after NO_MAN
+.include <bsd.own.mk>
+
+CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DSMALL
+
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+= -DINET6 
+.endif
+
 .include <bsd.prog.mk>
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
index 794d6ddc5c1a..9dd7cf5ddb6e 100644
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@@ -27,9 +27,12 @@
 #
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	setkey
 MAN=	setkey.8
 SRCS=	setkey.c parse.y token.l
+WARNS?=	1
 
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec
 YFLAGS=	-d
@@ -47,7 +50,11 @@ CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey
 
 SRCS+=	y.tab.h
 y.tab.h: parse.y
-CFLAGS+= -DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT -I.
+CFLAGS+= -DIPSEC_DEBUG -DYY_NO_UNPUT
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+= -DINET6
+.endif
+CFLAGS+= -I.
 DPADD+=	${LIBIPSEC}
 LDADD+=	-lipsec
 CLEANFILES+=	scriptdump y.tab.h
@@ -56,8 +63,6 @@ CLEANFILES+=	scriptdump y.tab.h
 
 LOCALPREFIX=	/usr
 
-WARNS=	1
-
 scriptdump: scriptdump.pl
 	sed -e 's#@LOCALPREFIX@#${LOCALPREFIX}#' < $> > scriptdump