Mon Aug 31 07:19:44 2009 UTC ()
Fix build problem on Solaris with PKGSRC_COMPILER=sunpro and 'db4'
in PKG_OPTIONS.apr-util/PKG_DEFAULT_OPTIONS.

USE_LANGUAGES should be set before including mk/apache.mk as it
(may) ends up including mk/compiler.mk.
This last file sets a default value of 'c' to USE_LANGUAGES and
then uses it to set PKG_CC, PKG_CXX and PKG_FC to "fail wrappers".
Hence the C++ compiler command ends up being wrapped by a "fail
script" thus breaks the build.


(seb)
diff -r1.14 -r1.15 pkgsrc/security/ap-modsecurity2/Makefile
cvs diff -r1.14 -r1.15 pkgsrc/security/ap-modsecurity2/Makefile (expand / switch to unified diff)

--- pkgsrc/security/ap-modsecurity2/Makefile 2009/07/17 18:00:23 1.14
+++ pkgsrc/security/ap-modsecurity2/Makefile 2009/08/31 07:19:44 1.15
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.14 2009/07/17 18:00:23 adrianp Exp $ 1# $NetBSD: Makefile,v 1.15 2009/08/31 07:19:44 seb Exp $
2 2
3DISTNAME= modsecurity-apache_2.5.9 3DISTNAME= modsecurity-apache_2.5.9
4PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/apache_//} 4PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/apache_//}
5CATEGORIES= www security 5CATEGORIES= www security
6MASTER_SITES= http://www.modsecurity.org/download/ 6MASTER_SITES= http://www.modsecurity.org/download/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.modsecurity.org/ 9HOMEPAGE= http://www.modsecurity.org/
10COMMENT= Intrusion detection and prevention engine for web applications 10COMMENT= Intrusion detection and prevention engine for web applications
11 11
12PKG_APACHE_ACCEPTED= apache2 apache22 12PKG_APACHE_ACCEPTED= apache2 apache22
 13USE_LANGUAGES+= c++ c
13 14
14.include "../../mk/apache.mk" 15.include "../../mk/apache.mk"
15.include "options.mk" 16.include "options.mk"
16 17
17GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
18USE_TOOLS+= pax 19USE_TOOLS+= pax
19USE_LIBTOOL= yes 20USE_LIBTOOL= yes
20WRKSRC= ${WRKDIR}/${DISTNAME}/apache2 21WRKSRC= ${WRKDIR}/${DISTNAME}/apache2
21USE_LANGUAGES+= c++ c 
22 22
23CONFIGURE_ARGS+= --with-apxs=${PREFIX}/sbin/apxs 23CONFIGURE_ARGS+= --with-apxs=${PREFIX}/sbin/apxs
24CONFIGURE_ARGS+= --with-pcre=${PREFIX} 24CONFIGURE_ARGS+= --with-pcre=${PREFIX}
25CONFIGURE_ARGS+= --with-libxml=${PREFIX} 25CONFIGURE_ARGS+= --with-libxml=${PREFIX}
26 26
27SUBST_CLASSES+= config 27SUBST_CLASSES+= config
28SUBST_STAGE.config= post-patch 28SUBST_STAGE.config= post-patch
29SUBST_FILES.config= configure 29SUBST_FILES.config= configure
30SUBST_SED.config= -e "s|@@PREFIX@@|${PREFIX}|g" 30SUBST_SED.config= -e "s|@@PREFIX@@|${PREFIX}|g"
31SUBST_MESSAGE.config= Fixing configuration files. 31SUBST_MESSAGE.config= Fixing configuration files.
32 32
33EGDIR= ${PREFIX}/share/examples/ap-modsecurity 33EGDIR= ${PREFIX}/share/examples/ap-modsecurity
34CONF_FILES= ${EGDIR}/modsecurity.conf-minimal \ 34CONF_FILES= ${EGDIR}/modsecurity.conf-minimal \