upstream/oracle/userland-gate: changeset 1152:96d423311191

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/DBI/DBI-PERLVER.p5m	Mon Feb 11 10:12:25 2013 -0800
@@ -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) 2013, 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-$(PLV)@$(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"
+
+# force a dependency on the Perl runtime
+depend fmri=__TBD pkg.debug.depend.file=perl \
+	pkg.debug.depend.path=usr/perl5/$(PERLVER)/bin type=require
+
+# force a dependency on the DBI package
+depend fmri=library/perl-5/database@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
+dir  path=usr/perl5/$(PERLVER)
+dir  path=usr/perl5/$(PERLVER)/bin
+file path=usr/perl5/$(PERLVER)/bin/dbilogstrip
+file path=usr/perl5/$(PERLVER)/bin/dbiprof
+file path=usr/perl5/$(PERLVER)/bin/dbiproxy
+dir  path=usr/perl5/$(PERLVER)/lib
+dir  path=usr/perl5/$(PERLVER)/lib/$(PERL_ARCH)
+#file path=usr/perl5/$(PERLVER)/lib/$(PERL_ARCH)/perllocal.pod
+dir  path=usr/perl5/$(PERLVER)/man
+dir  path=usr/perl5/$(PERLVER)/man/man1
+file path=usr/perl5/$(PERLVER)/man/man1/dbilogstrip.1
+file path=usr/perl5/$(PERLVER)/man/man1/dbiprof.1
+file path=usr/perl5/$(PERLVER)/man/man1/dbiproxy.1
+dir  path=usr/perl5/$(PERLVER)/man/man3
+file path=usr/perl5/$(PERLVER)/man/man3/Bundle::DBI.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::DBM.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::File.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::File::Developers.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::File::HowTo.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::File::Roadmap.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::Gofer.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::Gofer::Policy::Base.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::Gofer::Policy::classic.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::Gofer::Policy::pedantic.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::Gofer::Policy::rush.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::Gofer::Transport::Base.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::Gofer::Transport::corostream.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::Gofer::Transport::null.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::Gofer::Transport::pipeone.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::Gofer::Transport::stream.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::Proxy.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBD::Sponge.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Const::GetInfo::ANSI.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Const::GetInfo::ODBC.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Const::GetInfoReturn.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Const::GetInfoType.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::DBD.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::DBD::Metadata.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::DBD::SqlEngine.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::DBD::SqlEngine::Developers.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::DBD::SqlEngine::HowTo.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::FAQ.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Gofer::Execute.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Gofer::Request.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Gofer::Response.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Gofer::Serializer::Base.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Gofer::Serializer::DataDumper.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Gofer::Serializer::Storable.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Gofer::Transport::Base.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Gofer::Transport::pipeone.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Gofer::Transport::stream.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Profile.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::ProfileData.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::ProfileDumper.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::ProfileDumper::Apache.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::ProfileSubs.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::ProxyServer.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::PurePerl.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::SQL::Nano.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::Util::CacheMemory.3
+file path=usr/perl5/$(PERLVER)/man/man3/DBI::W32ODBC.3
+dir  path=usr/perl5/vendor_perl
+dir  path=usr/perl5/vendor_perl/$(PERLVER)
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Bundle
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Bundle/DBI.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/DBM.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/ExampleP.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/File
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/File.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/File/Developers.pod
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/File/HowTo.pod
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/File/Roadmap.pod
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer/Policy
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer/Policy/Base.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer/Policy/classic.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer/Policy/pedantic.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer/Policy/rush.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer/Transport
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer/Transport/Base.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer/Transport/corostream.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer/Transport/null.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer/Transport/pipeone.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Gofer/Transport/stream.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/NullP.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Proxy.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/Sponge.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Changes.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Const
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Const/GetInfo
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Const/GetInfo/ANSI.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Const/GetInfo/ODBC.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Const/GetInfoReturn.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Const/GetInfoType.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/DBD
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/DBD.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/DBD/Metadata.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/DBD/SqlEngine
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/DBD/SqlEngine.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/DBD/SqlEngine/Developers.pod
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/DBD/SqlEngine/HowTo.pod
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/FAQ.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Gofer
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Gofer/Execute.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Gofer/Request.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Gofer/Response.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Gofer/Serializer
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Gofer/Serializer/Base.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Gofer/Serializer/DataDumper.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Gofer/Serializer/Storable.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Gofer/Transport
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Gofer/Transport/Base.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Gofer/Transport/pipeone.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Gofer/Transport/stream.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Profile.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/ProfileData.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/ProfileDumper
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/ProfileDumper.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/ProfileDumper/Apache.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/ProfileSubs.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/ProxyServer.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/PurePerl.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/SQL
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/SQL/Nano.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Util
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Util/CacheMemory.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/Util/_accessor.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBI/W32ODBC.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/.packlist
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/DBI.bs
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/DBI.so
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/DBIXS.h
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/Driver.xst
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/Driver_xst.h
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/dbd_xsh.h
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/dbi_sql.h
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/dbipport.h
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/dbivport.h
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/dbixs_rev.h
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/dbixs_rev.pl

--- a/components/perl_modules/DBI/DBI.p5m	Mon Feb 11 08:59:55 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +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, 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=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)
-
-# 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_512.p5m	Mon Feb 11 08:59:55 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +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-512@$(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.12
-dir path=usr/perl5/5.12/bin
-#dir path=usr/perl5/5.12/lib
-#dir path=usr/perl5/5.12/lib/$(PERL_ARCH)
-dir path=usr/perl5/5.12/man
-dir path=usr/perl5/5.12/man/man1
-dir path=usr/perl5/5.12/man/man3
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/5.12
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/Bundle
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Gofer
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Gofer/Policy
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Gofer/Transport
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Const
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Const/GetInfo
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/DBD
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Gofer
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Gofer/Transport
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/ProfileDumper
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/SQL
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Util
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/Win32
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/DBI
-file path=usr/perl5/5.12/bin/dbilogstrip
-file path=usr/perl5/5.12/bin/dbiprof
-file path=usr/perl5/5.12/bin/dbiproxy
-#file path=usr/perl5/5.12/lib/$(PERL_ARCH)/perllocal.pod
-file path=usr/perl5/5.12/man/man1/dbilogstrip.1
-file path=usr/perl5/5.12/man/man1/dbiprof.1
-file path=usr/perl5/5.12/man/man1/dbiproxy.1
-file path=usr/perl5/5.12/man/man3/Bundle::DBI.3
-file path=usr/perl5/5.12/man/man3/DBD::DBM.3
-file path=usr/perl5/5.12/man/man3/DBD::File.3
-file path=usr/perl5/5.12/man/man3/DBD::Gofer.3
-file path=usr/perl5/5.12/man/man3/DBD::Gofer::Policy::Base.3
-file path=usr/perl5/5.12/man/man3/DBD::Gofer::Policy::classic.3
-file path=usr/perl5/5.12/man/man3/DBD::Gofer::Policy::pedantic.3
-file path=usr/perl5/5.12/man/man3/DBD::Gofer::Policy::rush.3
-file path=usr/perl5/5.12/man/man3/DBD::Gofer::Transport::Base.3
-file path=usr/perl5/5.12/man/man3/DBD::Gofer::Transport::null.3
-file path=usr/perl5/5.12/man/man3/DBD::Gofer::Transport::pipeone.3
-file path=usr/perl5/5.12/man/man3/DBD::Gofer::Transport::stream.3
-file path=usr/perl5/5.12/man/man3/DBD::Proxy.3
-file path=usr/perl5/5.12/man/man3/DBD::Sponge.3
-file path=usr/perl5/5.12/man/man3/DBI.3
-file path=usr/perl5/5.12/man/man3/DBI::Const::GetInfo::ANSI.3
-file path=usr/perl5/5.12/man/man3/DBI::Const::GetInfo::ODBC.3
-file path=usr/perl5/5.12/man/man3/DBI::Const::GetInfoReturn.3
-file path=usr/perl5/5.12/man/man3/DBI::Const::GetInfoType.3
-file path=usr/perl5/5.12/man/man3/DBI::DBD.3
-file path=usr/perl5/5.12/man/man3/DBI::DBD::Metadata.3
-file path=usr/perl5/5.12/man/man3/DBI::FAQ.3
-file path=usr/perl5/5.12/man/man3/DBI::Gofer::Execute.3
-file path=usr/perl5/5.12/man/man3/DBI::Gofer::Request.3
-file path=usr/perl5/5.12/man/man3/DBI::Gofer::Response.3
-file path=usr/perl5/5.12/man/man3/DBI::Gofer::Transport::Base.3
-file path=usr/perl5/5.12/man/man3/DBI::Gofer::Transport::pipeone.3
-file path=usr/perl5/5.12/man/man3/DBI::Gofer::Transport::stream.3
-file path=usr/perl5/5.12/man/man3/DBI::Profile.3
-file path=usr/perl5/5.12/man/man3/DBI::ProfileData.3
-file path=usr/perl5/5.12/man/man3/DBI::ProfileDumper.3
-file path=usr/perl5/5.12/man/man3/DBI::ProfileDumper::Apache.3
-file path=usr/perl5/5.12/man/man3/DBI::ProfileSubs.3
-file path=usr/perl5/5.12/man/man3/DBI::ProxyServer.3
-file path=usr/perl5/5.12/man/man3/DBI::PurePerl.3
-file path=usr/perl5/5.12/man/man3/DBI::SQL::Nano.3
-file path=usr/perl5/5.12/man/man3/DBI::W32ODBC.3
-file path=usr/perl5/5.12/man/man3/Roadmap.3
-file path=usr/perl5/5.12/man/man3/TASKS.3
-file path=usr/perl5/5.12/man/man3/Win32::DBIODBC.3
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/Bundle/DBI.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/DBM.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/ExampleP.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/File.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Gofer.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Gofer/Policy/Base.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Gofer/Policy/classic.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Gofer/Policy/pedantic.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Gofer/Policy/rush.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Gofer/Transport/Base.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Gofer/Transport/null.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Gofer/Transport/pipeone.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Gofer/Transport/stream.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/NullP.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Proxy.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBD/Sponge.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Changes.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Const/GetInfo/ANSI.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Const/GetInfo/ODBC.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Const/GetInfoReturn.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Const/GetInfoType.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/DBD.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/DBD/Metadata.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/FAQ.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Gofer/Execute.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Gofer/Request.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Gofer/Response.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Gofer/Transport/Base.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Gofer/Transport/pipeone.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Gofer/Transport/stream.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Profile.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/ProfileData.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/ProfileDumper.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/ProfileDumper/Apache.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/ProfileSubs.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/ProxyServer.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/PurePerl.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Roadmap.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/SQL/Nano.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/Util/_accessor.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/DBI/W32ODBC.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/Roadmap.pod
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/TASKS.pod
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/Win32/DBIODBC.pm
-#file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/DBI/.packlist
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/DBI/DBI.bs
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/DBI/DBI.so
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/DBI/DBIXS.h
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/DBI/Driver.xst
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/DBI/Driver_xst.h
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/DBI/dbd_xsh.h
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/DBI/dbi_sql.h
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/DBI/dbipport.h
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/DBI/dbivport.h
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/DBI/dbixs_rev.h
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/dbixs_rev.pl
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/goferperf.pl
-depend type=optional fmri=library/perl-5/[email protected]

