apache22: remove, it was eol'd in June 2017

Remove packages that only work with apache22.
Remove apache22 references.

4 files changed, 11 insertions, 21 deletions

diff --git a/mk/apache.mk b/mk/apache.mk
index 36c08f8f8f4..a88dc368a95 100644
--- a/mk/apache.mk
+++ b/mk/apache.mk
@@ -1,4 +1,4 @@
-# $NetBSD: apache.mk,v 1.30 2017/03/11 18:29:24 maya Exp $
+# $NetBSD: apache.mk,v 1.31 2018/01/01 10:23:09 wiz Exp $
 #
 # This file is meant to be included by packages that require an apache
 # web server.
@@ -9,7 +9,7 @@
 #	The default apache server to use and install. If there already
 #	is an apache installed, this will have no effect.
 #
-#	Possible values: apache22 apache24
+#	Possible values: apache24
 #
 # Package-settable variables:
 #
@@ -55,11 +55,7 @@ PKG_APACHE_ACCEPTED?=		${_PKG_APACHES}
 USE_APR?=			no
 
 # The available apache packages:
-_PKG_APACHES=			apache22 apache24
-
-_APACHE_PKGBASE.apache22=	apache-2.[23]*
-_APACHE_PKG_PREFIX.apache22=	ap22
-_APACHE_PKGSRCDIR.apache22=	../../www/apache22
+_PKG_APACHES=			apache24
 
 _APACHE_PKGBASE.apache24=	apache-2.[456789]*
 _APACHE_PKG_PREFIX.apache24=	ap24
@@ -72,7 +68,7 @@ _APACHE_PKGSRCDIR.apache24=	../../www/apache24
 .if empty(_PKG_APACHES:M${PKG_APACHE_DEFAULT})
 _PKG_APACHE_MESSAGE:=		"[apache.mk] Invalid apache package \""${PKG_APACHE_DEFAULT:Q}"\" in PKG_APACHE_DEFAULT."
 PKG_FAIL_REASON+=		${_PKG_APACHE_MESSAGE}
-PKG_APACHE_DEFAULT=		apache22
+PKG_APACHE_DEFAULT=		apache24
 .endif
 
 .for _ap_ in ${PKG_APACHE_ACCEPTED}
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index a3a7e089248..14b996fb748 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.288 2017/12/03 11:09:46 wiz Exp $
+# $NetBSD: mk.conf,v 1.289 2018/01/01 10:23:09 wiz Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -716,27 +716,27 @@ AMANDA_VAR?=	${VARBASE}/amanda
 # Default: ${VARBASE}/amanda
 
 APACHE_USER?=	www
-# Used in apache22, apache24, isap, and smb2www to specify the user
+# Used in apache24, 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 apache22, apache24, squirrelmail, and iasp to specify
+# Used in apache24, 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 apache22 and apache24 to specify additional suexec options
+# Used in apache24 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 apache22 and apache24 to specify the document space in
+# Used in apache24 to specify the document space in
 # which suexec will be allowed to work.
 # Possible: Any valid directory
 # Default: ${LOCALBASE}/share/httpd/htdocs
diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index e2a2708862e..15c11cafe08 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -30,7 +30,6 @@ apache			Enable support for Apache web server.
 apache-mpm-event	Use multi-threaded workers in Apache web server.
 apache-mpm-prefork	Use pre-forked workers in Apache web server.
 apache-mpm-worker	Use multiple processes of multi-threaded workers in Apache web server.
-apache-shared-modules	Build all modules as shared for apache22.
 apple-common-crypto	Use Apple's CommonCrypto.
 ares			Use the ares library for asynchronous name resolution.
 aria2-metalink		Enable Metalink support.
diff --git a/mk/pbulk/pbulk-index.mk b/mk/pbulk/pbulk-index.mk
index 61a70320be7..6288fd53c41 100644
--- a/mk/pbulk/pbulk-index.mk
+++ b/mk/pbulk/pbulk-index.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: pbulk-index.mk,v 1.23 2016/12/17 23:41:52 joerg Exp $
+#	$NetBSD: pbulk-index.mk,v 1.24 2018/01/01 10:23:09 wiz Exp $
 
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to the parallel bulk build
@@ -78,12 +78,7 @@ pbulk-index: pbulk-index-item
 # Use an ODE for loop to compute the carthesian product of
 # the support settings.  This expands to something like
 #
-#	for apache in apache22 apache24; do \
-#		_PBULK_MULTI_VALUE.apache=$apache; \
-#		export _PBULK_MULTI_VALUE.apache; \
-#		PKG_APACHE=$apache; \
-#		export PKG_APACHE; \
-#		for php in 4 5; do \
+#	for php in 4 5; do \
 #		_PBULK_MULTI_VALUE.php=$php; \
 #		export _PBULK_MULTI_VALUE.php; \
 #		PHP_VERSION_REQD=$php; \