--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/DBI_584.p5m	Wed Jan 16 12:43:19 2013 -0800
@@ -0,0 +1,26 @@
+#
+# 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, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/perl-5/[email protected],5.12-5.12.0.0.0.14.0
+set name=pkg.obsolete value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/net-ssleay-584.p5m	Wed Jan 16 12:43:19 2013 -0800
@@ -0,0 +1,29 @@
+#
+# 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, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/perl-5/[email protected],5.12-5.12.0.0.0.14.0
+set name=pkg.obsolete value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/pmtools_584.p5m	Wed Jan 16 12:43:19 2013 -0800
@@ -0,0 +1,27 @@
+#
+# 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, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/perl-5/[email protected],5.12-5.12.0.0.0.14.0
+set name=pkg.obsolete value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/xml-parser-584.p5m	Wed Jan 16 12:43:19 2013 -0800
@@ -0,0 +1,27 @@
+#
+# 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, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/perl-5/[email protected],5.12-5.12.0.0.0.14.0
+set name=pkg.obsolete value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/xml-simple-584.p5m	Wed Jan 16 12:43:19 2013 -0800
@@ -0,0 +1,27 @@
+#
+# 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, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/perl-5/[email protected],5.12-5.12.0.0.0.14.0
+set name=pkg.obsolete value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

--- a/components/perl_modules/DBI/DBI.p5m	Wed Jan 16 09:05:17 2013 -0800
+++ b/components/perl_modules/DBI/DBI.p5m	Wed Jan 16 12:43:19 2013 -0800
@@ -18,24 +18,24 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/library/perl-5/database@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl Database Independent Interface"
-set name=pkg.description value="The DBI is the standard database interface module for Perl."
-set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
+set name=pkg.description \
+    value="The DBI is the standard database interface module for Perl."
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Perl"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2007/431
+set name=org.opensolaris.arc-caseid value=LSARC/2007/431
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-# perl 5.8.4
-depend fmri=library/perl-5/database-584 predicate=runtime/perl-584 \
-    type=conditional
+
 # perl 5.12
 depend fmri=library/perl-5/database-512 predicate=runtime/perl-512 \
     type=conditional
+
 legacy pkg=SUNWpmdbi \
     desc="Database independent interface module" \
     name="Perl Database Independent Interface"

