summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2006-12-08 23:33:15 +0000
committerxtraeme <xtraeme@pkgsrc.org>2006-12-08 23:33:15 +0000
commit5e26cd5f5d9840f5b92ec2fa5b2cfe9c073c9ee9 (patch)
tree3cd651afec54d82db7e25629926c4215bd5c0ac9 /mk
parent5b7ca5fcb5a96a6f74467ca6037ac91203538bbf (diff)
downloadpkgsrc-5e26cd5f5d9840f5b92ec2fa5b2cfe9c073c9ee9.tar.gz
apache.mk now knows about apache22, available for PKG_APACHE_DEFAULT.
Diffstat (limited to 'mk')
-rw-r--r--mk/apache.mk14
1 files changed, 10 insertions, 4 deletions
diff --git a/mk/apache.mk b/mk/apache.mk
index db023c3fc38..483ffb88a2e 100644
--- a/mk/apache.mk
+++ b/mk/apache.mk
@@ -1,4 +1,4 @@
-# $NetBSD: apache.mk,v 1.15 2006/11/09 02:05:08 rillig Exp $
+# $NetBSD: apache.mk,v 1.16 2006/12/08 23:33:15 xtraeme Exp $
#
# This file is meant to be included by packages that require an apache
# web server.
@@ -9,7 +9,7 @@
# The default apache server to use and install. If there already
# is an apache installed, this will have no effect.
#
-# Possible values: apache13 apache2
+# Possible values: apache13 apache2 apache22
#
# Package-settable variables:
#
@@ -51,16 +51,20 @@ PKG_APACHE_ACCEPTED?= ${_PKG_APACHES}
USE_APR?= no
# The available apache packages:
-_PKG_APACHES= apache13 apache2
+_PKG_APACHES= apache13 apache2 apache22
_APACHE_PKGBASE.apache13= apache-1\*
_APACHE_PKG_PREFIX.apache13= ap13
_APACHE_PKGSRCDIR.apache13= ../../www/apache
-_APACHE_PKGBASE.apache2= apache-2\*
+_APACHE_PKGBASE.apache2= apache-2.0*
_APACHE_PKG_PREFIX.apache2= ap2
_APACHE_PKGSRCDIR.apache2= ../../www/apache2
+_APACHE_PKGBASE.apache22= apache-2.[23456789]\*
+_APACHE_PKG_PREFIX.apache22= ap2
+_APACHE_PKGSRCDIR.apache22= ../../www/apache22
+
#
# Sanity checks.
#
@@ -121,6 +125,8 @@ APACHE_PKG_PREFIX= ${_APACHE_PKG_PREFIX.${PKG_APACHE}}
.if (${PKG_APACHE} == "apache2") && !empty(USE_APR:M[yY][eE][sS])
. include "../../devel/apr/buildlink3.mk"
+.else if (${PKG_APACHE} == "apache22") && !empty(USE_APR:M[Yy][Ee][Ss])
+. include "../../devel/apr22/buildlink3.mk"
.endif
.endif # APACHE_MK