[pkgsrc/trunk]: pkgsrc/mk Apache6 package was removed on 2004/11/22: remove c...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c1a0b165b002
branches:  trunk
changeset: 486795:c1a0b165b002
user:      seb <seb%pkgsrc.org@localhost>
date:      Mon Jan 03 13:20:28 2005 +0000

description:
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:

 mk/apache.mk        |  10 +++-------
 mk/defaults/mk.conf |  14 +++++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diffs (105 lines):

diff -r b824d516ce8a -r c1a0b165b002 mk/apache.mk
--- a/mk/apache.mk      Mon Jan 03 12:49:00 2005 +0000
+++ b/mk/apache.mk      Mon Jan 03 13:20:28 2005 +0000
@@ -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 @@
 
 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 @@
 
 _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 @@
 
 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
diff -r b824d516ce8a -r c1a0b165b002 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Mon Jan 03 12:49:00 2005 +0000
+++ b/mk/defaults/mk.conf       Mon Jan 03 13:20:28 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.21 2004/12/25 19:16:29 jmmv Exp $
+# $NetBSD: mk.conf,v 1.22 2005/01/03 13:20:28 seb Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -667,38 +667,38 @@
 # Default: ${VARBASE}/amanda
 
 #APACHE_CUSTOM_CFLAGS=
-# Used in apache and apache6 to pass extra CFLAGS to the compiler during
+# Used in apache to pass extra CFLAGS to the compiler during
 # the build.
 # Possible: any legal compiler flags, e.g. -O6 -DHARD_SERVER_LIMIT=512
 # Default: not defined
 
 #APACHE_PERF_TUNING=   YES
-# Used in apache and apache6 to optimize for maximum performance.
+# Used in apache to optimize for maximum performance.
 # Possible: not defined, YES
 # Default: not defined
 
 APACHE_USER?=  www
-# Used in apache, apache2, apache6, isap, and smb2www to specify the user
+# Used in apache, apache2, isap, and smb2www to specify the user
 # allowed to execute the `suexec' wrapper.  Expected to be the user the
 # httpd server normally runs as.
 # Possible: any user name
 # Default: www
 
 APACHE_GROUP?= www
-# Used in apache, apache2, apache6, squirrelmail, and iasp to specify
+# Used in apache, apache2, squirrelmail, and iasp to specify
 # the default group of the user allowed to execute the `suexec' wrapper.
 # Expected to be the group the httpd server normally runs as.
 # Possible: any group name
 # Default: www
 
 #APACHE_SUEXEC_CONFIGURE_ARGS= --suexec-uidmin=1000
-# Used in apache, apache2, and apache6 to specify additional suexec options
+# Used in apache and apache2 to specify additional suexec options
 # to be passed to the configure script.
 # Possible: any --suexec-* options recognized by the Apache configure script.
 # Default: not defined
 
 APACHE_SUEXEC_DOCROOT?=        ${LOCALBASE}/share/httpd/htdocs
-# Used in apache, apache2, and apache6 to specify the document space in
+# Used in apache and apache2 to specify the document space in
 # which suexec will be allowed to work.
 # Possible: Any valid directory
 # Default: ${LOCALBASE}/share/httpd/htdocs