- Chase the www/apache20 conversion to devel/pcre only.

Reported by:    pointyhat via pav, erwin
With Hat:       apache@

www/mod_auth_form/Makefile

@@ -27,7 +27,6 @@ CONFIGURE_ENV=	MYSQL_PREFIX="${LOCALBASE}" APACHE2_PREFIX="${LOCALBASE}" \
 		APR1_INCLUDE="${LOCALBASE}/include/apache2"
 
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-I${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS NEWS README
 

www/mod_cplusplus/Makefile

@@ -17,6 +17,7 @@ MAKE_JOBS_SAFE=  yes
 
 USE_APACHE=	2.0+
 USE_AUTOTOOLS=	autoconf:262 autoheader:262 libtool:22 automake:19 aclocal:19
+CFLAGS+=	-I${LOCALBASE}/include
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}

www/mod_jk-apache2/Makefile

@@ -16,4 +16,6 @@ COMMENT=	Apache2 JK module for connecting to Tomcat using AJP1X
 
 MAKE_JOBS_SAFE=  yes
 
+CFLAGS+=	-I${LOCALBASE}/include
+
 .include "${MASTERDIR}/Makefile"

www/mod_proctitle/Makefile

@@ -18,6 +18,7 @@ MAKE_JOBS_SAFE=  yes
 USE_APACHE?=	2.0+
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+CFLAGS+=	-I${LOCALBASE}/include
 PLIST_FILES=	${APACHEMODDIR}/${PORTNAME}.so
 
 do-install:

www/p5-Apache-Scoreboard/Makefile

@@ -19,6 +19,8 @@ COMMENT=	Perl interface to the Apache scoreboard structure
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+CFLAGS+=	-I${LOCALBASE}/include
+
 PERL_CONFIGURE=	YES
 
 MAN3=		Apache::Scoreboard.3

www/suphp/Makefile

@@ -20,12 +20,13 @@ USE_AUTOTOOLS=	aclocal:110:env automake:110:env autoconf:262:env libtool:22:env
 
 # Maintainer has not tested suPHP 0.6.x on Apache 1.3.
 USE_APACHE=	2.0+
+CFLAGS+=	-I${LOCALBASE}/include
 USE_PHP=	yes
 WANT_PHP_CGI=	yes
 
 MYPORTDOCS=	apache/CONFIG apache/INSTALL apache/README CONFIG LICENSE INSTALL README
 
-CONFIGURE_ARGS=	CFLAGS=-I${LOCALBASE}/include --with-apxs=${APXS}
+CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" --with-apxs=${APXS}
 
 # WITH_SETID_MODE should be a value of "owner", "force", or "paranoid".
 # It's important that you understand the differences between each mode.