--- a/components/perl_modules/DBI/DBI_584.p5m	Wed Jan 16 09:05:17 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,217 +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, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
-set name=pkg.fmri value=pkg:/library/perl-5/database-584@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Perl Database Independent Interface"
-set name=pkg.description value="The DBI is the standard database interface module for Perl."
-set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2007/431
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license DBI.license license='Artistic'
-
-dir path=usr
-dir path=usr/perl5
-dir path=usr/perl5/5.8.4
-dir path=usr/perl5/5.8.4/bin
-dir path=usr/perl5/5.8.4/man
-dir path=usr/perl5/5.8.4/man/man1
-dir path=usr/perl5/5.8.4/man/man3
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/5.8.4
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/Bundle
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Gofer
-dir \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Gofer/Policy
-dir \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Gofer/Transport
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Const
-dir \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Const/GetInfo
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/DBD
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Gofer
-dir \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Gofer/Transport
-dir \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/ProfileDumper
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/SQL
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Util
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/Win32
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/DBI
-file path=usr/perl5/5.8.4/bin/dbilogstrip
-file path=usr/perl5/5.8.4/bin/dbiprof
-file path=usr/perl5/5.8.4/bin/dbiproxy
-#file path=usr/perl5/5.8.4/lib/$(PERL_ARCH)/perllocal.pod
-file path=usr/perl5/5.8.4/man/man1/dbilogstrip.1
-file path=usr/perl5/5.8.4/man/man1/dbiprof.1
-file path=usr/perl5/5.8.4/man/man1/dbiproxy.1
-file path=usr/perl5/5.8.4/man/man3/Bundle::DBI.3
-file path=usr/perl5/5.8.4/man/man3/DBD::DBM.3
-file path=usr/perl5/5.8.4/man/man3/DBD::File.3
-file path=usr/perl5/5.8.4/man/man3/DBD::Gofer.3
-file path=usr/perl5/5.8.4/man/man3/DBD::Gofer::Policy::Base.3
-file path=usr/perl5/5.8.4/man/man3/DBD::Gofer::Policy::classic.3
-file path=usr/perl5/5.8.4/man/man3/DBD::Gofer::Policy::pedantic.3
-file path=usr/perl5/5.8.4/man/man3/DBD::Gofer::Policy::rush.3
-file path=usr/perl5/5.8.4/man/man3/DBD::Gofer::Transport::Base.3
-file path=usr/perl5/5.8.4/man/man3/DBD::Gofer::Transport::null.3
-file path=usr/perl5/5.8.4/man/man3/DBD::Gofer::Transport::pipeone.3
-file path=usr/perl5/5.8.4/man/man3/DBD::Gofer::Transport::stream.3
-file path=usr/perl5/5.8.4/man/man3/DBD::Proxy.3
-file path=usr/perl5/5.8.4/man/man3/DBD::Sponge.3
-file path=usr/perl5/5.8.4/man/man3/DBI.3
-file path=usr/perl5/5.8.4/man/man3/DBI::Const::GetInfo::ANSI.3
-file path=usr/perl5/5.8.4/man/man3/DBI::Const::GetInfo::ODBC.3
-file path=usr/perl5/5.8.4/man/man3/DBI::Const::GetInfoReturn.3
-file path=usr/perl5/5.8.4/man/man3/DBI::Const::GetInfoType.3
-file path=usr/perl5/5.8.4/man/man3/DBI::DBD.3
-file path=usr/perl5/5.8.4/man/man3/DBI::DBD::Metadata.3
-file path=usr/perl5/5.8.4/man/man3/DBI::FAQ.3
-file path=usr/perl5/5.8.4/man/man3/DBI::Gofer::Execute.3
-file path=usr/perl5/5.8.4/man/man3/DBI::Gofer::Request.3
-file path=usr/perl5/5.8.4/man/man3/DBI::Gofer::Response.3
-file path=usr/perl5/5.8.4/man/man3/DBI::Gofer::Transport::Base.3
-file path=usr/perl5/5.8.4/man/man3/DBI::Gofer::Transport::pipeone.3
-file path=usr/perl5/5.8.4/man/man3/DBI::Gofer::Transport::stream.3
-file path=usr/perl5/5.8.4/man/man3/DBI::Profile.3
-file path=usr/perl5/5.8.4/man/man3/DBI::ProfileData.3
-file path=usr/perl5/5.8.4/man/man3/DBI::ProfileDumper.3
-file path=usr/perl5/5.8.4/man/man3/DBI::ProfileDumper::Apache.3
-file path=usr/perl5/5.8.4/man/man3/DBI::ProfileSubs.3
-file path=usr/perl5/5.8.4/man/man3/DBI::ProxyServer.3
-file path=usr/perl5/5.8.4/man/man3/DBI::PurePerl.3
-file path=usr/perl5/5.8.4/man/man3/DBI::SQL::Nano.3
-file path=usr/perl5/5.8.4/man/man3/DBI::W32ODBC.3
-file path=usr/perl5/5.8.4/man/man3/Roadmap.3
-file path=usr/perl5/5.8.4/man/man3/TASKS.3
-file path=usr/perl5/5.8.4/man/man3/Win32::DBIODBC.3
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/Bundle/DBI.pm
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/DBM.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/ExampleP.pm
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/File.pm
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Gofer.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Gofer/Policy/Base.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Gofer/Policy/classic.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Gofer/Policy/pedantic.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Gofer/Policy/rush.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Gofer/Transport/Base.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Gofer/Transport/null.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Gofer/Transport/pipeone.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Gofer/Transport/stream.pm
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/NullP.pm
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Proxy.pm
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBD/Sponge.pm
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Changes.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Const/GetInfo/ANSI.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Const/GetInfo/ODBC.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Const/GetInfoReturn.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Const/GetInfoType.pm
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/DBD.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/DBD/Metadata.pm
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/FAQ.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Gofer/Execute.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Gofer/Request.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Gofer/Response.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Gofer/Transport/Base.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Gofer/Transport/pipeone.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Gofer/Transport/stream.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Profile.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/ProfileData.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/ProfileDumper.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/ProfileDumper/Apache.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/ProfileSubs.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/ProxyServer.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/PurePerl.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Roadmap.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/SQL/Nano.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/Util/_accessor.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/DBI/W32ODBC.pm
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/Roadmap.pod
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/TASKS.pod
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/Win32/DBIODBC.pm
-#file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/DBI/.packlist
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/DBI/DBI.bs
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/DBI/DBI.so
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/DBI/DBIXS.h
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/DBI/Driver.xst
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/DBI/Driver_xst.h
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/DBI/dbd_xsh.h
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/DBI/dbi_sql.h
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/DBI/dbipport.h
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/DBI/dbivport.h
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/DBI/dbixs_rev.h
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/dbixs_rev.pl
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/goferperf.pl
-depend type=optional fmri=library/perl-5/[email protected]

