Bug 183404 - security/barnyard2, update port
Summary: security/barnyard2, update port
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-28 15:30 UTC by pauls
Modified: 2013-11-01 18:50 UTC (History)
0 users

See Also:


Attachments
barnyard2.diff (3.28 KB, patch)
2013-10-28 15:30 UTC, pauls
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description pauls 2013-10-28 15:30:01 UTC
	security/barnyard2, update port to include libroccoli port
	which was just accepted into the tree, convert port to STAGE
Comment 1 William Grzybowski freebsd_committer 2013-11-01 18:37:11 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.
Comment 2 William Grzybowski freebsd_committer 2013-11-01 18:40:23 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!
Comment 3 dfilter service freebsd_committer 2013-11-01 18:40:42 UTC
Author: wg
Date: Fri Nov  1 18:40:20 2013
New Revision: 332399
URL: http://svnweb.freebsd.org/changeset/ports/332399

Log:
  security/barnyard2: allow stating
  
  - Allw staging [1] (based on)
  
  PR:		ports/183404 [1]
  Submitted by:	Paul Schmehl <pauls utdallas.edu> (maintainer)

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

Modified: head/security/barnyard2/Makefile
==============================================================================
--- head/security/barnyard2/Makefile	Fri Nov  1 18:33:59 2013	(r332398)
+++ head/security/barnyard2/Makefile	Fri Nov  1 18:40:20 2013	(r332399)
@@ -2,6 +2,7 @@
 
 PORTNAME=	barnyard2
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	pauls@utdallas.edu
@@ -37,14 +38,12 @@ ACLOCAL_ARGS=	-I m4 -I ${LOCALBASE}/shar
 
 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
+EXAMPLES=	SCHEMA_ACCESS create_db2 create_mssql create_mysql create_oracle.sql create_postgresql
 
 .include <bsd.port.options.mk>
 
@@ -62,7 +61,7 @@ CONFIGURE_ARGS+=	--disable-aruba
 
 .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
@@ -135,22 +134,13 @@ post-patch:
 	@${REINPLACE_CMD} 's|/etc|${LOCALBASE}/etc|' \
 		${WRKSRC}/etc/barnyard2.conf
 
-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; \
-	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}
+do-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS1:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS2:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/schemas/|} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/barnyard2 ${STAGEDIR}${PREFIX}/bin/
+	${CP} ${WRKSRC}/etc/barnyard2.conf ${STAGEDIR}${PREFIX}/etc/barnyard2.conf.sample
 
 .include <bsd.port.mk>

Modified: head/security/barnyard2/pkg-plist
==============================================================================
--- head/security/barnyard2/pkg-plist	Fri Nov  1 18:33:59 2013	(r332398)
+++ head/security/barnyard2/pkg-plist	Fri Nov  1 18:40:20 2013	(r332399)
@@ -2,3 +2,18 @@ bin/barnyard2
 @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%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"