security/zeek: Port improvements

 - Remove useless BROKER option.

 - Remove USES=ninja (now implied by USES=cmake).

 - Make bison, flex, and swig hard dependencies.

 - Strip several installed binaries.

 - Remove some test files and directories mistakenly installed by
   spicy.

 - While we're here, run portfmt.

Thanks to @diizzy for the bulk of these changes.

PR:		266345
Reported by:	diizzy

2 files changed, 151 insertions, 155 deletions

diff --git a/security/zeek/Makefile b/security/zeek/Makefile
index 9e952a313da3..5d1c6d83cef5 100644
--- a/security/zeek/Makefile
+++ b/security/zeek/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	zeek
-PORTVERSION=	5.0.1
+DISTVERSION=	5.0.1
 CATEGORIES=	security
 MASTER_SITES=	https://download.zeek.org/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -12,10 +12,15 @@ LICENSE=	BSD3CLAUSE
 
 BROKEN_FreeBSD_12_powerpc64=	does not build: error: zero-size array 'names'
 
-BUILD_DEPENDS=	cmake>=3.15.0:devel/cmake
+BUILD_DEPENDS=	bison>=3.3:devel/bison \
+		cmake>=3.15.0:devel/cmake \
+		flex>=2.6:textproc/flex \
+		swig>=4.0.2:devel/swig
+LIB_DEPENDS=	libcares.so:dns/c-ares
+RUN_DEPENDS=	c-ares>=1.18.1:dns/c-ares
 
-USES=		bison cmake compiler cpe gettext-runtime \
-		ninja perl5 python shebangfix ssl
+USES=		bison cmake compiler:c++17-lang cpe gettext-runtime perl5 \
+		python shebangfix ssl
 
 USE_LDCONFIG=	yes
 
@@ -30,20 +35,15 @@ SHEBANG_FILES=	auxil/zeekctl/auxil/trace-summary/trace-summary
 SUB_FILES=	pkg-message
 NO_MTREE=	yes
 
-CMAKE_ARGS+=	-GNinja \
-		-D BUILD_SHARED_LIBS:BOOL=true \
-		-D BUILD_STATIC_BROKER:BOOL=true \
-		-D BinPAC_SKIP_INSTALL:BOOL=true \
-		-D CMAKE_EXE_LINKER_FLAGS="${OPENSSL_LDFLAGS}" \
-		-D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
-		-D ENABLE_PERFTOOLS_DEBUG:BOOL=false \
-		-D INSTALL_AUX_TOOLS:BOOL=true \
-		-D PYTHON_EXECUTABLE:PATH=${PYTHON_CMD} \
-		-D PY_MOD_INSTALL_DIR:PATH=${PREFIX}/lib/zeekctl \
-		-D ZEEK_ETC_INSTALL_DIR:PATH=${PREFIX}/etc \
-		-D ZEEK_MAN_INSTALL_PATH=${MANPREFIX}/man \
-		-D ZEEK_ROOT_DIR:PATH=${PREFIX} \
-		-D ZEEK_SCRIPT_INSTALL_PATH:PATH=${PREFIX}/share/zeek
+CMAKE_ON=	BROKER_DISABLE_DOC_EXAMPLES BROKER_DISABLE_TESTS \
+		BUILD_SHARED_LIBS BUILD_STATIC_BROKER INSTALL_AUX_TOOLS
+CMAKE_ARGS=	-DCARES_ROOT_DIR:PATH=${PREFIX} \
+		-DCMAKE_EXE_LINKER_FLAGS="${OPENSSL_LDFLAGS}" \
+		-DPY_MOD_INSTALL_DIR:PATH=${PREFIX}/lib/zeekctl \
+		-DZEEK_ETC_INSTALL_DIR:PATH=${PREFIX}/etc \
+		-DZEEK_MAN_INSTALL_PATH=${MANPREFIX}/man \
+		-DZEEK_ROOT_DIR:PATH=${PREFIX} \
+		-DZEEK_SCRIPT_INSTALL_PATH:PATH=${PREFIX}/share/zeek
 
 ZEEKUSER?=	zeek
 ZEEKGROUP?=	zeek
@@ -55,14 +55,14 @@ PLIST_SUB+=	ARCH=${UNAME_M} \
 USERS=		${ZEEKUSER}
 GROUPS=		${ZEEKGROUP}
 
