--- a/components/apache2/Makefile	Tue Dec 08 14:36:41 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-include ../../make-rules/shared-macros.mk
-
-COMPONENT_NAME=		apache2
-COMPONENT_VERSION=	2.2.31
-COMPONENT_PROJECT_URL=	http://httpd.apache.org/
-COMPONENT_SRC_NAME=	httpd
-COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	\
-     sha256:77afdd50ca2624f7d78832b1e92f34e4df293328ec59fd0e3f6cdedf67ac0c7f
-COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB=	utility/apache
-
-TPNO_APACHE=		23672
-TPNO_MOD_SED=		8897
-
-CONFIGURE_DEFAULT_DIRS=no
-
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
-
-ASLR_MODE = $(ASLR_ENABLE)
-
-PATCH_LEVEL=0
-
-# Some patches need configure script re-creation.
-COMPONENT_PREP_ACTION +=($(CP) mod_sed/* $(@D)/modules/filters);
-COMPONENT_PREP_ACTION +=($(CP) mod_auth_gss/mod_auth_gss.c $(@D)/modules/aaa);
-COMPONENT_PREP_ACTION +=($(CP) mod_auth_gss/mod_auth_gss.html $(@D)/docs/manual/mod);
-COMPONENT_PREP_ACTION +=(cd $(@D); autoreconf);
-
-VARIANT_PREFORK =	$(BUILD_DIR)/prefork
-VARIANT_WORKER =	$(BUILD_DIR)/worker
-
-VARIANTS = $(VARIANT_WORKER) $(VARIANT_PREFORK)
-
-BUILD_32 = $(VARIANTS:%=%/$(MACH32)/.built)
-BUILD_64 = $(VARIANTS:%=%/$(MACH64)/.built)
-
-INSTALL_32 = $(VARIANTS:%=%/$(MACH32)/.installed)
-INSTALL_64 = $(VARIANTS:%=%/$(MACH64)/.installed)
-
-$(VARIANT_PREFORK)/$(MACH64)/.configured: BITS=64
-$(VARIANT_WORKER)/$(MACH64)/.configured:  BITS=64
-
-$(VARIANT_PREFORK)/%/.configured: CONFIGURE_OPTIONS += --with-mpm=prefork
-$(VARIANT_WORKER)/%/.configured:  CONFIGURE_OPTIONS += --with-mpm=worker
-
-# pipefail wouldn't allow APR-util version check
-CONFIGURE_ENV += SHELLOPTS=
-
-CONFIGURE_PREFIX =	/usr/apache2/2.2
-
-CONFIGURE_OPTIONS +=	--enable-mods-shared=all
-CONFIGURE_OPTIONS +=	--enable-so
-CONFIGURE_OPTIONS +=	--enable-suexec
-CONFIGURE_OPTIONS +=	--with-suexec-caller=webservd
-CONFIGURE_OPTIONS +=	--enable-proxy
-CONFIGURE_OPTIONS +=	--enable-proxy-connect
-CONFIGURE_OPTIONS +=	--enable-proxy-ftp
-CONFIGURE_OPTIONS +=	--enable-proxy-http
-CONFIGURE_OPTIONS +=	--enable-proxy-ajp
-CONFIGURE_OPTIONS +=	--enable-proxy-balancer
-CONFIGURE_OPTIONS +=	--enable-cache
-CONFIGURE_OPTIONS +=	--enable-file-cache
-CONFIGURE_OPTIONS +=	--enable-disk-cache
-CONFIGURE_OPTIONS +=	--enable-mem-cache
-CONFIGURE_OPTIONS +=	--enable-deflate
-CONFIGURE_OPTIONS +=	--enable-cgid
-CONFIGURE_OPTIONS +=	--enable-cgi
-CONFIGURE_OPTIONS +=	--enable-authnz-ldap
-CONFIGURE_OPTIONS +=	--enable-ldap
-CONFIGURE_OPTIONS +=	--enable-ssl
-CONFIGURE_OPTIONS +=	--enable-exception-hook
-CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS) -DSSL_EXPERIMENTAL -DSSL_ENGINE"
-CONFIGURE_OPTIONS +=	LTFLAGS="--silent --tag=CC"
-CONFIGURE_OPTIONS.32 +=	--enable-layout=Solaris-Apache2
-CONFIGURE_OPTIONS.64 +=	--enable-layout=Solaris-Apache2-$(MACH64)
-CONFIGURE_OPTIONS.32 +=	--with-apr=/usr/apr/1.5/bin/apr-1-config
-CONFIGURE_OPTIONS.64 +=	--with-apr=/usr/apr/1.5/bin/$(MACH64)/apr-1-config
-CONFIGURE_OPTIONS.32 +=	--with-apr-util=/usr/apr-util/1.5/bin/apu-1-config
-CONFIGURE_OPTIONS.64 +=	--with-apr-util=/usr/apr-util/1.5/bin/$(MACH64)/apu-1-config
-CONFIGURE_OPTIONS.32 +=	--with-pcre=/usr/bin/pcre-config
-CONFIGURE_OPTIONS.64 +=	--with-pcre=/usr/bin/$(MACH64)/pcre-config
-
-PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
-ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
-endif
-
-configure:	$(CONFIGURE_32_and_64)
-
-build: $(BUILD_32_and_64)
-
-AP_CONFIG_LAYOUT_H=include/ap_config_layout.h
-
-install: $(INSTALL_32_and_64)
-	# Some files installed in proto area need to be fixed.
-	$(KSH93) Solaris/customization.sh $(PROTO_DIR) $(MACH64)
-	# Common header files for 32 and 64 bit variants are needed.
-	/usr/bin/diff -D __$(MACH64) \
-	  $(VARIANT_PREFORK)/$(MACH32)/$(AP_CONFIG_LAYOUT_H) \
-	  $(VARIANT_PREFORK)/$(MACH64)/$(AP_CONFIG_LAYOUT_H) \
-	  > $(PROTO_DIR)$(CONFIGURE_PREFIX)/$(AP_CONFIG_LAYOUT_H) ; true
-
-test: $(NO_TESTS)
-
-system-test:    $(NO_TESTS)
-
-
-REQUIRED_PACKAGES += library/apr-15
-REQUIRED_PACKAGES += library/apr-util-15
-REQUIRED_PACKAGES += library/apr-util-15/apr-ldap
-REQUIRED_PACKAGES += library/apr-util-15/dbd-mysql
-REQUIRED_PACKAGES += library/apr-util-15/dbd-sqlite
-REQUIRED_PACKAGES += library/openldap
-REQUIRED_PACKAGES += library/pcre
-REQUIRED_PACKAGES += library/security/openssl
-REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += shell/ksh93
-REQUIRED_PACKAGES += system/core-os
-REQUIRED_PACKAGES += system/library
-REQUIRED_PACKAGES += system/library/math
-REQUIRED_PACKAGES += system/library/security/gss
-REQUIRED_PACKAGES += system/network