--- old/usr/src/cmd/make/Makefile	2015-05-20 11:07:25.584082752 -0400
+++ /dev/null	2015-05-20 11:07:25.000000000 -0400
@@ -1,34 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.21 06/12/12
-#
-
-TOP 	= ..
-
-SUBDIRS= 	lib \
-		bin \
-		localize \
-		man
-
-include ${TOP}/rules/recurse.mk
--- old/usr/src/cmd/make/bin/Makefile	2015-05-20 11:07:25.748909088 -0400
+++ /dev/null	2015-05-20 11:07:25.000000000 -0400
@@ -1,32 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.16 06/12/12
-#
-
-TOP =		../..
-
-# SUBDIRS =	make maketool rxm rxs
-SUBDIRS =	make  rxm rxs
-
-include $(TOP)/rules/recurse.mk
--- old/usr/src/cmd/make/bin/make/Common.mk	2015-05-20 11:07:25.901878630 -0400
+++ /dev/null	2015-05-20 11:07:25.000000000 -0400
@@ -1,46 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Common.mk 1.3 06/12/12
-#
-
-TOP		= ../../../../..
-include $(TOP)/rules/master.mk
-
-PKG_TOP		= $(TOP)/Make
-
-LIBBSD_DIR	= $(PKG_TOP)/libbsd
-LIBBSD		= $(LIBBSD_DIR)/$(VARIANT)/libbsd.a
-
-LIBMKSDMSI18N_DIR = $(PKG_TOP)/libmksdmsi18n
-LIBMKSDMSI18N	= $(LIBMKSDMSI18N_DIR)/$(VARIANT)/libmksdmsi18n.a
-
-LIBMKSH_DIR	= $(PKG_TOP)/libmksh
-LIBMKSH		= $(LIBMKSH_DIR)/$(VARIANT)/libmksh.a
-
-LIBVROOT_DIR	= $(PKG_TOP)/libvroot
-LIBVROOT	= $(LIBVROOT_DIR)/$(VARIANT)/libvroot.a
-
-SRC		= ../src
-include $(TOP)/rules/derived.mk
-
--- old/usr/src/cmd/make/bin/make/Makefile	2015-05-20 11:07:26.057003382 -0400
+++ /dev/null	2015-05-20 11:07:26.000000000 -0400
@@ -1,32 +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 1997 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.7 06/12/12
-#
-
-TOP =			../../..
-
-#SUBDIRS =		dmake localize
-SUBDIRS =		smake make.xpg4 make.svr4
-
-include $(TOP)/rules/recurse.mk
--- old/usr/src/cmd/make/bin/make/make.svr4/Makefile	2015-05-20 11:07:26.207195928 -0400
+++ /dev/null	2015-05-20 11:07:26.000000000 -0400
@@ -1,38 +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 2001 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.6 06/12/12
-#
-
-TOP=../../../..
-include $(TOP)/rules/master.mk
-
-all clean clobber l10n_install:
-
-install:
-	$(INSTALL) -d $(DESTDIR)/usr/lib
-	$(INSTALL) -d $(DESTDIR)/usr/ccs/lib
-	rm -f $(DESTDIR)/usr/lib/svr4.make
-	rm -f $(DESTDIR)/usr/ccs/lib/svr4.make
-	ln $(DESTDIR)/usr/ccs/bin/make $(DESTDIR)/usr/lib/svr4.make
-	(cd $(DESTDIR)/usr/ccs/lib; ln -s ../../lib/svr4.make svr4.make)
--- old/usr/src/cmd/make/bin/make/make.xpg4/Makefile	2015-05-20 11:07:26.372968394 -0400
+++ /dev/null	2015-05-20 11:07:26.000000000 -0400
@@ -1,36 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.2 06/12/12
-#
-# @(#)Makefile	1.1	95/06/29 SMI
-
-TOP=../../../..
-include $(TOP)/rules/master.mk
-
-all clean clobber l10n_install:
-
-install:
-	$(INSTALL) -d $(DESTDIR)/usr/xpg4/bin
-	rm -f $(DESTDIR)/usr/xpg4/bin/make
-	ln $(DESTDIR)/usr/ccs/bin/make $(DESTDIR)/usr/xpg4/bin/make
--- old/usr/src/cmd/make/bin/make/smake/Makefile	2015-05-20 11:07:26.525212818 -0400
+++ /dev/null	2015-05-20 11:07:26.000000000 -0400
@@ -1,30 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.5 06/12/12
-#
-
-TOP		= ../../../..
-include $(TOP)/rules/variant.mk
-include $(TOP)/rules/derived.mk
-
--- old/usr/src/cmd/make/bin/make/smake/src/Makefile	2015-05-20 11:07:26.675321180 -0400
+++ /dev/null	2015-05-20 11:07:26.000000000 -0400
@@ -1,50 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.3 06/12/12
-#
-
-# Generic makefile for use in src directories.  Knows how to make common things
-# in the right $(VARIANT) directory.
-
-#TOP =		../../../../..
-include $(TOP)/rules/variant.mk
-
-all :=		TARG = all 
-install :=		TARG = install 
-clean :=		TARG = clean 
-test :=		TARG = test
-l10n_install :=	TARG = l10n_install
-i18n_install :=	TARG = i18n_install
-
-SRC =		../src
-MFLAGS += 	SRC=$(SRC)
-
-# See $(TOP)/rules/master.mk for how these are built.
-%.h %.cc %.C %.E %.o all install clean test l10n_install i18n_install: FRC
-	@ if [ ! -d ../$(VARIANT) ]; then \
-		mkdir ../$(VARIANT) ; \
-	fi
-	cd ../$(VARIANT); $(MAKE) $(MFLAGS) -f $(SRC)/Variant.mk DESTDIR=$(DESTDIR) $@
-
-FRC:
--- old/usr/src/cmd/make/bin/make/smake/src/Variant.mk	2015-05-20 11:07:26.831271618 -0400
+++ /dev/null	2015-05-20 11:07:26.000000000 -0400
@@ -1,155 +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 2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Variant.mk 1.36 06/12/12
-#
-
-TOP		= ../../../../..
-include $(TOP)/rules/master.mk
-include $(TOP)/Make/lib/Lib.mk
-
-# RELEASE_VER should be "Generic" for FCS. Otherwise it should be overridden
-# to display build number - "Build XX", patch number - "Patch XXXXXX-XX", etc.
-
-PKG_TOP		= ../../../..
-PROG		= make
-PACKAGE		= SUNWspro
-PRODVER		= 11
-PRODVER_V	= SunOS 5.11
-RELEASE_VER	= Generic
-DATE:sh		= date '+%B %Y'
-
-VERSTRING	= RELEASE VERSION $(PRODVER_V) $(RELEASE_VER) $(DATE)
-
-MORE_SRC	= \
-		ar.cc \
-		depvar.cc \
-		doname.cc \
-		dosys.cc \
-		files.cc \
-		globals.cc \
-		implicit.cc \
-		macro.cc \
-		main.cc \
-		misc.cc \
-		nse_printdep.cc \
-		read.cc \
-		read2.cc \
-		rep.cc \
-		state.cc
-
-CPPFLAGS	+= -I$(PKG_TOP)/include
-
-LDLIB		+= \
-		-lnsl \
-		-lsocket \
-		-lw
-
-HDRS_DIR	= $(PKG_TOP)/include/mk
-HDRS_LIST	= $(HDRS_DIR)/copyright.h $(HDRS_DIR)/defs.h
-
-.INIT: $(HDRS_LIST)
-
-SRCS = $(PROG).cc $(MORE_SRC)
-OBJS = $(SRCS:%.cc=%.o)
-
-LIB +=		-lintl -lm
-
-all install:: $(PROG)
-
-$(PROG): $(OBJS)
-	$(CCC) $(CCFLAGS) $(LDFLAGS) -o $@ \
-		$(OBJS) $(LIB) $(I18LIB) $(LDLIB)
-	/bin/sh $(TOP)/exe/sanity-check.sh $(TOP) $(PROG)
-
-clean:
-	$(RM) $(OBJS) $(PROG)
-
-
-include $(TOP)/rules/computed-options.mk
-
-#
-# This LIB macro must be declared after the include's above
-#
-LIB		= \
-		$(LIBMKSH) \
-		$(LIBMKSDMSI18N) \
-		$(LIBBSD) \
-		$(LIBVROOT)
-
-%.o: ../../common/%.cc
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-depvar.o nse.o nse_printdep.o := CPPFLAGS += -DSUNOS4_AND_AFTER
-
-LDFLAGS +=	-xildoff -norunpath
-
-install:: install-make-hdrs install-make-bin
-
-IHDR		= make.rules.file
-VIHDR		= svr4.make.rules.file
-HDR		= ${PKG_TOP}/bin/make/common/make.rules.file
-VHDR		= ${PKG_TOP}/bin/make/common/svr4.make.rules.file
-HDRSDIR		= $(DESTDIR)/usr/share/lib/make
-HDRFILE		= make.rules
-VHDRFILE	= svr4.make.rules
-SMAKEDIR	= $(DESTDIR)/usr/ccs/bin
-
-install-make-bin: make
-	$(INSTALL) -d $(SMAKEDIR)
-	$(INSTALL) make $(SMAKEDIR) 
-	mcs -d $(SMAKEDIR)/make
-	mcs -a '@(#)$(VERSTRING)' $(SMAKEDIR)/make
-
-install-make-hdrs: $(HDR) $(VHDR)
-	$(INSTALL) -d $(HDRSDIR)
-	$(INSTALL) -m 0444 $(HDR) $(HDRSDIR)
-	mv -f $(HDRSDIR)/$(IHDR) $(HDRSDIR)/$(HDRFILE)
-	$(INSTALL) -m 0444 $(VHDR) $(HDRSDIR)
-	mv -f $(HDRSDIR)/$(VIHDR) $(HDRSDIR)/$(VHDRFILE)
-
-
-#
-# i18n stuff
-#
-MAKE_MSG	= SUNW_SPRO_MAKE.msg
-#I18N_DIRS	= ../../common ../../../../lib/bsd/src ../../../../lib/mksh/src ../../../../lib/vroot/src
-I18N_DIRS	= ../../common
-TEXTDOMAIN	= SUNW_SPRO_MAKE
-APPPATH		= $(PKG_TOP)/bin/make/smake/$(VARIANT)
-LIB_DESTDIR	= $(DESTDIR)/usr/lib
-CAT_DESTDIR	= $(LIB_DESTDIR)/locale/C/LC_MESSAGES
-
-$(CAT_DESTDIR):
-	$(INSTALL) -d $@
-
-msg_catalogs: $(CAT_DESTDIR) .WAIT MAKE_MSG
-	cp $(APPPATH)/$(TEXTDOMAIN).msg $(CAT_DESTDIR)
-
-MAKE_MSG:
-	$(GENMSG) -l $(SRC)/genmsg.project -o $(TEXTDOMAIN).msg `find $(I18N_DIRS) \( -name '*.cc' -o -name '*.c' -o -name '*.y' -o -name '*.h' \) -print | grep -v /SCCS/`
-	rm -f *.cc.new
-
-i18n_install: msg_catalogs 
-
-FRC:
--- old/usr/src/cmd/make/lib/Lib.mk	2015-05-20 11:07:26.985128677 -0400
+++ /dev/null	2015-05-20 11:07:26.000000000 -0400
@@ -1,67 +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 2001 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Lib.mk 1.13 06/12/12
-#
-
-# Definitions of the libraries supplied by make/dmake.
-# You must correctly define TOP before including this file!
-
-MAKE_TOP	= $(TOP)/Make
-
-LIBBSD_DIR	= $(MAKE_TOP)/lib/bsd
-LIBBSD		= $(LIBBSD_DIR)/$(VARIANT)/libbsd.a
-
-LIBDMRXM_DIR	= $(MAKE_TOP)/lib/dmrxm
-LIBDMRXM	= $(LIBDMRXM_DIR)/$(VARIANT)/libdmrxm.a
-
-LIBDMRXS_DIR	= $(MAKE_TOP)/lib/dmrxs
-LIBDMRXS	= $(LIBDMRXS_DIR)/$(VARIANT)/libdmrxs.a
-
-LIBMAKESTATE_DIR = $(MAKE_TOP)/lib/makestate
-LIBMAKESTATE	= $(LIBMAKESTATE_DIR)/$(VARIANT)/libmakestate.a
-
-LIBMKSDMSI18N_DIR = $(MAKE_TOP)/lib/mksdmsi18n
-LIBMKSDMSI18N	= $(LIBMKSDMSI18N_DIR)/$(VARIANT)/libmksdmsi18n.a
-
-LIBMKSH_DIR	= $(MAKE_TOP)/lib/mksh
-LIBMKSH		= $(LIBMKSH_DIR)/$(VARIANT)/libmksh.a
-
-LIBVROOT_DIR	= $(MAKE_TOP)/lib/vroot
-LIBVROOT	= $(LIBVROOT_DIR)/$(VARIANT)/libvroot.a
-
-LIBDM_DIR	= $(MAKE_TOP)/lib/dm
-LIBDM		= $(LIBDM_DIR)/$(VARIANT)/libdm.a
-
-LIBDMCONF_DIR	= $(MAKE_TOP)/lib/dmconf
-LIBDMCONF	= $(LIBDMCONF_DIR)/$(VARIANT)/libdmconf.a
-
-LIBDMRC_DIR	= $(MAKE_TOP)/lib/dmrc
-LIBDMRC		= $(LIBDMRC_DIR)/$(VARIANT)/libdmrc.a
-
-LIBDMTHREAD_DIR	= $(MAKE_TOP)/lib/dmthread
-LIBDMTHREAD	= $(LIBDMTHREAD_DIR)/$(VARIANT)/libdmthread.a
-
-LIBRX_DIR	= $(MAKE_TOP)/lib/rx
-LIBRX		= $(LIBRX_DIR)/$(VARIANT)/librx.a
-
--- old/usr/src/cmd/make/lib/Makefile	2015-05-20 11:07:27.322749315 -0400
+++ /dev/null	2015-05-20 11:07:27.000000000 -0400
@@ -1,39 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.8 06/12/12
-#
-# @(#)Makefile	1.4	96/03/16 SMI
-
-TOP =	../..
-
-SUBDIRS =	\
-		makestate \
-		bsd \
-		dmrxm \
-		dmrxs \
-		mksdmsi18n \
-		mksh \
-		vroot
-
-include $(TOP)/rules/recurse.mk
--- old/usr/src/cmd/make/lib/bsd/Makefile	2015-05-20 11:07:27.711266468 -0400
+++ /dev/null	2015-05-20 11:07:27.000000000 -0400
@@ -1,29 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.5 06/12/12
-#
-
-TOP =		../../..
-include $(TOP)/rules/variant.mk
-include $(TOP)/rules/derived.mk
--- old/usr/src/cmd/make/lib/bsd/src/Makefile	2015-05-20 11:07:27.862525389 -0400
+++ /dev/null	2015-05-20 11:07:27.000000000 -0400
@@ -1,49 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.3 06/12/12
-#
-
-# Generic makefile for use in src directories.  Knows how to make common things
-# in the right $(VARIANT) directory.
-
-include $(TOP)/rules/variant.mk
-
-all :=		TARG = all 
-install :=		TARG = install 
-clean :=		TARG = clean 
-test :=		TARG = test
-l10n_install :=	TARG = l10n_install
-i18n_install :=	TARG = i18n_install
-
-SRC =		../src
-MFLAGS += 	SRC=$(SRC)
-
-# See $(TOP)/rules/master.mk for how these are built.
-%.h %.cc %.C %.E %.o all install clean test l10n_install i18n_install: FRC
-	@ if [ ! -d ../$(VARIANT) ]; then \
-		mkdir ../$(VARIANT) ; \
-	fi
-	cd ../$(VARIANT); $(MAKE) $(MFLAGS) -f $(SRC)/Variant.mk DESTDIR=$(DESTDIR) $@
-
-FRC:
--- old/usr/src/cmd/make/lib/bsd/src/Variant.mk	2015-05-20 11:07:28.027812593 -0400
+++ /dev/null	2015-05-20 11:07:28.000000000 -0400
@@ -1,45 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Variant.mk 1.13 06/12/12
-#
-
-TOP =		 ../../../..
-include ${TOP}/rules/master.mk
-
-PKG_TOP =	 $(TOP)/Make
-CPPFLAGS +=	 -I${PKG_TOP}/include
-MSG_FILE = libbsd.msg
-I18N_DIRS = $(SRC)
-
-CCSRCS =		bsd.cc
-CSRCS =
-
-HDRS_DIR =	 ${PKG_TOP}/include/bsd
-
-.INIT: ${HDRS_DIR}/bsd.h
-
-LIBNAME =	 libbsd.a
-
-include ${TOP}/rules/lib.mk
-
--- old/usr/src/cmd/make/lib/makestate/Makefile	2015-05-20 11:07:28.178525957 -0400
+++ /dev/null	2015-05-20 11:07:28.000000000 -0400
@@ -1,48 +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 2004 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.7 06/12/12
-#
-
-TOP =		../../..
-include $(TOP)/rules/variant.mk
-
-V9_VARIANT :sh= \
-if [ -x /usr/bin/isalist ] ; \
-then \
-    for f in `/usr/bin/isalist` ; \
-    do \
-	if [ "$f" = sparcv9 ] ; \
-	then \
-	    echo sparcv9 ; \
-	    break ; \
-	fi ; \
-	if [ "$f" = amd64 ] ; \
-	then \
-	    echo amd64-S2 ; \
-	    break ; \
-	fi ; \
-    done ; \
-fi
-
-include $(TOP)/rules/derived.mk
--- old/usr/src/cmd/make/lib/makestate/src/Makefile	2015-05-20 11:07:28.332687789 -0400
+++ /dev/null	2015-05-20 11:07:28.000000000 -0400
@@ -1,50 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.5 06/12/12
-#
-# @(#)Makefile	1.1	96/03/11 SMI
-
-# Generic makefile for use in src directories.  Knows how to make common things
-# in the right $(VARIANT) directory.
-
-include $(TOP)/rules/variant.mk
-
-all :=		TARG = all 
-install :=		TARG = install 
-clean :=		TARG = clean 
-test :=		TARG = test
-l10n_install :=	TARG = l10n_install
-i18n_install :=	TARG = i18n_install
-
-SRC =		../src
-MFLAGS += 	SRC=$(SRC)
-
-# See $(TOP)/rules/master.mk for how these are built.
-%.h %.cc %.C %.E %.o all install clean test l10n_install i18n_install: FRC
-	@ if [ ! -d ../$(VARIANT) ]; then \
-		mkdir ../$(VARIANT) ; \
-	fi
-	cd ../$(VARIANT); $(MAKE) $(MFLAGS) -f $(SRC)/Variant.mk DESTDIR=$(DESTDIR) $@
-
-FRC:
--- old/usr/src/cmd/make/lib/makestate/src/Variant.mk	2015-05-20 11:07:28.492214135 -0400
+++ /dev/null	2015-05-20 11:07:28.000000000 -0400
@@ -1,73 +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 2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Variant.mk 1.12 06/12/12
-#
-
-TOP =		../../../..
-
-%.o: $(SRC)/%.c
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
-
-include $(TOP)/rules/master.mk
-
-PKG_TOP =	$(TOP)/Make
-
-CSRCS =	\
-		ld_file.c \
-		lock.c
-
-LIBNAME =	libmakestate.a
-DLIBNAME =	libmakestate.so.1
-MSG_FILE = libmakestate.msg
-I18N_DIRS = $(SRC)
-
-CFLAGS += $(V9FLAGS) -KPIC -DTEXT_DOMAIN=\"SUNW_OST_OSLIB\"
-CPPFLAGS=
-
-#include $(TOP)/Make/lib/Lib.mk
-include $(TOP)/rules/lib.mk
-
-POUND_SIGN:sh=	echo \#
-RELEASE=	5.11
-VERSION=	$(RELEASE_VER)
-PATCHID=	$(VERSION)
-DATE:sh		= date '+%B %Y'
-RELEASE_DATE=	$(DATE)
-PATCH_DATE=	$(RELEASE_DATE)
-RELEASE_CM=	"@($(POUND_SIGN))RELEASE VERSION SunOS $(RELEASE) $(PATCHID) $(PATCH_DATE)"
-
-PROCESS_COMMENT=	mcs -a $(RELEASE_CM)
-POST_PROCESS_SO=	$(PROCESS_COMMENT) $@
-
-$(DLIBNAME) : $(LIBNAME)
-	$(CC) $(V9FLAGS) -o $@ -dy -G -ztext -h $@ ld_file.o lock.o -lelf
-	mcs -d $@
-	${POST_PROCESS_SO}
-
-all: $(DLIBNAME)
-
-install: all
-	${INSTALL} -d ${DESTDIR}/usr/lib$(VAR_DIR)
-	${RM} ${DESTDIR}/usr/lib$(VAR_DIR)/$(DLIBNAME)
-	${INSTALL} $(DLIBNAME) ${DESTDIR}/usr/lib$(VAR_DIR)
--- old/usr/src/cmd/make/lib/mksdmsi18n/Makefile	2015-05-20 11:07:28.643696378 -0400
+++ /dev/null	2015-05-20 11:07:28.000000000 -0400
@@ -1,30 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.5 06/12/12
-#
-
-TOP		= ../../..
-include $(TOP)/rules/variant.mk
-include $(TOP)/rules/derived.mk
-
--- old/usr/src/cmd/make/lib/mksdmsi18n/src/Makefile	2015-05-20 11:07:28.798532622 -0400
+++ /dev/null	2015-05-20 11:07:28.000000000 -0400
@@ -1,46 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.10 06/12/12
-#
-
-TOP =		../../../..
-include $(TOP)/rules/master.mk
-
-SUBDIRS =	lib
-include $(TOP)/rules/recurse.mk
-include $(SRC)/lib/version.mk
-
-PKG_TOP =	$(TOP)/Make
-CPPFLAGS +=	-I$(PKG_TOP)/include
-
-CCSRCS =		libmksdmsi18n_init.cc
-
-LIBNAME =	libmksdmsi18n.a
-
-#
-# Pass in the version number for the i18n message catalog.
-#
-libmksdmsi18n_init.o :=	CPPFLAGS += -DI18N_VERSION=$(VERSION)
-
-include $(TOP)/rules/lib.mk
--- old/usr/src/cmd/make/lib/mksdmsi18n/src/Variant.mk	2015-05-20 11:07:28.976007774 -0400
+++ /dev/null	2015-05-20 11:07:28.000000000 -0400
@@ -1,52 +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 1997 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Variant.mk 1.4 06/12/12
-#
-
-TOP =		../../../..
-include $(TOP)/rules/master.mk
-#include $(TOP)/rules/dmake.mk
-
-#SUBDIRS =	$(SRC)/lib
-#include $(TOP)/rules/recurse.mk
-
-CCSRCS = \
-		libmksdmsi18n_init.cc 
-
-CSRCS =
-
-include $(SRC)/lib/version.mk
-
-libmksdmsi18n_init.o := CPPFLAGS += -DI18N_VERSION=$(VERSION)
-
-#PKG_TOP =	$(TOP)/Make
-#CPPFLAGS +=	-I$(PKG_TOP)/include
-
-LIBNAME =	libmksdmsi18n.a
-MSG_FILE = libmksdmsi18n.msg
-I18N_DIRS = $(SRC)
-
-include $(TOP)/Make/lib/Lib.mk
-include $(TOP)/rules/lib.mk
-
--- old/usr/src/cmd/make/lib/mksdmsi18n/src/lib/Makefile	2015-05-20 11:07:29.130718733 -0400
+++ /dev/null	2015-05-20 11:07:29.000000000 -0400
@@ -1,54 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.7 06/12/12
-#
-
-include version.mk
-
-TOP		= ../../../../..
-PKG_TOP		= $(TOP)/Make
-PKG_LIB_TOP	= $(PKG_TOP)/lib
-I18N_LIBS	= bsd dmrxm dmrxs mksh vroot
-I18N_DIRS	= $(I18N_LIBS:%=$(PKG_LIB_TOP)/%/src)
-SRC		= .
-APPPATH		= .
-LIBNAME		= libmksdmsi18n
-TEXTDOMAIN	= $(LIBNAME)_$(VERSION)
-MSG_FILE	= $(TEXTDOMAIN).msg
-
-all clean:
-install: catalogs .WAIT i18n_install
-
-#
-# This is a hack until the top level makefiles for i18n/l10n message catalogs
-# are better organized and written.
-# This "catalogs" target was cp'ed from $(TOP)/rules/lib.mk
-#
-catalogs:
-	$(GENMSG) -l $(SRC)/genmsg.project -o $(MSG_FILE) `find $(I18N_DIRS) \( -name '*.cc' -o -name '*.c' -o -name '*.y' \) -print | grep -v /SCCS/`
-	rm -f *.cc.new
-
-include $(PKG_TOP)/prodver.mk
-include $(TOP)/rules/i18n-install.mk
-
--- old/usr/src/cmd/make/lib/mksdmsi18n/src/lib/version.mk	2015-05-20 11:07:29.282196043 -0400
+++ /dev/null	2015-05-20 11:07:29.000000000 -0400
@@ -1,30 +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 1995 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)version.mk 1.2 06/12/12
-#
-
-# A version number is needed to version the i18n catalog file
-
-VERSION = 1
-
--- old/usr/src/cmd/make/lib/mksh/Makefile	2015-05-20 11:07:29.432209201 -0400
+++ /dev/null	2015-05-20 11:07:29.000000000 -0400
@@ -1,29 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.5 06/12/12
-#
-
-TOP =		../../..
-include $(TOP)/rules/variant.mk
-include $(TOP)/rules/derived.mk
--- old/usr/src/cmd/make/lib/mksh/src/Makefile	2015-05-20 11:07:29.599640747 -0400
+++ /dev/null	2015-05-20 11:07:29.000000000 -0400
@@ -1,50 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.3 06/12/12
-#
-
-# Generic makefile for use in src directories.  Knows how to make common things
-# in the right $(VARIANT) directory.
-
-#TOP =		../../../..
-include $(TOP)/rules/variant.mk
-
-all :=		TARG = all 
-install :=		TARG = install 
-clean :=		TARG = clean 
-test :=		TARG = test
-l10n_install :=	TARG = l10n_install
-i18n_install :=	TARG = i18n_install
-
-SRC =		../src
-MFLAGS += 	SRC=$(SRC)
-
-# See $(TOP)/rules/master.mk for how these are built.
-%.h %.cc %.C %.E %.o all install clean test l10n_install i18n_install: FRC
-	@ if [ ! -d ../$(VARIANT) ]; then \
-		mkdir ../$(VARIANT) ; \
-	fi
-	cd ../$(VARIANT); $(MAKE) $(MFLAGS) -f $(SRC)/Variant.mk DESTDIR=$(DESTDIR) $@
-
-FRC:
--- old/usr/src/cmd/make/lib/mksh/src/Variant.mk	2015-05-20 11:07:29.757479089 -0400
+++ /dev/null	2015-05-20 11:07:29.000000000 -0400
@@ -1,58 +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 2002 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Variant.mk 1.19 06/12/12
-#
-
-TOP =		 ../../../..
-include $(TOP)/rules/master.mk
-include $(TOP)/rules/dmake.mk
-
-PKG_TOP =	$(TOP)/Make
-CPPFLAGS +=	-I$(PKG_TOP)/include
-
-CCSRCS =	\
-		dosys.cc \
-		globals.cc \
-		i18n.cc \
-		macro.cc \
-		misc.cc \
-		mksh.cc \
-		read.cc
-
-HDRS_DIR =	$(PKG_TOP)/include/mksh
-HDRS_LIST =	$(HDRS_DIR)/defs.h \
-		$(CCSRCS:%.cc=$(HDRS_DIR)/%.h) \
-		$(CSRCS:%.c=$(HDRS_DIR)/%.h)
-
-.INIT: $(HDRS_LIST)
-
-LIBNAME =	libmksh.a
-MSG_FILE = libmksh.msg
-I18N_DIRS = $(SRC)
-
-#CPPFLAGS	+= -DTEAMWARE_MAKE_CMN -DDISTRIBUTED
-
-include $(TOP)/Make/lib/Lib.mk
-include $(TOP)/rules/lib.mk
-
--- old/usr/src/cmd/make/lib/vroot/Makefile	2015-05-20 11:07:29.908191640 -0400
+++ /dev/null	2015-05-20 11:07:29.000000000 -0400
@@ -1,29 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.5 06/12/12
-#
-
-TOP =		../../..
-include $(TOP)/rules/variant.mk
-include $(TOP)/rules/derived.mk
--- old/usr/src/cmd/make/lib/vroot/src/Makefile	2015-05-20 11:07:30.082821463 -0400
+++ /dev/null	2015-05-20 11:07:30.000000000 -0400
@@ -1,49 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Makefile 1.3 06/12/12
-#
-
-# Generic makefile for use in src directories.  Knows how to make common things
-# in the right $(VARIANT) directory.
-
-include $(TOP)/rules/variant.mk
-
-all :=		TARG = all 
-install :=		TARG = install 
-clean :=		TARG = clean 
-test :=		TARG = test
-l10n_install :=	TARG = l10n_install
-i18n_install :=	TARG = i18n_install
-
-SRC =		../src
-MFLAGS += 	SRC=$(SRC)
-
-# See $(TOP)/rules/master.mk for how these are built.
-%.h %.cc %.C %.E %.o all install clean test l10n_install i18n_install: FRC
-	@ if [ ! -d ../$(VARIANT) ]; then \
-		mkdir ../$(VARIANT) ; \
-	fi
-	cd ../$(VARIANT); $(MAKE) $(MFLAGS) -f $(SRC)/Variant.mk DESTDIR=$(DESTDIR) $@
-
-FRC:
--- old/usr/src/cmd/make/lib/vroot/src/Variant.mk	2015-05-20 11:07:30.248325162 -0400
+++ /dev/null	2015-05-20 11:07:30.000000000 -0400
@@ -1,71 +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 1996 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# @(#)Variant.mk 1.28 06/12/12
-#
-
-TOP =		../../../..
-include $(TOP)/rules/master.mk
-include $(TOP)/rules/dmake.mk
-
-PKG_TOP =	$(TOP)/Make
-CPPFLAGS +=	-I$(PKG_TOP)/include
-
-CCSRCS =	\
-		access.cc \
-		args.cc \
-		chdir.cc \
-		chmod.cc \
-		chown.cc \
-		chroot.cc \
-		creat.cc \
-		execve.cc \
-		lock.cc \
-		lstat.cc \
-		mkdir.cc \
-		mount.cc \
-		open.cc \
-		readlink.cc \
-		report.cc \
-		rmdir.cc \
-		stat.cc \
-		statfs.cc \
-		truncate.cc \
-		unlink.cc \
-		unmount.cc \
-		utimes.cc \
-		vroot.cc \
-		setenv.cc
-
-
-HDRS_DIR =	$(PKG_TOP)/include/vroot
-
-.INIT: $(HDRS_DIR)/args.h $(HDRS_DIR)/report.h $(HDRS_DIR)/vroot.h
-
-LIBNAME =	libvroot.a
-MSG_FILE = libvroot.msg
-I18N_DIRS = $(SRC)
-
-include $(TOP)/Make/lib/Lib.mk
-include $(TOP)/rules/lib.mk
-
