summaryrefslogtreecommitdiff
path: root/www/apache2
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache2')
-rw-r--r--www/apache2/Makefile5
-rw-r--r--www/apache2/options.mk5
2 files changed, 6 insertions, 4 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 68114f91909..f7dd73c58db 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2007/06/28 01:49:04 lkundrak Exp $
+# $NetBSD: Makefile,v 1.115 2007/07/04 20:55:03 jlam Exp $
.include "Makefile.common"
@@ -93,7 +93,8 @@ APACHE_USER?= www
APACHE_GROUP?= www
PKG_GROUPS= ${APACHE_GROUP}
PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
-BUILD_DEFS+= APACHE_USER APACHE_GROUP
+PKG_GROUPS_VARS+= APACHE_GROUP
+PKG_USERS_VARS+= APACHE_USER
PKG_SYSCONFVAR= apache
PKG_SYSCONFSUBDIR?= httpd
diff --git a/www/apache2/options.mk b/www/apache2/options.mk
index 67d30d215d7..072af02318b 100644
--- a/www/apache2/options.mk
+++ b/www/apache2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2007/02/22 19:27:19 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2007/07/04 20:55:03 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.apache
PKG_SUPPORTED_OPTIONS= suexec
@@ -6,7 +6,8 @@ PKG_SUPPORTED_OPTIONS= suexec
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Msuexec)
-BUILD_DEFS+= VARBASE APACHE_USER APACHE_SUEXEC_PATH
+PKG_USERS_VARS+= APACHE_USER
+BUILD_DEFS+= VARBASE APACHE_SUEXEC_PATH
BUILD_DEFS+= APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE
APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs