[pkgsrc/trunk]: pkgsrc/www/apache2 Set APACHE_MODULES with ?= *before* bsd.pr...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/af0be6dfe678
branches:  trunk
changeset: 511866:af0be6dfe678
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Apr 24 20:10:02 2006 +0000

description:
Set APACHE_MODULES with ?= *before* bsd.prefs.mk, because that's the only
way that using APACHE_MODULES+= (additive) in mk.conf can work correctly.

diffstat:

 www/apache2/Makefile |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 6c40d33f7f57 -r af0be6dfe678 www/apache2/Makefile
--- a/www/apache2/Makefile      Mon Apr 24 18:52:25 2006 +0000
+++ b/www/apache2/Makefile      Mon Apr 24 20:10:02 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2006/04/23 11:42:38 adrianp Exp $
+# $NetBSD: Makefile,v 1.100 2006/04/24 20:10:02 tv Exp $
 
 .include "Makefile.common"
 
@@ -29,6 +29,12 @@
 
 BUILDLINK_API_DEPENDS.apr+=    apr>=0.9.7.2.0.55
 
+# the following must be set before bsd.prefs.mk in order to make += work
+# in mk.conf; however, it isn't expanded until referenced, so we can
+# define DFLT_APACHE_MODULES later
+#
+APACHE_MODULES?=       ${DFLT_APACHE_MODULES}
+
 .include "../../mk/bsd.prefs.mk"
 .include "../../devel/apr/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
@@ -81,7 +87,6 @@
 # APACHE_MODULES are the modules that are linked statically into the
 # apache httpd executable.
 #
-APACHE_MODULES?=       ${DFLT_APACHE_MODULES}
 CONFIGURE_ARGS+=       --enable-modules=${APACHE_MODULES:Q}
 BUILD_DEFS+=           APACHE_MODULES