Update to 2.0.5 [1]

Use %%DOCSDIR%% and %%DATADIR%% macros [2]

Submitted by:	Linh Pham <question@closedsrc.org> [1], osa [2]
PR:		59510

3 files changed, 68 insertions, 68 deletions

diff --git a/security/snort/Makefile b/security/snort/Makefile
index b34dbdcf835a..1aad279e2ee3 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	snort
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 CATEGORIES=	security
 MASTER_SITES=	http://www.snort.org/dl/
 
diff --git a/security/snort/distinfo b/security/snort/distinfo
index d218d95efaa4..34cca982c56f 100644
--- a/security/snort/distinfo
+++ b/security/snort/distinfo
@@ -1 +1 @@
-MD5 (snort-2.0.4.tar.gz) = 8cff1ab5b6ab0ff507fb7264a05be05b
+MD5 (snort-2.0.5.tar.gz) = f129ee00a3d6e7b7c1ff4a1e1fba3a08
diff --git a/security/snort/pkg-plist b/security/snort/pkg-plist
index 9d15668cbd08..0806f91fdc87 100644
--- a/security/snort/pkg-plist
+++ b/security/snort/pkg-plist
@@ -3,73 +3,73 @@ bin/snort
 etc/snort.conf-sample
 etc/rc.d/snort.sh.sample
 @exec [ -f %B/snort.conf ] || cp %B/%f %B/snort.conf
-%%PORTDOCS%%share/doc/snort/AUTHORS
-%%PORTDOCS%%share/doc/snort/NEWS
-%%PORTDOCS%%share/doc/snort/README.csv
-%%PORTDOCS%%share/doc/snort/BUGS
-%%PORTDOCS%%share/doc/snort/README
-%%PORTDOCS%%share/doc/snort/README.database
-%%PORTDOCS%%share/doc/snort/CREDITS
-%%PORTDOCS%%share/doc/snort/README.FLEXRESP
-%%PORTDOCS%%share/doc/snort/RULES.todo
-%%PORTDOCS%%share/doc/snort/FAQ
-%%PORTDOCS%%share/doc/snort/SnortUsersManual.pdf
-%%PORTDOCS%%share/doc/snort/README.PLUGINS
-%%PORTDOCS%%share/doc/snort/USAGE
-%%PORTDOCS%%share/doc/snort/README.thresholding
-share/snort/attack-responses.rules
-share/snort/backdoor.rules
-share/snort/bad-traffic.rules
-share/snort/chat.rules
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README.csv
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.database
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/README.FLEXRESP
+%%PORTDOCS%%%%DOCSDIR%%/RULES.todo
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/SnortUsersManual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/README.PLUGINS
+%%PORTDOCS%%%%DOCSDIR%%/USAGE
+%%PORTDOCS%%%%DOCSDIR%%/README.thresholding
+%%DATADIR%%/attack-responses.rules
+%%DATADIR%%/backdoor.rules
+%%DATADIR%%/bad-traffic.rules
+%%DATADIR%%/chat.rules
 @unexec if [ -f %B/classification.config ] && cmp -s %B/classification.config %B/classification.config-sample; then rm -f %B/classification.config; fi
-share/snort/classification.config-sample
+%%DATADIR%%/classification.config-sample
 @exec [ -f %B/classification.config ] || cp %B/%f %B/classification.config
-share/snort/ddos.rules
-share/snort/deleted.rules
-share/snort/dns.rules
-share/snort/dos.rules
-share/snort/experimental.rules
-share/snort/exploit.rules
-share/snort/finger.rules
-share/snort/ftp.rules
-share/snort/icmp-info.rules
-share/snort/icmp.rules
-share/snort/imap.rules
-share/snort/info.rules
-share/snort/local.rules
-share/snort/misc.rules
-share/snort/multimedia.rules
-share/snort/mysql.rules
-share/snort/netbios.rules
-share/snort/nntp.rules
-share/snort/oracle.rules
-share/snort/other-ids.rules
-share/snort/p2p.rules
-share/snort/policy.rules
-share/snort/pop2.rules
-share/snort/pop3.rules
-share/snort/porn.rules
+%%DATADIR%%/ddos.rules
+%%DATADIR%%/deleted.rules
+%%DATADIR%%/dns.rules
+%%DATADIR%%/dos.rules
+%%DATADIR%%/experimental.rules
+%%DATADIR%%/exploit.rules
+%%DATADIR%%/finger.rules
+%%DATADIR%%/ftp.rules
+%%DATADIR%%/icmp-info.rules
+%%DATADIR%%/icmp.rules
+%%DATADIR%%/imap.rules
+%%DATADIR%%/info.rules
+%%DATADIR%%/local.rules
+%%DATADIR%%/misc.rules
+%%DATADIR%%/multimedia.rules
+%%DATADIR%%/mysql.rules
+%%DATADIR%%/netbios.rules
+%%DATADIR%%/nntp.rules
+%%DATADIR%%/oracle.rules
+%%DATADIR%%/other-ids.rules
+%%DATADIR%%/p2p.rules
+%%DATADIR%%/policy.rules
+%%DATADIR%%/pop2.rules
+%%DATADIR%%/pop3.rules
+%%DATADIR%%/porn.rules
 @unexec if [ -f %B/reference.config ] && cmp -s %B/reference.config %B/reference.config-sample; then rm -f %B/reference.config; fi
-share/snort/reference.config-sample
+%%DATADIR%%/reference.config-sample
 @exec [ -f %B/reference.config ] || cp %B/%f %B/reference.config
-share/snort/rpc.rules
-share/snort/rservices.rules
-share/snort/scan.rules
-share/snort/shellcode.rules
-share/snort/smtp.rules
-share/snort/snmp.rules
-share/snort/sql.rules
-share/snort/telnet.rules
-share/snort/tftp.rules
-share/snort/virus.rules
-share/snort/web-attacks.rules
-share/snort/web-cgi.rules
-share/snort/web-client.rules
-share/snort/web-coldfusion.rules
-share/snort/web-frontpage.rules
-share/snort/web-iis.rules
-share/snort/web-misc.rules
-share/snort/web-php.rules
-share/snort/x11.rules
-%%PORTDOCS%%@dirrm share/doc/snort
-@dirrm share/snort
+%%DATADIR%%/rpc.rules
+%%DATADIR%%/rservices.rules
+%%DATADIR%%/scan.rules
+%%DATADIR%%/shellcode.rules
+%%DATADIR%%/smtp.rules
+%%DATADIR%%/snmp.rules
+%%DATADIR%%/sql.rules
+%%DATADIR%%/telnet.rules
+%%DATADIR%%/tftp.rules
+%%DATADIR%%/virus.rules
+%%DATADIR%%/web-attacks.rules
+%%DATADIR%%/web-cgi.rules
+%%DATADIR%%/web-client.rules
+%%DATADIR%%/web-coldfusion.rules
+%%DATADIR%%/web-frontpage.rules
+%%DATADIR%%/web-iis.rules
+%%DATADIR%%/web-misc.rules
+%%DATADIR%%/web-php.rules
+%%DATADIR%%/x11.rules
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%