-OPTIONS_DEFINE=	BROKER GEOIP2 IPSUMDUMP LBL_CF LBL_HF NETMAP PERFTOOLS \
-		SPICY ZEEKCTL ZKG
+OPTIONS_DEFINE=	GEOIP2 IPSUMDUMP LBL_CF LBL_HF NETMAP PERFTOOLS SPICY ZEEKCTL \
+		ZKG
 
 OPTIONS_SINGLE=			BUILD_TYPE
 OPTIONS_SINGLE_BUILD_TYPE=	DEBUG MINSIZEREL RELEASE RELWITHDEBINFO
 
-OPTIONS_DEFAULT=	BROKER GEOIP2 IPSUMDUMP LBL_CF LBL_HF NETMAP RELEASE \
-			ZEEKCTL ZKG
+OPTIONS_DEFAULT=	GEOIP2 IPSUMDUMP LBL_CF LBL_HF NETMAP RELEASE ZEEKCTL \
+			ZKG
 OPTIONS_DEFAULT_aarch64=	SPICY
 OPTIONS_DEFAULT_amd64=	SPICY
 OPTIONS_DEFAULT_armv6=	SPICY
@@ -70,7 +70,6 @@ OPTIONS_DEFAULT_armv7=	SPICY
 OPTIONS_DEFAULT_i386=	SPICY
 OPTIONS_SUB=		yes
 
-BROKER_DESC=		Enable the Broker communication library
 DEBUG_DESC=		Optimizations off, debug symbols/flags on
 GEOIP2_DESC=		Build with GeoIP2 (MaxMindDB) support
 IPSUMDUMP_DESC=		Enables traffic summaries
@@ -82,35 +81,28 @@ PERFTOOLS_DESC=		Use Perftools to improve memory & CPU usage
 RELEASE_DESC=		Optimizations on, debug symbols/flags off
 RELWITHDEBINFO_DESC=	Optimizations/debug symbols on, debug flags off
 SPICY_DESC=		Enable the Spicy parser generator
-ZEEKCTL_DESC=		ZeekControl support (implies BROKER and IPSUMDUMP)
+ZEEKCTL_DESC=		ZeekControl support (implies IPSUMDUMP)
 ZKG_DESC=		Zeek package manager support
 
