- Update to 0.9.6b20

- Give maintainership back to ports@ (foxfair has not logged into freefall
  for over a year and email is bouncing)

PR:		34862
Reviewed by:	Alex George <ageorge@nts.umd.edu>

5 files changed, 79 insertions, 90 deletions

diff --git a/security/acid/Makefile b/security/acid/Makefile
index ba391c204f7b..4f304daf9d22 100644
--- a/security/acid/Makefile
+++ b/security/acid/Makefile
@@ -6,33 +6,30 @@
 #
 
 PORTNAME=	acid
-PORTVERSION=	0.9.6b1
+PORTVERSION=	0.9.6b20
 CATEGORIES=	security
 MASTER_SITES=	http://www.andrew.cmu.edu/~rdanyliw/snort/
-DISTFILES=	acid-0.9.6b1.tar.gz
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MAINTAINER=	foxfair@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \
-		${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4 \
+RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4 \
 		${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql323-server \
 		${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort
 
-post-configure:
-	${MKDIR} ${LOCALBASE}/share/doc/apache/acid
-	${CP} ${FILESDIR}/Makefile.acid ${WRKSRC}/Makefile
+WRKSRC=		${WRKDIR}/${PORTNAME}
+NO_BUILD=	yes
+
+do-install:
+	@${MKDIR} ${PREFIX}/www/acid
+.for ext in html php sql css inc
+	@${INSTALL_DATA} ${WRKSRC}/*.${ext} ${PREFIX}/www/acid
+.endfor
+.ifndef(NOPORTDOCS)
+	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/www/acid
+	@${INSTALL_DATA} ${WRKSRC}/README.mssql ${PREFIX}/www/acid
+.endif
 
 post-install:
-	@${ECHO} "*****************************************************************************"
-	@${ECHO} "Please modify the file '${LOCALBASE}/share/doc/apache/acid/acid_conf.php',   "
-	@${ECHO} "and customize the following variables to fit your system:		       "
-	@${ECHO} "									       "
-	@${ECHO} "'alert_dbname'    : MySQL database name where the alerts are stored 	       "
-	@${ECHO} "'alert_host'      : host where the database is stored		       	       "
-	@${ECHO} "'alert_port'      : port where the database is stored		               "
-	@${ECHO} "'alert_user'      : username into the database			       "
-	@${ECHO} "'alert_password'  : password for the username				       "
-	@${ECHO} "*****************************************************************************"
+	@${SED} 's|%%PREFIX%%|${PREFIX}|' ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/security/acid/distinfo b/security/acid/distinfo
index 2e9d62ebe03b..c4b4fcf7041c 100644
--- a/security/acid/distinfo
+++ b/security/acid/distinfo
@@ -1 +1 @@
-MD5 (acid-0.9.6b1.tar.gz) = 24a7027c0b85186c0db83aed8e2dec11
+MD5 (acid-0.9.6b20.tar.gz) = b6d2f4e2ca066d75d6ed98d8dda83241
diff --git a/security/acid/files/Makefile.acid b/security/acid/files/Makefile.acid
deleted file mode 100644
index 4373759d7b9c..000000000000
--- a/security/acid/files/Makefile.acid
+++ /dev/null
@@ -1,43 +0,0 @@
-# This is a dummy Makefile for FreeBSD ports system, not from the author.
-# We don't need to compile anything but just copy these files to finish
-# the installation.
-#
-# Foxfair. <foxfair@FreeBSD.org>
-ACIDDIR=/usr/local/share/doc/apache/acid
-INSTALL=install
-
-ACIDFILES=\
-	README \
-	acid_ag_common.php \
-	acid_ag_main.php \
-	acid_app_faq.php \
-	acid_common.php \
-	acid_conf.php \
-	acid_db_common.php \
-	acid_db_setup.php \
-	acid_email.php \
-	acid_email_sqlcalls.php \
-	acid_footer.html \
-	acid_hdr1.html \
-	acid_hdr2.html \
-	acid_main.php \
-	acid_pkt_common.php \
-	acid_pkt_form.php \
-	acid_pkt_main.php \
-	acid_pkt_sqlcalls.php \
-	acid_stat_alerts.php \
-	acid_stat_common.php \
-	acid_stat_ipaddr.php \
-	acid_stat_sensor.php \
-	acid_stat_time.php \
-	acid_stat_uaddr.php \
-	acid_style.css \
-	index.html
-
-all: install
-
-install: ${ACIDFILES}
-	[ -d ${ACIDDIR} ] || mkdir ${ACIDDIR}
-	for i in ${ACIDFILES}; do \
-	    ${INSTALL} -c -m 444 $$i ${ACIDDIR} ; \
-	done
diff --git a/security/acid/pkg-message b/security/acid/pkg-message
new file mode 100644
index 000000000000..d26178eeb0a8
--- /dev/null
+++ b/security/acid/pkg-message
@@ -0,0 +1,10 @@
+
+************************************************************
+Please read the README file located at:
+
+%%PREFIX%%/www/acid/README
+
+for how to configure %%PREFIX%%/www/acid/acid_conf.php after
+installation.
+************************************************************
+
diff --git a/security/acid/pkg-plist b/security/acid/pkg-plist
index 8724f4156f45..66245b66ab8b 100644
--- a/security/acid/pkg-plist
+++ b/security/acid/pkg-plist
@@ -1,27 +1,52 @@
-share/doc/apache/acid/README
-share/doc/apache/acid/acid_ag_common.php
-share/doc/apache/acid/acid_ag_main.php
-share/doc/apache/acid/acid_app_faq.php
-share/doc/apache/acid/acid_common.php
-share/doc/apache/acid/acid_conf.php
-share/doc/apache/acid/acid_db_common.php
-share/doc/apache/acid/acid_db_setup.php
-share/doc/apache/acid/acid_email.php
-share/doc/apache/acid/acid_email_sqlcalls.php
-share/doc/apache/acid/acid_footer.html
-share/doc/apache/acid/acid_hdr1.html
-share/doc/apache/acid/acid_hdr2.html
-share/doc/apache/acid/acid_main.php
-share/doc/apache/acid/acid_pkt_common.php
-share/doc/apache/acid/acid_pkt_form.php
-share/doc/apache/acid/acid_pkt_main.php
-share/doc/apache/acid/acid_pkt_sqlcalls.php
-share/doc/apache/acid/acid_stat_alerts.php
-share/doc/apache/acid/acid_stat_common.php
-share/doc/apache/acid/acid_stat_ipaddr.php
-share/doc/apache/acid/acid_stat_sensor.php
-share/doc/apache/acid/acid_stat_time.php
-share/doc/apache/acid/acid_stat_uaddr.php
-share/doc/apache/acid/acid_style.css
-share/doc/apache/acid/index.html
-@dirrm share/doc/apache/acid
+%%PORTDOCS%%www/acid/README
+%%PORTDOCS%%www/acid/README.mssql
+www/acid/acid_action.inc
+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
+www/acid/acid_stat_ipaddr.php
+www/acid/acid_stat_iplink.php
+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