3 files changed, 250 insertions, 201 deletions

diff --git a/security/bro/Makefile b/security/bro/Makefile
index 0fc4eaf7ff68..334f7124c278 100644
--- a/security/bro/Makefile
+++ b/security/bro/Makefile
@@ -6,26 +6,44 @@
 #
 
 PORTNAME=	bro
-PORTVERSION=	1.5.3
+PORTVERSION=	2.0
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.bro-ids.org/
+MASTER_SITES=	http://www.bro-ids.org/downloads/archive/
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	System for detecting Network Intruders in real-time
 
-MAKE_JOBS_UNSAFE=	yes
+BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+LIB_DEPENDS=	GeoIP:${PORTSDIR}/net/GeoIP
 
-USE_PERL5=	yes
+USE_CMAKE=	yes
+CONFIGURE_WRKSRC=	${WRKSRC}/build
+BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 
-LIB_DEPENDS=	GeoIP:${PORTSDIR}/net/GeoIP
 
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-perftools \
-		--disable-broccoli \
-		--disable-broctl \
-		--enable-brov6
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include
+OPTIONS_DEFINE=	IPV6 LBL_HF LBL_CF ASSERT
+OPTIONS_DEFAULT=	LBL_HF LBL_CF
+LBL_HF_DESC=	Address to hostname filter support
+LBL_CF_DESC=	Unix time to formated time/date filter support
+OPTIONS_EXCLUDE=NLS DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MIPV6}
+CMAKE_ARGS+=	-DBROv6:BOOL=ON
+.endif
+
+.if ${PORT_OPTIONS:MLBL_HF}
+RUN_DEPENDS+=	hf:${PORTSDIR}/sysutils/lbl-hf
+.endif
+
+.if ${PORT_OPTIONS:MLBL_CF}
+RUN_DEPENDS+=	cf:${PORTSDIR}/sysutils/lbl-cf
+.endif
+
+.if ${PORT_OPTIONS:MASSERT}
+CMAKE_ARGS+=	-DENABLE_DEBUG:BOOL=ON
+.endif
 
 .include <bsd.port.mk>
diff --git a/security/bro/distinfo b/security/bro/distinfo
index a70dca971da5..6d7f52819a0a 100644
--- a/security/bro/distinfo
+++ b/security/bro/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bro-1.5.3.tar.gz) = 7ccb657d38e00cfa2d07f067ad701189e1ac238610089e67f6b4023734adf80e
-SIZE (bro-1.5.3.tar.gz) = 4441838
+SHA256 (bro-2.0.tar.gz) = 52df8fd777516761b4c9754ef587f326f6c2efcc8958a440cae9f9de92501947
+SIZE (bro-2.0.tar.gz) = 3652838
diff --git a/security/bro/pkg-plist b/security/bro/pkg-plist
index 2547848477f7..77f12520ed8b 100644
--- a/security/bro/pkg-plist
+++ b/security/bro/pkg-plist
@@ -1,189 +1,220 @@
+@comment $FreeBSD$
+bin/binpac
 bin/bro
