[pkgsrc/trunk]: pkgsrc/mk Oops, this was meant to go in with the rest of the ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c22c68886e7
branches:  trunk
changeset: 524405:7c22c68886e7
user:      epg <epg%pkgsrc.org@localhost>
date:      Wed Jan 24 19:48:44 2007 +0000

description:
Oops, this was meant to go in with the rest of the apr changes.
Use devel/apr0 for apache2 and devel/apr and devel/apr-util for apache22.

diffstat:

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

diffs (22 lines):

diff -r 51aaf6b1768e -r 7c22c68886e7 mk/apache.mk
--- a/mk/apache.mk      Wed Jan 24 19:48:30 2007 +0000
+++ b/mk/apache.mk      Wed Jan 24 19:48:44 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: apache.mk,v 1.18 2006/12/09 08:24:10 wiz Exp $
+# $NetBSD: apache.mk,v 1.19 2007/01/24 19:48:44 epg Exp $
 #
 # This file is meant to be included by packages that require an apache
 # web server.
@@ -124,9 +124,10 @@
 APACHE_PKG_PREFIX=     ${_APACHE_PKG_PREFIX.${PKG_APACHE}}
 
 .if (${PKG_APACHE} == "apache2") && !empty(USE_APR:M[yY][eE][sS])
-.  include "../../devel/apr/buildlink3.mk"
+.  include "../../devel/apr0/buildlink3.mk"
 .elif (${PKG_APACHE} == "apache22") && !empty(USE_APR:M[Yy][Ee][Ss])
-.  include "../../devel/apr1/buildlink3.mk"
+.  include "../../devel/apr/buildlink3.mk"
+.  include "../../devel/apr-util/buildlink3.mk"
 .endif
 
 .endif # APACHE_MK