--- a/components/a2ps/SUNWa2ps.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/a2ps/SUNWa2ps.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -30,7 +30,4 @@
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-set name=variant.opensolaris.zone value=global value=nonglobal
-set name=variant.arch value=$(ARCH)
-
 depend fmri=print/lp/filter/[email protected] type=require

--- a/components/a2ps/a2ps.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/a2ps/a2ps.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -27,7 +27,6 @@
 set name=info.upstream_url value=http://www.gnu.org/software/a2ps/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set variant.arch=$(ARCH)
 
 dir path=etc
 dir path=etc/gnu
@@ -93,10 +92,10 @@
 file path=etc/gnu/a2ps-site.cfg mode=0644 preserve=true original_name=SUNWa2ps:etc/gnu/a2ps-site.cfg
 file path=etc/gnu/a2ps.cfg mode=0644 preserve=true original_name=SUNWa2ps:etc/gnu/a2ps.cfg
 file path=etc/lp/fd/a2ps.fd
-file path=usr/bin/a2ps variant.arch=$(ARCH)
+file path=usr/bin/a2ps
 file path=usr/bin/card
 file path=usr/bin/composeglyphs
-file path=usr/bin/fixnt variant.arch=$(ARCH)
+file path=usr/bin/fixnt
 file path=usr/bin/fixps
 file path=usr/bin/ogonkify
 file path=usr/bin/pdiff
@@ -104,7 +103,7 @@
 file path=usr/bin/psset
 file path=usr/bin/texi2dvi4a2ps
 file path=usr/include/liba2ps.h
-file path=usr/lib/liba2ps.so.1.0.0 variant.arch=$(ARCH)
+file path=usr/lib/liba2ps.so.1.0.0
 link path=usr/sfw/bin/a2ps target=../../bin/a2ps
 link path=usr/sfw/bin/card target=../../bin/card
 link path=usr/sfw/bin/composeglyphs target=../../bin/composeglyphs

--- a/components/bzip2/SUNWbzip.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/bzip2/SUNWbzip.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -30,7 +30,4 @@
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-set name=variant.opensolaris.zone value=global value=nonglobal
-set name=variant.arch value=$(ARCH)
-
 depend fmri=compress/[email protected] type=require

--- a/components/bzip2/bzip2.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/bzip2/bzip2.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -30,30 +30,29 @@
 set name=info.upstream_url value=http://www.bzip.org/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set variant.arch=$(ARCH)
 
 dir path=usr
 dir path=usr/bin
 dir path=usr/include
 dir path=usr/lib
-dir path=usr/lib/$(MACH64) variant.arch=$(ARCH)
+dir path=usr/lib/$(MACH64)
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man3
-file path=usr/bin/bunzip2 variant.arch=$(ARCH)
-file path=usr/bin/bzcat variant.arch=$(ARCH)
+file path=usr/bin/bunzip2
+file path=usr/bin/bzcat
 file path=usr/bin/bzdiff
 file path=usr/bin/bzgrep
-file path=usr/bin/bzip2 variant.arch=$(ARCH)
-file path=usr/bin/bzip2recover variant.arch=$(ARCH)
+file path=usr/bin/bzip2
+file path=usr/bin/bzip2recover
 file path=usr/bin/bzmore
 file path=usr/include/bzlib.h
-file path=usr/lib/$(MACH64)/libbz2.so.1 variant.arch=$(ARCH)
-file path=usr/lib/$(MACH64)/llib-lbz2.ln variant.arch=$(ARCH)
-file path=usr/lib/libbz2.so.1 variant.arch=$(ARCH)
+file path=usr/lib/$(MACH64)/libbz2.so.1
+file path=usr/lib/$(MACH64)/llib-lbz2.ln
+file path=usr/lib/libbz2.so.1
 file path=usr/lib/llib-lbz2
-file path=usr/lib/llib-lbz2.ln variant.arch=$(ARCH)
+file path=usr/lib/llib-lbz2.ln
 file path=usr/share/man/man1/bunzip2.1
 file path=usr/share/man/man1/bzcat.1
 file path=usr/share/man/man1/bzcmp.1
@@ -70,8 +69,8 @@
 link path=usr/bin/bzegrep target=./bzgrep
 link path=usr/bin/bzfgrep target=./bzgrep
 link path=usr/bin/bzless target=./bzmore
-link path=usr/lib/$(MACH64)/libbz2.so target=libbz2.so.1 variant.arch=$(ARCH)
-link path=usr/lib/libbz2.so target=libbz2.so.1 variant.arch=$(ARCH)
+link path=usr/lib/$(MACH64)/libbz2.so target=libbz2.so.1
+link path=usr/lib/libbz2.so target=libbz2.so.1
 
 license bzip2.license license="bzip2 license"
 

