--- a/components/automake/automake-1.10/automake.p5m	Tue Jun 19 14:50:22 2012 -0700
+++ b/components/automake/automake-1.10/automake.p5m	Tue Jun 19 11:24:46 2012 -0700
@@ -153,4 +153,10 @@
 file path=usr/share/automake-$(COMPONENT_VERSION)/symlink-tree mode=0555
 file path=usr/share/automake-$(COMPONENT_VERSION)/texinfo.tex
 file path=usr/share/automake-$(COMPONENT_VERSION)/ylwrap mode=0555
+
+link path=usr/bin/aclocal target=aclocal-1.10 \
+    mediator=automake mediator-version=1.10
+link path=usr/bin/automake target=automake-1.10 \
+    mediator=automake mediator-version=1.10
+
 license automake.license license="GPLv2 FDLv1.2"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/automake/automake-1.11.2/automake-111.p5m	Tue Jun 19 11:24:46 2012 -0700
@@ -0,0 +1,192 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+
+set name=pkg.fmri \
+    value=pkg:/developer/build/automake-111@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="A Makefile generator"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/automake/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/293
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=usr
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/aclocal
+dir path=usr/share/aclocal-1.11
+dir path=usr/share/automake-1.11
+dir path=usr/share/automake-1.11/am
+dir path=usr/share/automake-1.11/Automake
+dir path=usr/share/doc
+dir path=usr/share/doc/automake
+dir path=usr/share/info
+dir path=usr/share/man
+dir path=usr/share/man/man1
+
+file path=usr/bin/aclocal-1.11
+file path=usr/bin/automake-1.11
+file dirlist path=usr/share/aclocal/dirlist \
+    mode=0644 overlay=allow preserve=true
+file path=usr/share/aclocal-1.11/amversion.m4
+file path=usr/share/aclocal-1.11/ar-lib.m4
+file path=usr/share/aclocal-1.11/as.m4
+file path=usr/share/aclocal-1.11/auxdir.m4
+file path=usr/share/aclocal-1.11/ccstdc.m4
+file path=usr/share/aclocal-1.11/cond-if.m4
+file path=usr/share/aclocal-1.11/cond.m4
+file path=usr/share/aclocal-1.11/depend.m4
+file path=usr/share/aclocal-1.11/depout.m4
+file path=usr/share/aclocal-1.11/dmalloc.m4
+file path=usr/share/aclocal-1.11/gcj.m4
+file path=usr/share/aclocal-1.11/header.m4
+file path=usr/share/aclocal-1.11/init.m4
+file path=usr/share/aclocal-1.11/install-sh.m4
+file path=usr/share/aclocal-1.11/lead-dot.m4
+file path=usr/share/aclocal-1.11/lex.m4
+file path=usr/share/aclocal-1.11/lispdir.m4
+file path=usr/share/aclocal-1.11/maintainer.m4
+file path=usr/share/aclocal-1.11/make.m4
+file path=usr/share/aclocal-1.11/minuso.m4
+file path=usr/share/aclocal-1.11/missing.m4
+file path=usr/share/aclocal-1.11/mkdirp.m4
+file path=usr/share/aclocal-1.11/multi.m4
+file path=usr/share/aclocal-1.11/obsol-gt.m4
+file path=usr/share/aclocal-1.11/obsol-lt.m4
+file path=usr/share/aclocal-1.11/obsolete.m4
+file path=usr/share/aclocal-1.11/options.m4
+file path=usr/share/aclocal-1.11/protos.m4
+file path=usr/share/aclocal-1.11/python.m4
+file path=usr/share/aclocal-1.11/regex.m4
+file path=usr/share/aclocal-1.11/runlog.m4
+file path=usr/share/aclocal-1.11/sanity.m4
+file path=usr/share/aclocal-1.11/silent.m4
+file path=usr/share/aclocal-1.11/strip.m4
+file path=usr/share/aclocal-1.11/substnot.m4
+file path=usr/share/aclocal-1.11/tar.m4
+file path=usr/share/aclocal-1.11/upc.m4
+file path=usr/share/aclocal-1.11/vala.m4
+file path=usr/share/automake-1.11/acinstall mode=0555
+file path=usr/share/automake-1.11/am/ansi2knr.am
+file path=usr/share/automake-1.11/am/check.am
+file path=usr/share/automake-1.11/am/check2.am
+file path=usr/share/automake-1.11/am/clean-hdr.am
+file path=usr/share/automake-1.11/am/clean.am
+file path=usr/share/automake-1.11/am/compile.am
+file path=usr/share/automake-1.11/am/configure.am
+file path=usr/share/automake-1.11/am/data.am
+file path=usr/share/automake-1.11/am/dejagnu.am
+file path=usr/share/automake-1.11/am/depend.am
+file path=usr/share/automake-1.11/am/depend2.am
+file path=usr/share/automake-1.11/am/distdir.am
+file path=usr/share/automake-1.11/am/footer.am
+file path=usr/share/automake-1.11/am/header-vars.am
+file path=usr/share/automake-1.11/am/header.am
+file path=usr/share/automake-1.11/am/inst-vars.am
+file path=usr/share/automake-1.11/am/install.am
+file path=usr/share/automake-1.11/am/java.am
+file path=usr/share/automake-1.11/am/lang-compile.am
+file path=usr/share/automake-1.11/am/lex.am
+file path=usr/share/automake-1.11/am/library.am
+file path=usr/share/automake-1.11/am/libs.am
+file path=usr/share/automake-1.11/am/libtool.am
+file path=usr/share/automake-1.11/am/lisp.am
+file path=usr/share/automake-1.11/am/ltlib.am
+file path=usr/share/automake-1.11/am/ltlibrary.am
+file path=usr/share/automake-1.11/am/mans-vars.am
+file path=usr/share/automake-1.11/am/mans.am
+file path=usr/share/automake-1.11/am/multilib.am
+file path=usr/share/automake-1.11/am/program.am
+file path=usr/share/automake-1.11/am/progs.am
+file path=usr/share/automake-1.11/am/python.am
+file path=usr/share/automake-1.11/am/remake-hdr.am
+file path=usr/share/automake-1.11/am/scripts.am
+file path=usr/share/automake-1.11/am/subdirs.am
+file path=usr/share/automake-1.11/am/tags.am
+file path=usr/share/automake-1.11/am/texi-vers.am
+file path=usr/share/automake-1.11/am/texibuild.am
+file path=usr/share/automake-1.11/am/texinfos.am
+file path=usr/share/automake-1.11/am/vala.am
+file path=usr/share/automake-1.11/am/yacc.am
+file path=usr/share/automake-1.11/ansi2knr.1
+file path=usr/share/automake-1.11/ansi2knr.c
+file path=usr/share/automake-1.11/ar-lib
+file path=usr/share/automake-1.11/Automake/ChannelDefs.pm
+file path=usr/share/automake-1.11/Automake/Channels.pm
+file path=usr/share/automake-1.11/Automake/Condition.pm
+file path=usr/share/automake-1.11/Automake/Config.pm
+file path=usr/share/automake-1.11/Automake/Configure_ac.pm
+file path=usr/share/automake-1.11/Automake/DisjConditions.pm
+file path=usr/share/automake-1.11/Automake/FileUtils.pm
+file path=usr/share/automake-1.11/Automake/General.pm
+file path=usr/share/automake-1.11/Automake/Item.pm
+file path=usr/share/automake-1.11/Automake/ItemDef.pm
+file path=usr/share/automake-1.11/Automake/Location.pm
+file path=usr/share/automake-1.11/Automake/Options.pm
+file path=usr/share/automake-1.11/Automake/Rule.pm
+file path=usr/share/automake-1.11/Automake/RuleDef.pm
+file path=usr/share/automake-1.11/Automake/Struct.pm
+file path=usr/share/automake-1.11/Automake/VarDef.pm
+file path=usr/share/automake-1.11/Automake/Variable.pm
+file path=usr/share/automake-1.11/Automake/Version.pm
+file path=usr/share/automake-1.11/Automake/Wrap.pm
+file path=usr/share/automake-1.11/Automake/XFile.pm
+file path=usr/share/automake-1.11/compile mode=0555
+file path=usr/share/automake-1.11/config-ml.in
+file path=usr/share/automake-1.11/config.guess mode=0555
+file path=usr/share/automake-1.11/config.sub mode=0555
+file path=usr/share/automake-1.11/COPYING
+file path=usr/share/automake-1.11/depcomp mode=0555
+file path=usr/share/automake-1.11/elisp-comp mode=0555
+file path=usr/share/automake-1.11/INSTALL
+file path=usr/share/automake-1.11/install-sh mode=0555
+file path=usr/share/automake-1.11/mdate-sh mode=0555
+file path=usr/share/automake-1.11/missing mode=0555
+file path=usr/share/automake-1.11/mkinstalldirs mode=0555
+file path=usr/share/automake-1.11/py-compile mode=0555
+file path=usr/share/automake-1.11/symlink-tree mode=0555
+file path=usr/share/automake-1.11/texinfo.tex
+file path=usr/share/automake-1.11/ylwrap mode=0555
+file path=usr/share/doc/automake/amhello-1.0.tar.gz \
+    pkg.linted.pkglint.dupaction001.1=true
+file path=usr/share/info/automake.info \
+    pkg.linted.pkglint.dupaction001.1=true
+file path=usr/share/info/automake.info-1 \
+    pkg.linted.pkglint.dupaction001.1=true
+file path=usr/share/info/automake.info-2 \
+    pkg.linted.pkglint.dupaction001.1=true
+file path=usr/share/info/automake.info-3
+file path=usr/share/man/man1/aclocal-1.11.1
+file path=usr/share/man/man1/aclocal.1
+file path=usr/share/man/man1/automake-1.11.1
+file path=usr/share/man/man1/automake.1
+
+link path=usr/bin/aclocal target=aclocal-1.11 \
+    mediator=automake mediator-version=1.11
+link path=usr/bin/automake target=automake-1.11 \
+    mediator=automake mediator-version=1.11
+
+license automake.license license="GPLv2 FDLv1.3"

