3 files changed, 195 insertions, 207 deletions

diff --git a/security/bro/Makefile b/security/bro/Makefile
index 492dea48935a..ad4ecb4292bd 100644
--- a/security/bro/Makefile
+++ b/security/bro/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=	bro
-PORTVERSION=	1.4
-PORTREVISION=	0
+PORTVERSION=	1.5.1
 CATEGORIES=	security
 MASTER_SITES=	ftp://bro-ids.org/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-release
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	System for detecting Network Intruders in real-time
 
 USE_PERL5=	yes
-WRKSRC=		${WRKDIR}/bro-${PORTVERSION}
 
 LIB_DEPENDS=	GeoIP:${PORTSDIR}/net/GeoIP
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-perftools
+CONFIGURE_ARGS=	--disable-perftools \
+		--disable-broccoli \
+		--disable-broctl
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -32,14 +31,4 @@ CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
 BROKEN=		does not package
 .endif
 
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/aux/broccoli/broccoli.conf \
-	   	${PREFIX}/etc/broccoli.conf.sample
-	@if [ ! -f ${PREFIX}/etc/broccoli.conf ]; then \
-		${CP} -p ${PREFIX}/etc/broccoli.conf.sample \
-		${PREFIX}/etc/broccoli.conf ; \
-	fi
-
-	${LN} -sf ${PREFIX}/lib/libbroccoli.so.2.0 ${PREFIX}/lib/libbroccoli.so
-
 .include <bsd.port.post.mk>
diff --git a/security/bro/distinfo b/security/bro/distinfo
index 68bd2acd0e52..e895dbb04fd5 100644
--- a/security/bro/distinfo
+++ b/security/bro/distinfo
@@ -1,3 +1,3 @@
-MD5 (bro-1.4-release.tar.gz) = 3607ae65c5993ca2509b267af3c830f0
-SHA256 (bro-1.4-release.tar.gz) = c585f98077ca371b59d12ebe209418f98ab614753f4cb6368dbafc7f228e784a
-SIZE (bro-1.4-release.tar.gz) = 4203949
+MD5 (bro-1.5.1.tar.gz) = 110b916b28952d4aa527564f90611501
+SHA256 (bro-1.5.1.tar.gz) = 9e9a34af14b6466c7253ce1d03bfd3ef586e3f765902d43981212db3de585a48
+SIZE (bro-1.5.1.tar.gz) = 4327064
diff --git a/security/bro/pkg-plist b/security/bro/pkg-plist
index 9d57413b822c..2547848477f7 100644
--- a/security/bro/pkg-plist
+++ b/security/bro/pkg-plist
@@ -1,190 +1,189 @@
 bin/bro
