Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 26 Oct 2014 12:40:11 +0000 (UTC)
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r371502 - head/net/daq
Message-ID:  <201410261240.s9QCeBDv076534@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zi
Date: Sun Oct 26 12:40:10 2014
New Revision: 371502
URL: https://svnweb.freebsd.org/changeset/ports/371502
QAT: https://qat.redports.org/buildarchive/r371502/

Log:
  - Disable netmap support on anything older than 9.1
  PR:		194607
  Submitted by:	ohauer@

Modified:
  head/net/daq/Makefile
  head/net/daq/pkg-plist

Modified: head/net/daq/Makefile
==============================================================================
--- head/net/daq/Makefile	Sun Oct 26 11:39:54 2014	(r371501)
+++ head/net/daq/Makefile	Sun Oct 26 12:40:10 2014	(r371502)
@@ -3,6 +3,7 @@
 
 PORTNAME=	daq
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/snort/snort \
 		http://mirrors.rit.edu/zi/
@@ -27,7 +28,16 @@ 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
 
-.include <bsd.port.mk>
+.if ${OSVERSION} < 901000
+CONFIGURE_ARGS+=--disable-netmap-module
+PLIST_SUB+=	NETMAP="@comment "
+.else
+PLIST_SUB+=	NETMAP=""
+.endif
+
+.include <bsd.port.post.mk>

Modified: head/net/daq/pkg-plist
==============================================================================
--- head/net/daq/pkg-plist	Sun Oct 26 11:39:54 2014	(r371501)
+++ head/net/daq/pkg-plist	Sun Oct 26 12:40:10 2014	(r371502)
@@ -6,7 +6,7 @@ include/sfbpf.h
 include/sfbpf_dlt.h
 lib/daq/daq_dump.so
 lib/daq/daq_ipfw.so
-lib/daq/daq_netmap.so
+%%NETMAP%%lib/daq/daq_netmap.so
 lib/daq/daq_pcap.so
 lib/libdaq.a
 lib/libdaq.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410261240.s9QCeBDv076534>