20995635 Perl TK needs to be upgraded to work with Perl 5.20
authorBill Rushmore <bill.rushmore@oracle.com>
Fri, 07 Aug 2015 13:43:38 -0700
changeset 4746 8e237ffd0a48
parent 4745 2d05f68d43d8
child 4747 0e43ac303e45
20995635 Perl TK needs to be upgraded to work with Perl 5.20 20994112 Perl XML::Parser needs to work with Perl 5.20 20989929 Perl net-ssleay needs to be fixed so it builds with Perl 5.20 20989909 Perl libxml needs to be fixed so it builds with Perl 5.20 20989894 Perl DBI - needs to be fixed so it builds with Perl 5.20 20989877 AUTHEN-PAM needs to be fixed so it builds with Perl 5.20 21195142 OpenSCAP's Makefile needs to be updated to work with Perl 5.20 21216887 Dependencies and references to Perl 5.16 need to be replaced with Perl 5.20
components/a2ps/Makefile
components/ant/Makefile
components/apache2/Makefile
components/apache24/Makefile
components/convmv/Makefile
components/emacs/Makefile
components/enscript/Makefile
components/grails/Makefile
components/graphviz/Makefile
components/graphviz/graphviz-perl-512.p5m
components/graphviz/graphviz-perl-516.p5m
components/graphviz/graphviz-perl-520.p5m
components/graphviz/graphviz.p5m
components/groff/Makefile
components/gutenprint/Makefile
components/lftp/Makefile
components/mc/Makefile
components/meta-packages/history/image-graphviz-graphviz-perl-512.p5m
components/meta-packages/history/image-graphviz-graphviz-perl-516.p5m
components/mutt/Makefile
components/mysql-5-5/Makefile
components/mysql-5-6/Makefile
components/ntp/Makefile
components/open-fabrics/Makefile
components/openscap/Makefile
components/parallel/Makefile
components/perl_modules/DBI/DBI-PERLVER.p5m
components/perl_modules/authen-pam/authen-pam-PERLVER.p5m
components/perl_modules/cssh/Makefile
components/perl_modules/net-ssleay/net-ssleay-PERLVER.p5m
components/perl_modules/perl-tk/Makefile
components/perl_modules/perl-tk/patches/001-system-jpeg.patch
components/perl_modules/perl-tk/patches/002-system-png.patch
components/perl_modules/perl-tk/tk-PERLVER.p5m
components/perl_modules/xml-libxml/xml-libxml-PERLVER.p5m
components/perl_modules/xml-parser/Makefile
components/perl_modules/xml-parser/test/results-all.master
components/perl_modules/xml-parser/xml-parser-516.p5m
components/perl_modules/xml-parser/xml-parser-520.p5m
components/perl_modules/xml-parser/xml-parser.p5m
components/samba/samba/Makefile
components/samba/samba36/Makefile
components/squid/Makefile
make-rules/makemaker.mk
make-rules/shared-macros.mk
--- a/components/a2ps/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/a2ps/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -81,7 +81,7 @@
 REQUIRED_PACKAGES += developer/gperf
 REQUIRED_PACKAGES += editor/gnu-emacs
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/math
--- a/components/ant/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/ant/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -83,5 +83,5 @@
 REQUIRED_PACKAGES += developer/java/junit
 REQUIRED_PACKAGES += developer/parser/antlr-2
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/apache2/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/apache2/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -141,7 +141,7 @@
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library
--- a/components/apache24/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/apache24/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -97,7 +97,7 @@
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/lua
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library
--- a/components/convmv/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/convmv/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -58,4 +58,4 @@
 
 
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
--- a/components/emacs/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/emacs/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -203,7 +203,7 @@
 REQUIRED_PACKAGES += library/libxml2
 REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/fontconfig
