Index: security/snort/Makefile
===================================================================
--- security/snort/Makefile
+++ security/snort/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	snort
 PORTVERSION=	2.9.12
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://snort.org/downloads/snort/ \
 		ZI
@@ -15,13 +16,14 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	daq>=2.0.0:net/daq
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libdnet.so:net/libdnet \
 		libpcap.so:net/libpcap
-
-BUILD_DEPENDS=	daq>=2.0.0:net/daq
 RUN_DEPENDS=	daq>=2.0.0:net/daq
 
+CONFLICTS_INSTALL=	snort3-3.*
+
 OPTIONS_DEFINE=		IPV6 GRE HA NORMALIZER DOCS APPID \
 			PERFPROFILE LRGPCAP SOURCEFIRE NONETHER \
 			FILEINSPECT
@@ -70,13 +72,13 @@
 
 .include <bsd.port.options.mk>
 
+USES=		cpe libtool pathfix shebangfix ssl
 USE_RC_SUBR=	snort
-SUB_FILES=	pkg-message
+USE_LDCONFIG=	yes
 
-USES=		cpe libtool pathfix shebangfix ssl
+SUB_FILES=	pkg-message
 SHEBANG_FILES=	tools/appid_detector_builder.sh
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 RULES_DIR=		${ETCDIR}/rules
Index: security/snort/files/patch-etc__snort.conf
===================================================================
--- security/snort/files/patch-etc__snort.conf
+++ security/snort/files/patch-etc__snort.conf
@@ -1,5 +1,5 @@
---- ./etc/snort.conf.orig	2010-03-19 20:41:00.000000000 +0100
-+++ ./etc/snort.conf	2010-04-27 22:26:53.000000000 +0200
+--- ./etc/snort.conf.orig	2010-03-19 21:41:00 UTC
++++ ./etc/snort.conf
 @@ -57,9 +57,9 @@
  # Path to your rules files (this can be a relative path)
  # Note for Windows users:  You are advised to make this an absolute path,