From 3d25746c61c5b96fb9ed1ff1faf3fc3e11c0691c Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 5 Feb 2015 09:55:00 +0000
Subject: [PATCH] MFC r277740,r278053:

r277740:

  Honor MK_WIRELESS with etc/rc.d/hostapd and etc/rc.d/wpa_supplicant

  Sponsored by: EMC / Isilon Storage Division

r278053:

  Remove hostapd and wpa_supplicant from FILES so they're installed conditionally
  if MK_WIRELESS != no


git-svn-id: svn://svn.freebsd.org/base/stable/9@278241 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/rc.d/Makefile                        | 7 +++++--
 tools/build/mk/OptionalObsoleteFiles.inc | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index b6adf2a18..ed7d4848b 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -45,7 +45,6 @@ FILES=	DAEMON \
 	gssd \
 	hastd \
 	${_hcsecd} \
-	hostapd \
 	hostid \
 	hostid_save \
 	hostname \
@@ -142,7 +141,6 @@ FILES=	DAEMON \
 	var \
 	virecover \
 	watchdogd \
-	wpa_supplicant \
 	ypbind \
 	yppasswdd \
 	ypserv \
@@ -196,6 +194,11 @@ _hcsecd=	hcsecd
 _ubthidhci=	ubthidhci
 .endif
 
+.if ${MK_WIRELESS} != "no"
+FILES+=		hostapd
+FILES+=		wpa_supplicant
+.endif
+
 FILESDIR=	/etc/rc.d
 FILESMODE=	${BINMODE}
 
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 4dc64d1d2..b86665058 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -3876,6 +3876,8 @@ OLD_FILES+=usr/share/man/man8/utxrm.8.gz
 
 .if ${MK_WIRELESS} == no
 OLD_FILES+=etc/regdomain.xml
+OLD_FILES+=etc/rc.d/hostapd
+OLD_FILES+=etc/rc.d/wpa_supplicant
 OLD_FILES+=usr/sbin/ancontrol
 OLD_FILES+=usr/sbin/hostapd
 OLD_FILES+=usr/sbin/hostapd_cli
-- 
2.45.0