--- a/components/enscript/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/enscript/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -91,7 +91,7 @@
 
 
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/math
--- a/components/grails/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/grails/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -81,7 +81,7 @@
 system-test:    $(NO_TESTS)
 
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += shell/bash
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/graphviz/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/graphviz/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -23,7 +23,7 @@
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-PERL_VERSION =		5.16
+PERL_VERSION =		5.20
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		graphviz
@@ -128,7 +128,7 @@
 REQUIRED_PACKAGES += print/filter/ghostscript
 REQUIRED_PACKAGES += runtime/lua
 REQUIRED_PACKAGES += runtime/ocaml
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += runtime/ruby-19
 REQUIRED_PACKAGES += runtime/tk-8
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/graphviz/graphviz-perl-512.p5m	Thu Aug 06 15:11:29 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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) 2014, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri \
-    value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.obsolete value=true
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/graphviz/graphviz-perl-516.p5m	Thu Aug 06 15:11:29 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-set name=pkg.fmri \
-    value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Perl 5.16 bindings for Graphviz"
-set name=com.oracle.info.description value="Perl 5.16 bindings for Graphviz"
-set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
-    value="org.opensolaris.category.2008:Applications/System Utilities"
-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/2011/269
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/lib/$(MACH64)/graphviz/perl/gv.pm
-link path=usr/lib/$(MACH64)/graphviz/perl/gv.so target=libgv_perl.so
-file path=usr/lib/$(MACH64)/graphviz/perl/libgv_perl.so
-link path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH)/gv.pm \
-    target=../../../../lib/$(MACH64)/graphviz/perl/gv.pm
-link path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH)/gv.so \
-    target=../../../../lib/$(MACH64)/graphviz/perl/libgv_perl.so
-file path=usr/share/graphviz/demo/modgraph.pl
-file usr/share/man/man3/gv.3perl path=usr/share/man/man3/gv-perl.3
-license COPYING license=EPL1.0
-license graphviz.license.extra license="Other Notices"
-
-# This package replaces the now-obsolete Perl 5.12 package, which needs to
-# be removed in order to prevent file collisions at install time.
-depend type=optional \
-    fmri=image/graphviz/[email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/graphviz/graphviz-perl-520.p5m	Fri Aug 07 13:43:38 2015 -0700
@@ -0,0 +1,47 @@
+#
+# 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) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Perl 5.20 bindings for Graphviz"
+set name=pkg.linted.pkglint.dupaction001.1 value=true
+set name=com.oracle.info.description value="Perl 5.20 bindings for Graphviz"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
+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/2011/269
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/$(MACH64)/graphviz/perl/gv.pm
+link path=usr/lib/$(MACH64)/graphviz/perl/gv.so target=libgv_perl.so
+file path=usr/lib/$(MACH64)/graphviz/perl/libgv_perl.so
+link path=usr/perl5/vendor_perl/5.20/$(PERL_ARCH)/gv.pm \
+    target=../../../../lib/$(MACH64)/graphviz/perl/gv.pm
+link path=usr/perl5/vendor_perl/5.20/$(PERL_ARCH)/gv.so \
+    target=../../../../lib/$(MACH64)/graphviz/perl/libgv_perl.so
+file path=usr/share/graphviz/demo/modgraph.pl
+file usr/share/man/man3/gv.3perl path=usr/share/man/man3/gv-perl.3
+license COPYING license=EPL1.0
+license graphviz.license.extra license="Other Notices"
--- a/components/graphviz/graphviz.p5m	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/graphviz/graphviz.p5m	Fri Aug 07 13:43:38 2015 -0700
@@ -523,8 +523,8 @@
     fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
     predicate=runtime/ocaml
 depend type=conditional \
-    fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
-    predicate=runtime/perl-516
+    fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
+    predicate=runtime/perl-520
 depend type=conditional \
     fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
     predicate=web/php-53
--- a/components/groff/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/groff/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -105,7 +105,7 @@
 
 
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library
--- a/components/gutenprint/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/gutenprint/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -74,7 +74,7 @@
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += print/cups
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/math
--- a/components/lftp/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/lftp/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -65,7 +65,7 @@
 REQUIRED_PACKAGES += library/gnutls
 REQUIRED_PACKAGES += library/readline
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/c++-runtime
--- a/components/mc/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/mc/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -71,6 +71,6 @@
 REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += library/slang
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/image-graphviz-graphviz-perl-512.p5m	Fri Aug 07 13:43:38 2015 -0700
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/image/graphviz/[email protected],5.12-5.12.0.0.0.81.0
+set name=pkg.obsolete value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/image-graphviz-graphviz-perl-516.p5m	Fri Aug 07 13:43:38 2015 -0700
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/image/graphviz/[email protected],5.12-5.12.0.0.0.81.0
+set name=pkg.obsolete value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/mutt/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/mutt/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -82,7 +82,7 @@
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/slang
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/math
--- a/components/mysql-5-5/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/mysql-5-5/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -107,7 +107,7 @@
 REQUIRED_PACKAGES += developer/build/cmake
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library
--- a/components/mysql-5-6/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/mysql-5-6/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -110,7 +110,7 @@
 REQUIRED_PACKAGES += developer/build/cmake
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library
--- a/components/ntp/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/ntp/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -80,7 +80,7 @@
 REQUIRED_PACKAGES += library/libedit
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += service/network/dns/mdns
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
--- a/components/open-fabrics/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/open-fabrics/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -101,7 +101,7 @@
 FORCE:
 
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += runtime/tcl-8
 REQUIRED_PACKAGES += shell/bash
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/openscap/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/openscap/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -47,14 +47,17 @@
 PYTHON_VERSION=		2.6
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
 
+PERL_VERSIONS = 5.12 5.20
+
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
 PERL_VERSION.32 = 5.12
-PERL_VERSION.64 = 5.16
+PERL_VERSION.64 = 5.20
 PERL_VERSION = $(PERL_VERSION.$(BITS))
 PERL = $(PERL.$(PERL_VERSION))
+PKG_MACROS		+=	P_ARCH=$(shell arch)
 CONFIGURE_BINDIR.64 =	$(CONFIGURE_PREFIX)/bin
 CPPFLAGS +=	-I/usr/include/openldap
 
@@ -125,7 +128,7 @@
 REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/pcre
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += runtime/python-26
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += security/compliance/openscap
--- a/components/parallel/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/parallel/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -63,5 +63,5 @@
 
 
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/which
--- a/components/perl_modules/DBI/DBI-PERLVER.p5m	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/perl_modules/DBI/DBI-PERLVER.p5m	Fri Aug 07 13:43:38 2015 -0700
@@ -145,7 +145,6 @@
 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
 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
--- a/components/perl_modules/authen-pam/authen-pam-PERLVER.p5m	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/perl_modules/authen-pam/authen-pam-PERLVER.p5m	Fri Aug 07 13:43:38 2015 -0700
@@ -51,7 +51,6 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Authen/PAM.pm
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Authen/PAM/FAQ.pod
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Authen/PAM/.packlist
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Authen/PAM/PAM.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Authen/PAM/PAM.so
 license authen-pam.license license=Artistic
 
--- a/components/perl_modules/cssh/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/perl_modules/cssh/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -36,15 +36,17 @@
 
 TPNO=			13257
 
+PERL_VERSIONS=5.12
+
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/makemaker.mk
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_32)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_32)
 
 test:		$(NO_TESTS)
 
