svn commit: r372112 - head/security/snort

[Ryan Steinmetz]

Author: zi
Date: Mon Nov  3 14:36:03 2014
New Revision: 372112
URL: https://svnweb.freebsd.org/changeset/ports/372112
QAT: https://qat.redports.org/buildarchive/r372112/

Log:
  - Remove configurable options as they break the build when they are disabled.

Modified:
  head/security/snort/Makefile

Modified: head/security/snort/Makefile
==============================================================================
--- head/security/snort/Makefile	Mon Nov  3 13:07:17 2014	(r372111)
+++ head/security/snort/Makefile	Mon Nov  3 14:36:03 2014	(r372112)
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/deve
 BUILD_DEPENDS=	daq>=2.0.0:${PORTSDIR}/net/daq
 RUN_DEPENDS=	daq>=2.0.0:${PORTSDIR}/net/daq
 
-OPTIONS_DEFINE=		IPV6 MPLS GRE TARGETBASED ZLIB NORMALIZER REACT \
+OPTIONS_DEFINE=		IPV6 GRE ZLIB NORMALIZER REACT \
 			PERFPROFILE LRGPCAP SOURCEFIRE NONETHER \
 			DOCS
 
@@ -28,11 +28,10 @@ OPTIONS_GROUP=		ADDONS DEV
 OPTIONS_GROUP_ADDONS=	BARNYARD PULLEDPORK
 OPTIONS_GROUP_DEV=	DBGSNORT
 
-OPTIONS_DEFAULT=	IPV6 MPLS GRE TARGETBASED ZLIB NORMALIZER REACT \
+OPTIONS_DEFAULT=	IPV6 GRE ZLIB NORMALIZER REACT \
 			PERFPROFILE SOURCEFIRE PULLEDPORK \
 			BARNYARD
 
-#FLEXRESP3_DESC=		Flexible response on events (v3)
 GRE_DESC=		GRE support
 IPV6_DESC=		IPv6 in snort.conf
 LRGPCAP_DESC=		Pcaps larger than 2GB
@@ -53,16 +52,13 @@ DBGSNORT_DESC=		Enable debugging symbols
 
 DBGSNORT_CONFIGURE_ENABLE=	corefiles debug
 DBGSNORT_MAKE_ENV=		DONTSTRIP="yes"
-#FLEXRESP3_CONFIGURE_ENABLE=	flexresp3 active-response
 GRE_CONFIGURE_ENABLE=		gre
 LRGPCAP_CONFIGURE_ENABLE=	large-pcap
-MPLS_CONFIGURE_ENABLE=		mpls
 NONETHER_CONFIGURE_ENABLE=	non-ether-decoders
 NORMALIZER_CONFIGURE_ENABLE=	normalizer
 PERFPROFILE_CONFIGURE_ENABLE=	perfprofiling ppm
 REACT_CONFIGURE_ENABLE=		react
 SOURCEFIRE_CONFIGURE_ENABLE=	sourcefire
-TARGETBASED_CONFIGURE_ENABLE=	targetbased
 ZLIB_CONFIGURE_ENABLE=		zlib
 
 BARNYARD_RUN_DEPENDS=	barnyard2:${PORTSDIR}/security/barnyard2
@@ -103,6 +99,7 @@ LIBNET_LIBDIR=	${LIBNET_LIBS:M-L*:S/-L//
 
 CFLAGS+=	-fstack-protector
 CONFIGURE_ARGS+=--enable-reload \
+		--enable-mpls --enable-targetbased \
 		--enable-reload-error-restart \
 		--with-dnet-includes=${LIBNET_INCDIR} \
 		--with-dnet-libraries=${LIBNET_LIBDIR}