[pkgsrc/trunk]: pkgsrc/mk apache.mk now knows about apache22, available for P...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/457736a6a828
branches:  trunk
changeset: 522410:457736a6a828
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Dec 08 23:33:15 2006 +0000

description:
apache.mk now knows about apache22, available for PKG_APACHE_DEFAULT.

diffstat:

 mk/apache.mk |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (50 lines):

diff -r 7dba7836009c -r 457736a6a828 mk/apache.mk
--- a/mk/apache.mk      Fri Dec 08 23:32:34 2006 +0000
+++ b/mk/apache.mk      Fri Dec 08 23:33:15 2006 +0000
@@ -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 @@
 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 @@
 
 .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