@@ -53,9 +55,7 @@
 
 REQUIRED_PACKAGES += library/perl-5/perl-x11-protocol
 REQUIRED_PACKAGES += library/perl-5/perl-x11-protocol-512
-REQUIRED_PACKAGES += library/perl-5/perl-x11-protocol-516
 REQUIRED_PACKAGES += library/perl5/perl-tk
 REQUIRED_PACKAGES += library/perl5/perl-tk-512
-REQUIRED_PACKAGES += library/perl5/perl-tk-516
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
--- a/components/perl_modules/net-ssleay/net-ssleay-PERLVER.p5m	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/perl_modules/net-ssleay/net-ssleay-PERLVER.p5m	Fri Aug 07 13:43:38 2015 -0700
@@ -44,7 +44,6 @@
 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
 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
--- a/components/perl_modules/perl-tk/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/perl_modules/perl-tk/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -24,17 +24,17 @@
 
 COMPONENT_NAME=		Tk
 # pkg does not like leading zeros, removed zero after dot.
-COMPONENT_VERSION=	804.31
-HUMAN_VERSION=		804.031
+COMPONENT_VERSION=	804.33
+HUMAN_VERSION=		804.033
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(HUMAN_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_PROJECT_URL=	http://search.cpan.org/~srezic/Tk
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:ce8d857a82a77f6bad3f94c1a8c3e3f32d5489bfb41619c3b8cae00103428054
+    sha256:84756e9b07a2555c8eecf88e63d5cbbba9b1aa97b1e71a3d4aa524a7995a88ad
 COMPONENT_ARCHIVE_URL=	http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	perl-mod/tk
 
-TPNO=			13259
+TPNO=			22548
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
--- a/components/perl_modules/perl-tk/patches/001-system-jpeg.patch	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/perl_modules/perl-tk/patches/001-system-jpeg.patch	Fri Aug 07 13:43:38 2015 -0700
@@ -1,7 +1,7 @@
 In-House patch. 
 Making sure Perl-Tk does not build its own copy of libjpeg, instead links against libjpeg library already present in Solaris in /usr/lib.
---- Tk-804.031/JPEG/Makefile.PL.orig	2014-01-03 22:04:39.788240812 -0800
-+++ Tk-804.031/JPEG/Makefile.PL	2014-01-03 21:57:20.929546011 -0800
+--- Tk-804.033/JPEG/Makefile.PL.orig	2014-01-03 22:04:39.788240812 -0800
++++ Tk-804.033/JPEG/Makefile.PL	2014-01-03 21:57:20.929546011 -0800
 @@ -1,27 +1,6 @@
  # -*- cperl -*-
  use Tk::MMutil;
--- a/components/perl_modules/perl-tk/patches/002-system-png.patch	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/perl_modules/perl-tk/patches/002-system-png.patch	Fri Aug 07 13:43:38 2015 -0700
@@ -1,60 +1,74 @@
 In-House patch. 
 Making sure Perl-Tk does not build its own copy of libpng and libz, instead links against these libraries already present in Solaris in /usr/lib.
 
---- Tk-804.031/PNG/Makefile.PL.orig	Tue Nov 12 22:36:34 2013
-+++ Tk-804.031/PNG/Makefile.PL	Tue Nov 12 22:36:41 2013
[email protected]@ -2,19 +2,7 @@
+--- Tk-804.033/PNG/Makefile.PL.orig	2015-05-01 10:47:20.131896716 -0700
++++ Tk-804.033/PNG/Makefile.PL	2015-05-01 10:52:57.599540636 -0700
[email protected]@ -2,19 +2,6 @@
  use strict;
  use Tk::MMutil;
  use Tk::Config ();
 -use Tk::MMtry;
 -use File::Copy;
- 
+-
 -my $l = $Config::Config{'lib_ext'};
 -my $cc = $Config::Config{'cc'};
 -my $zlib = "libz$l";
 -
 -foreach my $file (qw(zlib/Makefile.PL libpng/Makefile.PL))
 - {
+-  next unless -f $file;
 -  chmod(0666,$file) unless -w $file;
 -  unlink($file);
 - }
--
- my $libpng_cflags;
- my $libpng_libs;
- system('pkg-config --exists libpng');
[email protected]@ -21,74 +9,17 @@
- if ($? == 0) {
-     chomp($libpng_cflags = `pkg-config --cflags libpng`);
-     chomp($libpng_libs   = `pkg-config --libs libpng`);
--} else {
--    warn "'pkg-config libpng' failed, continue with fallback values for cflags and libs...\n";
--    $libpng_cflags = '-I/usr/local/include';
--    $libpng_libs   = '-lpng -lz -lm';
+ 
+ my $all_cflags;
+ my $all_libs;
[email protected]@ -27,12 +14,6 @@
+    chomp($libpng_cflags = `pkg-config --cflags libpng`);
+    chomp($libpng_libs   = `pkg-config --libs libpng`);
+   }
+- else
+-  {
+-   warn "'pkg-config libpng' failed, continue with fallback values for cflags and libs...\n";
+-   $libpng_cflags = '-I/usr/local/include';
+-   $libpng_libs   = '-lpng -lm';
+-  }
+ 
+  my $zlib_cflags;
+  my $zlib_libs;
[email protected]@ -51,65 +32,18 @@
+ 
+  $all_cflags = "$libpng_cflags $zlib_cflags";
+  $all_libs   = "$libpng_libs $zlib_libs";
++
++ Tk::MMutil::TkExtMakefile(
++     NAME         => 'Tk::PNG',
++     VERSION_FROM => 'PNG.pm',
++     XS_VERSION   => $Tk::Config::VERSION,
++     dist         => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' },
++     OBJECT       => '$(O_FILES)',
++     INC          => $libpng_cflags,
++     LIBS         => [$libpng_libs],
++   );
  }
  
 -if ($Tk::MMtry::VERSION ge '4.007' &&
--    try_run("config/has_png.c",[$libpng_cflags],[$libpng_libs]))
+-    try_run("config/has_png.c",[$all_cflags],[$all_libs]))
 - {
+-  warn "Using system's -lpng\n";
 -  Tk::MMutil::TkExtMakefile(
 -       NAME         => 'Tk::PNG',
 -       VERSION_FROM => 'PNG.pm',
 -       XS_VERSION   => $Tk::Config::VERSION,
 -       dist         => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' },
 -       OBJECT       => '$(O_FILES)',
--       INC          => $libpng_cflags,
--       LIBS         => [$libpng_libs],
+-       INC          => $all_cflags,
+-       LIBS         => [$all_libs],
 -     );
 - }
 -else
 - {
 -  my $ok = 1;
--  foreach my $file ("libpng/Makefile.PL","zlib/Makefile.PL")
--   {
--    next unless -f $file;
--    chmod(0666,$file);
--    unlink($file);
--   }
 -  unless (copy("Makefile.libpng.maybe","libpng/Makefile.PL"))
 -   {
 -    warn "Cannot copy Makefile.libpng.maybe => libpng/Makefile.PL ($!)";
@@ -95,37 +109,13 @@
 -     ExtUtils::MakeMaker::WriteEmptyMakefile();
 -    }
 - }
