From owner-svn-ports-all@FreeBSD.ORG  Sat Oct 13 02:05:14 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id ABAD2F4D;
 Sat, 13 Oct 2012 02:05:14 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 94C838FC1A;
 Sat, 13 Oct 2012 02:05:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9D25EDs018943;
 Sat, 13 Oct 2012 02:05:14 GMT (envelope-from zi@svn.freebsd.org)
Received: (from zi@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9D25ECl018941;
 Sat, 13 Oct 2012 02:05:14 GMT (envelope-from zi@svn.freebsd.org)
Message-Id: <201210130205.q9D25ECl018941@svn.freebsd.org>
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Sat, 13 Oct 2012 02:05:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305809 - head/security/snort
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Oct 2012 02:05:14 -0000

Author: zi
Date: Sat Oct 13 02:05:14 2012
New Revision: 305809
URL: http://svn.freebsd.org/changeset/ports/305809

Log:
  - As pulledpork/barnyard are required for most installations, depend on these by default
  
  Feature safe:	yes

Modified:
  head/security/snort/Makefile

Modified: head/security/snort/Makefile
==============================================================================
--- head/security/snort/Makefile	Sat Oct 13 01:42:15 2012	(r305808)
+++ head/security/snort/Makefile	Sat Oct 13 02:05:14 2012	(r305809)
@@ -27,9 +27,10 @@ RUN_DEPENDS=	daq>=1.1.1:${PORTSDIR}/net/
 
 OPTIONS_DEFINE=	IPV6 MPLS GRE TARGETBASED ZLIB NORMALIZER REACT \
 		PERFPROFILE FLEXRESP3 LRGPCAP SNORTSAM SOURCEFIRE \
-		DBGSNORT
+		DBGSNORT BARNYARD PULLEDPORK
 OPTIONS_DEFAULT=IPV6 MPLS GRE ZLIB NORMALIZER REACT PERFPROFILE \
-		FLEXRESP3 SOURCEFIRE TARGETBASED
+		FLEXRESP3 SOURCEFIRE TARGETBASED PULLEDPORK \
+		BARNYARD
 
 GRE_DESC=		Enable GRE support
 TARGETBASED_DESC=	Enable targetbased support
@@ -42,6 +43,8 @@ LRGPCAP_DESC=		Enable pcaps larger than 
 SNORTSAM_DESC=		Enable unofficial Snortsam patch
 SOURCEFIRE_DESC=	Enable Sourcefire-specific build options
 DBGSNORT_DESC=		Enable debugging symbols+core dumps
+BARNYARD_DESC=		Depend on Barnyard2
+PULLEDPORK_DESC=	Depend on pulledpork
 
 .include <bsd.port.options.mk>
 
@@ -142,6 +145,14 @@ PATCH_SITES+=	http://www.snortsam.net/fi
 PATCHFILES+=	snortsam-2.9.2.2.diff.gz:snortsam
 .endif
 
+.if ${PORT_OPTIONS:MBARNYARD}
+RUN_DEPENDS+=	barnyard2:${PORTSDIR}/security/barnyard2
+.endif
+
+.if ${PORT_OPTIONS:MPULLEDPORK}
+RUN_DEPENDS+=	pulledpork.pl:${PORTSDIR}/security/pulledpork
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name 'Makefile.in' | ${XARGS} ${REINPLACE_CMD} -e 's|lib/snort_|lib/snort/|g'
 	@${REINPLACE_CMD} "s,/etc/snort.conf,${CONFIG_DIR}/snort.conf," ${WRKSRC}/src/snort.c ${WRKSRC}/snort.8