Index: security/wpa_supplicant/Makefile
===================================================================
--- security/wpa_supplicant/Makefile
+++ security/wpa_supplicant/Makefile
@@ -43,11 +43,12 @@
 			HT_OVERRIDES VHT_OVERRIDES TLSV12 IEEE80211W \
 			IEEE80211R DEBUG_FILE DEBUG_SYSLOG PRIVSEP \
 			DELAYED_MIC IEEE80211N IEEE80211AC INTERWORKING \
-			HS20 NO_ROAMING P2P TDLS DOCS
+			HS20 NO_ROAMING P2P TDLS EAPOL_TEST DOCS
 OPTIONS_DEFAULT=	BSD WIRED NDIS \
 			TLS PEAP TTLS MD5 MSCHAPv2 GTC LEAP OTP PSK \
 			WPS PKCS12 SMARTCARD IEEE80211R DEBUG_SYSLOG \
 			INTERWORKING HS20
+OPTIONS_SUB=		yes
 
 WPS_DESC=		Wi-Fi Protected Setup
 WPS_ER_DESC=		Enable WPS External Registrar
@@ -55,6 +56,7 @@
 WPS_NFC_DESC=		Near Field Communication (NFC) configuration
 PKCS12_DESC=		PKCS\#12 (PFS) support
 SMARTCARD_DESC=		Private key on smartcard support
+EAPOL_TEST_DESC=	Build eapol_test utility
 HT_OVERRIDES_DESC=	Disable HT/HT40, mask MCS rates, etc
 VHT_OVERRIDES_DESC=	Disable VHT, mask MCS rates, etc
 TLSV12_DESC=		Build with TLS v1.2 instead of TLS v1.0
@@ -141,7 +143,7 @@
 .endif
 .for simple in WPS WPS_ER WPS_NFC PKCS12 SMARTCARD HT_OVERRIDES \
 	VHT_OVERRIDES TLSV12 IEEE80211AC IEEE80211N IEEE80211R IEEE80211W \
-	INTERWORKING DEBUG_FILE DEBUG_SYSLOG HS20 NO_ROAMING PRIVSEP P2P TDLS
+	INTERWORKING DEBUG_FILE DEBUG_SYSLOG HS20 NO_ROAMING PRIVSEP P2P TDLS EAPOL_TEST
 .  if ${PORT_OPTIONS:M${simple}}
 	@${ECHO_CMD} CONFIG_${simple}=y >> ${CFG}
 .  endif
@@ -168,11 +170,19 @@
 	@${ECHO_CMD} CONFIG_L2_PACKET=freebsd >> ${CFG}
 	@${ECHO_CMD} CONFIG_TLS=openssl >> ${CFG}
 
+post-build:
+.if ${PORT_OPTIONS:MEAPOL_TEST}
+	(cd ${BUILD_WRKSRC} && ${MAKE_CMD} eapol_test)
+.endif
+
 do-install:
 	(cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} wpa_supplicant wpa_cli \
 		wpa_passphrase ${STAGEDIR}${PREFIX}/sbin)
 	${INSTALL_DATA} ${BUILD_WRKSRC}/wpa_supplicant.conf \
 		${STAGEDIR}${PREFIX}/etc/wpa_supplicant.conf.sample
+.if ${PORT_OPTIONS:MEAPOL_TEST}
+	(cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} eapol_test ${STAGEDIR}${PREFIX}/sbin)
+.endif
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
Index: security/wpa_supplicant/files/patch-wpa__supplicant_Makefile
===================================================================
--- security/wpa_supplicant/files/patch-wpa__supplicant_Makefile
+++ security/wpa_supplicant/files/patch-wpa__supplicant_Makefile
@@ -1,6 +1,6 @@
---- wpa_supplicant/Makefile.orig	2015-03-15 17:30:39 UTC
+--- wpa_supplicant/Makefile.orig	2016-10-02 18:51:11 UTC
 +++ wpa_supplicant/Makefile
-@@ -99,6 +99,14 @@ OBJS += ../src/utils/os_$(CONFIG_OS).o
+@@ -129,6 +129,14 @@ OBJS += ../src/utils/os_$(CONFIG_OS).o
  OBJS_p += ../src/utils/os_$(CONFIG_OS).o
  OBJS_c += ../src/utils/os_$(CONFIG_OS).o
  
@@ -15,3 +15,12 @@
  ifdef CONFIG_WPA_TRACE
  CFLAGS += -DWPA_TRACE
  OBJS += ../src/utils/trace.o
+@@ -176,7 +184,7 @@ CFLAGS += -DCONFIG_ELOOP_KQUEUE
+ endif
+ 
+ ifdef CONFIG_EAPOL_TEST
+-CFLAGS += -Werror -DEAPOL_TEST
++CFLAGS += -DEAPOL_TEST
+ endif
+ 
+ ifdef CONFIG_CODE_COVERAGE
Index: security/wpa_supplicant/pkg-plist
===================================================================
--- security/wpa_supplicant/pkg-plist
+++ security/wpa_supplicant/pkg-plist
@@ -1,4 +1,5 @@
 sbin/wpa_supplicant
 sbin/wpa_passphrase
 sbin/wpa_cli
+%%EAPOL_TEST%%sbin/eapol_test
 @sample etc/wpa_supplicant.conf.sample