--- a/components/perl_modules/DBI/Makefile	Mon Feb 11 08:59:55 2013 -0800
+++ b/components/perl_modules/DBI/Makefile	Mon Feb 11 10:12:25 2013 -0800
@@ -18,16 +18,16 @@
 #
 # 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.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		DBI
-COMPONENT_VERSION=	1.58
+COMPONENT_VERSION=	1.623
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:32d0d92cc6a6589e88d6b476564be649908ca49152f3f13af5eeebf9522b1cf6
+    sha256:912d73f9eb0601f592aa58897d9c6787e238d9780f30ac86059c83b7085de3a1
 COMPONENT_ARCHIVE_URL=	http://backpan.perl.org/authors/id/T/TI/TIMB/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	http://search.cpan.org/~timb/DBI/
 COMPONENT_BUGDB=	perl-mod/dbi
@@ -36,12 +36,13 @@
 include $(WS_TOP)/make-rules/ips.mk
 include $(WS_TOP)/make-rules/makemaker.mk
 
-build:		$(BUILD_32)
+COMPONENT_TEST_TARGETS = test
+
+build:		$(BUILD_32_and_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_32_and_64)
 
-COMPONENT_TEST_TARGETS = test
-test:		$(TEST_32)
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)

--- a/components/perl_modules/net-ssleay/Makefile	Mon Feb 11 08:59:55 2013 -0800
+++ b/components/perl_modules/net-ssleay/Makefile	Mon Feb 11 10:12:25 2013 -0800
@@ -26,15 +26,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		Net-SSLeay
-COMPONENT_VERSION=	1.36
+COMPONENT_VERSION=	1.52
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_PROJECT_URL=	http://search.cpan.org/dist/Net-SSLeay/
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:e262897263c5aa9096e39f7813c7cb7d4d05508ca406b173878c4ecddb2c53ce
-COMPONENT_ARCHIVE_URL=	http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/$(COMPONENT_ARCHIVE)
+    sha256:48ece32f8f1b4c20acedfcaefd5d66f0ab8818ae6f994ab7c02da7f42e6d77ba
+COMPONENT_ARCHIVE_URL=	http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	perl-mod/net-ssleay
 
