ports/183404: security/barnyard2, update port

[Paul Schmehl]

>Number:         183404
>Category:       ports
>Synopsis:       security/barnyard2, update port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 28 15:30:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Paul Schmehl
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
The University of Texas at Dallas
>Environment:
System: FreeBSD hostname.utdallas.edu 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root at farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
	security/barnyard2, update port to include libroccoli port
	which was just accepted into the tree, convert port to STAGE
>How-To-Repeat:
	
>Fix:

	

--- barnyard2.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 331863)
+++ Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	barnyard2
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	pauls at utdallas.edu
@@ -37,13 +38,11 @@
 
 USE_RC_SUBR=	barnyard2
 GNU_CONFIGURE=	yes
-NO_STAGE=	yes
 
 SUB_FILES=	pkg-message
 
 PORTDOCS1=	README RELEASE.NOTES
 PORTDOCS2=	INSTALL README.aruba README.database README.sguil README.snortsam
-PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}
 PORTEXAMPLES=	SCHEMA_ACCESS create_db2 create_mssql create_mysql create_oracle.sql create_postgresql
 
 .include <bsd.port.options.mk>
@@ -62,7 +61,7 @@
 
 .if ${PORT_OPTIONS:MBRO}
 BROKEN=			Bro port is in transition right now, so this is not supported at this time
-BUILD_DEPENDS+=		bro:${PORTSDIR}/security/bro-barnyard2
+LIB_DEPENDS+=		libbroccoli.so:${PORTSDIR}/security/broccoli
 CONFIGURE_ARGS+=	--enable-bro --with-broccoli=${LOCALBASE}/lib
 .else
 CONFIGURE_ARGS+=	--disable-bro
@@ -134,23 +133,19 @@
 post-patch:
 	@${REINPLACE_CMD} 's|/etc|${LOCALBASE}/etc|' \
 		${WRKSRC}/etc/barnyard2.conf
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 
+do-install:
+	${INSTALL_DATA} ${PORTDOCS1:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS2:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/schemas/|} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/barnyard2 ${STAGEDIR}${PREFIX}/bin/
+
 post-install:
-	@${CP} ${WRKSRC}/etc/barnyard2.conf ${PREFIX}/etc/barnyard2.conf.sample
-	if [ ! -f ${PREFIX}/etc/barnyard2.conf ]; then \
-		${CP} -p ${PREFIX}/etc/barnyard2.conf.sample ${PREFIX}/etc/barnyard2.conf; \
+	@${CP} ${WRKSRC}/etc/barnyard2.conf ${STAGEDIR}${PREFIX}/etc/barnyard2.conf.sample
+	if [ ! -f ${STAGEDIR}${PREFIX}/etc/barnyard2.conf ]; then \
+		${CP} -p ${STAGEDIR}${PREFIX}/etc/barnyard2.conf.sample ${STAGEDIR}${PREFIX}/etc/barnyard2.conf; \
 	fi
 
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS1} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS2} ${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/schemas && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
-.endif
-
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 331863)
+++ pkg-plist	(working copy)
@@ -2,3 +2,18 @@
 @unexec if cmp -s %D/etc/barnyard2.conf %D/etc/barnyard2.conf.sample; then rm -f %D/etc/barnyard2.conf; fi
 etc/barnyard2.conf.sample
 @exec [ -f %B/barnyard2.conf ] || cp -p %B/%f %B/barnyard2.conf
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.aruba
+%%PORTDOCS%%%%DOCSDIR%%/README.database
+%%PORTDOCS%%%%DOCSDIR%%/README.sguil
+%%PORTDOCS%%%%DOCSDIR%%/README.snortsam
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SCHEMA_ACCESS
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_db2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_mssql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_mysql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_oracle.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_postgresql
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
--- barnyard2.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: