- Update to 1.10

- Convert to new options framework
- Allow for any available version of TCL to be used
- Add LICENSE
- Remove indefinite article from COMMENT, update
- Mark MAKE_JOBS_SAFE
- Trim Makefile header

PR:		ports/172456
Submitted by:	Paul Schmehl <pauls@utdallas.edu> (maintainer)
Approved by:	makc (mentor)
Feature safe:	yes

7 files changed, 76 insertions, 242 deletions

diff --git a/security/barnyard2-sguil/Makefile b/security/barnyard2-sguil/Makefile
index e7e34289f54f..17356cbdbb85 100644
--- a/security/barnyard2-sguil/Makefile
+++ b/security/barnyard2-sguil/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-sguil
 
 MASTERDIR=	${.CURDIR}/../barnyard2
 
 # enable tcl binding for sguil
-WITH_TCL=	yes
+PORT_OPTIONS+=	TCL
 SLAVE=		yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/security/barnyard2/Makefile b/security/barnyard2/Makefile
index 5c6a58f4bf6f..e6147f67ba4f 100644
--- a/security/barnyard2/Makefile
+++ b/security/barnyard2/Makefile
@@ -1,88 +1,116 @@
-# New ports collection makefile for:	barnyard2
-# Date created:				28 Aug 2009
-# Whom:					pauls
-#
 # $FreeBSD$
-#
 
 PORTNAME=	barnyard2
-PORTVERSION=	1.9
-PORTREVISION=	2
+PORTVERSION=	1.10
+PORTREVISION?=	0
 CATEGORIES=	security
-MASTER_SITES=	http://www.securixlive.com/download/barnyard2/
 
 MAINTAINER=	pauls@utdallas.edu
-COMMENT=	An output system for Snort or Suricata that parses unified2 files
+COMMENT=	Interpreter for Snort unified2 binary output files
+
+LICENSE=	GPLv2
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	firnsy
+GH_PROJECT=	${PORTNAME}
+GH_TAGNAME=	v2-${PORTVERSION}
+GH_COMMIT=	2f5d496
+
+OPTIONS_DEFINE=	MYSQL PGSQL BRO SNORT SNORTSAM SURICATA
+OPTIONS_DEFAULT=#empty
+NO_OPTIONS_SORT=yes
+
+BRO_DESC=	Depend on security/bro
+MYSQL_DESC=	Enable MySQL support
+PGSQL_DESC=	Enable PostgreSQL support
+SNORT_DESC=	Depend on security/snort
+SNORTSAM_DESC=	Depend on security/snortsam
+SURICATA_DESC=	Depend on security/suricata
 
-OPTIONS=	MYSQL "Enable MySQL support" on \
-		POSTGRESQL "Enable PostgreSQL support" off \
-		SNORT "Depend on security/snort" off \
-		SURICATA "Depend on security/suricata" off
 .if !defined(SLAVE)
-OPTIONS+=	TCL "Enable TCL support" off
+OPTIONS_DEFINE+=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
+
 USE_RC_SUBR=	barnyard2
 GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
+
 SUB_FILES=	pkg-message
 
-PORTDOCS1=	README
-PORTDOCS2=	INSTALL README.aruba README.database README.sguil
+PORTDOCS1=	README RELEASE.NOTES
+PORTDOCS2=	INSTALL README.aruba README.database README.sguil README.snortsam
+PORTEXAMPLES=	create_db2 create_mysql	create_postgresql SCHEMA_ACCESS	create_mssql create_oracle.sql
 PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql \
 			--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libraries=${LOCALBASE}/lib/mysql
 SUB_LIST+=		MYSQL=" mysql"
 .else
+CONFIGURE_ARGS+=	--without-mysql
 SUB_LIST+=		MYSQL=""
 .endif
 
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
-CONFIGURE_ARGS+=	--with-postgresql
+CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
 SUB_LIST+=		PGSQL=" postgresql"
 .else
+CONFIGURE_ARGS+=	--without-postgresql
 SUB_LIST+=		PGSQL=""
 .endif
 
-.if defined(WITH_SNORT)
+.if ${PORT_OPTIONS:MBRO}
+RUN_DEPENDS+=		${LOCALBASE}/bin/bro:${PORTSDIR}/security/bro
+.endif
+
+.if ${PORT_OPTIONS:MSNORT}
 RUN_DEPENDS+=		${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort
 .endif
 
-.if defined(WITH_SURICATA)
+.if ${PORT_OPTIONS:MSNORTSAM}
+RUN_DEPENDS+=		${LOCALBASE}/bin/snortsnam:${PORTSDIR}/security/snortsam
+.endif
+
+.if ${PORT_OPTIONS:MSURICATA}
 RUN_DEPENDS+=		${LOCALBASE}/bin/suricata:${PORTSDIR}/security/suricata
 .endif
 
-.if defined(WITH_TCL)
+.if ${PORT_OPTIONS:MTCL}
 USE_TCL=		yes
-CONFIGURE_ARGS+=	--with-tcl=${PREFIX}/lib/tcl8.4
-LIB_DEPENDS+=		tcl84.1:${PORTSDIR}/lang/tcl84
+CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}
+.else
+CONFIGURE_ARGS+=	--without-tcl
 .endif
 