--- a/components/perl_modules/net-ssleay/net-ssleay-584.p5m	Wed Jan 16 09:05:17 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +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, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-set name=pkg.fmri \
-    value=pkg:/library/perl-5/net-ssleay-584@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Net::SSLeay- Perl extension for using OpenSSL"
-set name=info.classification \
-    value="org.opensolaris.category.2008:Development/Perl"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2009/189
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license net-ssleay.copyright license='OpenSSL, SSLeay'
-
-dir path=usr
-dir path=usr/perl5
-dir path=usr/perl5/5.8.4
-dir path=usr/perl5/5.8.4/man
-dir path=usr/perl5/5.8.4/man/man3
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/5.8.4
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/Net
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/Net/SSLeay
-
-file path=usr/perl5/5.8.4/man/man3/Net::SSLeay::Handle.3
-file path=usr/perl5/5.8.4/man/man3/Net::SSLeay.3
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/.packlist
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/autosplit.ix
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/debug_read.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/do_https.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/do_https2.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/do_https3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/do_https4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/do_httpx2.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/do_httpx3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/do_httpx4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/dump_peer_certificate.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/get_http.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/get_http3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/get_http4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/get_https.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/get_https3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/get_https4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/get_httpx.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/get_httpx3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/get_httpx4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/head_http.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/head_http3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/head_http4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/head_https.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/head_https3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/head_https4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/head_httpx.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/head_httpx3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/head_httpx4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/http_cat.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/https_cat.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/httpx_cat.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/make_form.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/make_headers.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/new_x_ctx.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/open_proxy_tcp_connection.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/open_tcp_connection.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/post_http.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/post_http3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/post_http4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/post_https.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/post_https3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/post_https4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/post_httpx.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/post_httpx3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/post_httpx4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/put_http.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/put_http3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/put_http4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/put_https.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/put_https3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/put_https4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/put_httpx.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/put_httpx3.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/put_httpx4.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/randomize.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/set_cert_and_key.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/set_proxy.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/set_server_cert_and_key.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/ssl_read_all.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/ssl_read_CRLF.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/ssl_read_until.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/ssl_write_all.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/ssl_write_CRLF.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/sslcat.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/SSLeay.bs
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/SSLeay.so mode=0555
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/tcp_read_all.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/tcp_read_CRLF.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/tcp_read_until.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/tcp_write_all.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/tcp_write_CRLF.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/tcpcat.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/tcpxcat.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/want_nothing.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/want_read.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/want_write.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/Net/SSLeay/want_X509_lookup.al
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/Net/SSLeay.pm
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/Net/SSLeay/Handle.pm
-
-depend fmri=library/[email protected] type=require

--- a/components/perl_modules/net-ssleay/net-ssleay.p5m	Wed Jan 16 09:05:17 2013 -0800
+++ b/components/perl_modules/net-ssleay/net-ssleay.p5m	Wed Jan 16 12:43:19 2013 -0800
@@ -20,24 +20,19 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-set name=pkg.fmri \
-    value=pkg:/library/perl-5/net-ssleay@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/library/perl-5/net-ssleay@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Net::SSLeay- Perl extension for using OpenSSL"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Perl"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2009/189
+set name=org.opensolaris.arc-caseid value=PSARC/2009/189
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-# perl 5.8.4
-depend fmri=library/perl-5/net-ssleay-584 predicate=runtime/perl-584 \
-    type=conditional
 # perl 5.12
 depend fmri=library/perl-5/net-ssleay-512 predicate=runtime/perl-512 \
     type=conditional

--- a/components/perl_modules/pmtools/pmtools.p5m	Wed Jan 16 09:05:17 2013 -0800
+++ b/components/perl_modules/pmtools/pmtools.p5m	Wed Jan 16 12:43:19 2013 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -30,15 +30,11 @@
     value=org.opensolaris.category.2008:Development/Perl
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2009/121
+set name=org.opensolaris.arc-caseid value=PSARC/2009/121
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
 license pmtools.license license="GPLv2, Artistic"