-%%DATADIR%%/OS-fingerprint.bro
-%%DATADIR%%/adu.bro
-%%DATADIR%%/alarm.bro
-%%DATADIR%%/analy.bro
-%%DATADIR%%/anon.bro
-%%DATADIR%%/arp.bro
-%%DATADIR%%/backdoor.bro
-%%DATADIR%%/bittorrent.bro
-%%DATADIR%%/blaster.bro
-%%DATADIR%%/bro.bif.bro
-%%DATADIR%%/bro.init
-%%DATADIR%%/brolite-backdoor.bro
-%%DATADIR%%/brolite-sigs.bro
-%%DATADIR%%/brolite.bro
-%%DATADIR%%/bt-tracker.bro
-%%DATADIR%%/capture-events.bro
-%%DATADIR%%/capture-loss.bro
-%%DATADIR%%/capture-state-updates.bro
-%%DATADIR%%/checkpoint.bro
-%%DATADIR%%/clear-passwords.bro
-%%DATADIR%%/common-rw.bif.bro
-%%DATADIR%%/conn-flood.bro
-%%DATADIR%%/conn-id.bro
-%%DATADIR%%/conn.bro
-%%DATADIR%%/const.bif.bro
-%%DATADIR%%/contents.bro
-%%DATADIR%%/cpu-adapt.bro
-%%DATADIR%%/dce.bro
-%%DATADIR%%/demux.bro
-%%DATADIR%%/detect-protocols-http.bro
-%%DATADIR%%/detect-protocols.bro
-%%DATADIR%%/dhcp.bro
-%%DATADIR%%/dns-anonymizer.bro
-%%DATADIR%%/dns-info.bro
-%%DATADIR%%/dns-lookup.bro
-%%DATADIR%%/dns-rw.bif.bro
-%%DATADIR%%/dns.bro
-%%DATADIR%%/dpd.bro
-%%DATADIR%%/drop-adapt.bro
-%%DATADIR%%/drop.bro
-%%DATADIR%%/dyn-disable.bro
-%%DATADIR%%/event.bif.bro
-%%DATADIR%%/file-flush.bro
-%%DATADIR%%/finger-rw.bif.bro
-%%DATADIR%%/finger.bro
-%%DATADIR%%/firewall.bro
-%%DATADIR%%/flag-irc.bro
-%%DATADIR%%/flag-warez.bro
-%%DATADIR%%/frag.bro
-%%DATADIR%%/ftp-anonymizer.bro
-%%DATADIR%%/ftp-cmd-arg.bro
-%%DATADIR%%/ftp-reply-pattern.bro
-%%DATADIR%%/ftp-rw.bif.bro
-%%DATADIR%%/ftp-safe-words.bro
-%%DATADIR%%/ftp.bro
-%%DATADIR%%/gnutella.bro
-%%DATADIR%%/hand-over.bro
-%%DATADIR%%/heavy-analysis.bro
-%%DATADIR%%/heavy.http.bro
-%%DATADIR%%/heavy.irc.bro
-%%DATADIR%%/heavy.scan.bro
-%%DATADIR%%/heavy.software.bro
-%%DATADIR%%/heavy.trw.bro
-%%DATADIR%%/hot-ids.bro
-%%DATADIR%%/hot.bro
-%%DATADIR%%/http-abstract.bro
-%%DATADIR%%/http-anon-server.bro
-%%DATADIR%%/http-anon-useragent.bro
-%%DATADIR%%/http-anon-utils.bro
-%%DATADIR%%/http-anonymizer.bro
-%%DATADIR%%/http-body.bro
-%%DATADIR%%/http-detect-passwd.bro
-%%DATADIR%%/http-entity.bro
-%%DATADIR%%/http-event.bro
-%%DATADIR%%/http-extract-items.bro
-%%DATADIR%%/http-header.bro
-%%DATADIR%%/http-identified-files.bro
-%%DATADIR%%/http-reply.bro
-%%DATADIR%%/http-request.bro
-%%DATADIR%%/http-rewriter.bro
-%%DATADIR%%/http-rw.bif.bro
-%%DATADIR%%/http.bro
-%%DATADIR%%/icmp.bro
-%%DATADIR%%/ident-rewriter.bro
-%%DATADIR%%/ident-rw.bif.bro
-%%DATADIR%%/ident.bro
-%%DATADIR%%/inactivity.bro
-%%DATADIR%%/interconn.bro
-%%DATADIR%%/irc-bot.bro
-%%DATADIR%%/irc.bro
-%%DATADIR%%/large-conns.bro
-%%DATADIR%%/listen-clear.bro
-%%DATADIR%%/listen-ssl.bro
-%%DATADIR%%/load-level.bro
-%%DATADIR%%/load-sample.bro
-%%DATADIR%%/log-append.bro
-%%DATADIR%%/login.bro
-%%DATADIR%%/mime-pop.bro
-%%DATADIR%%/mime.bro
-%%DATADIR%%/mt.bro
-%%DATADIR%%/ncp.bro
-%%DATADIR%%/netflow.bro
-%%DATADIR%%/netstats.bro
-%%DATADIR%%/nfs.bro
-%%DATADIR%%/notice-action-filters.bro
-%%DATADIR%%/notice-policy.bro
-%%DATADIR%%/notice.bro
-%%DATADIR%%/ntp.bro
-%%DATADIR%%/passwords.bro
-%%DATADIR%%/pcap.bro
-%%DATADIR%%/peer-status.bro
-%%DATADIR%%/pkt-profile.bro
-%%DATADIR%%/pop3.bro
-%%DATADIR%%/port-name.bro
-%%DATADIR%%/portmapper.bro
-%%DATADIR%%/print-filter.bro
-%%DATADIR%%/print-globals.bro
-%%DATADIR%%/print-resources.bro
-%%DATADIR%%/print-sig-states.bro
-%%DATADIR%%/profiling.bro
-%%DATADIR%%/proxy.bro
-%%DATADIR%%/remote-pcap.bro
-%%DATADIR%%/remote-ping.bro
-%%DATADIR%%/remote-print-id-reply.bro
-%%DATADIR%%/remote-print-id.bro
-%%DATADIR%%/remote-print.bro
-%%DATADIR%%/remote-report-notices.bro
-%%DATADIR%%/remote-send-id.bro
-%%DATADIR%%/remote.bro
-%%DATADIR%%/rotate-logs.bro
-%%DATADIR%%/rsh.bro
-%%DATADIR%%/save-peer-status.bro
-%%DATADIR%%/scan.bro
-%%DATADIR%%/secondary-filter.bro
-%%DATADIR%%/sensor-sshd.bro
-%%DATADIR%%/server-ports.bro
-%%DATADIR%%/service-probe.bro
-%%DATADIR%%/signatures.bro
-%%DATADIR%%/sigs/dpd.sig
-%%DATADIR%%/sigs/ex.web-rules.sig
-%%DATADIR%%/sigs/http-bots.sig
-%%DATADIR%%/sigs/p0fsyn.osf
-%%DATADIR%%/sigs/snort-default.sig
-%%DATADIR%%/sigs/ssl-worm.sig
-%%DATADIR%%/sigs/worm.sig
-%%DATADIR%%/site.bro
-%%DATADIR%%/smb-rw.bif.bro
-%%DATADIR%%/smb.bro
-%%DATADIR%%/smtp-relay.bro
-%%DATADIR%%/smtp-rewriter.bro
-%%DATADIR%%/smtp-rw.bif.bro
-%%DATADIR%%/smtp.bro
-%%DATADIR%%/snort.bro
-%%DATADIR%%/software.bro
-%%DATADIR%%/ssh-stepping.bro
-%%DATADIR%%/ssh.bro
-%%DATADIR%%/ssl-alerts.bro
-%%DATADIR%%/ssl-ciphers.bro
-%%DATADIR%%/ssl-errors.bro
-%%DATADIR%%/ssl-worm.bro
-%%DATADIR%%/ssl.bro
-%%DATADIR%%/stats.bro
-%%DATADIR%%/stepping.bro
-%%DATADIR%%/strings.bif.bro
-%%DATADIR%%/synflood.bro
-%%DATADIR%%/targeted-scan.bro
-%%DATADIR%%/tcp.bro
-%%DATADIR%%/terminate-connection.bro
-%%DATADIR%%/tftp.bro
-%%DATADIR%%/time-machine/time-machine.bro
-%%DATADIR%%/time-machine/tm-capture.bro
-%%DATADIR%%/time-machine/tm-class.bro
-%%DATADIR%%/time-machine/tm-contents.bro
-%%DATADIR%%/time-machine/tm-ftp.bro
-%%DATADIR%%/time-machine/tm-gap.bro
-%%DATADIR%%/time-machine/tm-http.bro
-%%DATADIR%%/trw-impl.bro
-%%DATADIR%%/trw.bro
-%%DATADIR%%/udp-common.bro
-%%DATADIR%%/udp.bro
-%%DATADIR%%/vlan.bro
-%%DATADIR%%/weird.bro
-%%DATADIR%%/worm.bro
-@dirrm %%DATADIR%%/time-machine
+include/binpac.h
+include/binpac_analyzer.h
+include/binpac_buffer.h
+include/binpac_bytestring.h
+include/binpac_exception.h
+include/binpac_regex.h
+lib/libbinpac.a
+%%DATADIR%%/base/bro.bif.bro
+%%DATADIR%%/base/const.bif.bro
+%%DATADIR%%/base/event.bif.bro
+%%DATADIR%%/base/frameworks/cluster/__load__.bro
+%%DATADIR%%/base/frameworks/cluster/main.bro
+%%DATADIR%%/base/frameworks/cluster/nodes/manager.bro
+%%DATADIR%%/base/frameworks/cluster/nodes/proxy.bro
+%%DATADIR%%/base/frameworks/cluster/nodes/worker.bro
+%%DATADIR%%/base/frameworks/cluster/setup-connections.bro
+%%DATADIR%%/base/frameworks/communication/__load__.bro
+%%DATADIR%%/base/frameworks/communication/main.bro
+%%DATADIR%%/base/frameworks/control/__load__.bro
+%%DATADIR%%/base/frameworks/control/main.bro
+%%DATADIR%%/base/frameworks/dpd/__load__.bro
+%%DATADIR%%/base/frameworks/dpd/dpd.sig
+%%DATADIR%%/base/frameworks/dpd/main.bro
+%%DATADIR%%/base/frameworks/intel/__load__.bro
+%%DATADIR%%/base/frameworks/intel/main.bro
+%%DATADIR%%/base/frameworks/logging/__load__.bro
+%%DATADIR%%/base/frameworks/logging/main.bro
+%%DATADIR%%/base/frameworks/logging/postprocessors/__load__.bro
+%%DATADIR%%/base/frameworks/logging/postprocessors/scp.bro
+%%DATADIR%%/base/frameworks/logging/postprocessors/sftp.bro
+%%DATADIR%%/base/frameworks/logging/writers/ascii.bro
+%%DATADIR%%/base/frameworks/metrics/__load__.bro
+%%DATADIR%%/base/frameworks/metrics/cluster.bro
+%%DATADIR%%/base/frameworks/metrics/main.bro
+%%DATADIR%%/base/frameworks/metrics/non-cluster.bro
+%%DATADIR%%/base/frameworks/notice/__load__.bro
+%%DATADIR%%/base/frameworks/notice/actions/add-geodata.bro
+%%DATADIR%%/base/frameworks/notice/actions/drop.bro
+%%DATADIR%%/base/frameworks/notice/actions/email_admin.bro
+%%DATADIR%%/base/frameworks/notice/actions/page.bro
+%%DATADIR%%/base/frameworks/notice/actions/pp-alarms.bro
+%%DATADIR%%/base/frameworks/notice/cluster.bro
+%%DATADIR%%/base/frameworks/notice/extend-email/hostnames.bro
+%%DATADIR%%/base/frameworks/notice/main.bro
+%%DATADIR%%/base/frameworks/notice/weird.bro
+%%DATADIR%%/base/frameworks/packet-filter/__load__.bro
+%%DATADIR%%/base/frameworks/packet-filter/main.bro
+%%DATADIR%%/base/frameworks/packet-filter/netstats.bro
+%%DATADIR%%/base/frameworks/reporter/__load__.bro
+%%DATADIR%%/base/frameworks/reporter/main.bro
+%%DATADIR%%/base/frameworks/signatures/__load__.bro
+%%DATADIR%%/base/frameworks/signatures/main.bro
+%%DATADIR%%/base/frameworks/software/__load__.bro
+%%DATADIR%%/base/frameworks/software/main.bro
+%%DATADIR%%/base/init-bare.bro
+%%DATADIR%%/base/init-default.bro
+%%DATADIR%%/base/logging.bif.bro
+%%DATADIR%%/base/misc/p0f.fp
+%%DATADIR%%/base/protocols/conn/__load__.bro
+%%DATADIR%%/base/protocols/conn/contents.bro
+%%DATADIR%%/base/protocols/conn/inactivity.bro
+%%DATADIR%%/base/protocols/conn/main.bro
+%%DATADIR%%/base/protocols/dns/__load__.bro
+%%DATADIR%%/base/protocols/dns/consts.bro
+%%DATADIR%%/base/protocols/dns/main.bro
+%%DATADIR%%/base/protocols/ftp/__load__.bro
+%%DATADIR%%/base/protocols/ftp/file-extract.bro
+%%DATADIR%%/base/protocols/ftp/main.bro
+%%DATADIR%%/base/protocols/ftp/utils-commands.bro
+%%DATADIR%%/base/protocols/http/__load__.bro
+%%DATADIR%%/base/protocols/http/file-extract.bro
+%%DATADIR%%/base/protocols/http/file-hash.bro
+%%DATADIR%%/base/protocols/http/file-ident.bro
+%%DATADIR%%/base/protocols/http/file-ident.sig
+%%DATADIR%%/base/protocols/http/main.bro
+%%DATADIR%%/base/protocols/http/utils.bro
+%%DATADIR%%/base/protocols/irc/__load__.bro
+%%DATADIR%%/base/protocols/irc/dcc-send.bro
+%%DATADIR%%/base/protocols/irc/main.bro
+%%DATADIR%%/base/protocols/smtp/__load__.bro
+%%DATADIR%%/base/protocols/smtp/entities-excerpt.bro
+%%DATADIR%%/base/protocols/smtp/entities.bro
+%%DATADIR%%/base/protocols/smtp/main.bro
+%%DATADIR%%/base/protocols/ssh/__load__.bro
+%%DATADIR%%/base/protocols/ssh/main.bro
+%%DATADIR%%/base/protocols/ssl/__load__.bro
+%%DATADIR%%/base/protocols/ssl/consts.bro
+%%DATADIR%%/base/protocols/ssl/main.bro
+%%DATADIR%%/base/protocols/ssl/mozilla-ca-list.bro
+%%DATADIR%%/base/protocols/syslog/__load__.bro
+%%DATADIR%%/base/protocols/syslog/consts.bro
+%%DATADIR%%/base/protocols/syslog/main.bro
+%%DATADIR%%/base/reporter.bif.bro
+%%DATADIR%%/base/strings.bif.bro
+%%DATADIR%%/base/types.bif.bro
+%%DATADIR%%/base/utils/addrs.bro
+%%DATADIR%%/base/utils/conn-ids.bro
+%%DATADIR%%/base/utils/directions-and-hosts.bro
+%%DATADIR%%/base/utils/files.bro
+%%DATADIR%%/base/utils/numbers.bro
+%%DATADIR%%/base/utils/paths.bro
+%%DATADIR%%/base/utils/patterns.bro
+%%DATADIR%%/base/utils/site.bro
+%%DATADIR%%/base/utils/strings.bro
+%%DATADIR%%/base/utils/thresholds.bro
+%%DATADIR%%/policy/frameworks/communication/listen.bro
+%%DATADIR%%/policy/frameworks/control/controllee.bro
+%%DATADIR%%/policy/frameworks/control/controller.bro
+%%DATADIR%%/policy/frameworks/dpd/detect-protocols.bro
+%%DATADIR%%/policy/frameworks/dpd/packet-segment-logging.bro
+%%DATADIR%%/policy/frameworks/metrics/conn-example.bro
+%%DATADIR%%/policy/frameworks/metrics/http-example.bro
+%%DATADIR%%/policy/frameworks/metrics/ssl-example.bro
+%%DATADIR%%/policy/frameworks/signatures/detect-windows-shells.sig
+%%DATADIR%%/policy/frameworks/software/version-changes.bro
+%%DATADIR%%/policy/frameworks/software/vulnerable.bro
+%%DATADIR%%/policy/integration/barnyard2/__load__.bro
+%%DATADIR%%/policy/integration/barnyard2/main.bro
+%%DATADIR%%/policy/integration/barnyard2/types.bro
+%%DATADIR%%/policy/misc/analysis-groups.bro
+%%DATADIR%%/policy/misc/capture-loss.bro
+%%DATADIR%%/policy/misc/loaded-scripts.bro
+%%DATADIR%%/policy/misc/profiling.bro
+%%DATADIR%%/policy/misc/stats.bro
+%%DATADIR%%/policy/misc/trim-trace-file.bro
+%%DATADIR%%/policy/protocols/conn/known-hosts.bro
+%%DATADIR%%/policy/protocols/conn/known-services.bro
+%%DATADIR%%/policy/protocols/conn/weirds.bro
+%%DATADIR%%/policy/protocols/dns/auth-addl.bro
+%%DATADIR%%/policy/protocols/dns/detect-external-names.bro
+%%DATADIR%%/policy/protocols/ftp/detect.bro
+%%DATADIR%%/policy/protocols/ftp/software.bro
+%%DATADIR%%/policy/protocols/http/detect-MHR.bro
+%%DATADIR%%/policy/protocols/http/detect-intel.bro
+%%DATADIR%%/policy/protocols/http/detect-sqli.bro
+%%DATADIR%%/policy/protocols/http/detect-webapps.bro
+%%DATADIR%%/policy/protocols/http/detect-webapps.sig
+%%DATADIR%%/policy/protocols/http/header-names.bro
+%%DATADIR%%/policy/protocols/http/software-browser-plugins.bro
+%%DATADIR%%/policy/protocols/http/software.bro
+%%DATADIR%%/policy/protocols/http/var-extraction-cookies.bro
+%%DATADIR%%/policy/protocols/http/var-extraction-uri.bro
+%%DATADIR%%/policy/protocols/smtp/blocklists.bro
+%%DATADIR%%/policy/protocols/smtp/detect-suspicious-orig.bro
+%%DATADIR%%/policy/protocols/smtp/software.bro
+%%DATADIR%%/policy/protocols/ssh/detect-bruteforcing.bro
+%%DATADIR%%/policy/protocols/ssh/geo-data.bro
+%%DATADIR%%/policy/protocols/ssh/interesting-hostnames.bro
+%%DATADIR%%/policy/protocols/ssh/software.bro
+%%DATADIR%%/policy/protocols/ssl/cert-hash.bro
+%%DATADIR%%/policy/protocols/ssl/expiring-certs.bro
+%%DATADIR%%/policy/protocols/ssl/extract-certs-pem.bro
+%%DATADIR%%/policy/protocols/ssl/known-certs.bro
+%%DATADIR%%/policy/protocols/ssl/validate-certs.bro
+%%DATADIR%%/policy/tuning/__load__.bro
+%%DATADIR%%/policy/tuning/defaults/__load__.bro
+%%DATADIR%%/policy/tuning/defaults/packet-fragments.bro
+%%DATADIR%%/policy/tuning/defaults/warnings.bro
+%%DATADIR%%/policy/tuning/track-all-assets.bro
+%%DATADIR%%/site/local-manager.bro
+%%DATADIR%%/site/local-proxy.bro
+%%DATADIR%%/site/local-worker.bro
+%%DATADIR%%/site/local.bro
+@dirrm %%DATADIR%%/policy/tuning/defaults
+@dirrm %%DATADIR%%/policy/tuning
+@dirrm %%DATADIR%%/policy/protocols/ssl
+@dirrm %%DATADIR%%/policy/protocols/ssh
+@dirrm %%DATADIR%%/policy/protocols/smtp
+@dirrm %%DATADIR%%/policy/protocols/http
+@dirrm %%DATADIR%%/policy/protocols/ftp
+@dirrm %%DATADIR%%/policy/protocols/dns
+@dirrm %%DATADIR%%/policy/protocols/conn
+@dirrm %%DATADIR%%/policy/protocols
+@dirrm %%DATADIR%%/policy/misc
+@dirrm %%DATADIR%%/policy/integration/barnyard2
+@dirrm %%DATADIR%%/policy/integration
+@dirrm %%DATADIR%%/policy/frameworks/software
+@dirrm %%DATADIR%%/policy/frameworks/signatures
+@dirrm %%DATADIR%%/policy/frameworks/metrics
+@dirrm %%DATADIR%%/policy/frameworks/dpd
+@dirrm %%DATADIR%%/policy/frameworks/control
+@dirrm %%DATADIR%%/policy/frameworks/communication
+@dirrm %%DATADIR%%/policy/frameworks
+@dirrm %%DATADIR%%/policy
+@dirrm %%DATADIR%%/base/utils
+@dirrm %%DATADIR%%/base/protocols/syslog
+@dirrm %%DATADIR%%/base/protocols/ssl
+@dirrm %%DATADIR%%/base/protocols/ssh
+@dirrm %%DATADIR%%/base/protocols/smtp
+@dirrm %%DATADIR%%/base/protocols/irc
+@dirrm %%DATADIR%%/base/protocols/http
+@dirrm %%DATADIR%%/base/protocols/ftp
+@dirrm %%DATADIR%%/base/protocols/dns
+@dirrm %%DATADIR%%/base/protocols/conn
+@dirrm %%DATADIR%%/base/protocols
+@dirrm %%DATADIR%%/base/misc
+@dirrm %%DATADIR%%/base/frameworks/software
+@dirrm %%DATADIR%%/base/frameworks/signatures
+@dirrm %%DATADIR%%/base/frameworks/reporter
+@dirrm %%DATADIR%%/base/frameworks/packet-filter
+@dirrm %%DATADIR%%/base/frameworks/notice/extend-email
+@dirrm %%DATADIR%%/base/frameworks/notice/actions
+@dirrm %%DATADIR%%/base/frameworks/notice
+@dirrm %%DATADIR%%/base/frameworks/metrics
+@dirrm %%DATADIR%%/base/frameworks/logging/writers
+@dirrm %%DATADIR%%/base/frameworks/logging/postprocessors
+@dirrm %%DATADIR%%/base/frameworks/logging
+@dirrm %%DATADIR%%/base/frameworks/intel
+@dirrm %%DATADIR%%/base/frameworks/dpd
+@dirrm %%DATADIR%%/base/frameworks/control
+@dirrm %%DATADIR%%/base/frameworks/communication
+@dirrm %%DATADIR%%/base/frameworks/cluster/nodes
+@dirrm %%DATADIR%%/base/frameworks/cluster
+@dirrm %%DATADIR%%/base/frameworks
+@dirrm %%DATADIR%%/base
 @dirrm %%DATADIR%%/site
-@dirrm %%DATADIR%%/sigs
 @dirrm %%DATADIR%%
-@exec mkdir -p %D/%%DATADIR%%/site