[Midnightbsd-cvs] mports [20678] trunk/security/barnyard2: barnyard 2 1.13

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Nov 8 10:02:35 EST 2015 

Revision: 20678
          http://svnweb.midnightbsd.org/mports/?rev=20678
Author:   laffer1
Date:     2015-11-08 10:02:34 -0500 (Sun, 08 Nov 2015)
Log Message:
-----------
barnyard 2 1.13

Modified Paths:
--------------
    trunk/security/barnyard2/Makefile
    trunk/security/barnyard2/distinfo
    trunk/security/barnyard2/pkg-plist

Modified: trunk/security/barnyard2/Makefile
===================================================================
--- trunk/security/barnyard2/Makefile	2015-11-07 20:35:49 UTC (rev 20677)
+++ trunk/security/barnyard2/Makefile	2015-11-08 15:02:34 UTC (rev 20678)
@@ -1,7 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	barnyard2
-PORTVERSION=	1.12
+PORTVERSION=	1.13
+DISTVERSIONPREFIX=	v2-
 CATEGORIES=	security
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -11,10 +12,10 @@
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	firnsy
-GH_TAGNAME=	v2-${PORTVERSION}
-GH_COMMIT=	3c1f553
 
-OPTIONS_DEFINE=	64BIT ARUBA BRO GRE IPV6 MPLS MYSQL MYSQL_SSL ODBC PRELUDE PGSQL
+OPTIONS_DEFINE=	64BIT ARUBA BRO GRE IPV6 MPLS PORT_PCAP DOCS EXAMPLES
+OPTIONS_RADIO=	DATABASE
+OPTIONS_RADIO_DATABASE=	MYSQL MYSQL_SSL ODBC PGSQL
 NO_OPTIONS_SORT=yes
 
 64BIT_DESC=	Enable 64bit compilation (experimental)
@@ -22,7 +23,7 @@
 BRO_DESC=	Enable bro support (libbroccoli)
 GRE_DESC=	Enable gre support
 MYSQL_SSL_DESC=	Enable mysql ssl support (experimental)
-PRELUDE_DESC=	Enable prelude support
+PORT_PCAP_DESC=	Use libpcap from ports
 
 .if defined(SLAVE)
 OPTIONS_DEFINE+=	TCL
@@ -30,11 +31,7 @@
 OPTIONS_DEFAULT+=	TCL
 .endif
 
-USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf
-LIBTOOLIZE_ARGS=--copy --force
-AUTOMAKE_ARGS=	--add-missing --copy
-ACLOCAL_ARGS=	-I m4 -I ${LOCALBASE}/share/aclocal
-
+USES=		autoreconf libtool
 USE_RC_SUBR=	barnyard2
 GNU_CONFIGURE=	yes
 
@@ -41,113 +38,46 @@
 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
+PORTDOCS2=	INSTALL README.aruba README.database README.sguil README.sig_suppress README.snortsam
+EXAMPLES=	SCHEMA_ACCESS create_db2 create_mssql create_mysql create_oracle.sql create_postgresql
 
