From 95605da1aa74801202d0f288c8e6d9155677c90d Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Tue, 17 Oct 2017 08:59:51 -0200
Subject: [PATCH] Use hostapd / wpa_supplicant from ports when available

---
 src/etc/inc/interfaces.inc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index cb3ea7ab27..4393056d96 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -2672,8 +2672,16 @@ function interface_wireless_configure($if, &$wl, &$wlcfg) {
 	$wlan_setup_log = fopen("{$g['tmp_path']}/{$if}_setup.log", "w");
 
 	/* set values for /path/program */
-	$hostapd = "/usr/sbin/hostapd";
-	$wpa_supplicant = "/usr/sbin/wpa_supplicant";
+	if (file_exists("/usr/local/sbin/hostapd")) {
+		$hostapd = "/usr/local/sbin/hostapd";
+	} else {
+		$hostapd = "/usr/sbin/hostapd";
+	}
+	if (file_exists("/usr/local/sbin/wpa_supplicant")) {
+		$wpa_supplicant = "/usr/local/sbin/wpa_supplicant";
+	} else {
+		$wpa_supplicant = "/usr/sbin/wpa_supplicant";
+	}
 	$ifconfig = "/sbin/ifconfig";
 	$sysctl = "/sbin/sysctl";
 	$killall = "/usr/bin/killall";