diff options
| -rw-r--r-- | mk/alternatives.mk | 6 | ||||
| -rw-r--r-- | mk/apache.mk | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/mk/alternatives.mk b/mk/alternatives.mk index 6287a398651..3686eb9d43d 100644 --- a/mk/alternatives.mk +++ b/mk/alternatives.mk @@ -1,4 +1,4 @@ -# $NetBSD: alternatives.mk,v 1.8 2006/11/10 20:48:41 rillig Exp $ +# $NetBSD: alternatives.mk,v 1.9 2007/05/07 09:32:11 rillig Exp $ # # This Makefile fragment handles the alternatives system, registering a # package in the database. @@ -25,6 +25,10 @@ .if !defined(ALTERNATIVES_MK) ALTERNATIVES_MK= # defined +_VARGROUPS+= alternatives +_PKG_VARS.alternatives= ALTERNATIVES_SRC +_SYS_VARS.alternatives= PKG_ALTERNATIVES + .if exists(${.CURDIR}/ALTERNATIVES) ALTERNATIVES_SRC?= ${.CURDIR}/ALTERNATIVES .endif diff --git a/mk/apache.mk b/mk/apache.mk index eaa0cbab994..7cd8c68ecb4 100644 --- a/mk/apache.mk +++ b/mk/apache.mk @@ -1,4 +1,4 @@ -# $NetBSD: apache.mk,v 1.19 2007/01/24 19:48:44 epg Exp $ +# $NetBSD: apache.mk,v 1.20 2007/05/07 09:32:29 rillig Exp $ # # This file is meant to be included by packages that require an apache # web server. @@ -40,6 +40,11 @@ .if !defined(APACHE_MK) APACHE_MK= # defined +_VARGROUPS+= apache +_USER_VARS.apache= PKG_APACHE_DEFAULT +_PKG_VARS.apache= PKG_APACHE_ACCEPTED USE_APR +_SYS_VARS.apache= PKG_APACHE APACHE_PKG_PREFIX + .include "../../mk/bsd.prefs.mk" PKG_APACHE_DEFAULT?= apache2 |