-.include <bsd.mport.options.mk>
-
-.if ${PORT_OPTIONS:M64BIT}
-CONFIGURE_ARGS+=	--enable-64bit-gcc
-.else
-CONFIGURE_ARGS+=	--disable-64bit-gcc
-.endif
-
-.if ${PORT_OPTIONS:MARUBA}
-CONFIGURE_ARGS+=	--enable-aruba
-.else
-CONFIGURE_ARGS+=	--disable-aruba
-.endif
-
-.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
-CONFIGURE_ARGS+=	--enable-bro --with-broccoli=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--disable-bro
-.endif
-
-.if ${PORT_OPTIONS:MGRE}
-CONFIGURE_ARGS+=	--enable-gre
-.else
-CONFIGURE_ARGS+=	--disable-gre
-.endif
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MMPLS}
-CONFIGURE_ARGS+=	--enable-mpls
-.else
-CONFIGURE_ARGS+=	--disable-mpls
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		yes
-CONFIGURE_ARGS+=	--with-mysql \
-			--with-mysql-includes=${LOCALBASE}/include/mysql \
+64BIT_CONFIGURE_ENABLE=	64bit-gcc
+ARUBA_CONFIGURE_ENABLE=	aruba
+BRO_LIB_DEPENDS=	libbroccoli.so:${PORTSDIR}/security/broccoli
+BRO_CONFIGURE_ON=	--with-broccoli=${LOCALBASE}/lib
+BRO_CONFIGURE_ENABLE=	bro
+GRE_CONFIGURE_ENABLE=	gre
+IPV6_CONFIGURE_ENABLE=	ipv6
+MPLS_CONFIGURE_ENABLE=	mpls
+MYSQL_USE=		MYSQL=yes
+MYSQL_CONFIGURE_WITH=	mysql
+MYSQL_CONFIGURE_ON=	--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libraries=${LOCALBASE}/lib/mysql
-.else
-CONFIGURE_ARGS+=	--without-mysql
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL_SSL}
-USE_MYSQL=		yes
-CONFIGURE_ARGS+=	--enable-mysql-ssl-support
-.else
-CONFIGURE_ARGS+=	--disable-mysql-ssl-support
-.endif
-
-.if ${PORT_OPTIONS:MODBC}
-LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=	--with-odbc
-.else
-CONFIGURE_ARGS+=	--without-odbc
-.endif
-
-.if ${PORT_OPTIONS:MPRELUDE}
-BUILD_DEPENDS+=	prelude-manager:${PORTSDIR}/security/prelude-manager
-CONFIGURE_ARGS+=	--enable-prelude
-.else
-CONFIGURE_ARGS+=	--disable-prelude
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=		yes
+MYSQL_SSL_CONFIGURE_ENABLE=	mysql-ssl-support
+ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+ODBC_WITH=		odbc
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}/bin/pg_config --with-pgsql-includes=${LOCALBASE}/include/postgresql/server
+PGSQL_CONFIGURE_OFF=	--without-postgresql
+TCL_USES=		tcl
+TCL_CONFIGURE_ON=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}
+TCL_CONFIGURE_OFF=	--without-tcl
 WANT_PGSQL_VER=		92+
-CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}/bin/pg_config --with-pgsql-includes=${LOCALBASE}/include/postgresql/server
-.else
-CONFIGURE_ARGS+=	--without-postgresql
-.endif
+PORT_PCAP_LIB_DEPENDS=	libpcap.so:${PORTSDIR}/net/libpcap
+PORT_PCAP_CONFIGURE_ON=	--with-libpcap-includes=${LOCALBASE}/include \
+			--with-libpcap-libraries=${LOCALBASE}/lib
 
-.if ${PORT_OPTIONS:MTCL}
-USE_TCL=		yes
-CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}
-.else
-CONFIGURE_ARGS+=	--without-tcl
-.endif
-
 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
+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
 
-.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
-
 .include <bsd.port.mk>

Modified: trunk/security/barnyard2/distinfo
===================================================================
--- trunk/security/barnyard2/distinfo	2015-11-07 20:35:49 UTC (rev 20677)
+++ trunk/security/barnyard2/distinfo	2015-11-08 15:02:34 UTC (rev 20678)
@@ -1,2 +1,2 @@
-SHA256 (barnyard2-1.12.tar.gz) = 30b31ec4ad1d2c05493f10e082496b42111807497443f01bb2648859eff246a9
-SIZE (barnyard2-1.12.tar.gz) = 425744
+SHA256 (barnyard2-v2-1.13_GH0.tar.gz) = b9e67f22334b937a59cf808ca20bdcd9c46561a4369979c965a0bb554d7dd09b
+SIZE (barnyard2-v2-1.13_GH0.tar.gz) = 435017

Modified: trunk/security/barnyard2/pkg-plist
===================================================================
--- trunk/security/barnyard2/pkg-plist	2015-11-07 20:35:49 UTC (rev 20677)
+++ trunk/security/barnyard2/pkg-plist	2015-11-08 15:02:34 UTC (rev 20678)
@@ -1,4 +1,16 @@
 bin/barnyard2
- at 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
- at exec [ -f %B/barnyard2.conf ] || cp -p %B/%f %B/barnyard2.conf
+ at sample etc/barnyard2.conf.sample
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.aruba
+%%PORTDOCS%%%%DOCSDIR%%/README.database
+%%PORTDOCS%%%%DOCSDIR%%/README.sguil
+%%PORTDOCS%%%%DOCSDIR%%/README.sig_suppress
+%%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

More information about the Midnightbsd-cvs mailing list