Index: security/bro/Makefile
===================================================================
--- security/bro/Makefile
+++ security/bro/Makefile
@@ -3,11 +3,14 @@
 
 PORTNAME=	bro
 PORTVERSION=	2.5.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://www.bro.org/downloads/:source1 \
-		https://codeload.github.com/${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${PORTVERSION2}?dummy=/:source2
+		https://codeload.github.com/${GH_ACCOUNT2}/${GH_PROJECT2}/tar.gz/${PORTVERSION2}?dummy=/:source2 \
+		https://github.com/${GH_ACCOUNT3}/${GH_PROJECT3}/archive/${GH_TAGNAME3}.tar.gz?dummy=/:source3
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:source1 \
-		${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION2}_GH0${EXTRACT_SUFX}:source2
+		${GH_ACCOUNT2}-${GH_PROJECT2}-${PORTVERSION2}_GH0${EXTRACT_SUFX}:source2 \
+		${GH_ACCOUNT3}-${GH_PROJECT3}-${GH_TAGNAME3}_GH0${EXTRACT_SUFX}:source3
 
 MAINTAINER=	leres@FreeBSD.org
 COMMENT=	System for detecting network intruders in real-time
@@ -18,8 +21,12 @@
 
 LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
-GH_ACCOUNT=	actor-framework
-GH_PROJECT=	${GH_ACCOUNT}
+GH_ACCOUNT2=	actor-framework
+GH_PROJECT2=	${GH_ACCOUNT2}
+
+GH_ACCOUNT3=	bro
+GH_PROJECT3=	bro-netmap
+GH_TAGNAME3=	cf88debf487b31ab30dc3b5bac64783b4e49997e
 
 USES=		bison cmake:outsource compiler:c++11-lang ninja perl5 python shebangfix ssl
 
@@ -27,9 +34,11 @@
 CXXFLAGS+=	-std=c++11 -Wall
 
 PORTVERSION2=	0.14.6
-WRKSRC2=	${WRKDIR}/${GH_PROJECT}-${PORTVERSION2}
+WRKSRC2=	${WRKDIR}/${GH_PROJECT2}-${PORTVERSION2}
 STAGEDIR2=	${STAGEDIR}-caf
 
+WRKSRC3=	${WRKDIR}/${GH_PROJECT3}-${GH_TAGNAME3}
+
 SHEBANG_FILES=	aux/broctl/aux/trace-summary/trace-summary
 
 SUB_FILES=	pkg-message
@@ -51,14 +60,17 @@
 
 BROUSER?=	bro
 BROGROUP?=	bro
-PLIST_SUB+=	BROUSER=${BROUSER} \
-		BROGROUP=${BROGROUP}
+PLIST_SUB+=	ARCH=${ARCH} \
+		BROUSER=${BROUSER} \
+		BROGROUP=${BROGROUP} \
+		LCASE_OPSYS=${OPSYS:tl}
 
 USERS=		${BROUSER}
 GROUPS=		${BROGROUP}
 
-OPTIONS_DEFINE=	BROCCOLI BROCTL BROKER DEBUG IPSUMDUMP LBL_CF LBL_HF PERFTOOLS
-OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF
+OPTIONS_DEFINE=	BROCCOLI BROCTL BROKER DEBUG IPSUMDUMP LBL_CF LBL_HF \
+		NETMAP PERFTOOLS
+OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF NETMAP
 OPTIONS_SUB=	yes
 
 BROCCOLI_DESC=	Build support for libbroccoli communications
@@ -67,6 +79,7 @@
 IPSUMDUMP_DESC=	Enables traffic summaries
 LBL_CF_DESC=	Unix time to formated time/date filter support
 LBL_HF_DESC=	Address to hostname filter support
+NETMAP_DESC=	Build and install the bro netmap plugin
 PERFTOOLS_DESC=	Use Perftools to improve memory & CPU usage
 
 BROCTL_IMPLIES=		BROCCOLI IPSUMDUMP
@@ -134,4 +147,10 @@
 pre-install-BROCTL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d
 
+post-build-NETMAP-on:
+	${LN} -s ../.build ${WRKSRC}/build
+	(cd ${WRKSRC3} && ./configure --bro-dist=${WRKSRC} \
+	    --install-root=${STAGEDIR}${PREFIX}/lib/bro/plugins && \
+	    make && make install)
+
 .include <bsd.port.mk>
Index: security/bro/distinfo
===================================================================
--- security/bro/distinfo
+++ security/bro/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1508621466
+TIMESTAMP = 1516330946
 SHA256 (bro-2.5.2.tar.gz) = ab95b1bc376282919e5fa6b25b5ef8864e2e7bd5efe842db35d4a223b8f5b970
 SIZE (bro-2.5.2.tar.gz) = 18512696
 SHA256 (actor-framework-actor-framework-0.14.6_GH0.tar.gz) = cbc2033896fe41e42604de2f74673971718a40684996650157484485755f7720
 SIZE (actor-framework-actor-framework-0.14.6_GH0.tar.gz) = 1239451
+SHA256 (bro-bro-netmap-cf88debf487b31ab30dc3b5bac64783b4e49997e_GH0.tar.gz) = 383423f92932c3ef244194954708b3a237b4f37ebc358014f51dcb3b9786896b
+SIZE (bro-bro-netmap-cf88debf487b31ab30dc3b5bac64783b4e49997e_GH0.tar.gz) = 24630
Index: security/bro/pkg-plist
===================================================================
--- security/bro/pkg-plist
+++ security/bro/pkg-plist
@@ -56,6 +56,12 @@
 %%BROKER%%include/broker/util/operators.hh
 %%BROKER%%include/broker/util/optional.hh
 %%BROKER%%include/broker/util/variant.hh
+%%NETMAP%%lib/bro/plugins/Bro_Netmap/COPYING
+%%NETMAP%%lib/bro/plugins/Bro_Netmap/__bro_plugin__
+%%NETMAP%%lib/bro/plugins/Bro_Netmap/broctl/netmap.py
+%%NETMAP%%lib/bro/plugins/Bro_Netmap/lib/Bro-Netmap.%%LCASE_OPSYS%%-%%ARCH%%.so
+%%NETMAP%%lib/bro/plugins/Bro_Netmap/scripts/__load__.bro
+%%NETMAP%%lib/bro/plugins/Bro_Netmap/scripts/init.bro
 %%BROCTL%%lib/broctl/BroControl/__init__.py
 %%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/__init__.pyc
 %%BROCTL%%lib/broctl/BroControl/brocmd.py
@@ -780,5 +786,9 @@
 %%BROCTL%%@dir lib/broctl/plugins
 %%BROCTL%%@dir lib/broctl/BroControl
 %%BROCTL%%@dir lib/broctl
+%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap/scripts
+%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap/lib
+%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap/broctl
+%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap
 @dir lib/bro/plugins
 %%BROCTL%%@postexec su -fm %%BROUSER%% -c '%D/bin/broctl install; rm -f %D/spool/debug.log'