--- a/components/elinks/SUNWelinks.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/elinks/SUNWelinks.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -30,7 +30,4 @@
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-set name=variant.opensolaris.zone value=global value=nonglobal
-set name=variant.arch value=$(ARCH)
-
 depend fmri=web/browser/[email protected] type=require

--- a/components/elinks/elinks.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/elinks/elinks.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -27,7 +27,6 @@
 set name=info.upstream_url value="http://elinks.or.cz/"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set variant.arch=$(ARCH)
 
 dir path=usr
 dir path=usr/bin
@@ -98,7 +97,7 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man5
-file path=usr/bin/elinks variant.arch=$(ARCH)
+file path=usr/bin/elinks
 file path=usr/share/doc/elinks/bittorrent.txt
 file path=usr/share/doc/elinks/color-model.txt
 file path=usr/share/doc/elinks/bookmarks.txt

--- a/components/gtar/SUNWgtar.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/gtar/SUNWgtar.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -30,7 +30,4 @@
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-set name=variant.opensolaris.zone value=global value=nonglobal
-set name=variant.arch value=$(ARCH)
-
 depend fmri=archiver/[email protected] type=require

--- a/components/gtar/gtar.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/gtar/gtar.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -27,7 +27,6 @@
 set name=info.upstream_url value="http://www.gnu.org/software/tar/"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set variant.arch=$(ARCH)
 
 dir path=usr
 dir path=usr/bin
@@ -115,7 +114,7 @@
 dir path=usr/share/locale/zh_TW/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/gtar variant.arch=$(ARCH)
+file path=usr/bin/gtar
 file path=usr/share/info/tar.info
 file path=usr/share/info/tar.info-1
 file path=usr/share/info/tar.info-2

--- a/components/less/SUNWless.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/less/SUNWless.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -30,7 +30,4 @@
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-set name=variant.opensolaris.zone value=global value=nonglobal
-set name=variant.arch value=$(ARCH)
-
 depend fmri=text/[email protected] type=require

--- a/components/less/less.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/less/less.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -30,7 +30,6 @@
 set name=info.upstream_url value=http://www.greenwoodsoftware.com/less/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set variant.arch=$(ARCH)
 
 license less.license license='Less License'
 
@@ -39,9 +38,9 @@
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/less variant.arch=$(ARCH)
-file path=usr/bin/lessecho variant.arch=$(ARCH)
-file path=usr/bin/lesskey variant.arch=$(ARCH)
+file path=usr/bin/less
+file path=usr/bin/lessecho
+file path=usr/bin/lesskey
 file path=usr/share/man/man1/less.1
 file path=usr/share/man/man1/lessecho.1
 file path=usr/share/man/man1/lesskey.1

--- a/components/make/SUNWgmake.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/make/SUNWgmake.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -30,7 +30,4 @@
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-set name=variant.opensolaris.zone value=global value=nonglobal
-set name=variant.arch value=$(ARCH)
-
 depend fmri=developer/build/[email protected] type=require

--- a/components/make/make.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/make/make.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -30,7 +30,6 @@
 set name=info.upstream_url value=http://http.gnu.org/software/make/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set variant.arch=$(ARCH)
 
 dir path=usr
 dir path=usr/bin
@@ -95,7 +94,7 @@
 dir path=usr/share/locale/zh_CN/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/gmake variant.arch=$(ARCH)
+file path=usr/bin/gmake
 file path=usr/share/info/make.info
 file path=usr/share/info/make.info-1
 file path=usr/share/info/make.info-2

--- a/components/which/SUNWgnu-which.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/which/SUNWgnu-which.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -30,7 +30,4 @@
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-set name=variant.opensolaris.zone value=global value=nonglobal
-set name=variant.arch value=$(ARCH)
-
 depend fmri=shell/[email protected] type=require

--- a/components/which/which.p5m	Mon Feb 07 17:45:11 2011 -0800
+++ b/components/which/which.p5m	Tue Feb 08 10:54:06 2011 -0800
@@ -27,8 +27,6 @@
 set name=info.upstream_url value="http://www.xs4all.nl/~carlo17/which/"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set variant.arch=$(ARCH)
-
 
 dir path=usr
 dir path=usr/gnu
@@ -38,7 +36,7 @@
 dir path=usr/gnu/share/man/man1
 dir path=usr/share
 dir path=usr/share/info
