From owner-svn-ports-head@freebsd.org  Tue Mar 21 22:43:57 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE49ED17CD5;
 Tue, 21 Mar 2017 22:43:57 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 7D94F19DA;
 Tue, 21 Mar 2017 22:43:57 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2LMhuW5062340;
 Tue, 21 Mar 2017 22:43:56 GMT (envelope-from mandree@FreeBSD.org)
Received: (from mandree@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2LMhuRY062339;
 Tue, 21 Mar 2017 22:43:56 GMT (envelope-from mandree@FreeBSD.org)
Message-Id: <201703212243.v2LMhuRY062339@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mandree set sender to
 mandree@FreeBSD.org using -f
From: Matthias Andree <mandree@FreeBSD.org>
Date: Tue, 21 Mar 2017 22:43:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r436660 - head/dns/dnsmasq
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Mar 2017 22:43:57 -0000

Author: mandree
Date: Tue Mar 21 22:43:56 2017
New Revision: 436660
URL: https://svnweb.freebsd.org/changeset/ports/436660

Log:
  Allow build on PF-less (NO_IPSET) systems.
  
  This adds a new ports option, IPSET, defaulting to on.
  
  Use the opportunity to use the options helpers OPT_CFLAGS[_OFF] on the
  trivial options.
  
  PR:		217900
  Submitted by:	Oliver Pinter <oliver.pinter@hardenedbsd.org>

Modified:
  head/dns/dnsmasq/Makefile

Modified: head/dns/dnsmasq/Makefile
==============================================================================
--- head/dns/dnsmasq/Makefile	Tue Mar 21 21:59:31 2017	(r436659)
+++ head/dns/dnsmasq/Makefile	Tue Mar 21 22:43:56 2017	(r436660)
@@ -24,14 +24,15 @@ CFLAGS+=	-Wall -Wno-unused-value -Wno-un
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}"
 
-OPTIONS_DEFINE=		IPV6 DBUS LUA DNSSEC DOCS
-OPTIONS_DEFAULT=	DNSSEC
+OPTIONS_DEFINE=		IPSET IPV6 DBUS LUA DNSSEC DOCS
+OPTIONS_DEFAULT=	DNSSEC IPSET
 OPTIONS_EXCLUDE+=	EXAMPLES
 OPTIONS_RADIO=		INTL
 OPTIONS_RADIO_INTL=	IDN NLS
 INTL_DESC=	Internationalization Support Level
 NLS_DESC=	IDN+NLS: Int'l Domain Names & National Language support
 IDN_DESC=	IDN: Int'l Domain Names WITHOUT full NLS
+IPSET_DESC=	Dynamic firewall managment of resolved names (require PF)
 LUA_DESC=	Support lease-change scripts written in Lua
 DNSSEC_DESC=	Enable DNSSEC caching and validation
 USES=		cpe shebangfix tar:xz
@@ -41,9 +42,8 @@ CPE_VENDOR=	thekelleys
 
 .include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MIPV6)
-CFLAGS+=	-DNO_IPV6
-.endif
+IPV6_CFLAGS_OFF=-DNO_IPV6
+IPSET_CFLAGS_OFF=-DNO_IPSET
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext gmake iconv pkgconfig