-+Tk::MMutil::TkExtMakefile(
-+     NAME         => 'Tk::PNG',
-+     VERSION_FROM => 'PNG.pm',
-+     XS_VERSION   => $Tk::Config::VERSION,
-+     dist         => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' },
-+     OBJECT       => '$(O_FILES)',
-+     INC          => $libpng_cflags,
-+     LIBS         => [$libpng_libs],
-+   );
  
  sub MY::test_via_harness
  {
[email protected]@ -98,63 +29,3 @@
[email protected]@ -134,48 +68,3 @@
+     qq[PASTHRU="CC=$Config::Config{cc} $Config::Config{cccdlflags}" RANLIB=\"$Config::Config{ranlib}\"];
+    }
  }
- 
- package MY;
--
--sub pasthru {
--  if ($^O eq 'MSWin32' && $Config::Config{cc} =~ /gcc/)
--   {
--    # gcc usually has ranlib, also dmake does not understand "rem"
--    # which is default setting for $Config::Config{ranlib} under
--    # Windows, unless .USE_SHELL: is specified (see also special_targets
--    # in ExtUtils::MM_Win32)
--    qq[PASTHRU="CC=$Config::Config{cc} $Config::Config{cccdlflags}"];
--   }
--  else
--   {
--    qq[PASTHRU="CC=$Config::Config{cc} $Config::Config{cccdlflags}" RANLIB=\"$Config::Config{ranlib}\"];
--   }
--}
 -
 -sub postamble {
 -  my $s = '';
--- a/components/perl_modules/perl-tk/tk-PERLVER.p5m	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/perl_modules/perl-tk/tk-PERLVER.p5m	Fri Aug 07 13:43:38 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
@@ -621,17 +621,13 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Tk/winfolder.xpm
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Tk/wintext.xpm
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/CancelRepeat.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Canvas/Canvas.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Canvas/Canvas.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Clipboard/autosplit.ix
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Clipboard/getSelected.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Compound/Compound.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Compound/Compound.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/EnterFocus.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Entry/Entry.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Entry/Entry.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Error.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Event/Event.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Event/Event.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/FirstMenu.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/FocusChildren.al
@@ -647,13 +643,10 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Frame/queuePack.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Frame/sbset.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Frame/scrollbars.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/HList/HList.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/HList/HList.so
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/IO/IO.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/IO/IO.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/ImageNames.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/ImageTypes.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/InputO/InputO.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/InputO/InputO.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Listbox/AutoScan.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Listbox/BeginExtend.al
@@ -672,7 +665,6 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Listbox/ExtendUpDown.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Listbox/FETCH.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Listbox/FETCHSIZE.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Listbox/Listbox.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Listbox/Listbox.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Listbox/Motion.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Listbox/POP.al
@@ -691,13 +683,9 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Listbox/deleteSelected.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Listbox/getSelected.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Listbox/xyIndex.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Menubutton/Menubutton.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Menubutton/Menubutton.so
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Mwm/Mwm.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Mwm/Mwm.so
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/NBFrame/NBFrame.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/NBFrame/NBFrame.so
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Pixmap/Pixmap.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Pixmap/Pixmap.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Receive.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/RepeatId.al
@@ -710,7 +698,6 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scale/Enter.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scale/Increment.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scale/Leave.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scale/Scale.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scale/Scale.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scale/autosplit.ix
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scrollbar/ButtonDown.al
@@ -724,13 +711,11 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scrollbar/ScrlByUnits.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scrollbar/ScrlToPos.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scrollbar/ScrlTopBottom.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scrollbar/Scrollbar.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scrollbar/Scrollbar.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scrollbar/Select.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scrollbar/StartDrag.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Scrollbar/autosplit.ix
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Selection.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/TList/TList.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/TList/TList.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Table/Create.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Table/Posn.al
@@ -738,14 +723,11 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Table/see.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Table/totalColumns.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Table/totalRows.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Text/Text.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Text/Text.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Text/autosplit.ix
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/TextEdit/autosplit.ix
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/TextUndo/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/TixGrid/TixGrid.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/TixGrid/TixGrid.so
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Tk.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Tk.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Toplevel/FG_BindIn.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Toplevel/FG_BindOut.al
@@ -768,7 +750,6 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Widget/bindDump.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Widget/clipboardKeysyms.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Widget/pathname.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/WinPhoto/WinPhoto.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/WinPhoto/WinPhoto.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Wm/AnchorAdjust.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Wm/FullScreen.al
@@ -776,10 +757,8 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Wm/Post.al
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Wm/autosplit.ix
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Wm/iconposition.al
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/X/X.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/X/X.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/X/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Xlib/Xlib.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/Xlib/Xlib.so
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/autosplit.ix
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Tk/break.al
--- a/components/perl_modules/xml-libxml/xml-libxml-PERLVER.p5m	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/perl_modules/xml-libxml/xml-libxml-PERLVER.p5m	Fri Aug 07 13:43:38 2015 -0700
@@ -124,7 +124,6 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/LibXML/XPathContext.pod
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/LibXML/XPathExpression.pod
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/XML/LibXML/.packlist
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/XML/LibXML/LibXML.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/XML/LibXML/LibXML.so
 license xml-libxml.license license=Artistic
 
--- a/components/perl_modules/xml-parser/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/perl_modules/xml-parser/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -56,7 +56,10 @@
 COMPONENT_TEST_TARGETS = test
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 COMPONENT_TEST_TRANSFORMS += \
-        '-e "s|\(^Files=\).*|\1|" '
+        '-e "s|\(^Files=\).*|\1|" ' \
+	'-e "s|\(^PERL_DL_NONLAZY=\).*|\1|" ' \
+	'-e "/\(^Running Mkbootstrap for XML::Parser::Expat ()\).*/d" ' \
+	'-e "/\(^chmod 644 Expat.bs\).*/d" '
 
 PKG_MACROS +=	PERL_A=$(shell arch)
 
--- a/components/perl_modules/xml-parser/test/results-all.master	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/perl_modules/xml-parser/test/results-all.master	Fri Aug 07 13:43:38 2015 -0700
@@ -1,7 +1,7 @@
 make[1]: Entering directory `$(@D)'
 make[2]: Entering directory `$(@D)/Expat'
 make[2]: Leaving directory `$(@D)/Expat'
-PERL_DL_NONLAZY=1 $(PERL) "-MExtUtils::Command::MM" "-e" "test_harness(0, 'blib/lib', 'blib/arch')" t/*.t
+PERL_DL_NONLAZY=
 t/astress.t ....... ok
 t/cdata.t ......... ok
 t/decl.t .......... ok
--- a/components/perl_modules/xml-parser/xml-parser-516.p5m	Thu Aug 06 15:11:29 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +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, 2015, 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/[email protected]$(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=com.oracle.info.description value="the XML::Parser Perl 5.16 module"
-set name=com.oracle.info.tpno value=$(TPNO)
-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=LSARC/2004/251
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-#file path=usr/perl5/5.16/lib/$(PERL_A)-solaris-64/perllocal.pod
-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
-file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/XML/Parser.pm
-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
-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
-file path=usr/perl5/vendor_perl/5.16/$(PERL_A)-solaris-64/auto/XML/Parser/.packlist
-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
-license xml-parser.license license=Artistic
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/xml-parser/xml-parser-520.p5m	Fri Aug 07 13:43:38 2015 -0700
@@ -0,0 +1,81 @@
+#
+# 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, 2015, 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/[email protected]$(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=com.oracle.info.description value="the XML::Parser Perl 5.20 module"
+set name=com.oracle.info.tpno value=$(TPNO)
+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=LSARC/2004/251
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+#file path=usr/perl5/5.20/lib/$(PERL_A)-solaris-thread-multi-64/perllocal.pod
+file path=usr/perl5/5.20/man/man3/XML::Parser.3
+file path=usr/perl5/5.20/man/man3/XML::Parser::Expat.3
+file path=usr/perl5/5.20/man/man3/XML::Parser::Style::Debug.3
+file path=usr/perl5/5.20/man/man3/XML::Parser::Style::Objects.3
+file path=usr/perl5/5.20/man/man3/XML::Parser::Style::Stream.3
+file path=usr/perl5/5.20/man/man3/XML::Parser::Style::Subs.3
+file path=usr/perl5/5.20/man/man3/XML::Parser::Style::Tree.3
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser.pm
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/Japanese_Encodings.msg
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/README
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/big5.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/euc-kr.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/ibm866.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-2.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-3.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-4.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-5.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-7.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-8.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-9.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/koi8-r.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/windows-1250.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/windows-1251.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/windows-1252.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/windows-1255.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/x-euc-jp-unicode.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/x-sjis-cp932.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/x-sjis-jdk117.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/x-sjis-jisx0221.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/x-sjis-unicode.enc
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Expat.pm
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/LWPExternEnt.pl
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Style/Debug.pm
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Style/Objects.pm
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Style/Stream.pm
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Style/Subs.pm
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Style/Tree.pm
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/auto/XML/Parser/.packlist
+file path=usr/perl5/vendor_perl/5.20/$(PERL_A)-solaris-thread-multi-64/auto/XML/Parser/Expat/Expat.so
+license xml-parser.license license=Artistic
--- a/components/perl_modules/xml-parser/xml-parser.p5m	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/perl_modules/xml-parser/xml-parser.p5m	Fri Aug 07 13:43:38 2015 -0700
@@ -43,9 +43,9 @@
 depend type=conditional fmri=library/perl-5/xml-parser-512 \
     predicate=runtime/perl-512
 
-# perl 5.16
-depend type=conditional fmri=library/perl-5/xml-parser-516 \
-    predicate=runtime/perl-516
+# perl 5.20
+depend type=conditional fmri=library/perl-5/xml-parser-520 \
+    predicate=runtime/perl-520
 
 # perl 5.12 threaded
 depend type=conditional fmri=library/perl-5/xml-parser-threaded-512 \
--- a/components/samba/samba/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/samba/samba/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -175,7 +175,7 @@
 CONFIGURE_ENV += 	CC="$(CC)"
 CONFIGURE_ENV += 	CPP="$(CC) -E"
 CONFIGURE_ENV += 	AWK=gawk
-CONFIGURE_ENV += 	PERL=/usr/perl5/5.16/bin/perl
+CONFIGURE_ENV += 	PERL=$(PERL.5.20)
 CONFIGURE_ENV += 	PYTHONDIR="$(PYTHON_VENDOR_PACKAGES)"
 CONFIGURE_ENV += 	PYTHONARCHDIR="$(PYTHON_VENDOR_PACKAGES)/samba"
 CONFIGURE_ENV += 	LD="$(LD)"
@@ -305,7 +305,7 @@
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += package/pkg
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += runtime/ruby
 REQUIRED_PACKAGES += security/sudo
--- a/components/samba/samba36/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/samba/samba36/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -191,7 +191,7 @@
 REQUIRED_PACKAGES += library/samba/libsmbclient
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += service/security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
--- a/components/squid/Makefile	Thu Aug 06 15:11:29 2015 -0700
+++ b/components/squid/Makefile	Fri Aug 07 13:43:38 2015 -0700
@@ -152,7 +152,7 @@
 REQUIRED_PACKAGES += library/libtool/libltdl
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-516
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library
--- a/make-rules/makemaker.mk	Thu Aug 06 15:11:29 2015 -0700
+++ b/make-rules/makemaker.mk	Fri Aug 07 13:43:38 2015 -0700
@@ -40,6 +40,9 @@
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.configured:	BITS=32
 $(BUILD_DIR)/$(MACH64)-5.16/.configured:	PERL_VERSION=5.16
 $(BUILD_DIR)/$(MACH64)-5.16/.configured:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.20/.configured:	PERL_VERSION=5.20
+$(BUILD_DIR)/$(MACH64)-5.20/.configured:	BITS=64
+
 
 $(BUILD_DIR)/$(MACH32)-5.12/.tested:	PERL_VERSION=5.12
 $(BUILD_DIR)/$(MACH32)-5.12/.tested:	BITS=32
@@ -47,6 +50,9 @@
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.tested:	BITS=32
 $(BUILD_DIR)/$(MACH64)-5.16/.tested:	PERL_VERSION=5.16
 $(BUILD_DIR)/$(MACH64)-5.16/.tested:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.20/.tested:	PERL_VERSION=5.20
+$(BUILD_DIR)/$(MACH64)-5.20/.tested:	BITS=64
+
 
 $(BUILD_DIR)/$(MACH32)-5.12/.tested-and-compared:	PERL_VERSION=5.12
 $(BUILD_DIR)/$(MACH32)-5.12/.tested-and-compared:	BITS=32
@@ -54,6 +60,9 @@
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.tested-and-compared:	BITS=32
 $(BUILD_DIR)/$(MACH64)-5.16/.tested-and-compared:	PERL_VERSION=5.16
 $(BUILD_DIR)/$(MACH64)-5.16/.tested-and-compared:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared:	PERL_VERSION=5.20
+$(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared:	BITS=64
+
 
 $(BUILD_DIR)/$(MACH32)-5.12/.system-tested:	PERL_VERSION=5.12
 $(BUILD_DIR)/$(MACH32)-5.12/.system-tested:	BITS=32
@@ -61,6 +70,9 @@
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested:	BITS=32
 $(BUILD_DIR)/$(MACH64)-5.16/.system-tested:	PERL_VERSION=5.16
 $(BUILD_DIR)/$(MACH64)-5.16/.system-tested:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.20/.system-tested:	PERL_VERSION=5.20
+$(BUILD_DIR)/$(MACH64)-5.20/.system-tested:	BITS=64
+
 
 $(BUILD_DIR)/$(MACH32)-5.12/.system-tested-and-compared:	PERL_VERSION=5.12
 $(BUILD_DIR)/$(MACH32)-5.12/.system-tested-and-compared:	BITS=32
@@ -68,14 +80,19 @@
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested-and-compared:	BITS=32
 $(BUILD_DIR)/$(MACH64)-5.16/.system-tested-and-compared:	PERL_VERSION=5.16
 $(BUILD_DIR)/$(MACH64)-5.16/.system-tested-and-compared:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.20/.system-tested-and-compared:	PERL_VERSION=5.20
+$(BUILD_DIR)/$(MACH64)-5.20/.system-tested-and-compared:	BITS=64
+
 
 BUILD_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.built
 BUILD_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.built
 BUILD_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.built
+BUILD_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.built
 
 INSTALL_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.installed
 INSTALL_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.installed
 INSTALL_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.installed
+INSTALL_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.installed
 
 COMPONENT_CONFIGURE_ENV +=	$(COMMON_PERL_ENV)
 COMPONENT_CONFIGURE_ENV +=	PERL="$(PERL)"
@@ -129,20 +146,24 @@
 TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.tested
 TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.tested
 TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.tested
+TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.tested
 else
 TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.tested-and-compared
 TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.tested-and-compared
 TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.tested-and-compared
+TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared
 endif
 
 ifeq ($(strip $(wildcard $(COMPONENT_TEST_RESULTS_DIR)/results-*.master)),)
 SYSTEM_TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.system-tested
 SYSTEM_TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested
 SYSTEM_TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.system-tested
+SYSTEM_TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.system-tested
 else
 SYSTEM_TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.system-tested-and-compared
 SYSTEM_TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested-and-compared
 SYSTEM_TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.system-tested-and-compared
+SYSTEM_TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.system-tested-and-compared
 endif
 
 # test the built source
@@ -220,3 +241,6 @@
 ifneq ($(findstring 5.16, $(PERL_VERSIONS)),)
 REQUIRED_PACKAGES += runtime/perl-516
 endif
+ifneq ($(findstring 5.20, $(PERL_VERSIONS)),)
+REQUIRED_PACKAGES += runtime/perl-520
+endif
--- a/make-rules/shared-macros.mk	Thu Aug 06 15:11:29 2015 -0700
+++ b/make-rules/shared-macros.mk	Fri Aug 07 13:43:38 2015 -0700
@@ -532,11 +532,12 @@
 # Not necessarily the system's default version, i.e. /usr/bin/perl
 PERL_VERSION ?=  5.12
 
-PERL_VERSIONS = 5.12 5.16
+PERL_VERSIONS = 5.12 5.20
 
 PERL.5.12 =     /usr/perl5/5.12/bin/perl
 PERL.5.16 =	/usr/perl5/5.16/bin/perl
 PERL.5.12-mt =	/usr/perl5/5.12/bin/perl-threaded
+PERL.5.20 =     /usr/perl5/5.20/bin/perl
 
 PERL =          $(PERL.$(PERL_VERSION))