From owner-svn-ports-head@FreeBSD.ORG Fri Nov 1 18:40:21 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8DAEE2EE; Fri, 1 Nov 2013 18:40:21 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7A8562016; Fri, 1 Nov 2013 18:40:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1IeLmK003963; Fri, 1 Nov 2013 18:40:21 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1IeLDL003961; Fri, 1 Nov 2013 18:40:21 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201311011840.rA1IeLDL003961@svn.freebsd.org> From: William Grzybowski Date: Fri, 1 Nov 2013 18:40:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332399 - head/security/barnyard2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Nov 2013 18:40:21 -0000 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 (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 @@ -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 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%%