Update to 0.9.6b21

PR:		36940
Submitted by:	king@v2project.com

4 files changed, 36 insertions, 26 deletions

diff --git a/security/acid/Makefile b/security/acid/Makefile
index 4f304daf9d22..c464c07eeb3e 100644
--- a/security/acid/Makefile
+++ b/security/acid/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	acid
-PORTVERSION=	0.9.6b20
+PORTVERSION=	0.9.6b21
 CATEGORIES=	security
 MASTER_SITES=	http://www.andrew.cmu.edu/~rdanyliw/snort/
 
@@ -14,7 +14,8 @@ MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4 \
 		${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql323-server \
-		${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort
+		${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort \
+		${LOCALBASE}/www/data.default/php/adodb:${PORTSDIR}/databases/adodb
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
diff --git a/security/acid/distinfo b/security/acid/distinfo
index c4b4fcf7041c..9138c9240717 100644
--- a/security/acid/distinfo
+++ b/security/acid/distinfo
@@ -1 +1 @@
-MD5 (acid-0.9.6b20.tar.gz) = b6d2f4e2ca066d75d6ed98d8dda83241
+MD5 (acid-0.9.6b21.tar.gz) = a0e2ccfa072dc96832dc54cb3c834d82
diff --git a/security/acid/files/patch-aa b/security/acid/files/patch-aa
new file mode 100644
index 000000000000..569f2eb3447e
--- /dev/null
+++ b/security/acid/files/patch-aa
@@ -0,0 +1,11 @@
+--- acid_conf.php	Mon Mar  4 00:02:44 2002
++++ /usr/local/www/acid/acid_conf.php	Wed Apr 10 00:22:38 2002
+@@ -9,7 +9,7 @@
+  *        $foo = "c:\tmp"    [OK]
+  *        $foo = "c:\tmp\"   [WRONG]
+  */
+-$DBlib_path = "";
++$DBlib_path = "/usr/local/www/data.default/php/adodb";
+ 
+ /* The type of underlying alert database
+  * 
diff --git a/security/acid/pkg-plist b/security/acid/pkg-plist
index 66245b66ab8b..1d7b3217c210 100644
--- a/security/acid/pkg-plist
+++ b/security/acid/pkg-plist
@@ -1,36 +1,24 @@
-%%PORTDOCS%%www/acid/README
-%%PORTDOCS%%www/acid/README.mssql
-www/acid/acid_action.inc
+www/acid/acid_footer.html
+www/acid/acid_hdr1.html
+www/acid/acid_hdr2.html
+www/acid/index.html
 www/acid/acid_ag_common.php
 www/acid/acid_ag_main.php
 www/acid/acid_app_faq.php
-www/acid/acid_cache.inc
 www/acid/acid_common.php
 www/acid/acid_conf.php
-www/acid/acid_constants.inc
-www/acid/acid_db.inc
 www/acid/acid_db_common.php
 www/acid/acid_db_setup.php
-www/acid/acid_footer.html
 www/acid/acid_graph_common.php
 www/acid/acid_graph_display.php
 www/acid/acid_graph_main.php
-www/acid/acid_hdr1.html
-www/acid/acid_hdr2.html
-www/acid/acid_include.inc
-www/acid/acid_log_error.inc
-www/acid/acid_log_timing.inc
 www/acid/acid_main.php
 www/acid/acid_maintenance.php
-www/acid/acid_net.inc
-www/acid/acid_output_html.inc
-www/acid/acid_output_query.inc
 www/acid/acid_qry_alert.php
 www/acid/acid_qry_common.php
 www/acid/acid_qry_form.php
 www/acid/acid_qry_main.php
 www/acid/acid_qry_sqlcalls.php
-www/acid/acid_signature.inc
 www/acid/acid_stat_alerts.php
 www/acid/acid_stat_class.php
 www/acid/acid_stat_common.php
@@ -40,13 +28,23 @@ www/acid/acid_stat_ports.php
 www/acid/acid_stat_sensor.php
 www/acid/acid_stat_time.php
 www/acid/acid_stat_uaddr.php
-www/acid/acid_state_common.inc
-www/acid/acid_state_criteria.inc
-www/acid/acid_state_query.inc
-www/acid/acid_style.css
 www/acid/create_acid_tbls_mssql.sql
 www/acid/create_acid_tbls_mysql.sql
 www/acid/create_acid_tbls_pgsql.sql
-www/acid/index.html
-@unexec rmdir %D/www/acid 2>/dev/null || true
-@unexec rmdir %D/www 2>/dev/null || true
+www/acid/acid_style.css
+www/acid/acid_db.inc
+www/acid/acid_action.inc
+www/acid/acid_cache.inc
+www/acid/acid_constants.inc
+www/acid/acid_include.inc
+www/acid/acid_log_error.inc
+www/acid/acid_log_timing.inc
+www/acid/acid_net.inc
+www/acid/acid_output_html.inc
+www/acid/acid_output_query.inc
+www/acid/acid_signature.inc
+www/acid/acid_state_common.inc
+www/acid/acid_state_criteria.inc
+www/acid/acid_state_query.inc
+www/acid/README
+www/acid/README.mssql