-file path=usr/gnu/bin/which variant.arch=$(ARCH)
+file path=usr/gnu/bin/which
 file path=usr/gnu/share/man/man1/which.1
 file path=usr/share/info/which.info
 

--- a/make-rules/ips.mk	Mon Feb 07 17:45:11 2011 -0800
+++ b/make-rules/ips.mk	Tue Feb 08 10:54:06 2011 -0800
@@ -47,7 +47,6 @@
 
 # order is important
 GENERATE_TRANSFORMS +=		$(WS_TOP)/transforms/generate-cleanup
-GENERATE_TRANSFORMS +=		$(WS_TOP)/transforms/variant.arch
 
 COMPARISON_TRANSFORMS +=	$(WS_TOP)/transforms/comparison-cleanup
 COMPARISON_TRANSFORMS +=	$(PKGMOGRIFY_TRANSFORMS)
@@ -116,8 +115,7 @@
 		$(PUBLISH_TRANSFORMS) | \
 		sed -e '/^$$/d' -e '/^#.*$$/d' | uniq >$@
 
-# generate dependencies, drop variant.arch in set and depend actions because
-# "pkgdepend resolve" fails when it's present.
+# generate dependencies
 $(MANIFEST_BASE)-%.depend:	$(MANIFEST_BASE)-%.mogrified
 	$(PKGDEPEND) generate -m $< $(PROTO_DIR) >$@
 

--- a/transforms/defaults	Mon Feb 07 17:45:11 2011 -0800
+++ b/transforms/defaults	Tue Feb 08 10:54:06 2011 -0800
@@ -36,6 +36,7 @@
 
 <transform dir path=usr$ -> default group sys>
 <transform dir path=usr/share$ -> default group sys>
+<transform dir path=usr/share/doc$ -> default group other>
 <transform dir path=usr/share/locale(/.+){0,1}$ -> default group other>
 <transform dir path=usr/gnu/share$ -> default group sys>
 

--- a/transforms/manifest-metadata-template	Mon Feb 07 17:45:11 2011 -0800
+++ b/transforms/manifest-metadata-template	Tue Feb 08 10:54:06 2011 -0800
@@ -27,7 +27,6 @@
 set name=info.upstream_url value="XXX PROJECT URL XXX"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set variant.arch=$(ARCH)
 
 license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
 

--- a/transforms/variant.arch	Mon Feb 07 17:45:11 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +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) 2010, Oracle and/or it's affiliates.  All rights reserved.
-#
-
-#
-# These transforms will automatically tag actions that are likely to be
-# architecture specific.  This is only meant to aid folks in generating
-# manifests that properly tag actions.  The results should be carefully
-# audited since it may tag architecture independent files that match the
-# the pattern space and may not tag architecture specific files that don't.
-#
-# It might also be useful to use "diff -rq" to determine the differences
-# between proto areas for multiple architectures, though take care to avoid
-# timestamp.
-#
-# Note: this uses and then replaces $!(ARCH) to avoid macro substitution
-#
-
-# add anything with the architecture embedded in the path
-<transform dir file link hardlink path=.*/\$\(MACH.*\) -> \
-	default variant.arch "$!(ARCH)">
-<transform dir file link hardlink \
-		path=.*/(sparcv9|sparcv7|sparc|amd64|i86|i386)(/.*){0,1}$ -> \
-	default variant.arch "$!(ARCH)">
-<transform dir file link hardlink \
-		path=.*/(sparc|i386)-(sun|pc)-solaris\d\.\d+ -> \
-	default variant.arch "$!(ARCH)">
-
-# add anything that looks like a shared object
-<transform file path=.*/.+\.so(\.\d+)*$ -> \
-	default variant.arch "$!(ARCH)">
-
-# add anything that looks like an archive library
-<transform file path=.*/lib.+\.a$ -> \
-	default variant.arch "$!(ARCH)">
-
-# add anything that looks like a libtool .la file
-<transform file path=.*/.+\.la$ -> \
-	default variant.arch "$!(ARCH)">
-
-# add "compiled" python files
-<transform dir file link hardlink path=.+\.pyc$ -> \
-	default variant.arch "$!(ARCH)">
-
-# delete "raw" python scripts that we may have accidentally picked up
-<transform dir file link hardlink path=.+\.py$ variant.arch=\$!\(ARCH\) -> \
-	delete variant.arch .*>
-
-# convert "$!(ARCH)" to "$(ARCH)"
-<transform dir file link hardlink -> \
-	edit variant.arch "\$!\((.*)\)" "$(\1)">