From owner-svn-ports-all@freebsd.org Fri May 8 20:51:25 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CB4682E16DC; Fri, 8 May 2020 20:51:25 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49JjDD62rCz4K92; Fri, 8 May 2020 20:51:24 +0000 (UTC) (envelope-from leres@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A7618861E; Fri, 8 May 2020 20:51:23 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 048KpN2g007298; Fri, 8 May 2020 20:51:23 GMT (envelope-from leres@FreeBSD.org) Received: (from leres@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 048KpNTR007297; Fri, 8 May 2020 20:51:23 GMT (envelope-from leres@FreeBSD.org) Message-Id: <202005082051.048KpNTR007297@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: leres set sender to leres@FreeBSD.org using -f From: Craig Leres Date: Fri, 8 May 2020 20:51:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534434 - head/security/zeek X-SVN-Group: ports-head X-SVN-Commit-Author: leres X-SVN-Commit-Paths: head/security/zeek X-SVN-Commit-Revision: 534434 X-SVN-Commit-Repository: ports 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.32 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2020 20:51:25 -0000 Author: leres Date: Fri May 8 20:51:23 2020 New Revision: 534434 URL: https://svnweb.freebsd.org/changeset/ports/534434 Log: security/zeek: Fix build with PERFTOOLS which needed BUILD_DEPENDS. While we're here sort options related. Reported by: James Welcher Modified: head/security/zeek/Makefile Modified: head/security/zeek/Makefile ============================================================================== --- head/security/zeek/Makefile Fri May 8 20:51:19 2020 (r534433) +++ head/security/zeek/Makefile Fri May 8 20:51:23 2020 (r534434) @@ -3,6 +3,7 @@ PORTNAME= zeek PORTVERSION= 3.0.6 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://old.zeek.org/downloads/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -36,7 +37,6 @@ CMAKE_ARGS+= -GNinja \ -D ZEEK_SCRIPT_INSTALL_PATH:PATH=${PREFIX}/share/zeek \ -D ZEEK_ETC_INSTALL_DIR:PATH=${PREFIX}/etc \ -D ZEEK_MAN_INSTALL_PATH=${MANPREFIX}/man \ - -D ENABLE_PERFTOOLS:BOOL=false \ -D ENABLE_PERFTOOLS_DEBUG:BOOL=false \ -D BinPAC_SKIP_INSTALL:BOOL=true \ -D INSTALL_AUX_TOOLS:BOOL=true \ @@ -72,25 +72,26 @@ ZEEKCTL_DESC= ZeekControl support (implies BROKER and ZEEKCTL_IMPLIES= BROKER IPSUMDUMP BROCCOLI_LIB_DEPENDS= libbroccoli.so:security/broccoli -GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb -IPSUMDUMP_BUILD_DEPENDS=ipsumdump:net/ipsumdump -IPSUMDUMP_RUN_DEPENDS= ipsumdump:net/ipsumdump BROKER_BUILD_DEPENDS= swig3.0:devel/swig30 BROKER_CMAKE_BOOL= ENABLE_BROKER DEBUG_CMAKE_BOOL= ENABLE_DEBUG -LBL_HF_RUN_DEPENDS= ${LOCALBASE}/bin/hf:sysutils/lbl-hf +GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb +IPSUMDUMP_BUILD_DEPENDS=ipsumdump:net/ipsumdump +IPSUMDUMP_RUN_DEPENDS= ipsumdump:net/ipsumdump LBL_CF_RUN_DEPENDS= ${LOCALBASE}/bin/cf:sysutils/lbl-cf +LBL_HF_RUN_DEPENDS= ${LOCALBASE}/bin/hf:sysutils/lbl-hf NETMAP_GH_TUPLE= bro:bro-netmap:f3620df:bro_netmap NETMAP_USE= GITHUB=nodefault +PERFTOOLS_BUILD_DEPENDS=${LOCALBASE}/bin/perftools-pprof:devel/google-perftools PERFTOOLS_CMAKE_BOOL= ENABLE_PERFTOOLS -PERFTOOLS_RUN_DEPENDS= ${LOCALBASE}/bin/perftools-pprof:devel/google-perftools +PERFTOOLS_RUN_DEPENDS=${LOCALBASE}/bin/perftools-pprof:devel/google-perftools PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 ZEEKCTL_BUILD_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ swig3.0:devel/swig30 +ZEEKCTL_CMAKE_BOOL= INSTALL_ZEEKCTL ZEEKCTL_RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} -ZEEKCTL_CMAKE_BOOL= INSTALL_ZEEKCTL .include