svn commit: r489611 - in head/security/snort: . files

[Ryan Steinmetz]

Author: zi
Date: Mon Jan  7 19:40:53 2019
New Revision: 489611
URL: https://svnweb.freebsd.org/changeset/ports/489611

Log:
  - Add CONFLICTS for security/snort3
  - Pet portlint
  
  PR:		234699
  Requested by:	Vinícius Zavam <egypcio at FreeBSD.org>

Modified:
  head/security/snort/Makefile
  head/security/snort/files/patch-etc__snort.conf

Modified: head/security/snort/Makefile
==============================================================================
--- head/security/snort/Makefile	Mon Jan  7 19:39:36 2019	(r489610)
+++ head/security/snort/Makefile	Mon Jan  7 19:40:53 2019	(r489611)
@@ -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,27 @@ COMMENT=	Lightweight network intrusion detection syste
 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
 
+USES=			cpe libtool pathfix shebangfix ssl
+USE_RC_SUBR=		snort
+USE_LDCONFIG=		yes
+
+SUB_FILES=		pkg-message
+SHEBANG_FILES=		tools/appid_detector_builder.sh
+GNU_CONFIGURE=		yes
+MAKE_JOBS_UNSAFE=	yes
+
+RULES_DIR=		${ETCDIR}/rules
+PREPROC_RULE_DIR=	${ETCDIR}/preproc_rules
+LOGS_DIR=		/var/log/snort
+
+CONFLICTS_INSTALL=	snort3-3.*
+
 OPTIONS_DEFINE=		IPV6 GRE HA NORMALIZER DOCS APPID \
 			PERFPROFILE LRGPCAP SOURCEFIRE NONETHER \
 			FILEINSPECT
@@ -69,19 +84,6 @@ APPID_CONFIGURE_ENV+=	luajit_CFLAGS="-I${LOCALBASE}/in
 			luajit_LIBS="-L${LOCALBASE}/lib -lluajit-5.1"
 
 .include <bsd.port.options.mk>
-
-USE_RC_SUBR=	snort
-SUB_FILES=	pkg-message
-
-USES=		cpe libtool pathfix shebangfix ssl
-SHEBANG_FILES=	tools/appid_detector_builder.sh
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-MAKE_JOBS_UNSAFE=	yes
-
-RULES_DIR=		${ETCDIR}/rules
-PREPROC_RULE_DIR=	${ETCDIR}/preproc_rules
-LOGS_DIR=		/var/log/snort
 
 CONFIG_FILES=	classification.config gen-msg.map reference.config \
 		snort.conf threshold.conf unicode.map file_magic.conf

Modified: head/security/snort/files/patch-etc__snort.conf
==============================================================================
--- head/security/snort/files/patch-etc__snort.conf	Mon Jan  7 19:39:36 2019	(r489610)
+++ head/security/snort/files/patch-etc__snort.conf	Mon Jan  7 19:40:53 2019	(r489611)
@@ -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,