Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Feb 2015 14:12:08 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r379515 - head/ftp/frox
Message-ID:  <201502211412.t1LEC8oZ075487@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Sat Feb 21 14:12:07 2015
New Revision: 379515
URL: https://svnweb.freebsd.org/changeset/ports/379515
QAT: https://qat.redports.org/buildarchive/r379515/

Log:
  - Fix build with PF OPTION selected [1]
  - Move IPFILTER / PF OPTIONS into OPTIONS_RADIO because port does
    not build if both are selected [2]
  
  PR:		197412
  Submitted by:	fidaj@ukr.net [1]
  Reviewed by:	riggs [2]
  Approved by:	maintainer timeout

Modified:
  head/ftp/frox/Makefile

Modified: head/ftp/frox/Makefile
==============================================================================
--- head/ftp/frox/Makefile	Sat Feb 21 13:58:02 2015	(r379514)
+++ head/ftp/frox/Makefile	Sat Feb 21 14:12:07 2015	(r379515)
@@ -30,9 +30,12 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 CONFIGURE_ARGS=	--enable-configfile=${PREFIX}/etc/frox.conf
 
-OPTIONS_DEFINE=	IPFILTER PF VIRUS_SCAN HTTP_CACHE LOCAL_CACHE CCP ROOT_RUN DOCS
+OPTIONS_DEFINE=	VIRUS_SCAN HTTP_CACHE LOCAL_CACHE CCP ROOT_RUN DOCS
 OPTIONS_DEFAULT=	HTTP_CACHE CCP
 
+OPTIONS_RADIO=	PFILTER
+OPTIONS_RADIO_PFILTER=	IPFILTER PF
+
 IPFILTER_DESC=		Use ipfilter instead of ipfw
 PF_DESC=		Build with pf(4) support
 VIRUS_SCAN_DESC=	Run external virus scaner on each download
@@ -42,7 +45,7 @@ CCP_DESC=	 	Ftp-proxy style command cont
 ROOT_RUN_DESC=	 	Allow frox running as root (not recomended)
 
 IPFILTER_CONFIGURE_ENABLE=	ipfilter
-PF_CPPFLAGS=		DPF
+PF_CPPFLAGS=		-DPF
 VIRUS_SCAN_CONFIGURE_ENABLE=	virus-scan
 HTTP_CACHE_CONFIGURE_ENABLE=	http-cache
 LOCAL_CACHE_CONFIGURE_ENABLE=	local-cache



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