Update to snort-1.8.7

Submitted by:	Paul Marquis <pmarquis@pobox.com>
PR:		ports/40528

4 files changed, 18 insertions, 23 deletions

diff --git a/security/snort/Makefile b/security/snort/Makefile
index 31e0d9b4b25e..2cf7ff7e7fb9 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	snort
-PORTVERSION=	1.8.6
+PORTVERSION=	1.8.7
 CATEGORIES=	security
 MASTER_SITES=	http://www.snort.org/dl/
 
@@ -51,16 +51,11 @@ pre-configure:
 	@${ECHO} ""
 
 post-install:
-	${MKDIR} ${PREFIX}/share/snort
-.for i in CREDITS RULES.SAMPLE USAGE attack-responses.rules backdoor.rules \
-	bad-traffic.rules ddos.rules dns.rules dos.rules exploit.rules \
-	finger.rules ftp.rules icmp.rules icmp-info.rules info.rules local.rules \
-	misc.rules netbios.rules policy.rules porn.rules rpc.rules rservices.rules \
-	scan.rules shellcode.rules smtp.rules sql.rules telnet.rules tftp.rules \
-	virus.rules web-attacks.rules web-cgi.rules web-coldfusion.rules \
-	web-frontpage.rules web-iis.rules web-misc.rules x11.rules
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/snort
-.endfor
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/CREDITS ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/RULES.SAMPLE ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/USAGE ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.rules ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/classification.config ${PREFIX}/etc/classification.config-sample
 	${INSTALL_DATA} ${WRKSRC}/snort.conf ${PREFIX}/etc/snort.conf-sample
 	@${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE}
diff --git a/security/snort/distinfo b/security/snort/distinfo
index c8497362ba54..c5913bbc5773 100644
--- a/security/snort/distinfo
+++ b/security/snort/distinfo
@@ -1 +1 @@
-MD5 (snort-1.8.6.tar.gz) = 6bba7e1cbc837a5c7404d7c0b496780b
+MD5 (snort-1.8.7.tar.gz) = 29c81d0bc243edb21ba4ab33ee80457e
diff --git a/security/snort/files/patch-aa b/security/snort/files/patch-aa
deleted file mode 100644
index fdd36588b4f8..000000000000
--- a/security/snort/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugbase.h.orig	Mon Jun  3 03:06:52 2002
-+++ plugbase.h	Mon Jun  3 03:06:59 2002
-@@ -99,7 +99,7 @@
- #endif
- 
- #if defined(FREEBSD) || defined(OPENBSD)
--    #include <machine/param.h>
-+    #include <sys/param.h>
- #endif
- 
- #if defined(SOLARIS)
diff --git a/security/snort/files/patch-snort.c b/security/snort/files/patch-snort.c
new file mode 100644
index 000000000000..b299c7e60748
--- /dev/null
+++ b/security/snort/files/patch-snort.c
@@ -0,0 +1,11 @@
+--- snort.c.orig	Fri Jun 28 10:22:59 2002
++++ snort.c	Sat Jul 13 11:13:16 2002
+@@ -1694,7 +1694,7 @@
+     difftime.tv_sec = endtime.tv_sec - starttime.tv_sec;
+     difftime.tv_usec = endtime.tv_usec - starttime.tv_usec;
+ 
+-    printf("Run time for packet processing was %u.%u seconds\n", 
++    printf("Run time for packet processing was %lu.%lu seconds\n", 
+             difftime.tv_sec, difftime.tv_usec);
+ 
+     CleanExit(SIGQUIT);