diff options
| author | wiz <wiz> | 2004-07-06 22:49:16 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2004-07-06 22:49:16 +0000 |
| commit | b4ae93066fb2a80a7e9a7ba60a77b5819f2248ce (patch) | |
| tree | 8ddd6f5fbca3030a00649cceea94d5dd34d4b845 /mk/apache.mk | |
| parent | d21825768d4c8a1342aeb7ecbf568da3fa5347a3 (diff) | |
| download | pkgsrc-b4ae93066fb2a80a7e9a7ba60a77b5819f2248ce.tar.gz | |
Retire buildlink2, now that all packages using it have been converted to
buildlink3.
Diffstat (limited to 'mk/apache.mk')
| -rw-r--r-- | mk/apache.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/mk/apache.mk b/mk/apache.mk index bac28430e50..2ae9f53bf1f 100644 --- a/mk/apache.mk +++ b/mk/apache.mk @@ -1,4 +1,4 @@ -# $NetBSD: apache.mk,v 1.5 2003/12/11 13:51:28 grant Exp $ +# $NetBSD: apache.mk,v 1.6 2004/07/06 22:49:16 wiz Exp $ # # This Makefile fragment handles Apache dependencies and make variables, # and is meant to be included by packages that require Apache either at @@ -133,8 +133,6 @@ _APACHE_DEPENDENCY?= ${BUILDLINK_DEPENDS.${_PKG_APACHE}}:${_APACHE_PKGSRCDIR} .if defined(_APACHE_PKGSRCDIR) . if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) . include "${_APACHE_BL_SRCDIR}/buildlink3.mk" -. elif defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) -. include "${_APACHE_BL_SRCDIR}/buildlink2.mk" . else DEPENDS+= ${_APACHE_DEPENDENCY} . endif @@ -146,8 +144,6 @@ DEPENDS+= ${_APACHE_DEPENDENCY} .if defined(_APACHE_PKGSRCDIR) . if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) . include "${_APACHE_BL_SRCDIR}/buildlink3.mk" -. elif defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) -. include "${_APACHE_BL_SRCDIR}/buildlink2.mk" . else BUILD_DEPENDS+= ${_APACHE_DEPENDENCY} . endif @@ -157,8 +153,6 @@ BUILD_DEPENDS+= ${_APACHE_DEPENDENCY} . if defined(USE_APR) && !empty(USE_APR:M[yY][eE][sS]) . if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) . include "../../devel/apr/buildlink3.mk" -. elif defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) -. include "../../devel/apr/buildlink2.mk" . endif . endif .endif |