[pkgsrc/trunk]: pkgsrc/mk apache6 has no buildlink2.mk as it is handled autom...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1343f062a4d5
branches:  trunk
changeset: 463623:1343f062a4d5
user:      grant <grant%pkgsrc.org@localhost>
date:      Fri Nov 21 07:04:43 2003 +0000

description:
apache6 has no buildlink2.mk as it is handled automagically by
apache/buildlink2.mk, so include that instead.

makes this actually work with apache6.

diffstat:

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

diffs (41 lines):

diff -r d909e8e1e6ca -r 1343f062a4d5 mk/apache.mk
--- a/mk/apache.mk      Fri Nov 21 01:02:24 2003 +0000
+++ b/mk/apache.mk      Fri Nov 21 07:04:43 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: apache.mk,v 1.2 2003/10/19 07:46:50 grant Exp $
+# $NetBSD: apache.mk,v 1.3 2003/11/21 07:04:43 grant Exp $
 #
 # This Makefile fragment handles Apache dependencies and make variables,
 # and is meant to be included by packages that require Apache either at
@@ -117,10 +117,13 @@
 _APACHE_PKGSRCDIR=     ../../www/apache
 .elif ${_PKG_APACHE} == "apache2"
 _APACHE_PKGSRCDIR=     ../../www/apache2
+_APACHE_BL_SRCDIR=     ${_APACHE_PKGSRCDIR}
 .elif ${_PKG_APACHE} == "apache6"
 _APACHE_PKGSRCDIR=     ../../www/apache6
 .endif
 
+_APACHE_BL_SRCDIR?=    ../../www/apache
+
 _APACHE_DEPENDENCY?=   ${BUILDLINK_DEPENDS.${_PKG_APACHE}:${_APACHE_PKGSRCDIR}
 
 # Add a runtime dependency on the apache server.
@@ -128,7 +131,7 @@
 # what the apache buildlink2.mk file does.
 .if defined(_APACHE_PKGSRCDIR)
 .  if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
-.    include "${_APACHE_PKGSRCDIR}/buildlink2.mk"
+.    include "${_APACHE_BL_SRCDIR}/buildlink2.mk"
 .  else
 DEPENDS+=              ${_APACHE_DEPENDENCY}
 .  endif
@@ -138,7 +141,7 @@
 # dependency on apr, and the apache sources?
 .if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
 .  if defined(_APACHE_PKGSRCDIR)
-.    include "${_APACHE_PKGSRCDIR}/buildlink2.mk"
+.    include "${_APACHE_BL_SRCDIR}/buildlink2.mk"
 .  endif
 .else
 BUILD_DEPENDS+=                ${_APACHE_DEPENDENCY}