-pre-install:
-	${CHMOD} 744 ${WRKSRC}/install-sh
-
 post-patch:
 	@${REINPLACE_CMD} 's|/etc|${LOCALBASE}/etc|' \
 		${WRKSRC}/etc/barnyard2.conf
 
 post-install:
+	if [ ! -f ${PREFIX}/etc/barnyard2.conf ]; then \
+		${CP} -p ${PREFIX}/etc/barnyard2.conf.sample ${PREFIX}/etc/barnyard2.conf; \
+	fi
 
-.for f in barnyard2.conf
-	[ -f ${PREFIX}/etc/${f} ] || \
-	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f}
-.endfor
-.if !defined(NOPORTDOCS)
+.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.post.mk>
+.include <bsd.port.mk>
diff --git a/security/barnyard2/distinfo b/security/barnyard2/distinfo
index 677220a986e2..c33116663cbf 100644
--- a/security/barnyard2/distinfo
+++ b/security/barnyard2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (barnyard2-1.9.tar.gz) = 6bce0d5bd4a6fa2be2e5b1daaed1d6d0ec8e7f50b33bc1125125c8a9e78a5b0c
-SIZE (barnyard2-1.9.tar.gz) = 652879
+SHA256 (barnyard2-1.10.tar.gz) = 31d4e3745606489658bd411f74ffeb8a27573fdc08d0b51a6a71e1bf4dece8a2
+SIZE (barnyard2-1.10.tar.gz) = 419781
diff --git a/security/barnyard2/files/patch-configure b/security/barnyard2/files/patch-configure
deleted file mode 100644
index aaa5233a5bc2..000000000000
--- a/security/barnyard2/files/patch-configure
+++ /dev/null
@@ -1,190 +0,0 @@
---- ./configure.orig	2010-12-26 23:39:18.000000000 +0100
-+++ ./configure	2011-05-15 18:42:45.000000000 +0200
-@@ -13610,93 +13610,6 @@
-     fi
- fi
- 
--# Checking for Tcl support (required by spo_sguil)
--
--# Check whether --with-tcl was given.
--if test "${with_tcl+set}" = set; then :
--  withval=$with_tcl;  with_tcl="$withval"
--else
--   with_tcl=no
--fi
--
--
--if test "$with_tcl" != "no"; then
--    # prioritise manual definition of the Tcl library.
--	if test -d "$with_tcl"; then
--		tclpath="$with_tcl"
--	else
--		# let tclsh tell us where it was installed (prefer new Tcl versions).
--		for ac_prog in tclsh8.4 tclsh8.3 tclsh8.2 tclsh8.1 tclsh8.0 tclsh
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_TCLSH+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$TCLSH"; then
--  ac_cv_prog_TCLSH="$TCLSH" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_TCLSH="$ac_prog"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--TCLSH=$ac_cv_prog_TCLSH
--if test -n "$TCLSH"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5
--$as_echo "$TCLSH" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--  test -n "$TCLSH" && break
--done
--
--	    if test "$TCLSH" != ""; then
--			tclpath=`echo 'puts [lindex $tcl_pkgPath 0]' | $TCLSH`
--		fi
--	fi
--
--	# check, if tclConfig.sh can be found in tclsh's installation directory.
--    if test ! -r $tclpath/tclConfig.sh; then
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
--	Can't find Tcl libraries.  Use --with-tcl to specify
--        the directory containing tclConfig.sh on your system.
--	Continuing build without Tcl support." >&5
--$as_echo "
--	Can't find Tcl libraries.  Use --with-tcl to specify
--        the directory containing tclConfig.sh on your system.
--	Continuing build without Tcl support." >&6; }
--    else
--	# source tclsh's configuration file and tell the user about the version.
--	. $tclpath/tclConfig.sh
--	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the tcl version number" >&5
--$as_echo_n "checking for the tcl version number... " >&6; }
--	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCL_VERSION, patchlevel $TCL_PATCH_LEVEL" >&5
--$as_echo "$TCL_VERSION, patchlevel $TCL_PATCH_LEVEL" >&6; }
--        LIBS="$LIBS $TCL_LIBS $TCL_LIB_SPEC"
--	TCL_INCLUDE="$TCL_PREFIX/include/tcl$TCL_VERSION"
--	CPPFLAGS="$CPPFLAGS -I$TCL_INCLUDE -DENABLE_TCL";
--    fi
--fi
--
--
- # Check whether --with-mysql was given.
- if test "${with_mysql+set}" = set; then :
-   withval=$with_mysql;  with_mysql="$withval"
-@@ -14496,6 +14409,93 @@
-   LIBS="${LIBS} -lbroccoli"
- fi
- 
-+# Checking for Tcl support (required by spo_sguil)
-+
-+# Check whether --with-tcl was given.
-+if test "${with_tcl+set}" = set; then :
-+  withval=$with_tcl;  with_tcl="$withval"
-+else
-+   with_tcl=no
-+fi
-+
-+
-+if test "$with_tcl" != "no"; then
-+    # prioritise manual definition of the Tcl library.
-+	if test -d "$with_tcl"; then
-+		tclpath="$with_tcl"
-+	else
-+		# let tclsh tell us where it was installed (prefer new Tcl versions).
-+		for ac_prog in tclsh8.4 tclsh8.3 tclsh8.2 tclsh8.1 tclsh8.0 tclsh
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_TCLSH+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$TCLSH"; then
-+  ac_cv_prog_TCLSH="$TCLSH" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_TCLSH="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+TCLSH=$ac_cv_prog_TCLSH
-+if test -n "$TCLSH"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5
-+$as_echo "$TCLSH" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$TCLSH" && break
-+done
-+
-+	    if test "$TCLSH" != ""; then
-+			tclpath=`echo 'puts [lindex $tcl_pkgPath 0]' | $TCLSH`
-+		fi
-+	fi
-+
-+	# check, if tclConfig.sh can be found in tclsh's installation directory.
-+    if test ! -r $tclpath/tclConfig.sh; then
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
-+	Can't find Tcl libraries.  Use --with-tcl to specify
-+        the directory containing tclConfig.sh on your system.
-+	Continuing build without Tcl support." >&5
-+$as_echo "
-+	Can't find Tcl libraries.  Use --with-tcl to specify
-+        the directory containing tclConfig.sh on your system.
-+	Continuing build without Tcl support." >&6; }
-+    else
-+	# source tclsh's configuration file and tell the user about the version.
-+	. $tclpath/tclConfig.sh
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the tcl version number" >&5
-+$as_echo_n "checking for the tcl version number... " >&6; }
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCL_VERSION, patchlevel $TCL_PATCH_LEVEL" >&5
-+$as_echo "$TCL_VERSION, patchlevel $TCL_PATCH_LEVEL" >&6; }
-+        LIBS="$LIBS $TCL_LIBS $TCL_LIB_SPEC"
-+	TCL_INCLUDE="$TCL_PREFIX/include/tcl$TCL_VERSION"
-+	CPPFLAGS="$CPPFLAGS -I$TCL_INCLUDE -DENABLE_TCL";
-+    fi
-+fi
-+
-+
- # let's make some fixes..
- 
- CFLAGS=`echo $CFLAGS | sed -e 's/-I\/usr\/include //g'`
diff --git a/security/barnyard2/files/patch-etc-Makefile.in b/security/barnyard2/files/patch-etc-Makefile.in
deleted file mode 100644
index 43e881a23634..000000000000
--- a/security/barnyard2/files/patch-etc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/Makefile.in.orig	2010-07-04 13:17:33.000000000 -0400
-+++ etc/Makefile.in	2010-07-04 13:18:42.000000000 -0400
-@@ -249,7 +249,7 @@
- 	done | $(am__base_list) | \
- 	while read files; do \
- 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)/$$files-sample" || exit $$?; \
- 	done
- 
- uninstall-sysconfDATA:
diff --git a/security/barnyard2/files/patch-etc__Makefile.am b/security/barnyard2/files/patch-etc__Makefile.am
new file mode 100644
index 000000000000..a2ec88bb3e5f
--- /dev/null
+++ b/security/barnyard2/files/patch-etc__Makefile.am
@@ -0,0 +1,8 @@
+--- ./etc/Makefile.am.orig	2012-10-08 10:03:32.000000000 -0400
++++ ./etc/Makefile.am	2012-10-08 10:05:02.000000000 -0400
+@@ -4,4 +4,4 @@
+ EXTRA_DIST = barnyard2.conf 
+ 
+ install-data-am:
+-	test -e $(sysconfdir)/barnyard2.conf || install -m 600 $(top_srcdir)/etc/barnyard2.conf $(sysconfdir)
++	install -m 600 $(top_srcdir)/etc/barnyard2.conf $(sysconfdir)/barnyard2.conf.sample
diff --git a/security/barnyard2/pkg-plist b/security/barnyard2/pkg-plist
index 374ee123055c..b5cdf006379c 100644
--- a/security/barnyard2/pkg-plist
+++ b/security/barnyard2/pkg-plist
@@ -1,4 +1,4 @@
 bin/barnyard2
-@unexec if [ -f %D/etc/barnyard2.conf ] && cmp -s %D/etc/barnyard2.conf %D/etc/barnyard2.conf-sample; then rm -f %D/etc/barnyard2.conf; fi
-etc/barnyard2.conf-sample
-@exec if [ ! -f %D/etc/barnyard2.conf ] ; then cp -p %D/%F %B/barnyard2.conf; fi
+@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