2 files changed, 200 insertions, 8 deletions

diff --git a/security/barnyard2/Makefile b/security/barnyard2/Makefile
index 0edab4669138..7efeb3c42d14 100644
--- a/security/barnyard2/Makefile
+++ b/security/barnyard2/Makefile
@@ -17,8 +17,10 @@ COMMENT=	An output system for Snort or Suricata that parses unified2 files
 OPTIONS=	MYSQL "Enable MySQL support" on \
 		POSTGRESQL "Enable PostgreSQL support" off \
 		SNORT "Depend on security/snort" off \
-		SURICATA "Depend on security/suricata" off \
-		TCL "Enable TCL support" off 
+		SURICATA "Depend on security/suricata" off
+.if !defined(SLAVE)
+OPTIONS+=	TCL "Enable TCL support" off
+.endif
 
 USE_RC_SUBR=	barnyard2.sh
 GNU_CONFIGURE=	yes
@@ -31,12 +33,6 @@ PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_TCL)
-USE_TCL=		yes
-CONFIGURE_ARGS+=	--with-tcl=${PREFIX}/lib/tcl8.4
-LIB_DEPENDS+=   	tcl84.1:${PORTSDIR}/lang/tcl84
-.endif
-
 .if defined(WITH_MYSQL)
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql \
@@ -57,6 +53,12 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort
 RUN_DEPENDS+=	${LOCALBASE}/bin/suricata:${PORTSDIR}/security/suricata
 .endif
 
+.if defined(WITH_TCL)
+USE_TCL=		yes
+CONFIGURE_ARGS+=	--with-tcl=${PREFIX}/lib/tcl8.4
+LIB_DEPENDS+=   	tcl84.1:${PORTSDIR}/lang/tcl84
+.endif
+
 pre-install:
 	${CHMOD} 744 ${WRKSRC}/install-sh
 
diff --git a/security/barnyard2/files/patch-configure b/security/barnyard2/files/patch-configure
new file mode 100644
index 000000000000..aaa5233a5bc2
--- /dev/null
+++ b/security/barnyard2/files/patch-configure
@@ -0,0 +1,190 @@
+--- ./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'`