Index: head/net/daq/Makefile
===================================================================
--- head/net/daq/Makefile	(revision 398239)
+++ head/net/daq/Makefile	(revision 398240)
@@ -1,42 +1,33 @@
 # Created by: Dean Freeman (wfreeman@sourcefire.com)
 # $FreeBSD$
 
 PORTNAME=	daq
 PORTVERSION=	2.0.6
 CATEGORIES=	net
 MASTER_SITES=	https://snort.org/downloads/snort/ \
 		http://mirrors.rit.edu/zi/
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Data Acquisition abstraction library for snort 2.9+
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet \
 		libpcap.so:${PORTSDIR}/net/libpcap
 BUILD_DEPENDS=	flex:${PORTSDIR}/textproc/flex
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		bison gmake libtool
 USE_LDCONFIG=	yes
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 MAKE_JOBS_UNSAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* ${STAGEDIR}${PREFIX}/lib/daq/*.so
 
-.if ${OSVERSION} < 901000
-CONFIGURE_ARGS+=--disable-netmap-module
-PLIST_SUB+=	NETMAP="@comment "
-.else
-PLIST_SUB+=	NETMAP=""
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/net/daq/pkg-plist
===================================================================
--- head/net/daq/pkg-plist	(revision 398239)
+++ head/net/daq/pkg-plist	(revision 398240)
@@ -1,22 +1,21 @@
 bin/daq-modules-config
 include/daq.h
 include/daq_api.h
 include/daq_common.h
 include/sfbpf.h
 include/sfbpf_dlt.h
 lib/daq/daq_dump.so
 lib/daq/daq_ipfw.so
-%%NETMAP%%lib/daq/daq_netmap.so
+lib/daq/daq_netmap.so
 lib/daq/daq_pcap.so
 lib/libdaq.a
 lib/libdaq.so
 lib/libdaq.so.2
 @comment lib/libdaq.so.%%PORTVERSION%%
 lib/libdaq.so.2.0.4
 lib/libdaq_static.a
 lib/libdaq_static_modules.a
 lib/libsfbpf.a
 lib/libsfbpf.so
 lib/libsfbpf.so.0
 lib/libsfbpf.so.0.0.1
-@dir lib/daq