diff options
| author | obache <obache> | 2011-03-19 13:31:52 +0000 |
|---|---|---|
| committer | obache <obache> | 2011-03-19 13:31:52 +0000 |
| commit | 11e235810c97f721d474916f737c9aab276e0b0c (patch) | |
| tree | c96565d4db528f4f613ff8f4aaf772347d3ce6d2 /security | |
| parent | e4a84232f3540e6eb56cfeae816541d23bf1a440 (diff) | |
| download | pkgsrc-11e235810c97f721d474916f737c9aab276e0b0c.tar.gz | |
* additional missing clean up after removal of libxml option.
* pass to configure more preferred variables.
Diffstat (limited to 'security')
| -rw-r--r-- | security/ap-modsecurity2/MESSAGE.xml | 9 | ||||
| -rw-r--r-- | security/ap-modsecurity2/Makefile | 8 | ||||
| -rw-r--r-- | security/ap-modsecurity2/options.mk | 15 |
3 files changed, 6 insertions, 26 deletions
diff --git a/security/ap-modsecurity2/MESSAGE.xml b/security/ap-modsecurity2/MESSAGE.xml deleted file mode 100644 index c214312f8ed..00000000000 --- a/security/ap-modsecurity2/MESSAGE.xml +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.xml,v 1.1.1.1 2006/11/05 14:33:37 adrianp Exp $ - -In order to use the XML support in your Apache installation, you will need -to add the following to your httpd.conf file: - - LoadFile ${PREFIX}/lib/libxml2.so - -=========================================================================== diff --git a/security/ap-modsecurity2/Makefile b/security/ap-modsecurity2/Makefile index 8456ac610bc..da48b54d8a6 100644 --- a/security/ap-modsecurity2/Makefile +++ b/security/ap-modsecurity2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2009/08/31 07:19:44 seb Exp $ +# $NetBSD: Makefile,v 1.16 2011/03/19 13:31:52 obache Exp $ DISTNAME= modsecurity-apache_2.5.9 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/apache_//} @@ -20,9 +20,9 @@ USE_TOOLS+= pax USE_LIBTOOL= yes WRKSRC= ${WRKDIR}/${DISTNAME}/apache2 -CONFIGURE_ARGS+= --with-apxs=${PREFIX}/sbin/apxs -CONFIGURE_ARGS+= --with-pcre=${PREFIX} -CONFIGURE_ARGS+= --with-libxml=${PREFIX} +CONFIGURE_ARGS+= --with-apxs=${APXS} +CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} +CONFIGURE_ARGS+= --with-libxml=${BUILDLINK_PREFIX.libxml2} SUBST_CLASSES+= config SUBST_STAGE.config= post-patch diff --git a/security/ap-modsecurity2/options.mk b/security/ap-modsecurity2/options.mk index 6d0f9e2b10c..f43004ac2d1 100644 --- a/security/ap-modsecurity2/options.mk +++ b/security/ap-modsecurity2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2008/10/12 12:50:17 adrianp Exp $ +# $NetBSD: options.mk,v 1.4 2011/03/19 13:31:52 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ap-modsecurity2 @@ -7,22 +7,11 @@ PKG_SUPPORTED_OPTIONS= curl .include "../../mk/bsd.options.mk" ### -### Bring in support for libxml2 -### -.if !empty(PKG_OPTIONS:Mxml) -. include "../../textproc/libxml2/buildlink3.mk" -CONFIGURE_ARGS+= --with-libxml -MESSAGE_SRC+= ${WRKDIR}/.MESSAGE_SRC.xml -.else -CONFIGURE_ARGS+= --without-libxml -.endif - -### ### Bring in support for curl ### .if !empty(PKG_OPTIONS:Mcurl) . include "../../www/curl/buildlink3.mk" -CONFIGURE_ARGS+= --with-curl=${PREFIX}/bin/curl +CONFIGURE_ARGS+= --with-curl=${BUILDLINK_PREFIX.curl} .else CONFIGURE_ARGS+= --without-curl .endif |