+
 # perl 5.12
 depend fmri=library/perl-5/pmtools-512 predicate=runtime/perl-512 \
     type=conditional
-
-# perl 5.8.4
-depend fmri=library/perl-5/pmtools-584 predicate=runtime/perl-584 \
-    type=conditional
-

--- a/components/perl_modules/pmtools/pmtools_584.p5m	Wed Jan 16 09:05:17 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +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, 2012, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-set name=pkg.fmri \
-    value=pkg:/library/perl-5/pmtools-584@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.description \
-    value="Perl module tools is a suite of small tools that help manage and inspect perl modules, perl Plain Old Documentation files, and perl programs."
-set name=pkg.summary value="Perl module tools."
-set name=info.classification \
-    value=org.opensolaris.category.2008:Development/Perl
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2009/121
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/perl5
-dir path=usr/perl5/5.8.4
-dir path=usr/perl5/5.8.4/bin
-dir path=usr/perl5/5.8.4/man
-dir path=usr/perl5/5.8.4/man/man1
-dir path=usr/perl5/5.8.4/man/man3
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/5.8.4
-dir path=usr/perl5/vendor_perl/5.8.4/Devel
-file path=usr/perl5/5.8.4/bin/basepods
-file path=usr/perl5/5.8.4/bin/faqpods
-file path=usr/perl5/5.8.4/bin/modpods
-file path=usr/perl5/5.8.4/bin/pfcat
-file path=usr/perl5/5.8.4/bin/plxload
-file path=usr/perl5/5.8.4/bin/pmall
-file path=usr/perl5/5.8.4/bin/pman
-file path=usr/perl5/5.8.4/bin/pmcat
-file path=usr/perl5/5.8.4/bin/pmdesc
-file path=usr/perl5/5.8.4/bin/pmdirs
-file path=usr/perl5/5.8.4/bin/pmeth
-file path=usr/perl5/5.8.4/bin/pmexp
-file path=usr/perl5/5.8.4/bin/pmfunc
-file path=usr/perl5/5.8.4/bin/pminst
-file path=usr/perl5/5.8.4/bin/pmload
-file path=usr/perl5/5.8.4/bin/pmls
-file path=usr/perl5/5.8.4/bin/pmpath
-file path=usr/perl5/5.8.4/bin/pmvers
-file path=usr/perl5/5.8.4/bin/podgrep
-file path=usr/perl5/5.8.4/bin/podpath
-file path=usr/perl5/5.8.4/bin/pods
-file path=usr/perl5/5.8.4/bin/podtoc
-file path=usr/perl5/5.8.4/bin/sitepods
-file path=usr/perl5/5.8.4/bin/stdpods
-file path=usr/perl5/5.8.4/man/man1/basepods.1
-file path=usr/perl5/5.8.4/man/man1/faqpods.1
-file path=usr/perl5/5.8.4/man/man1/modpods.1
-file path=usr/perl5/5.8.4/man/man1/pfcat.1
-file path=usr/perl5/5.8.4/man/man1/plxload.1
-file path=usr/perl5/5.8.4/man/man1/pmall.1
-file path=usr/perl5/5.8.4/man/man1/pman.1
-file path=usr/perl5/5.8.4/man/man1/pmcat.1
-file path=usr/perl5/5.8.4/man/man1/pmdesc.1
-file path=usr/perl5/5.8.4/man/man1/pmdirs.1
-file path=usr/perl5/5.8.4/man/man1/pmeth.1
-file path=usr/perl5/5.8.4/man/man1/pmexp.1
-file path=usr/perl5/5.8.4/man/man1/pmfunc.1
-file path=usr/perl5/5.8.4/man/man1/pminst.1
-file path=usr/perl5/5.8.4/man/man1/pmload.1
-file path=usr/perl5/5.8.4/man/man1/pmls.1
-file path=usr/perl5/5.8.4/man/man1/pmpath.1
-file path=usr/perl5/5.8.4/man/man1/pmvers.1
-file path=usr/perl5/5.8.4/man/man1/podgrep.1
-file path=usr/perl5/5.8.4/man/man1/podpath.1
-file path=usr/perl5/5.8.4/man/man1/pods.1
-file path=usr/perl5/5.8.4/man/man1/podtoc.1
-file path=usr/perl5/5.8.4/man/man1/sitepods.1
-file path=usr/perl5/5.8.4/man/man1/stdpods.1
-file path=usr/perl5/5.8.4/man/man3/Devel::Loaded.3
-file path=usr/perl5/vendor_perl/5.8.4/Devel/Loaded.pm
-license pmtools.license license="GPLv2, Artistic"
-