-bin/broccoli-config
-@unexec if cmp -s %D/etc/broccoli.conf %D/etc/broccoli.conf.sample; then rm -f %D/etc/broccoli.conf; fi
-etc/broccoli.conf.sample
-@exec if [ ! -f %D/etc/broccoli.conf ]; then cp %B/%f %D/etc/broccoli.conf; fi
-include/broccoli.h
-lib/libbroccoli.a
-lib/libbroccoli.la
-lib/libbroccoli.so
-lib/libbroccoli.so.2.0
-share/bro/OS-fingerprint.bro
-share/bro/adu.bro
-share/bro/alarm.bro
-share/bro/analy.bro
-share/bro/anon.bro
-share/bro/arp.bro
-share/bro/backdoor.bro
-share/bro/bittorrent.bro
-share/bro/blaster.bro
-share/bro/bro.bif.bro
-share/bro/bro.init
-share/bro/brolite-backdoor.bro
-share/bro/brolite-sigs.bro
-share/bro/brolite.bro
-share/bro/bt-tracker.bro
-share/bro/capture-events.bro
-share/bro/capture-state-updates.bro
-share/bro/checkpoint.bro
-share/bro/clear-passwords.bro
-share/bro/common-rw.bif.bro
-share/bro/conn-flood.bro
-share/bro/conn-id.bro
-share/bro/conn.bro
-share/bro/const.bif.bro
-share/bro/contents.bro
-share/bro/cpu-adapt.bro
-share/bro/demux.bro
-share/bro/detect-protocols-http.bro
-share/bro/detect-protocols.bro
-share/bro/dhcp.bro
-share/bro/dns-anonymizer.bro
-share/bro/dns-info.bro
-share/bro/dns-lookup.bro
-share/bro/dns-rw.bif.bro
-share/bro/dns.bro
-share/bro/dpd.bro
-share/bro/drop-adapt.bro
-share/bro/drop.bro
-share/bro/dyn-disable.bro
-share/bro/event.bif.bro
-share/bro/file-flush.bro
-share/bro/finger-rw.bif.bro
-share/bro/finger.bro
-share/bro/firewall.bro
-share/bro/flag-irc.bro
-share/bro/flag-warez.bro
-share/bro/frag.bro
-share/bro/ftp-anonymizer.bro
-share/bro/ftp-cmd-arg.bro
-share/bro/ftp-reply-pattern.bro
-share/bro/ftp-rw.bif.bro
-share/bro/ftp-safe-words.bro
-share/bro/ftp.bro
-share/bro/gnutella.bro
-share/bro/hand-over.bro
-share/bro/heavy-analysis.bro
-share/bro/heavy.http.bro
-share/bro/heavy.irc.bro
-share/bro/heavy.scan.bro
-share/bro/heavy.software.bro
-share/bro/heavy.trw.bro
-share/bro/hot-ids.bro
-share/bro/hot.bro
-share/bro/http-abstract.bro
-share/bro/http-anon-server.bro
-share/bro/http-anon-useragent.bro
-share/bro/http-anon-utils.bro
-share/bro/http-anonymizer.bro
-share/bro/http-body.bro
-share/bro/http-entity.bro
-share/bro/http-event.bro
-share/bro/http-extract-items.bro
-share/bro/http-header.bro
-share/bro/http-identified-files.bro
-share/bro/http-reply.bro
-share/bro/http-request.bro
-share/bro/http-rewriter.bro
-share/bro/http-rw.bif.bro
-share/bro/http.bro
-share/bro/icmp.bro
-share/bro/ident-rewriter.bro
-share/bro/ident-rw.bif.bro
-share/bro/ident.bro
-share/bro/inactivity.bro
-share/bro/interconn.bro
-share/bro/irc-bot.bro
-share/bro/irc.bro
-share/bro/large-conns.bro
-share/bro/listen-clear.bro
-share/bro/listen-ssl.bro
-share/bro/load-level.bro
-share/bro/load-sample.bro
-share/bro/log-append.bro
-share/bro/login.bro
-share/bro/mime-pop.bro
-share/bro/mime.bro
-share/bro/mt.bro
-share/bro/netflow.bro
-share/bro/netstats.bro
-share/bro/nfs.bro
-share/bro/notice-action-filters.bro
-share/bro/notice-policy.bro
-share/bro/notice.bro
-share/bro/ntp.bro
-share/bro/passwords.bro
-share/bro/pcap.bro
-share/bro/peer-status.bro
-share/bro/pkt-profile.bro
-share/bro/pop3.bro
-share/bro/port-name.bro
-share/bro/portmapper.bro
-share/bro/print-filter.bro
-share/bro/print-globals.bro
-share/bro/print-resources.bro
-share/bro/print-sig-states.bro
-share/bro/profiling.bro
-share/bro/proxy.bro
-share/bro/remote-pcap.bro
-share/bro/remote-ping.bro
-share/bro/remote-print-id-reply.bro
-share/bro/remote-print-id.bro
-share/bro/remote-print.bro
-share/bro/remote-report-notices.bro
-share/bro/remote-send-id.bro
-share/bro/remote.bro
-share/bro/rotate-logs.bro
-share/bro/rsh.bro
-share/bro/scan.bro
-share/bro/secondary-filter.bro
-share/bro/sensor-sshd.bro
-share/bro/server-ports.bro
-share/bro/service-probe.bro
-share/bro/signatures.bro
-share/bro/sigs/dpd.sig
-share/bro/sigs/ex.web-rules.sig
-share/bro/sigs/p0fsyn.osf
-share/bro/sigs/snort-default.sig
-share/bro/sigs/ssl-worm.sig
-share/bro/sigs/worm.sig
-share/bro/site.bro
-share/bro/smb-rw.bif.bro
-share/bro/smtp-relay.bro
-share/bro/smtp-rewriter.bro
-share/bro/smtp-rw.bif.bro
-share/bro/smtp.bro
-share/bro/snort.bro
-share/bro/software.bro
-share/bro/ssh-stepping.bro
-share/bro/ssh.bro
-share/bro/ssl-alerts.bro
-share/bro/ssl-ciphers.bro
-share/bro/ssl-errors.bro
-share/bro/ssl-worm.bro
-share/bro/ssl.bro
-share/bro/stats.bro
-share/bro/stepping.bro
-share/bro/strings.bif.bro
-share/bro/synflood.bro
-share/bro/targeted-scan.bro
-share/bro/tcp.bro
-share/bro/terminate-connection.bro
-share/bro/tftp.bro
-share/bro/time-machine/time-machine.bro
-share/bro/time-machine/tm-capture.bro
-share/bro/time-machine/tm-class.bro
-share/bro/time-machine/tm-contents.bro
-share/bro/time-machine/tm-ftp.bro
-share/bro/time-machine/tm-gap.bro
-share/bro/time-machine/tm-http.bro
-share/bro/trw-impl.bro
-share/bro/trw.bro
-share/bro/udp-common.bro
-share/bro/udp.bro
-share/bro/vlan.bro
-share/bro/weird.bro
-share/bro/worm.bro
-@dirrm share/bro/time-machine
-@dirrm share/bro/site
-@dirrm share/bro/sigs
-@dirrm share/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
+@dirrm %%DATADIR%%/site
+@dirrm %%DATADIR%%/sigs
+@dirrm %%DATADIR%%
+@exec mkdir -p %D/%%DATADIR%%/site