--- a/components/Makefile	Fri Aug 07 16:20:13 2015 -0600
+++ b/components/Makefile	Wed Aug 05 13:31:58 2015 -0700
@@ -169,7 +169,10 @@
 	done
 
 publish:
+ifneq ($(BUILD_TYPE), evaluation)
+	# evaluation packages don't need to be incorporated
 	$(MAKE) incorporation
+endif
 # pkglint all of the published manifests in one batch.
 ifdef CANONICAL_REPO
 	@echo 'pkglinting all package manifests...'

--- a/components/meta-packages/evaluation/Makefile	Fri Aug 07 16:20:13 2015 -0600
+++ b/components/meta-packages/evaluation/Makefile	Wed Aug 05 13:31:58 2015 -0700
@@ -34,4 +34,8 @@
 PUBLISH_STAMP=
 endif
 
+# Override default settings in prep.mk so we don't delete the entire directory.
+CLEAN_PATHS=	$(BUILD_DIR)
+CLOBBER_PATHS=	$(BUILD_DIR)
+
 include $(WS_MAKE_RULES)/ips.mk

--- a/components/meta-packages/evaluation/evaluation.p5m	Fri Aug 07 16:20:13 2015 -0600
+++ b/components/meta-packages/evaluation/evaluation.p5m	Wed Aug 05 13:31:58 2015 -0700
@@ -23,18 +23,18 @@
 # Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-# Every package automatically gets a license action added to it during an
+# Every package automatically gets a pkg(5) license action added to it during an
 # 'evaluation' build.  We need to add must-accept and must-display attributes
-# to this package so that installing it always displays the license and
+# to this package so that installing it always displays the information and
 # requires that it be accepted.
 <transform license license=evaluation -> add must-accept true>
 <transform license license=evaluation -> add must-display true>
 set name=pkg.fmri \
     value=pkg:/release/evaluation@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="evaluation license meta-package"
-set name=pkg.description value="This package contains the evaluation license."
+set name=pkg.summary value="evaluation information meta-package"
+set name=pkg.description value="This package contains evaluation information."
 set name=pkg.linted.userland.manifest001.0 value=true
-set name=com.oracle.info.description value="evaluation license meta-package"
+set name=com.oracle.info.description value="evaluation information meta-package"
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file evaluation path=etc/notices/evaluation

--- a/licenses/evaluation	Fri Aug 07 16:20:13 2015 -0600
+++ b/licenses/evaluation	Wed Aug 05 13:31:58 2015 -0700
@@ -1,1 +1,2 @@
-TBD evaluation software license goes here.
+This software has been made available for evaluation purposes only.
+See http://www.oracle.com/technetwork/server-storage/solaris11/technologies/foss-evaluation-program-2586275.html for further information.

--- a/make-rules/ips.mk	Fri Aug 07 16:20:13 2015 -0600
+++ b/make-rules/ips.mk	Wed Aug 05 13:31:58 2015 -0700
@@ -90,7 +90,7 @@
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/incorporate
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/publish-cleanup
 
-# If we are building "evaluation" packages, add the evaluation license
+# If we are building "evaluation" packages, add the evaluation information
 # action so that the package(s) display the terms and require acceptance
 # to install.
 ifeq ($(BUILD_TYPE),evaluation)

--- a/make-rules/shared-macros.mk	Fri Aug 07 16:20:13 2015 -0600
+++ b/make-rules/shared-macros.mk	Wed Aug 05 13:31:58 2015 -0700
@@ -80,12 +80,6 @@
 
 SHELL=	/bin/bash
 
-# If we are building "evaluation" software for the Solaris release repository
-# we want the PUBLISHER to be "solaris".
-ifeq ($(BUILD_TYPE),evaluation)
-PUBLISHER = solaris
-endif
-
 # We want "nightly" as our publisher, to match other consolidations and
 # facilitate migrations.  G11N wants $(CONSOLIDATION)-localizable for
 # the localizable publisher.