--- a/components/automake/automake-1.11.2/automake.p5m	Tue Jun 19 14:50:22 2012 -0700
+++ b/components/automake/automake-1.11.2/automake.p5m	Tue Jun 19 11:24:46 2012 -0700
@@ -20,10 +20,9 @@
 #
 # Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 #
-<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 
 set name=pkg.fmri \
-    value=pkg:/developer/build/automake-111@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/developer/build/automake@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A Makefile generator"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
@@ -33,160 +32,4 @@
     value=PSARC/2007/293
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-dir path=usr
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/aclocal
-dir path=usr/share/aclocal-1.11
-dir path=usr/share/automake-1.11
-dir path=usr/share/automake-1.11/am
-dir path=usr/share/automake-1.11/Automake
-dir path=usr/share/doc
-dir path=usr/share/doc/automake
-dir path=usr/share/info
-dir path=usr/share/man
-dir path=usr/share/man/man1
-
-file path=usr/bin/aclocal-1.11
-file path=usr/bin/automake-1.11
-file dirlist path=usr/share/aclocal/dirlist \
-    mode=0644 overlay=allow preserve=true
-file path=usr/share/aclocal-1.11/amversion.m4
-file path=usr/share/aclocal-1.11/ar-lib.m4
-file path=usr/share/aclocal-1.11/as.m4
-file path=usr/share/aclocal-1.11/auxdir.m4
-file path=usr/share/aclocal-1.11/ccstdc.m4
-file path=usr/share/aclocal-1.11/cond-if.m4
-file path=usr/share/aclocal-1.11/cond.m4
-file path=usr/share/aclocal-1.11/depend.m4
-file path=usr/share/aclocal-1.11/depout.m4
-file path=usr/share/aclocal-1.11/dmalloc.m4
-file path=usr/share/aclocal-1.11/gcj.m4
-file path=usr/share/aclocal-1.11/header.m4
-file path=usr/share/aclocal-1.11/init.m4
-file path=usr/share/aclocal-1.11/install-sh.m4
-file path=usr/share/aclocal-1.11/lead-dot.m4
-file path=usr/share/aclocal-1.11/lex.m4
-file path=usr/share/aclocal-1.11/lispdir.m4
-file path=usr/share/aclocal-1.11/maintainer.m4
-file path=usr/share/aclocal-1.11/make.m4
-file path=usr/share/aclocal-1.11/minuso.m4
-file path=usr/share/aclocal-1.11/missing.m4
-file path=usr/share/aclocal-1.11/mkdirp.m4
-file path=usr/share/aclocal-1.11/multi.m4
-file path=usr/share/aclocal-1.11/obsol-gt.m4
-file path=usr/share/aclocal-1.11/obsol-lt.m4
-file path=usr/share/aclocal-1.11/obsolete.m4
-file path=usr/share/aclocal-1.11/options.m4
-file path=usr/share/aclocal-1.11/protos.m4
-file path=usr/share/aclocal-1.11/python.m4
-file path=usr/share/aclocal-1.11/regex.m4
-file path=usr/share/aclocal-1.11/runlog.m4
-file path=usr/share/aclocal-1.11/sanity.m4
-file path=usr/share/aclocal-1.11/silent.m4
-file path=usr/share/aclocal-1.11/strip.m4
-file path=usr/share/aclocal-1.11/substnot.m4
-file path=usr/share/aclocal-1.11/tar.m4
-file path=usr/share/aclocal-1.11/upc.m4
-file path=usr/share/aclocal-1.11/vala.m4
-file path=usr/share/automake-1.11/acinstall mode=0555
-file path=usr/share/automake-1.11/am/ansi2knr.am
-file path=usr/share/automake-1.11/am/check.am
-file path=usr/share/automake-1.11/am/check2.am
-file path=usr/share/automake-1.11/am/clean-hdr.am
-file path=usr/share/automake-1.11/am/clean.am
-file path=usr/share/automake-1.11/am/compile.am
-file path=usr/share/automake-1.11/am/configure.am
-file path=usr/share/automake-1.11/am/data.am
-file path=usr/share/automake-1.11/am/dejagnu.am
-file path=usr/share/automake-1.11/am/depend.am
-file path=usr/share/automake-1.11/am/depend2.am
-file path=usr/share/automake-1.11/am/distdir.am
-file path=usr/share/automake-1.11/am/footer.am
-file path=usr/share/automake-1.11/am/header-vars.am
-file path=usr/share/automake-1.11/am/header.am
-file path=usr/share/automake-1.11/am/inst-vars.am
-file path=usr/share/automake-1.11/am/install.am
-file path=usr/share/automake-1.11/am/java.am
-file path=usr/share/automake-1.11/am/lang-compile.am
-file path=usr/share/automake-1.11/am/lex.am
-file path=usr/share/automake-1.11/am/library.am
-file path=usr/share/automake-1.11/am/libs.am
-file path=usr/share/automake-1.11/am/libtool.am
-file path=usr/share/automake-1.11/am/lisp.am
-file path=usr/share/automake-1.11/am/ltlib.am
-file path=usr/share/automake-1.11/am/ltlibrary.am
-file path=usr/share/automake-1.11/am/mans-vars.am
-file path=usr/share/automake-1.11/am/mans.am
-file path=usr/share/automake-1.11/am/multilib.am
-file path=usr/share/automake-1.11/am/program.am
-file path=usr/share/automake-1.11/am/progs.am
-file path=usr/share/automake-1.11/am/python.am
-file path=usr/share/automake-1.11/am/remake-hdr.am
-file path=usr/share/automake-1.11/am/scripts.am
-file path=usr/share/automake-1.11/am/subdirs.am
-file path=usr/share/automake-1.11/am/tags.am
-file path=usr/share/automake-1.11/am/texi-vers.am
-file path=usr/share/automake-1.11/am/texibuild.am
-file path=usr/share/automake-1.11/am/texinfos.am
-file path=usr/share/automake-1.11/am/vala.am
-file path=usr/share/automake-1.11/am/yacc.am
-file path=usr/share/automake-1.11/ansi2knr.1
-file path=usr/share/automake-1.11/ansi2knr.c
-file path=usr/share/automake-1.11/ar-lib
-file path=usr/share/automake-1.11/Automake/ChannelDefs.pm
-file path=usr/share/automake-1.11/Automake/Channels.pm
-file path=usr/share/automake-1.11/Automake/Condition.pm
-file path=usr/share/automake-1.11/Automake/Config.pm
-file path=usr/share/automake-1.11/Automake/Configure_ac.pm
-file path=usr/share/automake-1.11/Automake/DisjConditions.pm
-file path=usr/share/automake-1.11/Automake/FileUtils.pm
-file path=usr/share/automake-1.11/Automake/General.pm
-file path=usr/share/automake-1.11/Automake/Item.pm
-file path=usr/share/automake-1.11/Automake/ItemDef.pm
-file path=usr/share/automake-1.11/Automake/Location.pm
-file path=usr/share/automake-1.11/Automake/Options.pm
-file path=usr/share/automake-1.11/Automake/Rule.pm
-file path=usr/share/automake-1.11/Automake/RuleDef.pm
-file path=usr/share/automake-1.11/Automake/Struct.pm
-file path=usr/share/automake-1.11/Automake/VarDef.pm
-file path=usr/share/automake-1.11/Automake/Variable.pm
-file path=usr/share/automake-1.11/Automake/Version.pm
-file path=usr/share/automake-1.11/Automake/Wrap.pm
-file path=usr/share/automake-1.11/Automake/XFile.pm
-file path=usr/share/automake-1.11/compile mode=0555
-file path=usr/share/automake-1.11/config-ml.in
-file path=usr/share/automake-1.11/config.guess mode=0555
-file path=usr/share/automake-1.11/config.sub mode=0555
-file path=usr/share/automake-1.11/COPYING
-file path=usr/share/automake-1.11/depcomp mode=0555
-file path=usr/share/automake-1.11/elisp-comp mode=0555
-file path=usr/share/automake-1.11/INSTALL
-file path=usr/share/automake-1.11/install-sh mode=0555
-file path=usr/share/automake-1.11/mdate-sh mode=0555
-file path=usr/share/automake-1.11/missing mode=0555
-file path=usr/share/automake-1.11/mkinstalldirs mode=0555
-file path=usr/share/automake-1.11/py-compile mode=0555
-file path=usr/share/automake-1.11/symlink-tree mode=0555
-file path=usr/share/automake-1.11/texinfo.tex
-file path=usr/share/automake-1.11/ylwrap mode=0555
-file path=usr/share/doc/automake/amhello-1.0.tar.gz \
-    pkg.linted.pkglint.dupaction001.1=true
-file path=usr/share/info/automake.info \
-    pkg.linted.pkglint.dupaction001.1=true
-file path=usr/share/info/automake.info-1 \
-    pkg.linted.pkglint.dupaction001.1=true
-file path=usr/share/info/automake.info-2 \
-    pkg.linted.pkglint.dupaction001.1=true
-file path=usr/share/info/automake.info-3
-file path=usr/share/man/man1/aclocal-1.11.1
-file path=usr/share/man/man1/aclocal.1
-file path=usr/share/man/man1/automake-1.11.1
-file path=usr/share/man/man1/automake.1
-
-link path=usr/bin/aclocal target=aclocal-1.11 \
-    pkg.linted.pkglint.dupaction010.2=true
-link path=usr/bin/automake target=automake-1.11 \
-    pkg.linted.pkglint.dupaction010.2=true
-
-license automake.license license="GPLv2 FDLv1.3"
+depend type=require fmri=developer/build/automake-111

--- a/components/automake/automake-1.9.6/automake.p5m	Tue Jun 19 14:50:22 2012 -0700
+++ b/components/automake/automake-1.9.6/automake.p5m	Tue Jun 19 11:24:46 2012 -0700
@@ -150,4 +150,10 @@
 file path=usr/share/automake-1.9/symlink-tree mode=0555
 file path=usr/share/automake-1.9/texinfo.tex
 file path=usr/share/automake-1.9/ylwrap mode=0555
+
+link path=usr/bin/aclocal target=aclocal-1.9 \
+    mediator=automake mediator-version=1.9
+link path=usr/bin/automake target=automake-1.9 \
+    mediator=automake mediator-version=1.9
+
 license automake.license license=GPLv2