diff options
| author | seb <seb@pkgsrc.org> | 2005-01-03 13:20:28 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2005-01-03 13:20:28 +0000 |
| commit | ae6f41a73d8c539838cc7d22099a9bcb21fc4f02 (patch) | |
| tree | e2c9ab7680f389202a7ac96e38f15ac3470b65ed /mk/apache.mk | |
| parent | bdac0013139180fbf7377691ca2aa076ad33b5be (diff) | |
| download | pkgsrc-ae6f41a73d8c539838cc7d22099a9bcb21fc4f02.tar.gz | |
Apache6 package was removed on 2004/11/22: remove code to support it in
mk/apache.mk and references to it in mk/defaults/mk.conf.
It is now only referenced in some CONFLICTS specifications and some
dependencies specifications (for www/ap-dav and www/ap-jserv; should theses be
removed too?)
Diffstat (limited to 'mk/apache.mk')
| -rw-r--r-- | mk/apache.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mk/apache.mk b/mk/apache.mk index 2ae9f53bf1f..57aaf9630af 100644 --- a/mk/apache.mk +++ b/mk/apache.mk @@ -1,4 +1,4 @@ -# $NetBSD: apache.mk,v 1.6 2004/07/06 22:49:16 wiz Exp $ +# $NetBSD: apache.mk,v 1.7 2005/01/03 13:20:28 seb Exp $ # # This Makefile fragment handles Apache dependencies and make variables, # and is meant to be included by packages that require Apache either at @@ -13,7 +13,7 @@ # The available user variables are: # # PKG_APACHE_DEFAULT is a user-settable variable whose value is the default -# apache server to use. Possible values are apache13, apache2 and apache6. +# apache server to use. Possible values are apache13 and apache2. # If there is already a version of apache installed this will have no # effect. # @@ -36,7 +36,7 @@ APACHE_MK= # defined PKG_APACHE_DEFAULT?= # empty -_PKG_APACHES?= apache13 apache2 apache6 +_PKG_APACHES?= apache13 apache2 .if defined(PKG_APACHE_ACCEPTED) . for _ap_ in ${PKG_APACHE_ACCEPTED} @@ -59,7 +59,6 @@ _PKG_APACHE_DEFAULT?= apache13 _APACHE_PKGBASE.apache13= apache-1\* _APACHE_PKGBASE.apache2= apache-2\* -_APACHE_PKGBASE.apache6= apache6 # Mark the acceptable apaches and check which apache packages are installed. .for _ap_ in ${_PKG_APACHE_ACCEPTED} @@ -111,15 +110,12 @@ _PKG_APACHE= "none" BUILDLINK_DEPENDS.apache13?= apache-1.3* BUILDLINK_DEPENDS.apache2?= apache-2* -BUILDLINK_DEPENDS.apache6?= apache6* .if ${_PKG_APACHE} == "apache13" _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 |