aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2014-08-15 00:05:17 +0000
committerJohn Marino <marino@FreeBSD.org>2014-08-15 00:05:17 +0000
commitadcddca1ea5c5827c797624c296c5339c34ba486 (patch)
treeacc72ec5f98d19b6f85e376ae86af07448a58150 /security
parentc4b62c6b39db5e0b4f30e6f3224c45edb6b83a4d (diff)
downloadports-adcddca1ea5c5827c797624c296c5339c34ba486.tar.gz
ports-adcddca1ea5c5827c797624c296c5339c34ba486.zip
Notes
Diffstat (limited to 'security')
-rw-r--r--security/bro/Makefile12
-rw-r--r--security/bro/pkg-plist6
2 files changed, 6 insertions, 12 deletions
diff --git a/security/bro/Makefile b/security/bro/Makefile
index d8154f1a8124..df3a9573443e 100644
--- a/security/bro/Makefile
+++ b/security/bro/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bro
PORTVERSION= 2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://www.bro.org/downloads/release/
@@ -18,8 +18,7 @@ LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP
SUB_LIST+= PYTHON_CMD="${PYTHON_CMD}"
-USES= cmake:outsource perl5
-USE_PYTHON= yes
+USES= cmake:outsource perl5 python
SUB_FILES= pkg-message
NO_MTREE= yes
@@ -140,11 +139,8 @@ post-install:
.endif
@${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/auto
@${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/site
-.for F in broctl.cfg
- @${INSTALL_DATA} ${INSTALL_WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example
-.endfor
-.for F in networks.cfg node.cfg
- @${MV} ${WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example
+.for F in broctl.cfg networks.cfg node.cfg
+ @${MV} ${STAGEDIR}${PREFIX}/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example
.endfor
.endif
diff --git a/security/bro/pkg-plist b/security/bro/pkg-plist
index f4b0bd60d8b1..fbbdf987b1bd 100644
--- a/security/bro/pkg-plist
+++ b/security/bro/pkg-plist
@@ -4,6 +4,7 @@
%%BROCTL%%@exec mkdir -p %D/spool/tmp
%%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/spool
%%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/spool/tmp
+%%BROCTL%%@exec chown -R %%BROUSER%%:%%BROGROUP%% %D/spool/installed-scripts-do-not-touch
bin/bro
bin/bro-cut
%%BROCTL%%bin/broctl
@@ -454,11 +455,8 @@ bin/bro-cut
%%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/site/local.bro
%%BROCTL%%@dirrmtry spool/tmp
%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/site
-%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/site
-%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/auto
%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/auto
%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch
-%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch
%%BROCTL%%@dirrmtry spool
%%BROCTL%%@dirrm %%DATADIR%%ctl/scripts/postprocessors
%%BROCTL%%@dirrm %%DATADIR%%ctl/scripts/helpers
@@ -560,4 +558,4 @@ bin/bro-cut
%%CLEANUP_PREFIX%%@dirrmtry etc
%%CLEANUP_PREFIX%%@dirrmtry bin
%%CLEANUP_PREFIX%%@dirrmtry %D
-%%BROCTL%%@exec su %%BROUSER%% -c '%D/bin/broctl install'
+%%BROCTL%%@exec su -fm %%BROUSER%% -c '%D/bin/broctl install'