-ZEEKCTL_IMPLIES=	BROKER IPSUMDUMP
-
-BROKER_BUILD_DEPENDS=	swig:devel/swig
-BROKER_CMAKE_BOOL=	ENABLE_BROKER
-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=	zeek:zeek-netmap:v2.0.0:zeek_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
-PYTHON_BUILD_DEPENDS=	swig:devel/swig
-SPICY_CMAKE_OFF=	-DDISABLE_SPICY=ON
-SPICY_BUILD_DEPENDS=	bison>=3.3:devel/bison \
-			flex>=2.6:textproc/flex
-ZEEKCTL_BUILD_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
-			${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
-			swig:devel/swig
-ZEEKCTL_CMAKE_BOOL=	INSTALL_ZEEKCTL
-ZEEKCTL_RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
-			${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
-ZKG_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zkg>=2.7.1:security/py-zkg@${PY_FLAVOR} \
-
+ZEEKCTL_IMPLIES=	IPSUMDUMP
+
+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=		zeek:zeek-netmap:v2.0.0:zeek_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
+SPICY_CMAKE_OFF=		-DDISABLE_SPICY=ON
+ZEEKCTL_BUILD_DEPENDS=		${LOCALBASE}/bin/bash:shells/bash \
+				${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+ZEEKCTL_CMAKE_BOOL=		INSTALL_ZEEKCTL
+ZEEKCTL_RUN_DEPENDS=		${LOCALBASE}/bin/bash:shells/bash \
+				${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+ZKG_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}zkg>=2.7.1:security/py-zkg@${PY_FLAVOR}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
@@ -129,6 +121,9 @@ STRIP=
 USE_RC_SUBR=	zeek
 .endif
 
+post-extract:
+	@${RM} -rf ${WRKSRC}/auxil/c-ares
+
 post-patch:
 	${REINPLACE_CMD} -e '\|/usr/local/|s|$$| ${STAGEDIR}${PREFIX}/|' \
 	    ${WRKSRC_zeek_netmap}/cmake/FindNetmap.cmake
@@ -148,6 +143,18 @@ post-install-ZEEKCTL-on:
 post-install:
 	${MV} ${STAGEDIR}${DATADIR}/site/local.zeek \
 	    ${STAGEDIR}${DATADIR}/site/local.zeek.sample
+	@${RM} -rf ${STAGEDIR}${PREFIX}/include/hilti/rt/3rdparty/SafeInt/Archive
+	@${RM} -rf ${STAGEDIR}${PREFIX}/include/hilti/rt/3rdparty/SafeInt/Test
+	@${RMDIR} ${STAGEDIR}${PREFIX}/include/zeek/builtin-plugins/spicy-plugin/bin
+	@${RMDIR} ${STAGEDIR}${PREFIX}/include/zeek/builtin-plugins/spicy-plugin/cmake
+	@${RM} -rf ${STAGEDIR}${PREFIX}/include/zeek/builtin-plugins/spicy-plugin/include
+	@${RMDIR} ${STAGEDIR}${PREFIX}/include/zeek/builtin-plugins/spicy-plugin/spicy
+	@${RM} -rf ${STAGEDIR}${PREFIX}/include/zeek/builtin-plugins/spicy-plugin/src
+	@${RM} -rf ${STAGEDIR}${PREFIX}/include/zeek/builtin-plugins/spicy-plugin/tests
+	@${RMDIR} ${STAGEDIR}${PREFIX}/include/zeek/script_opt/CPP/maint
+	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/zeek-spicy/modules
+	@${RM} -rf ${STAGEDIR}${PREFIX}/var
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/zeek-cut
 
 pre-install-ZEEKCTL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d
@@ -161,6 +168,7 @@ post-install-NETMAP-on:
 	    ./configure --with-netmap=/usr \
 	    --install-root=${STAGEDIR}${PREFIX}/lib/zeek/plugins
 	cd ${WRKSRC_zeek_netmap}/build && make && make install
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/zeek/plugins/Zeek_Netmap/lib/Zeek-Netmap.freebsd-${UNAME_M}.so
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/zeek/pkg-plist b/security/zeek/pkg-plist
index f0ded961275d..46fe29ee08c0 100644
--- a/security/zeek/pkg-plist
+++ b/security/zeek/pkg-plist
@@ -8,7 +8,6 @@ bin/bro
 bin/bro-config
 bin/bro-cut
 bin/broctl
-bin/broker-benchmark
 %%ZEEKCTL%%bin/capstats
 bin/gen-zam
 %%SPICY%%bin/hilti-config
@@ -36,95 +35,95 @@ include/binpac/binpac_buffer.h
 include/binpac/binpac_bytestring.h
 include/binpac/binpac_exception.h
 include/binpac/binpac_regex.h
-%%BROKER%%include/broker/address.hh
-%%BROKER%%include/broker/alm/multipath.hh
-%%BROKER%%include/broker/alm/routing_table.hh
-%%BROKER%%include/broker/api_flags.hh
-%%BROKER%%include/broker/backend.hh
-%%BROKER%%include/broker/backend_options.hh
-%%BROKER%%include/broker/bad_variant_access.hh
-%%BROKER%%include/broker/broker.hh
-%%BROKER%%include/broker/config.hh
-%%BROKER%%include/broker/configuration.hh
-%%BROKER%%include/broker/convert.hh
-%%BROKER%%include/broker/cow_tuple.hh
-%%BROKER%%include/broker/data.hh
-%%BROKER%%include/broker/defaults.hh
-%%BROKER%%include/broker/detail/abstract_backend.hh
-%%BROKER%%include/broker/detail/algorithms.hh
-%%BROKER%%include/broker/detail/appliers.hh
-%%BROKER%%include/broker/detail/assert.hh
-%%BROKER%%include/broker/detail/blob.hh
-%%BROKER%%include/broker/detail/comparable.hh
-%%BROKER%%include/broker/detail/die.hh
-%%BROKER%%include/broker/detail/filesystem.hh
-%%BROKER%%include/broker/detail/flare.hh
-%%BROKER%%include/broker/detail/has_network_info.hh
-%%BROKER%%include/broker/detail/hash.hh
-%%BROKER%%include/broker/detail/inspect_enum.hh
-%%BROKER%%include/broker/detail/make_backend.hh
-%%BROKER%%include/broker/detail/memory_backend.hh
-%%BROKER%%include/broker/detail/monotonic_buffer_resource.hh
-%%BROKER%%include/broker/detail/native_socket.hh
-%%BROKER%%include/broker/detail/next_tick.hh
-%%BROKER%%include/broker/detail/opaque_type.hh
-%%BROKER%%include/broker/detail/operators.hh
-%%BROKER%%include/broker/detail/overload.hh
-%%BROKER%%include/broker/detail/peer_status_map.hh
-%%BROKER%%include/broker/detail/pp.hh
-%%BROKER%%include/broker/detail/prefix_matcher.hh
-%%BROKER%%include/broker/detail/radix_tree.hh
-%%BROKER%%include/broker/detail/sink_driver.hh
-%%BROKER%%include/broker/detail/source_driver.hh
-%%BROKER%%include/broker/detail/sqlite_backend.hh
-%%BROKER%%include/broker/detail/store_state.hh
-%%BROKER%%include/broker/detail/subscription.hh
-%%BROKER%%include/broker/detail/type_traits.hh
-%%BROKER%%include/broker/domain_options.hh
-%%BROKER%%include/broker/endpoint.hh
-%%BROKER%%include/broker/endpoint_id.hh
-%%BROKER%%include/broker/endpoint_info.hh
-%%BROKER%%include/broker/entity_id.hh
-%%BROKER%%include/broker/enum_value.hh
-%%BROKER%%include/broker/error.hh
-%%BROKER%%include/broker/expected.hh
-%%BROKER%%include/broker/filter_type.hh
-%%BROKER%%include/broker/frontend.hh
-%%BROKER%%include/broker/fwd.hh
-%%BROKER%%include/broker/internal_command.hh
-%%BROKER%%include/broker/lamport_timestamp.hh
-%%BROKER%%include/broker/mailbox.hh
-%%BROKER%%include/broker/message.hh
-%%BROKER%%include/broker/network_info.hh
-%%BROKER%%include/broker/none.hh
-%%BROKER%%include/broker/peer_flags.hh
-%%BROKER%%include/broker/peer_info.hh
-%%BROKER%%include/broker/peer_status.hh
-%%BROKER%%include/broker/port.hh
-%%BROKER%%include/broker/publisher.hh
-%%BROKER%%include/broker/publisher_id.hh
-%%BROKER%%include/broker/shutdown_options.hh
-%%BROKER%%include/broker/snapshot.hh
-%%BROKER%%include/broker/span.hh
-%%BROKER%%include/broker/status.hh
-%%BROKER%%include/broker/status_subscriber.hh
-%%BROKER%%include/broker/store.hh
-%%BROKER%%include/broker/store_event.hh
-%%BROKER%%include/broker/subnet.hh
-%%BROKER%%include/broker/subscriber.hh
-%%BROKER%%include/broker/telemetry/counter.hh
-%%BROKER%%include/broker/telemetry/fwd.hh
-%%BROKER%%include/broker/telemetry/gauge.hh
-%%BROKER%%include/broker/telemetry/histogram.hh
-%%BROKER%%include/broker/telemetry/metric_family.hh
-%%BROKER%%include/broker/telemetry/metric_registry.hh
-%%BROKER%%include/broker/telemetry/metric_registry_impl.hh
-%%BROKER%%include/broker/time.hh
-%%BROKER%%include/broker/timeout.hh
-%%BROKER%%include/broker/topic.hh
-%%BROKER%%include/broker/version.hh
-%%BROKER%%include/broker/worker.hh
-%%BROKER%%include/broker/zeek.hh
+include/broker/address.hh
+include/broker/alm/multipath.hh
+include/broker/alm/routing_table.hh
+include/broker/api_flags.hh
+include/broker/backend.hh
+include/broker/backend_options.hh
+include/broker/bad_variant_access.hh
+include/broker/broker.hh
+include/broker/config.hh
+include/broker/configuration.hh
+include/broker/convert.hh
+include/broker/cow_tuple.hh
+include/broker/data.hh
+include/broker/defaults.hh
+include/broker/detail/abstract_backend.hh
+include/broker/detail/algorithms.hh
+include/broker/detail/appliers.hh
+include/broker/detail/assert.hh
+include/broker/detail/blob.hh
+include/broker/detail/comparable.hh
+include/broker/detail/die.hh
+include/broker/detail/filesystem.hh
+include/broker/detail/flare.hh
+include/broker/detail/has_network_info.hh
+include/broker/detail/hash.hh
+include/broker/detail/inspect_enum.hh
+include/broker/detail/make_backend.hh
+include/broker/detail/memory_backend.hh
+include/broker/detail/monotonic_buffer_resource.hh
+include/broker/detail/native_socket.hh
+include/broker/detail/next_tick.hh
+include/broker/detail/opaque_type.hh
+include/broker/detail/operators.hh
+include/broker/detail/overload.hh
+include/broker/detail/peer_status_map.hh
+include/broker/detail/pp.hh
+include/broker/detail/prefix_matcher.hh
+include/broker/detail/radix_tree.hh
+include/broker/detail/sink_driver.hh
+include/broker/detail/source_driver.hh
+include/broker/detail/sqlite_backend.hh
+include/broker/detail/store_state.hh
+include/broker/detail/subscription.hh
+include/broker/detail/type_traits.hh
+include/broker/domain_options.hh
+include/broker/endpoint.hh
+include/broker/endpoint_id.hh
+include/broker/endpoint_info.hh
+include/broker/entity_id.hh
+include/broker/enum_value.hh
+include/broker/error.hh
+include/broker/expected.hh
+include/broker/filter_type.hh
+include/broker/frontend.hh
+include/broker/fwd.hh
+include/broker/internal_command.hh
+include/broker/lamport_timestamp.hh
+include/broker/mailbox.hh
+include/broker/message.hh
+include/broker/network_info.hh
+include/broker/none.hh
+include/broker/peer_flags.hh
+include/broker/peer_info.hh
+include/broker/peer_status.hh
+include/broker/port.hh
+include/broker/publisher.hh
+include/broker/publisher_id.hh
+include/broker/shutdown_options.hh
+include/broker/snapshot.hh
+include/broker/span.hh
+include/broker/status.hh
+include/broker/status_subscriber.hh
+include/broker/store.hh
+include/broker/store_event.hh
+include/broker/subnet.hh
+include/broker/subscriber.hh
+include/broker/telemetry/counter.hh
+include/broker/telemetry/fwd.hh
+include/broker/telemetry/gauge.hh
+include/broker/telemetry/histogram.hh
+include/broker/telemetry/metric_family.hh
+include/broker/telemetry/metric_registry.hh
+include/broker/telemetry/metric_registry_impl.hh
+include/broker/time.hh
+include/broker/timeout.hh
+include/broker/topic.hh
+include/broker/version.hh
+include/broker/worker.hh
+include/broker/zeek.hh
 %%SPICY%%include/hilti/ast/all.h
 %%SPICY%%include/hilti/ast/ast.h
 %%SPICY%%include/hilti/ast/attribute.h
@@ -346,18 +345,7 @@ include/binpac/binpac_regex.h
 %%SPICY%%include/hilti/global.h
 %%SPICY%%include/hilti/hilti.h
 %%SPICY%%include/hilti/rt/3rdparty/ArticleEnumClass-v2/EnumClass.h
-%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/0/SafeInt_3017p.hpp
-%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/1/SafeInt_3016p.hpp
-%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/2/TestMain.h
-%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/3/SafeInt_3015p.hpp
-%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/4/SafeInt_3014p.hpp
-%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/4/SafeInt_gcc.hpp
-%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/5/SafeInt_gcc.hpp
-%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/6/SafeInt_3012p.hpp
-%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/6/SafeInt_gcc.h
-%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/7/SafeInt_3011p.hpp
 %%SPICY%%include/hilti/rt/3rdparty/SafeInt/SafeInt.hpp
-%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Test/TestMain.h
 %%SPICY%%include/hilti/rt/3rdparty/any/any.hpp
 %%SPICY%%include/hilti/rt/3rdparty/any/test_shared_lib.hpp
 %%SPICY%%include/hilti/rt/3rdparty/ghc/filesystem.hpp
@@ -1224,7 +1212,7 @@ lib/cmake/Broker/BrokerTargets.cmake
 lib/libbinpac.so
 lib/libbinpac.so.0
 lib/libbinpac.so.0.59
-%%BROKER%%lib/libbroker.a
+lib/libbroker.a
 %%SPICY%%lib/libhilti-rt-debug.a
 %%SPICY%%lib/libhilti-rt.a
 %%SPICY%%lib/libhilti.a
@@ -1265,9 +1253,9 @@ lib/libparaglob.a
 %%NETMAP%%lib/zeek/plugins/Zeek_Netmap/zeekctl/netmap.py
 lib/zeek/python/SubnetTree.py
 lib/zeek/python/_SubnetTree.so
-%%BROKER%%lib/zeek/python/broker/__init__.py
-%%BROKER%%lib/zeek/python/broker/_broker.so
-%%BROKER%%lib/zeek/python/broker/zeek.py
+lib/zeek/python/broker/__init__.py
+lib/zeek/python/broker/_broker.so
+lib/zeek/python/broker/zeek.py
 %%ZEEKCTL%%lib/zeek/python/zeekctl/BroControl/__init__.py
 %%ZEEKCTL%%lib/zeek/python/zeekctl/BroControl/cmdresult.py
 %%ZEEKCTL%%lib/zeek/python/zeekctl/BroControl/config.py