Update to 1.9.4

This package used to register as ap-modsecurity regardless of which apache
version it built against.  It will now register as ap13-modsecurity if
building against apache 1.x and ap2-modsecurity if building against
apache 2.x.
Lots of changes including:
* Enhanced memory utilisation.
* Log level is now present on every entry in the debug log.
* Added new actions (e.g. setenv, setnote, auditlog, noauditlog)
* 404 responses are no longer considered relevant.
* Added performance measurement to the Apache 2 versions.
See CHANGES for all the details

3 files changed, 33 insertions, 20 deletions

diff --git a/security/ap-modsecurity/Makefile b/security/ap-modsecurity/Makefile
index 57c59e7ffb6..f65e4fa8b36 100644
--- a/security/ap-modsecurity/Makefile
+++ b/security/ap-modsecurity/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:10:42 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/21 12:36:07 adrianp Exp $
 #
 
-DISTNAME=	modsecurity-1.8.7
-PKGNAME=	ap-modsecurity-1.8.7
-PKGREVISION=	2
+DISTNAME=	modsecurity-apache_1.9.4
+PKGNAME=	${APACHE_PKG_PREFIX}-modsecurity-1.9.4
 CATEGORIES=	www security
 MASTER_SITES=	http://www.modsecurity.org/download/
 
@@ -26,25 +25,20 @@ PTHREAD_OPTS+=	require
 
 do-build:
 	cd ${WRKSRC}/${APACHE_DIR} && \
-		${SETENV} PATH=${PATH} \
+		${SETENV} PATH=${PATH:Q} \
 		${APXS} ${CPPFLAGS} ${LDFLAGS} -c mod_security.c
 
 do-install:
 	cd ${WRKSRC}/${APACHE_DIR} && \
-		${SETENV} PATH=${PATH} \
+		${SETENV} PATH=${PATH:Q} \
 		${APXS} ${CPPFLAGS} ${LDFLAGS} -i mod_security.${MOD_EXTN}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ap-security
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ap-security
 
-	${INSTALL_DATA} ${WRKSRC}/httpd.conf.regression-v1 \
-		${PREFIX}/share/examples/ap-security
-	${INSTALL_DATA} ${WRKSRC}/httpd.conf.regression-v2 \
-		${PREFIX}/share/examples/ap-security
 	${INSTALL_DATA} ${WRKSRC}/httpd.conf.example-minimal \
 		${PREFIX}/share/examples/ap-security
-	${INSTALL_DATA} ${WRKSRC}/modsecurity-manual.pdf \
-		${PREFIX}/share/doc/ap-security
+	cd ${WRKSRC}/doc && ${PAX} -rw . ${PREFIX}/share/doc/ap-security
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ap-modsecurity/PLIST b/security/ap-modsecurity/PLIST
index 2385cc77652..0b9946f8555 100644
--- a/security/ap-modsecurity/PLIST
+++ b/security/ap-modsecurity/PLIST
@@ -1,8 +1,27 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/14 18:29:39 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/10/21 12:36:07 adrianp Exp $
+share/doc/ap-security/html-multipage/01-introduction.html
+share/doc/ap-security/html-multipage/02-installation.html
+share/doc/ap-security/html-multipage/03-configuration.html
+share/doc/ap-security/html-multipage/04-rules.html
+share/doc/ap-security/html-multipage/05-actions.html
+share/doc/ap-security/html-multipage/06-special_features.html
+share/doc/ap-security/html-multipage/07-logging.html
+share/doc/ap-security/html-multipage/08-miscellaneous.html
+share/doc/ap-security/html-multipage/09-examples.html
+share/doc/ap-security/html-multipage/aa-recommended_configuration.html
+share/doc/ap-security/html-multipage/index.html
+share/doc/ap-security/html-multipage/modsecurity-manual.css
+share/doc/ap-security/html-multipage/modsecurity.gif
+share/doc/ap-security/html-multipage/thinkingstone.gif
+share/doc/ap-security/index.html
+share/doc/ap-security/modsecurity-manual.css
+share/doc/ap-security/modsecurity-manual.html
+share/doc/ap-security/modsecurity-manual.xml
+share/doc/ap-security/modsecurity.gif
+share/doc/ap-security/thinkingstone.gif
 lib/httpd/mod_security.so
 share/doc/ap-security/modsecurity-manual.pdf
 share/examples/ap-security/httpd.conf.example-minimal
-share/examples/ap-security/httpd.conf.regression-v1
-share/examples/ap-security/httpd.conf.regression-v2
-@dirrm share/examples/ap-security
+@dirrm share/doc/ap-security/html-multipage
 @dirrm share/doc/ap-security
+@dirrm share/examples/ap-security
diff --git a/security/ap-modsecurity/distinfo b/security/ap-modsecurity/distinfo
index 40474be3113..dca8a7a0f9f 100644
--- a/security/ap-modsecurity/distinfo
+++ b/security/ap-modsecurity/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/14 18:29:39 adrianp Exp $
+$NetBSD: distinfo,v 1.2 2006/10/21 12:36:07 adrianp Exp $
 
-SHA1 (modsecurity-1.8.7.tar.gz) = 59296d4c2776b0beb3ee65e4d5b7dc51f36142a5
-RMD160 (modsecurity-1.8.7.tar.gz) = ee5e6566dda8c932e5e01833af290186f22af773
-Size (modsecurity-1.8.7.tar.gz) = 313004 bytes
+SHA1 (modsecurity-apache_1.9.4.tar.gz) = 8f34540a8dfa8374d9b2446cf9b17c4acc69e59f
+RMD160 (modsecurity-apache_1.9.4.tar.gz) = 2fd5e3f43fa94836a4845f106285bed68c704aef
+Size (modsecurity-apache_1.9.4.tar.gz) = 496805 bytes