+
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/makemaker.mk
 include $(WS_TOP)/make-rules/ips.mk
@@ -42,13 +43,13 @@
 # The component Makefile.PL file will ask some questions on whether we want
 # to run external tests, to which we want to answer with "n".
 COMPONENT_CONFIGURE_ENV += ; echo "n" |
+COMPONENT_TEST_TARGETS = test
 
-# common targets
-build:		$(BUILD_32)
+build:		$(BUILD_32_and_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_32_and_64)
 
-test:		$(TEST_32)
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)

--- a/components/perl_modules/net-ssleay/net-ssleay-512.p5m	Mon Feb 11 08:59:55 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-512@$(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.12
-dir path=usr/perl5/5.12/man
-dir path=usr/perl5/5.12/man/man3
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/5.12
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/Net
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/Net/SSLeay
-
-file path=usr/perl5/5.12/man/man3/Net::SSLeay::Handle.3
-file path=usr/perl5/5.12/man/man3/Net::SSLeay.3
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/.packlist
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/autosplit.ix
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/debug_read.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/do_https.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/do_https2.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/do_https3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/do_https4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/do_httpx2.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/do_httpx3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/do_httpx4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/dump_peer_certificate.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/get_http.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/get_http3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/get_http4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/get_https.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/get_https3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/get_https4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/get_httpx.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/get_httpx3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/get_httpx4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/head_http.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/head_http3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/head_http4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/head_https.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/head_https3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/head_https4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/head_httpx.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/head_httpx3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/head_httpx4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/http_cat.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/https_cat.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/httpx_cat.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/make_form.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/make_headers.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/new_x_ctx.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/open_proxy_tcp_connection.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/open_tcp_connection.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/post_http.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/post_http3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/post_http4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/post_https.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/post_https3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/post_https4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/post_httpx.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/post_httpx3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/post_httpx4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/put_http.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/put_http3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/put_http4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/put_https.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/put_https3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/put_https4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/put_httpx.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/put_httpx3.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/put_httpx4.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/randomize.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/set_cert_and_key.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/set_proxy.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/set_server_cert_and_key.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/ssl_read_all.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/ssl_read_CRLF.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/ssl_read_until.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/ssl_write_all.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/ssl_write_CRLF.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/sslcat.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/SSLeay.bs
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/SSLeay.so mode=0555
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/tcp_read_all.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/tcp_read_CRLF.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/tcp_read_until.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/tcp_write_all.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/tcp_write_CRLF.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/tcpcat.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/tcpxcat.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/want_nothing.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/want_read.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/want_write.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Net/SSLeay/want_X509_lookup.al
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/Net/SSLeay.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/Net/SSLeay/Handle.pm
-
-depend fmri=library/[email protected] type=require

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/net-ssleay/net-ssleay-PERLVER.p5m	Mon Feb 11 10:12:25 2013 -0800
@@ -0,0 +1,140 @@
+#
+# 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.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/library/perl-5/net-ssleay-$(PLV)@$(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'
+
+depend fmri=library/[email protected] type=require
+
+dir  path=usr
+dir  path=usr/perl5
+dir  path=usr/perl5/$(PERLVER)
+dir  path=usr/perl5/$(PERLVER)/lib
+dir  path=usr/perl5/$(PERLVER)/lib/$(PERL_ARCH)
+#file path=usr/perl5/$(PERLVER)/lib/$(PERL_ARCH)/perllocal.pod
+dir  path=usr/perl5/$(PERLVER)/man
+dir  path=usr/perl5/$(PERLVER)/man/man3
+file path=usr/perl5/$(PERLVER)/man/man3/Net::SSLeay.3
+file path=usr/perl5/$(PERLVER)/man/man3/Net::SSLeay::Handle.3
+dir  path=usr/perl5/vendor_perl
+dir  path=usr/perl5/vendor_perl/$(PERLVER)
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Net
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Net/SSLeay
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Net/SSLeay.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Net/SSLeay.pod
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Net/SSLeay/Handle.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/.packlist
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/SSLeay.bs
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/SSLeay.so
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/autosplit.ix
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/debug_read.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/do_https.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/do_https2.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/do_https3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/do_https4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/do_httpx2.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/do_httpx3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/do_httpx4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/dump_peer_certificate.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/get_http.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/get_http3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/get_http4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/get_https.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/get_https3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/get_https4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/get_httpx.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/get_httpx3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/get_httpx4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/head_http.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/head_http3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/head_http4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/head_https.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/head_https3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/head_https4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/head_httpx.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/head_httpx3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/head_httpx4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/http_cat.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/https_cat.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/httpx_cat.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/initialize.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/make_form.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/make_headers.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/new_x_ctx.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/open_proxy_tcp_connection.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/open_tcp_connection.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/post_http.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/post_http3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/post_http4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/post_https.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/post_https3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/post_https4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/post_httpx.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/post_httpx3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/post_httpx4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/put_http.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/put_http3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/put_http4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/put_https.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/put_https3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/put_https4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/put_httpx.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/put_httpx3.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/put_httpx4.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/randomize.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/set_cert_and_key.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/set_proxy.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/set_server_cert_and_key.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/ssl_read_CRLF.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/ssl_read_all.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/ssl_read_until.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/ssl_write_CRLF.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/ssl_write_all.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/sslcat.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/tcp_read_CRLF.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/tcp_read_all.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/tcp_read_until.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/tcp_write_CRLF.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/tcp_write_all.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/tcpcat.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/tcpxcat.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/want_X509_lookup.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/want_nothing.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/want_read.al
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/SSLeay/want_write.al

--- a/components/perl_modules/net-ssleay/net-ssleay.p5m	Mon Feb 11 08:59:55 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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 (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.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)
-
-# perl 5.12
-depend fmri=library/perl-5/net-ssleay-512 predicate=runtime/perl-512 \
-    type=conditional

--- a/components/perl_modules/pmtools/Makefile	Mon Feb 11 08:59:55 2013 -0800
+++ b/components/perl_modules/pmtools/Makefile	Mon Feb 11 10:12:25 2013 -0800
@@ -20,18 +20,18 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pmtools
-COMPONENT_VERSION=	1.10
+COMPONENT_VERSION=	1.30
 COMPONENT_PROJECT_URL=	http://search.cpan.org/dist/pmtools/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:44e8cbe9ac851dad2373e2e0243a1faab690a4ca1e69b83a77591a47682806ae
+    sha256:8662103905aba2debfe36e378fb3130e4b0367eb4d271ac851317dc2b8deea90
 COMPONENT_ARCHIVE_URL=	http://search.cpan.org/CPAN/authors/id/M/ML/MLFISHER/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/perl-pmtools
 
@@ -39,10 +39,9 @@
 include $(WS_TOP)/make-rules/makemaker.mk
 include $(WS_TOP)/make-rules/ips.mk
 
-# common targets
-build:		$(BUILD_32)
+build:		$(BUILD_32_and_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_32_and_64)
 
 test:		$(NO_TESTS)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/pmtools/pmtools-PERLVER.p5m	Mon Feb 11 10:12:25 2013 -0800
@@ -0,0 +1,106 @@
+#
+# 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.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri value=pkg:/library/perl-5/pmtools-$(PLV)@$(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)
+
+license pmtools.license license="GPLv2, Artistic"
+
+dir  path=usr
+dir  path=usr/perl5
+dir  path=usr/perl5/$(PERLVER)
+dir  path=usr/perl5/$(PERLVER)/bin
+file path=usr/perl5/$(PERLVER)/bin/basepods
+file path=usr/perl5/$(PERLVER)/bin/faqpods
+file path=usr/perl5/$(PERLVER)/bin/modpods
+file path=usr/perl5/$(PERLVER)/bin/pfcat
+file path=usr/perl5/$(PERLVER)/bin/plxload
+file path=usr/perl5/$(PERLVER)/bin/pmall
+file path=usr/perl5/$(PERLVER)/bin/pman
+file path=usr/perl5/$(PERLVER)/bin/pmcat
+file path=usr/perl5/$(PERLVER)/bin/pmcheck
+file path=usr/perl5/$(PERLVER)/bin/pmdesc
+file path=usr/perl5/$(PERLVER)/bin/pmdirs
+file path=usr/perl5/$(PERLVER)/bin/pmeth
+file path=usr/perl5/$(PERLVER)/bin/pmexp
+file path=usr/perl5/$(PERLVER)/bin/pmfunc
+file path=usr/perl5/$(PERLVER)/bin/pminst
+file path=usr/perl5/$(PERLVER)/bin/pmload
+file path=usr/perl5/$(PERLVER)/bin/pmls
+file path=usr/perl5/$(PERLVER)/bin/pmpath
+file path=usr/perl5/$(PERLVER)/bin/pmvers
+file path=usr/perl5/$(PERLVER)/bin/podgrep
+file path=usr/perl5/$(PERLVER)/bin/podpath
+file path=usr/perl5/$(PERLVER)/bin/pods
+file path=usr/perl5/$(PERLVER)/bin/podtoc
+file path=usr/perl5/$(PERLVER)/bin/sitepods
+file path=usr/perl5/$(PERLVER)/bin/stdpods
+dir  path=usr/perl5/$(PERLVER)/lib
+dir  path=usr/perl5/$(PERLVER)/lib/$(PERL_ARCH)
+#file path=usr/perl5/$(PERLVER)/lib/$(PERL_ARCH)/perllocal.pod
+dir  path=usr/perl5/$(PERLVER)/man
+dir  path=usr/perl5/$(PERLVER)/man/man1
+file path=usr/perl5/$(PERLVER)/man/man1/basepods.1
+file path=usr/perl5/$(PERLVER)/man/man1/faqpods.1
+file path=usr/perl5/$(PERLVER)/man/man1/modpods.1
+file path=usr/perl5/$(PERLVER)/man/man1/pfcat.1
+file path=usr/perl5/$(PERLVER)/man/man1/plxload.1
+file path=usr/perl5/$(PERLVER)/man/man1/pmall.1
+file path=usr/perl5/$(PERLVER)/man/man1/pman.1
+file path=usr/perl5/$(PERLVER)/man/man1/pmcat.1
+file path=usr/perl5/$(PERLVER)/man/man1/pmcheck.1
+file path=usr/perl5/$(PERLVER)/man/man1/pmdesc.1
+file path=usr/perl5/$(PERLVER)/man/man1/pmdirs.1
+file path=usr/perl5/$(PERLVER)/man/man1/pmeth.1
+file path=usr/perl5/$(PERLVER)/man/man1/pmexp.1
+file path=usr/perl5/$(PERLVER)/man/man1/pmfunc.1
+file path=usr/perl5/$(PERLVER)/man/man1/pminst.1
+file path=usr/perl5/$(PERLVER)/man/man1/pmload.1
+file path=usr/perl5/$(PERLVER)/man/man1/pmls.1
+file path=usr/perl5/$(PERLVER)/man/man1/pmpath.1
+file path=usr/perl5/$(PERLVER)/man/man1/pmvers.1
+file path=usr/perl5/$(PERLVER)/man/man1/podgrep.1
+file path=usr/perl5/$(PERLVER)/man/man1/podpath.1
+file path=usr/perl5/$(PERLVER)/man/man1/pods.1
+file path=usr/perl5/$(PERLVER)/man/man1/podtoc.1
+file path=usr/perl5/$(PERLVER)/man/man1/sitepods.1
+file path=usr/perl5/$(PERLVER)/man/man1/stdpods.1
+dir  path=usr/perl5/$(PERLVER)/man/man3
+file path=usr/perl5/$(PERLVER)/man/man3/Devel::Loaded.3
+dir  path=usr/perl5/vendor_perl
+dir  path=usr/perl5/vendor_perl/$(PERLVER)
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/Devel
+file path=usr/perl5/vendor_perl/$(PERLVER)/Devel/Loaded.pm
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/pmtools
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/pmtools/.packlist

--- a/components/perl_modules/pmtools/pmtools.p5m	Mon Feb 11 08:59:55 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +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, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri \
-    value=pkg:/library/perl-5/pmtools@$(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)
-
-license pmtools.license license="GPLv2, Artistic"
-
-# perl 5.12
-depend fmri=library/perl-5/pmtools-512 predicate=runtime/perl-512 \
-    type=conditional

--- a/components/perl_modules/pmtools/pmtools_512.p5m	Mon Feb 11 08:59:55 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-512@$(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.12
-dir path=usr/perl5/5.12/bin
-dir path=usr/perl5/5.12/man
-dir path=usr/perl5/5.12/man/man1
-dir path=usr/perl5/5.12/man/man3
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/5.12
-dir path=usr/perl5/vendor_perl/5.12/Devel
-file path=usr/perl5/5.12/bin/basepods
-file path=usr/perl5/5.12/bin/faqpods
-file path=usr/perl5/5.12/bin/modpods
-file path=usr/perl5/5.12/bin/pfcat
-file path=usr/perl5/5.12/bin/plxload
-file path=usr/perl5/5.12/bin/pmall
-file path=usr/perl5/5.12/bin/pman
-file path=usr/perl5/5.12/bin/pmcat
-file path=usr/perl5/5.12/bin/pmdesc
-file path=usr/perl5/5.12/bin/pmdirs
-file path=usr/perl5/5.12/bin/pmeth
-file path=usr/perl5/5.12/bin/pmexp
-file path=usr/perl5/5.12/bin/pmfunc
-file path=usr/perl5/5.12/bin/pminst
-file path=usr/perl5/5.12/bin/pmload
-file path=usr/perl5/5.12/bin/pmls
-file path=usr/perl5/5.12/bin/pmpath
-file path=usr/perl5/5.12/bin/pmvers
-file path=usr/perl5/5.12/bin/podgrep
-file path=usr/perl5/5.12/bin/podpath
-file path=usr/perl5/5.12/bin/pods
-file path=usr/perl5/5.12/bin/podtoc
-file path=usr/perl5/5.12/bin/sitepods
-file path=usr/perl5/5.12/bin/stdpods
-file path=usr/perl5/5.12/man/man1/basepods.1
-file path=usr/perl5/5.12/man/man1/faqpods.1
-file path=usr/perl5/5.12/man/man1/modpods.1
-file path=usr/perl5/5.12/man/man1/pfcat.1
-file path=usr/perl5/5.12/man/man1/plxload.1
-file path=usr/perl5/5.12/man/man1/pmall.1
-file path=usr/perl5/5.12/man/man1/pman.1
-file path=usr/perl5/5.12/man/man1/pmcat.1
-file path=usr/perl5/5.12/man/man1/pmdesc.1
-file path=usr/perl5/5.12/man/man1/pmdirs.1
-file path=usr/perl5/5.12/man/man1/pmeth.1
-file path=usr/perl5/5.12/man/man1/pmexp.1
-file path=usr/perl5/5.12/man/man1/pmfunc.1
-file path=usr/perl5/5.12/man/man1/pminst.1
-file path=usr/perl5/5.12/man/man1/pmload.1
-file path=usr/perl5/5.12/man/man1/pmls.1
-file path=usr/perl5/5.12/man/man1/pmpath.1
-file path=usr/perl5/5.12/man/man1/pmvers.1
-file path=usr/perl5/5.12/man/man1/podgrep.1
-file path=usr/perl5/5.12/man/man1/podpath.1
-file path=usr/perl5/5.12/man/man1/pods.1
-file path=usr/perl5/5.12/man/man1/podtoc.1
-file path=usr/perl5/5.12/man/man1/sitepods.1
-file path=usr/perl5/5.12/man/man1/stdpods.1
-file path=usr/perl5/5.12/man/man3/Devel::Loaded.3
-file path=usr/perl5/vendor_perl/5.12/Devel/Loaded.pm
-license pmtools.license license="GPLv2, Artistic"
-

--- a/components/perl_modules/xml-parser/Makefile	Mon Feb 11 08:59:55 2013 -0800
+++ b/components/perl_modules/xml-parser/Makefile	Mon Feb 11 10:12:25 2013 -0800
@@ -18,18 +18,25 @@
 #
 # 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.
+#
+
 #
+# Note that package library/perl-5/xml-parser cannot use versionless
+# packaging because this package migrated from the desktop consolidation
+# with an incorrect version number.
+#
+
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		XML-Parser
-COMPONENT_VERSION=	2.36
+COMPONENT_VERSION=	2.41
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f
-COMPONENT_ARCHIVE_URL=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://search.cpan.org/~msergeant/
+    sha256:b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9
+COMPONENT_ARCHIVE_URL=	http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://search.cpan.org/~toddr/
 COMPONENT_BUGDB=	perl-mod/xml-parser
 
 include $(WS_TOP)/make-rules/prep.mk
@@ -39,12 +46,15 @@
 # man pages go in the common area
 COMPONENT_INSTALL_ENV += INSTALLVENDORMAN3DIR=$(USRSHAREMAN3DIR)
 
-build:		$(BUILD_32)
+COMPONENT_TEST_TARGETS = test
+
+PKG_MACROS +=	PERL_A=$(shell arch)
 
-install:	$(INSTALL_32)
+build:		$(BUILD_32_and_64)
 
-COMPONENT_TEST_TARGETS = test
-test:		$(TEST_32)
+install:	$(INSTALL_32_and_64)
+
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)

--- a/components/perl_modules/xml-parser/xml-parser-512.p5m	Mon Feb 11 08:59:55 2013 -0800
+++ b/components/perl_modules/xml-parser/xml-parser-512.p5m	Mon Feb 11 10:12:25 2013 -0800
@@ -18,45 +18,34 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+
 set name=pkg.fmri value=pkg:/library/perl-5/xml-parser-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="XML::Parser - A perl module for parsing XML documents"
+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.arc-caseid \
-    value=LSARC/2004/251
+set name=org.opensolaris.arc-caseid value=LSARC/2004/251
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license xml-parser.license license='Artistic'
 
+depend type=optional fmri=library/perl-5/[email protected]
+
 dir path=usr
 dir path=usr/perl5
 dir path=usr/perl5/5.12
 dir path=usr/perl5/5.12/lib
 dir path=usr/perl5/5.12/lib/$(PERL_ARCH)
+#file path=usr/perl5/5.12/lib/$(PERL_ARCH)/perllocal.pod
 dir path=usr/perl5/5.12/man
 dir path=usr/perl5/5.12/man/man3
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/5.12
-dir path=usr/perl5/vendor_perl/5.12/XML
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Style
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/XML
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/XML/Parser
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/XML/Parser/Expat
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man3
-#file path=usr/perl5/5.12/lib/$(PERL_ARCH)/perllocal.pod
 file path=usr/perl5/5.12/man/man3/XML::Parser.3
 file path=usr/perl5/5.12/man/man3/XML::Parser::Expat.3
 file path=usr/perl5/5.12/man/man3/XML::Parser::Style::Debug.3
@@ -64,64 +53,52 @@
 file path=usr/perl5/5.12/man/man3/XML::Parser::Style::Stream.3
 file path=usr/perl5/5.12/man/man3/XML::Parser::Style::Subs.3
 file path=usr/perl5/5.12/man/man3/XML::Parser::Style::Tree.3
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/Japanese_Encodings.msg
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/README
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/big5.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/euc-kr.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-2.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-3.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-4.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-5.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-7.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-8.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-9.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/windows-1250.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/windows-1252.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/x-euc-jp-unicode.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/x-sjis-cp932.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/x-sjis-jdk117.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/x-sjis-jisx0221.enc
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Encodings/x-sjis-unicode.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Expat.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/LWPExternEnt.pl
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Style/Debug.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Style/Objects.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Style/Stream.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Style/Subs.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/XML/Parser/Style/Tree.pm
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/XML/Parser/.packlist
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/XML/Parser/Expat/Expat.bs
-file \
-    path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/XML/Parser/Expat/Expat.so
+dir path=usr/perl5/vendor_perl
+dir path=usr/perl5/vendor_perl/5.12
+dir path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int
+dir path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML
+dir path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser.pm
+dir path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/Japanese_Encodings.msg
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/README
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/big5.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/euc-kr.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/ibm866.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/iso-8859-2.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/iso-8859-3.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/iso-8859-4.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/iso-8859-5.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/iso-8859-7.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/iso-8859-8.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/iso-8859-9.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/koi8-r.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/windows-1250.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/windows-1251.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/windows-1252.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/windows-1255.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/x-euc-jp-unicode.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/x-sjis-cp932.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/x-sjis-jdk117.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/x-sjis-jisx0221.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Encodings/x-sjis-unicode.enc
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Expat.pm
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/LWPExternEnt.pl
+dir path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Style
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Style/Debug.pm
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Style/Objects.pm
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Style/Stream.pm
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Style/Subs.pm
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/XML/Parser/Style/Tree.pm
+dir path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/auto
+dir path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/auto/XML
+dir path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/auto/XML/Parser
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/auto/XML/Parser/.packlist
+dir path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/auto/XML/Parser/Expat
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/auto/XML/Parser/Expat/Expat.bs
+file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/auto/XML/Parser/Expat/Expat.so
+
 link path=usr/share/man/man3/XML::Parser.3 target=../../../perl5/5.12/man/man3/XML::Parser.3
 link path=usr/share/man/man3/XML::Parser::Expat.3 target=../../../perl5/5.12/man/man3/XML::Parser::Expat.3
 link path=usr/share/man/man3/XML::Parser::Style::Debug.3 target=../../../perl5/5.12/man/man3/XML::Parser::Style::Debug.3
@@ -129,4 +106,3 @@
 link path=usr/share/man/man3/XML::Parser::Style::Stream.3 target=../../../perl5/5.12/man/man3/XML::Parser::Style::Stream.3
 link path=usr/share/man/man3/XML::Parser::Style::Subs.3 target=../../../perl5/5.12/man/man3/XML::Parser::Style::Subs.3
 link path=usr/share/man/man3/XML::Parser::Style::Tree.3 target=../../../perl5/5.12/man/man3/XML::Parser::Style::Tree.3
-depend type=optional fmri=library/perl-5/[email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/xml-parser/xml-parser-516.p5m	Mon Feb 11 10:12:25 2013 -0800
@@ -0,0 +1,98 @@
+#
+# 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.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+
+set name=pkg.fmri value=pkg:/library/perl-5/xml-parser-516@$(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.16
+dir path=usr/perl5/5.16/lib
+dir path=usr/perl5/5.16/lib/$(PERL_A)-solaris-64
+#file path=usr/perl5/5.16/lib/$(PERL_A)-solaris-64/perllocal.pod
+dir path=usr/perl5/5.16/man
+dir path=usr/perl5/5.16/man/man3
+file path=usr/perl5/5.16/man/man3/XML::Parser.3
+file path=usr/perl5/5.16/man/man3/XML::Parser::Expat.3
+file path=usr/perl5/5.16/man/man3/XML::Parser::Style::Debug.3
+file path=usr/perl5/5.16/man/man3/XML::Parser::Style::Objects.3
+file path=usr/perl5/5.16/man/man3/XML::Parser::Style::Stream.3
+file path=usr/perl5/5.16/man/man3/XML::Parser::Style::Subs.3
+file path=usr/perl5/5.16/man/man3/XML::Parser::Style::Tree.3
+dir path=usr/perl5/vendor_perl
+dir path=usr/perl5/vendor_perl/5.16
+dir path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64
+dir path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML
+dir path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser.pm
+dir path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/Japanese_Encodings.msg
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/README
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/big5.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/euc-kr.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/ibm866.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/iso-8859-2.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/iso-8859-3.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/iso-8859-4.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/iso-8859-5.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/iso-8859-7.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/iso-8859-8.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/iso-8859-9.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/koi8-r.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/windows-1250.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/windows-1251.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/windows-1252.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/windows-1255.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/x-euc-jp-unicode.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/x-sjis-cp932.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/x-sjis-jdk117.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/x-sjis-jisx0221.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Encodings/x-sjis-unicode.enc
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Expat.pm
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/LWPExternEnt.pl
+dir path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Style
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Style/Debug.pm
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Style/Objects.pm
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Style/Stream.pm
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Style/Subs.pm
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser/Style/Tree.pm
+dir path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/auto
+dir path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/auto/XML
+dir path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/auto/XML/Parser
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/auto/XML/Parser/.packlist
+dir path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/auto/XML/Parser/Expat
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/auto/XML/Parser/Expat/Expat.bs
+file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/auto/XML/Parser/Expat/Expat.so

--- a/components/perl_modules/xml-parser/xml-parser.p5m	Mon Feb 11 08:59:55 2013 -0800
+++ b/components/perl_modules/xml-parser/xml-parser.p5m	Mon Feb 11 10:12:25 2013 -0800
@@ -24,7 +24,8 @@
 # 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.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."
@@ -38,6 +39,10 @@
 depend fmri=library/perl-5/xml-parser-512 predicate=runtime/perl-512 \
     type=conditional
 
+# perl 5.16
+depend fmri=library/perl-5/xml-parser-516 predicate=runtime/perl-516 \
+    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"

--- a/components/perl_modules/xml-simple/Makefile	Mon Feb 11 08:59:55 2013 -0800
+++ b/components/perl_modules/xml-simple/Makefile	Mon Feb 11 10:12:25 2013 -0800
@@ -18,18 +18,19 @@
 #
 # 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.
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		XML-Simple
-COMPONENT_VERSION=	2.18
+COMPONENT_VERSION=	2.20
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:a54967c188cda3e20f496c83be4de3f1740eeaa83c0380712ecd969ad8766826
-COMPONENT_ARCHIVE_URL=	http://www.cpan.org/authors/id/G/GR/GRANTM/$(COMPONENT_ARCHIVE)
+    sha256:5cff13d0802792da1eb45895ce1be461903d98ec97c9c953bc8406af7294434a
+COMPONENT_ARCHIVE_URL=	\
+    http://www.cpan.org/authors/id/G/GR/GRANTM/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	http://search.cpan.org/~grantm/
 COMPONENT_BUGDB=	perl-mod/xml-parser
 
@@ -40,25 +41,16 @@
 # man pages go in the common area
 COMPONENT_INSTALL_ENV += INSTALLVENDORMAN3DIR=$(USRSHAREMAN3DIR)
 
-# look in XML::Parser's proto area
-PERL_FLAGS = -I$(COMPONENT_DIR)/../xml-parser/build/prototype/$(MACH)/usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)
-
+COMPONENT_TEST_TARGETS = test
 
-build:		$(BUILD_32)
-
-install:	$(INSTALL_32)
+build:		$(BUILD_32_and_64)
 
-# The tests with perl 5.8.4 are clean.
-# Perl 5.12.3 has lots of failures and issues.
-COMPONENT_TEST_TARGETS = test
-test:		$(TEST_32)
+install:	$(INSTALL_32_and_64)
 
-# special targets; need xml-parser built and installed first
-../xml-parser/build/5.8.4/.installed ../xml-parser/build/5.12/.installed:
-	(cd ../xml-parser ; $(GMAKE) install)
-
-$(BUILD_32):	../xml-parser/build/5.8.4/.installed \
-		../xml-parser/build/5.12/.installed
+	#
+	# Must have xml-parser installed for these tests to pass.
+	#
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)

--- a/components/perl_modules/xml-simple/xml-simple-512.p5m	Mon Feb 11 08:59:55 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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-512@$(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.12
-dir path=usr/perl5/5.12/lib
-dir path=usr/perl5/5.12/lib/$(PERL_ARCH)
-dir path=usr/perl5/5.12/man
-dir path=usr/perl5/5.12/man/man3
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/5.12
-dir path=usr/perl5/vendor_perl/5.12/XML
-dir path=usr/perl5/vendor_perl/5.12/XML/Simple
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/XML
-dir path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/XML/Simple
-#file path=usr/perl5/5.12/lib/$(PERL_ARCH)/perllocal.pod
-file path=usr/perl5/5.12/man/man3/XML::Simple.3
-file path=usr/perl5/5.12/man/man3/XML::Simple::FAQ.3
-file path=usr/perl5/vendor_perl/5.12/XML/Simple.pm
-file path=usr/perl5/vendor_perl/5.12/XML/Simple/FAQ.pod
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/XML/Simple/.packlist
-link path=usr/share/man/man3/XML::Simple.3 target=../../../perl5/5.12/man/man3/XML::Simple.3
-link path=usr/share/man/man3/XML::Simple::FAQ.3 target=../../../perl5/5.12/man/man3/XML::Simple::FAQ.3
-depend fmri=library/perl-5/[email protected] type=optional
-depend fmri=library/perl-5/xml-parser-512 type=require

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/xml-simple/xml-simple-PERLVER.p5m	Mon Feb 11 10:12:25 2013 -0800
@@ -0,0 +1,62 @@
+#
+# 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.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+
+set name=pkg.fmri value=pkg:/library/perl-5/xml-simple-$(PLV)@$(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'
+
+depend fmri=library/perl-5/[email protected] type=optional
+depend fmri=library/perl-5/xml-parser type=require
+
+dir  path=usr
+dir  path=usr/perl5
+dir  path=usr/perl5/$(PERLVER)
+dir  path=usr/perl5/$(PERLVER)/lib
+dir  path=usr/perl5/$(PERLVER)/lib/$(PERL_ARCH)
+#file path=usr/perl5/$(PERLVER)/lib/$(PERL_ARCH)/perllocal.pod
+dir  path=usr/perl5/$(PERLVER)/man
+dir  path=usr/perl5/$(PERLVER)/man/man3
+file path=usr/perl5/$(PERLVER)/man/man3/XML::Simple.3
+file path=usr/perl5/$(PERLVER)/man/man3/XML::Simple::FAQ.3
+dir  path=usr/perl5/vendor_perl
+dir  path=usr/perl5/vendor_perl/$(PERLVER)
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/XML
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/XML/Simple
+file path=usr/perl5/vendor_perl/$(PERLVER)/XML/Simple.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/XML/Simple/FAQ.pod
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/XML
+dir  path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/XML/Simple
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/XML/Simple/.packlist

--- a/components/perl_modules/xml-simple/xml-simple.p5m	Mon Feb 11 08:59:55 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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 (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.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.consolidation value=$(CONSOLIDATION)
-
-# 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/ips.mk	Mon Feb 11 08:59:55 2013 -0800
+++ b/make-rules/ips.mk	Mon Feb 11 10:12:25 2013 -0800
@@ -116,7 +116,7 @@
 VERSIONED_MANIFESTS = \
 	$(PYV_MANIFESTS) $(PYNV_MANIFESTS) \
 	$(PERLV_MANIFESTS) $(PERLNV_MANIFESTS) \
-	$(UNVERSIONED_MANIFESTS)
+	$(NOPERL_MANIFESTS)
 
 GENERATED =		$(MANIFEST_BASE)-generated
 COMBINED =		$(MANIFEST_BASE)-combined
@@ -184,6 +184,15 @@
 		$(WS_TOP)/transforms/mkgeneric $< > $@
 	if [ -f $*-GENFRAG.p5m ]; then cat $*-GENFRAG.p5m >> $@; fi
 
+# Define and execute a macro that generates a rule to create a manifest for a
+# perl module specific to a particular version of the perl runtime.
+define perl-manifest-rule
+$(MANIFEST_BASE)-%-$(shell echo $(1) | tr -d .).p5m: %-PERLVER.p5m
+	$(PKGMOGRIFY) -D PERLVER=$(1) -D PLV=$(shell echo $(1) | tr -d .) \
+		-D PERL_ARCH=$(call PERL_ARCH_FUNC,$(PERL.$(1))) $$< > $$@
+endef
+$(foreach ver,$(PERL_VERSIONS),$(eval $(call perl-manifest-rule,$(ver))))
+
 # A rule to create a helper transform package for perl, that will insert the
 # appropriate conditional dependencies into a perl library's
 # runtime-version-generic package to pull in the version-specific bits when the
@@ -193,16 +202,8 @@
 	$(foreach ver,$(shell echo $(PERL_VERSIONS) | tr -d .), \
 		$(call mkgeneric,runtime/perl,$(ver)))
 
-# Define and execute a macro that generates a rule to create a manifest for a
-# perl module specific to a particular version of the perl runtime.
-define perl-manifest-rule
-$(MANIFEST_BASE)-%-$(shell echo $(1) | tr -d .).p5m: %-PERLVER.p5m
-	$(PKGMOGRIFY) -D PERLVER=$(1) -D PLV=$(shell echo $(1) | tr -d .) $< > $@
-endef
-$(foreach ver,$(PERL_VERSIONS),$(eval $(call perl-manifest-rule,$(ver))))
-
 # Build Perl version-wrapping manifests from the generic version.
-$(MANIFEST_BASE)-%.p5m: %-PERLVER.p5m
+$(MANIFEST_BASE)-%.p5m: %-PERLVER.p5m $(WS_TOP)/transforms/mkgeneric-perl
 	$(PKGMOGRIFY) -D PLV=### $(WS_TOP)/transforms/mkgeneric-perl \
 		$(WS_TOP)/transforms/mkgeneric $< > $@
 	if [ -f $*-GENFRAG.p5m ]; then cat $*-GENFRAG.p5m >> $@; fi

--- a/make-rules/makemaker.mk	Mon Feb 11 08:59:55 2013 -0800
+++ b/make-rules/makemaker.mk	Mon Feb 11 10:12:25 2013 -0800
@@ -21,8 +21,8 @@
 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
-# we only do 32 bit perl for now.
-BITS=32
+# Perl 5.12 and older are 32-bit only.
+# Perl 5.16 and newer are 64-bit only.
 
 COMMON_PERL_ENV +=	MAKE=$(GMAKE)
 COMMON_PERL_ENV +=	PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:$(PATH)
@@ -33,18 +33,24 @@
 # Yes.  Perl is just scripts, for now, but we need architecture
 # directories so that it populates all architecture prototype
 # directories.
-PERLBD_ARCH = $(BUILD_DIR)/$(MACH32)
 
-$(PERLBD_ARCH)-5.12/.configured:		PERL_VERSION=5.12
+$(BUILD_DIR)/$(MACH32)-5.12/.configured:	PERL_VERSION=5.12
+$(BUILD_DIR)/$(MACH32)-5.12/.configured:	BITS=32
+$(BUILD_DIR)/$(MACH64)-5.16/.configured:	PERL_VERSION=5.16
+$(BUILD_DIR)/$(MACH64)-5.16/.configured:	BITS=64
 
-BUILD_32 =	$(PERL_VERSIONS:%=$(PERLBD_ARCH)-%/.built)
-INSTALL_32 =	$(BUILD_32:%/.built=%/.installed)
-TEST_32 =	$(BUILD_32:%/.built=%/.tested)
+BUILD_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.built
+BUILD_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.built
 
+INSTALL_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.installed
+INSTALL_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.installed
+
+TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.tested
+TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.tested
 
 COMPONENT_CONFIGURE_ENV +=	$(COMMON_PERL_ENV)
 COMPONENT_CONFIGURE_ENV +=	PERL="$(PERL)"
-$(PERLBD_ARCH)-%/.configured:	$(SOURCE_DIR)/.prep
+$(BUILD_DIR)/%/.configured:	$(SOURCE_DIR)/.prep
 	($(RM) -r $(@D) ; $(MKDIR) $(@D))
 	$(CLONEY) $(SOURCE_DIR) $(@D)
 	$(COMPONENT_PRE_CONFIGURE_ACTION)
@@ -55,7 +61,7 @@
 
 
 COMPONENT_BUILD_ENV +=	$(COMMON_PERL_ENV)
-$(PERLBD_ARCH)-%/.built:	$(PERLBD_ARCH)-%/.configured
+$(BUILD_DIR)/%/.built:	$(BUILD_DIR)/%/.configured
 	$(COMPONENT_PRE_BUILD_ACTION)
 	(cd $(@D) ; $(ENV) $(COMPONENT_BUILD_ENV) \
 		$(GMAKE) $(COMPONENT_BUILD_ARGS) $(COMPONENT_BUILD_TARGETS))
@@ -66,7 +72,7 @@
 COMPONENT_INSTALL_ARGS +=	DESTDIR="$(PROTO_DIR)"
 COMPONENT_INSTALL_TARGETS =	install_vendor
 COMPONENT_INSTALL_ENV +=	$(COMMON_PERL_ENV)
-$(PERLBD_ARCH)-%/.installed:	$(PERLBD_ARCH)-%/.built
+$(BUILD_DIR)/%/.installed:	$(BUILD_DIR)/%/.built
 	$(COMPONENT_PRE_INSTALL_ACTION)
 	(cd $(@D) ; $(ENV) $(COMPONENT_INSTALL_ENV) $(GMAKE) \
 			$(COMPONENT_INSTALL_ARGS) $(COMPONENT_INSTALL_TARGETS))
@@ -76,7 +82,7 @@
 
 COMPONENT_TEST_TARGETS =	check
 COMPONENT_TEST_ENV +=	$(COMMON_PERL_ENV)
-$(PERLBD_ARCH)-%/.tested:	$(PERLBD_ARCH)-%/.built
+$(BUILD_DIR)/%/.tested:	$(BUILD_DIR)/%/.built
 	$(COMPONENT_PRE_TEST_ACTION)
 	(cd $(@D) ; $(ENV) $(COMPONENT_TEST_ENV) $(GMAKE) \
 			$(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))

--- a/make-rules/shared-macros.mk	Mon Feb 11 08:59:55 2013 -0800
+++ b/make-rules/shared-macros.mk	Mon Feb 11 10:12:25 2013 -0800
@@ -305,13 +305,15 @@
 # Not necessarily the system's default version, i.e. /usr/bin/perl
 PERL_VERSION =  5.12
 
-PERL_VERSIONS = 5.12
+PERL_VERSIONS = 5.12 5.16
 
 PERL.5.12 =     /usr/perl5/5.12/bin/perl
+PERL.5.16 =	/usr/perl5/5.16/bin/perl
 
 PERL =          $(PERL.$(PERL_VERSION))
 
 PERL_ARCH :=	$(shell $(PERL) -e 'use Config; print $$Config{archname}')
+PERL_ARCH_FUNC=	$(shell $(1) -e 'use Config; print $$Config{archname}')
 # Optimally we should ask perl which C compiler was used but it doesn't
 # result in a full path name.  Only "c" is being recorded
 # inside perl builds while we actually need a full path to

author	Craig Mohrman <craig.mohrman@oracle.com>
	Mon, 11 Feb 2013 10:12:25 -0800
changeset 1152	96d423311191
parent 1151	76498004a954
child 1153	984eb3d32e04

components/perl_modules/DBI/DBI-PERLVER.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/DBI/DBI.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/DBI/DBI_512.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/DBI/Makefile		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/net-ssleay/Makefile		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/net-ssleay/net-ssleay-512.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/net-ssleay/net-ssleay-PERLVER.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/net-ssleay/net-ssleay.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/pmtools/Makefile		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/pmtools/pmtools-PERLVER.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/pmtools/pmtools.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/pmtools/pmtools_512.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/xml-parser/Makefile		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/xml-parser/xml-parser-512.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/xml-parser/xml-parser-516.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/xml-parser/xml-parser.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/xml-simple/Makefile		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/xml-simple/xml-simple-512.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/xml-simple/xml-simple-PERLVER.p5m		file \| annotate \| diff \| comparison \| revisions
components/perl_modules/xml-simple/xml-simple.p5m		file \| annotate \| diff \| comparison \| revisions
make-rules/ips.mk		file \| annotate \| diff \| comparison \| revisions
make-rules/makemaker.mk		file \| annotate \| diff \| comparison \| revisions
make-rules/shared-macros.mk		file \| annotate \| diff \| comparison \| revisions