--- a/components/perl_modules/xml-parser/xml-parser-584.p5m	Wed Jan 16 09:05:17 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +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, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-set name=pkg.fmri value=pkg:/library/perl-5/xml-parser-584@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="XML::Parser - A perl module for parsing XML documents"
-set name=pkg.description value="This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat."
-set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2004/251
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license xml-parser.license license='Artistic'
-
-dir path=usr
-dir path=usr/perl5
-dir path=usr/perl5/5.8.4
-dir path=usr/perl5/5.8.4/lib
-dir path=usr/perl5/5.8.4/lib/$(PERL_ARCH)
-dir path=usr/perl5/5.8.4/man
-dir path=usr/perl5/5.8.4/man/man3
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/5.8.4
-dir path=usr/perl5/vendor_perl/5.8.4/XML
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Style
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/XML
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/XML/Parser
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/XML/Parser/Expat
-#file path=usr/perl5/5.8.4/lib/$(PERL_ARCH)/perllocal.pod
-file path=usr/perl5/5.8.4/man/man3/XML::Parser.3
-file path=usr/perl5/5.8.4/man/man3/XML::Parser::Expat.3
-file path=usr/perl5/5.8.4/man/man3/XML::Parser::Style::Debug.3
-file path=usr/perl5/5.8.4/man/man3/XML::Parser::Style::Objects.3
-file path=usr/perl5/5.8.4/man/man3/XML::Parser::Style::Stream.3
-file path=usr/perl5/5.8.4/man/man3/XML::Parser::Style::Subs.3
-file path=usr/perl5/5.8.4/man/man3/XML::Parser::Style::Tree.3
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/Japanese_Encodings.msg
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/README
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/big5.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/euc-kr.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-2.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-3.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-4.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-5.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-7.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-8.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-9.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/windows-1250.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/windows-1252.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/x-euc-jp-unicode.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/x-sjis-cp932.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/x-sjis-jdk117.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/x-sjis-jisx0221.enc
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Encodings/x-sjis-unicode.enc
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Expat.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/LWPExternEnt.pl
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Style/Debug.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Style/Objects.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Style/Stream.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Style/Subs.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/XML/Parser/Style/Tree.pm
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/XML/Parser/.packlist
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/XML/Parser/Expat/Expat.bs
-file \
-    path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/XML/Parser/Expat/Expat.so
-depend type=optional fmri=library/perl-5/[email protected]

--- a/components/perl_modules/xml-parser/xml-parser.p5m	Wed Jan 16 09:05:17 2013 -0800
+++ b/components/perl_modules/xml-parser/xml-parser.p5m	Wed Jan 16 12:43:19 2013 -0800
@@ -18,25 +18,26 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
-# The version is specifically set to 5.8.4 until there is a version that it
+# The version is specifically set until there is a version that is
 # greater than this due to the way xml-parser was originally delivered from
 # the desktop consolidation.
-set name=pkg.fmri value=pkg:/library/perl-5/[email protected],$(BUILD_VERSION)
-set name=pkg.summary value="XML::Parser - A perl module for parsing XML documents"
+set name=pkg.fmri value=pkg:/library/perl-5/[email protected],$(BUILD_VERSION)
+set name=pkg.summary \
+    value="XML::Parser - A perl module for parsing XML documents"
 set name=pkg.description value="This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat."
-set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Perl"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-# perl 5.8.4
-depend fmri=library/perl-5/xml-parser-584 predicate=runtime/perl-584 \
-    type=conditional
+
 # perl 5.12
 depend fmri=library/perl-5/xml-parser-512 predicate=runtime/perl-512 \
     type=conditional
+
 legacy pkg=SUNWperl-xml-parser \
