diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile
index e0268cf626ef..e98fc6fbbb43 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -1,107 +1,92 @@
 PORTNAME=	kismet
 DISTVERSION=	2016-07-R1
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	802.11 layer2 wireless network detector, sniffer, and IDS
 WWW=		https://www.kismetwireless.net/
 
 LICENSE=	GPLv2
 
-USES=		gmake tar:xz
+USES=		gmake localbase:ldflags tar:xz
+USE_CXXSTD=	c++14
 
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+
+WRKSRC=	${WRKDIR}/${DISTNAME:S/a$$//}
+
+PORTDOCS=	README
+PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		PCRE PLUGINS SETUID DOCS EXAMPLES
 OPTIONS_DEFAULT=	PCRE PLUGINS SETUID
+OPTIONS_SUB=		yes
+
 SETUID_DESC=		Use privilege separation
 
-WRKSRC=	${WRKDIR}/${DISTNAME:S/a$$//}
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
+PCRE_CONFIGURE_ENABLE=	pcre
+PLUGINS_USES=	ssl
+PLUGINS_ALL_TARGET=	depend all all-plugins
+PLUGINS_INSTALL_TARGET=	all-plugins-install
+SETUID_CONFIGURE_ON=--with-suidgroup=wheel
+SETUID_CONFIGURE_OFF=--without-suidgroup
+SETUID_INSTALL_TARGET=		suidinstall
+SETUID_INSTALL_TARGET_OFF=		install
+SETUID_SUB_FILES=	suid_pkg-message
+SETUID_PLIST_SUB=	SUID="" SUIDGROUP="${GROUPS}"
+SETUID_PLIST_SUB_OFF=	SUID="@comment " SUIDGROUP=""
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	README
-.endif
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-PORTEXAMPLES=	*
-.endif
-
-.if ${PORT_OPTIONS:MPCRE}
-CONFIGURE_ARGS+=--enable-pcre
-LIB_DEPENDS+=	libpcre.so:devel/pcre
-.else
-CONFIGURE_ARGS+=--disable-pcre
-.endif
-
 .if ${PORT_OPTIONS:MSETUID}
 GROUPS=		kismet
-CONFIGURE_ARGS+=--with-suidgroup=wheel
-INSTALL_TARGET=		suidinstall
-PLIST_SUB+=	SUID="" SUIDGROUP="${GROUPS}"
 PKGMESSAGE=	${WRKDIR}/suid_pkg-message
-SUB_FILES+=	suid_pkg-message
-.else
-INSTALL_TARGET=		install
-CONFIGURE_ARGS+=--without-suidgroup
-PLIST_SUB+=	SUID="@comment " SUIDGROUP=""
-.endif
-
-.if ${PORT_OPTIONS:MPLUGINS}
-ALL_TARGET=	depend all all-plugins
-INSTALL_TARGET+=	all-plugins-install
-USES+=	ssl
-PLIST_SUB+=	PLUGINS=""
-.else
-PLIST_SUB+=	PLUGINS="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "/gps=/s/true/false/" \
 		-e "/ouifile=/{/wireshark/d;s|/etc|${DOCSDIR}|;}" \
 			${WRKSRC}/conf/kismet.conf.in \
 			${WRKSRC}/conf/kismet_drone.conf
 	@${REINPLACE_CMD} -e "s/plugin-/plugin-[aps]/" \
 		-e "s/make/${MAKE_CMD}/" \
 		-e "s/\$$(MAKE)/${MAKE_CMD}/" \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s/CXXFLAGS/CPPFLAGS/" \
 		${WRKSRC}/plugin-alertsyslog/Makefile
 	@${FIND} ${WRKSRC} -type f -name 'Makefile' -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -E \
 		'/C(XX)?FLAGS[[:blank:]]*\+=/s/ -g / /'
 	@${FIND} ${WRKSRC} -type f \( -name Makefile -o -name Makefile.in \) -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's,-o $$(INSTUSR) -g $$(INSTGRP),,' \
 		-e 's,-o $$(INSTUSR) -g $$(MANGRP),,' \
 		-e 's,-o $$(INSTUSR) -g $$(SUIDGROUP) -m 4550,,'
 
 post-build:
 	cd ${WRKSRC}; ${STRIP_CMD} kismet_client kismet_drone kismet_server */*.so
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/ruby/* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 	${MV} ${STAGEDIR}${PREFIX}/etc/kismet.conf \
 		${STAGEDIR}${PREFIX}/etc/kismet.conf.sample
 	${MV} ${STAGEDIR}${PREFIX}/etc/kismet_drone.conf \
 		${STAGEDIR}${PREFIX}/etc/kismet_drone.conf.sample
 
 .include <bsd.port.post.mk>