From owner-svn-ports-all@FreeBSD.ORG  Sun Oct 26 12:40:11 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C01F815D;
 Sun, 26 Oct 2014 12:40:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA670276;
 Sun, 26 Oct 2014 12:40:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9QCeB77076536;
 Sun, 26 Oct 2014 12:40:11 GMT (envelope-from zi@FreeBSD.org)
Received: (from zi@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9QCeBDv076534;
 Sun, 26 Oct 2014 12:40:11 GMT (envelope-from zi@FreeBSD.org)
Message-Id: <201410261240.s9QCeBDv076534@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org
 using -f
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Sun, 26 Oct 2014 12:40:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r371502 - head/net/daq
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Oct 2014 12:40:11 -0000

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