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?)

1 files changed, 7 insertions, 7 deletions

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index f4c17d8ee58..fd95e6dab80 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -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 @@ AMANDA_VAR?=	${VARBASE}/amanda
 # 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