-	desc="Perl XML::Parser and XML::Simple PERL modules - development files" \
-	name="Perl XML::Parser and XML::Simple PERL modules"
+    desc="Perl XML::Parser and XML::Simple PERL modules - development files" \
+    name="Perl XML::Parser and XML::Simple PERL modules"

--- a/components/perl_modules/xml-simple/xml-simple-584.p5m	Wed Jan 16 09:05:17 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +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, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-set name=pkg.fmri value=pkg:/library/perl-5/xml-simple-584@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="XML::Simple - Easy API to maintain XML (esp config files)"
-set name=pkg.description value="The XML::Simple module provides a simple API layer on top of an underlying XML parsing module (either XML::Parser or one of the SAX2 parser modules)."
-set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2004/251
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license xml-simple.license license='Artistic'
-
-dir path=usr
-dir path=usr/perl5
-dir path=usr/perl5/5.8.4
-dir path=usr/perl5/5.8.4/lib
-dir path=usr/perl5/5.8.4/lib/$(PERL_ARCH)
-dir path=usr/perl5/5.8.4/man
-dir path=usr/perl5/5.8.4/man/man3
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/5.8.4
-dir path=usr/perl5/vendor_perl/5.8.4/XML
-dir path=usr/perl5/vendor_perl/5.8.4/XML/Simple
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/XML
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/XML/Simple
-#file path=usr/perl5/5.8.4/lib/$(PERL_ARCH)/perllocal.pod
-file path=usr/perl5/5.8.4/man/man3/XML::Simple.3
-file path=usr/perl5/5.8.4/man/man3/XML::Simple::FAQ.3
-file path=usr/perl5/vendor_perl/5.8.4/XML/Simple.pm
-file path=usr/perl5/vendor_perl/5.8.4/XML/Simple/FAQ.pod
-file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)/auto/XML/Simple/.packlist
-depend fmri=library/perl-5/[email protected] type=optional
-depend fmri=library/perl-5/xml-parser-584 type=require

--- a/components/perl_modules/xml-simple/xml-simple.p5m	Wed Jan 16 09:05:17 2013 -0800
+++ b/components/perl_modules/xml-simple/xml-simple.p5m	Wed Jan 16 12:43:19 2013 -0800
@@ -18,21 +18,22 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/library/perl-5/xml-simple@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="XML::Simple - Easy API to maintain XML (esp config files)"
+set name=pkg.summary \
+    value="XML::Simple - Easy API to maintain XML (esp config files)"
 set name=pkg.description value="The XML::Simple module provides a simple API layer on top of an underlying XML parsing module (either XML::Parser or one of the SAX2 parser modules)."
-set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Perl"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-# perl 5.8.4
-depend fmri=library/perl-5/xml-simple-584 predicate=runtime/perl-584 \
-    type=conditional
+
 # perl 5.12
 depend fmri=library/perl-5/xml-simple-512 predicate=runtime/perl-512 \
     type=conditional
+
 # No legacy package because this is split from xml-parser
 depend fmri=library/perl-5/xml-parser type=require

--- a/make-rules/makemaker.mk	Wed Jan 16 09:05:17 2013 -0800
+++ b/make-rules/makemaker.mk	Wed Jan 16 12:43:19 2013 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 # we only do 32 bit perl for now.
@@ -35,7 +35,6 @@
 # directories.
 PERLBD_ARCH = $(BUILD_DIR)/$(MACH32)
 
-$(PERLBD_ARCH)-5.8.4/.configured:		PERL_VERSION=5.8.4
 $(PERLBD_ARCH)-5.12/.configured:		PERL_VERSION=5.12
 
 BUILD_32 =	$(PERL_VERSIONS:%=$(PERLBD_ARCH)-%/.built)

--- a/make-rules/shared-macros.mk	Wed Jan 16 09:05:17 2013 -0800
+++ b/make-rules/shared-macros.mk	Wed Jan 16 12:43:19 2013 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 PATH=/usr/bin:/usr/gnu/bin
@@ -305,9 +305,8 @@
 # Not necessarily the system's default version, i.e. /usr/bin/perl
 PERL_VERSION =  5.12
 
-PERL_VERSIONS = 5.8.4 5.12
+PERL_VERSIONS = 5.12
 
-PERL.5.8.4 =    /usr/perl5/5.8.4/bin/perl
 PERL.5.12 =     /usr/perl5/5.12/bin/perl
 
 PERL =          $(PERL.$(PERL_VERSION))