4 files changed, 17 insertions, 34 deletions

diff --git a/security/broccoli/Makefile b/security/broccoli/Makefile
index 914076da743b..68008217767e 100644
--- a/security/broccoli/Makefile
+++ b/security/broccoli/Makefile
@@ -2,14 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	broccoli
-PORTVERSION=	2.1
+PORTVERSION=	2.2
 CATEGORIES=	security
-MASTER_SITES=	http://www.bro-ids.org/downloads/release/
+MASTER_SITES=	http://www.bro.org/downloads/release/
 DISTNAME=	bro-${PORTVERSION}
 
 MAINTAINER=	leres@ee.lbl.gov
 COMMENT=	The Bro Client Communications Library
 
+LICENSE=	BSD
+
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
 		swig:${PORTSDIR}/devel/swig13
 LIB_DEPENDS=	GeoIP:${PORTSDIR}/net/GeoIP
@@ -24,10 +26,12 @@ CMAKE_SOURCE_PATH=	${WRKSRC}/aux/broccoli
 .if defined(BRO_PREFIX)
 PREFIX=${BRO_PREFIX}
 PLIST_SUB+=	CLEANUP_PREFIX=""
+NEED_ROOT=	yes
 .else
 PLIST_SUB+=	CLEANUP_PREFIX="@comment "
 .endif
 CMAKE_ARGS+=	-D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
+		-D BRO_ETC_INSTALL_DIR:PATH=${PREFIX}/etc \
 		-D PY_MOD_INSTALL_DIR:PATH=${PREFIX}
 
 OPTIONS_DEFINE=	DEBUG PYTHON RUBY
@@ -36,7 +40,6 @@ DEBUG_DESC=	Compile in debugging mode
 PYTHON_DESC=	Build python bindings for broccoli
 RUBY_DESC=	Build ruby bindings for broccoli
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
@@ -59,10 +62,11 @@ CMAKE_ARGS+=		-D DISABLE_RUBY_BINDINGS:BOOL=true
 PLIST_SUB+=		RUBY="@comment "
 .endif
 
-post-install:
-	@${MKDIR} ${PREFIX}/etc
-	@${INSTALL_SCRIPT} ${WRKSRC}/aux/broccoli/broccoli.conf ${PREFIX}/etc/broccoli.conf.sample
-	@[ -f ${PREFIX}/etc/broccoli.conf ] || \
-	    ${CP} -p ${PREFIX}/etc/broccoli.conf.sample ${PREFIX}/etc/broccoli.conf
+post-stage::
+.if defined(BRO_PREFIX)
+	@${MKDIR} ${PREFIX}
+.endif
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
+	@${INSTALL_SCRIPT} ${WRKSRC}/aux/broccoli/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example
 
 .include <bsd.port.mk>
diff --git a/security/broccoli/distinfo b/security/broccoli/distinfo
index 603120096066..f87e2082e431 100644
--- a/security/broccoli/distinfo
+++ b/security/broccoli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bro-2.1.tar.gz) = 0d83b7c78d6e247d44b0407649df7fefa6da5c73a572a16c0096c9b7f2a955e0
-SIZE (bro-2.1.tar.gz) = 5627966
+SHA256 (bro-2.2.tar.gz) = 86909361c2d804681f314604a6ce763be663937b2f045c8d25d810528a633dc9
+SIZE (bro-2.2.tar.gz) = 9646602
diff --git a/security/broccoli/files/patch-aux-broccoli-CMakeLists.txt b/security/broccoli/files/patch-aux-broccoli-CMakeLists.txt
deleted file mode 100644
index 25308bf09936..000000000000
--- a/security/broccoli/files/patch-aux-broccoli-CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- aux/broccoli/CMakeLists.txt.orig	2013-03-04 18:49:06.000000000 -0800
-+++ aux/broccoli/CMakeLists.txt	2013-03-04 18:50:16.000000000 -0800
-@@ -96,12 +96,12 @@
- ########################################################################
- ## Install Files
- 
--include(InstallPackageConfigFile)
-+#include(InstallPackageConfigFile)
- 
--InstallPackageConfigFile(
--    ${CMAKE_CURRENT_SOURCE_DIR}/broccoli.conf
--    ${BRO_SYSCONF_DIR}
--    broccoli.conf)
-+#InstallPackageConfigFile(
-+#    ${CMAKE_CURRENT_SOURCE_DIR}/broccoli.conf
-+#    ${BRO_SYSCONF_DIR}
-+#    broccoli.conf)
- 
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/broccoli-config DESTINATION bin)
- 
diff --git a/security/broccoli/pkg-plist b/security/broccoli/pkg-plist
index 768053aa8d48..8ce3f844fb06 100644
--- a/security/broccoli/pkg-plist
+++ b/security/broccoli/pkg-plist
@@ -1,8 +1,7 @@
 bin/broccoli-config
-@exec mkdir -p %B
-@unexec cmp -s %D/etc/broccoli.conf.sample %D/etc/broccoli.conf && rm %D/etc/broccoli.conf || true
-etc/broccoli.conf.sample
-@exec test -f %B/broccoli.conf || cp -p %D/%F %B/broccoli.conf
+@unexec cmp -s %D/etc/broccoli.conf.example %D/etc/broccoli.conf && rm %D/etc/broccoli.conf || true
+etc/broccoli.conf.example
+@exec test -f %D/etc/broccoli.conf || cp -p %D/%F %D/etc/broccoli.conf
 include/broccoli.h
 lib/libbroccoli.a
 lib/libbroccoli.so