svn commit: r364876 - head/security/bro

[John Marino]

Author: marino
Date: Fri Aug 15 00:05:17 2014
New Revision: 364876
URL: http://svnweb.freebsd.org/changeset/ports/364876
QAT: https://qat.redports.org/buildarchive/r364876/

Log:
  security/bro: Add su flags so pkg initialization works
  
  PR:		192646
  Submitted by:	maintainer (Craig Leres)

Modified:
  head/security/bro/Makefile
  head/security/bro/pkg-plist

Modified: head/security/bro/Makefile
==============================================================================
--- head/security/bro/Makefile	Thu Aug 14 23:06:13 2014	(r364875)
+++ head/security/bro/Makefile	Fri Aug 15 00:05:17 2014	(r364876)
@@ -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
 
 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
 

Modified: head/security/bro/pkg-plist
==============================================================================
--- head/security/bro/pkg-plist	Thu Aug 14 23:06:13 2014	(r364875)
+++ head/security/bro/pkg-plist	Fri Aug 15 00:05:17 2014	(r364876)
@@ -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'