23078956 adjust the remainder of the userland components to use perl 5.22
authorCraig Mohrman <craig.mohrman@oracle.com>
Mon, 18 Apr 2016 13:01:02 -0700
changeset 5797 432ac76de3b0
parent 5795 b6b9d57d2466
child 5798 7dcc6a44422d
23078956 adjust the remainder of the userland components to use perl 5.22 22909079 resume testing in several perl modules 22909338 xml-parsers pkg manifests should be cleaned up once 5.12 threaded is gone 23051223 dbd-sqlite's clobber doesn't remove generated DBD-SQLite.license file 23057814 graphviz perl package depends on other obsolete perl packages 22991554 DBD-SQLite has an unlisted build dependency on library/perl-5/database et al
components/a2ps/Makefile
components/ant/Makefile
components/apache24/Makefile
components/avahi/Makefile
components/convmv/Makefile
components/cups/Makefile
components/desktop/libgtkspell/Makefile
components/desktop/pidgin-otr/Makefile
components/desktop/pidgin/Makefile
components/desktop/xscreensaver/Makefile
components/emacs/Makefile
components/enscript/Makefile
components/ghostscript/Makefile
components/ghostscript/patches/10-fixmswrd.pl.patch
components/gnome/evince/Makefile
components/golang/Makefile
components/golang/patches/0600-perl-env.patch
components/gparted/Makefile
components/graphviz/Makefile
components/graphviz/graphviz-perl-PERLVER.p5m
components/graphviz/graphviz.p5m
components/groff/Makefile
components/gutenprint/Makefile
components/help2man/Makefile
components/hplip/Makefile
components/lftp/Makefile
components/mc/Makefile
components/mrtg/Makefile
components/mutt/Makefile
components/mysql-5-5/Makefile
components/mysql-5-6/Makefile
components/ntp/Makefile
components/open-fabrics/Makefile
components/open-fabrics/ibutils/Makefile
components/open-fabrics/infiniband-diags/Makefile
components/open-fabrics/open-fabrics.p5m
components/openjade/Makefile
components/openjade/patches/openjade-04-perl.patch
components/openjade/test/results-all.master
components/openscap/Makefile
components/parallel/Makefile
components/patchutils/Makefile
components/perl/perl522/Makefile
components/perl_modules/DBI/Makefile
components/perl_modules/DBI/history
components/perl_modules/DBI/test/results-5.22-64.master
components/perl_modules/authen-pam/Makefile
components/perl_modules/authen-pam/authen-pam-PERLVER.p5m
components/perl_modules/authen-pam/history
components/perl_modules/cssh/Makefile
components/perl_modules/cssh/history
components/perl_modules/dbd-sqlite/DBD-SQLite-PERLVER.p5m
components/perl_modules/dbd-sqlite/Makefile
components/perl_modules/dbd-sqlite/history
components/perl_modules/dbd-sqlite/test/results-all.master
components/perl_modules/gettext/Makefile
components/perl_modules/gettext/history
components/perl_modules/net-ssleay/Makefile
components/perl_modules/net-ssleay/history
components/perl_modules/perl-tk/Makefile
components/perl_modules/perl-tk/history
components/perl_modules/perl-tk/tk-PERLVER.p5m
components/perl_modules/perl-x11-protocol/Makefile
components/perl_modules/perl-x11-protocol/history
components/perl_modules/pmtools/Makefile
components/perl_modules/pmtools/history
components/perl_modules/xml-libxml/Makefile
components/perl_modules/xml-libxml/history
components/perl_modules/xml-libxml/xml-libxml-GENFRAG.p5m
components/perl_modules/xml-libxml/xml-libxml-PERLVER.p5m
components/perl_modules/xml-namespacesupport/Makefile
components/perl_modules/xml-namespacesupport/history
components/perl_modules/xml-namespacesupport/xml-namespacesupport-GENFRAG.p5m
components/perl_modules/xml-namespacesupport/xml-namespacesupport-PERLVER.p5m
components/perl_modules/xml-parser/Makefile
components/perl_modules/xml-parser/history
components/perl_modules/xml-parser/xml-parser-512.p5m
components/perl_modules/xml-parser/xml-parser-512thread.p5m
components/perl_modules/xml-parser/xml-parser-520.p5m
components/perl_modules/xml-parser/xml-parser-522.p5m
components/perl_modules/xml-parser/xml-parser-GENFRAG.p5m
components/perl_modules/xml-parser/xml-parser-PERLVER.p5m
components/perl_modules/xml-parser/xml-parser.p5m
components/perl_modules/xml-sax-base/Makefile
components/perl_modules/xml-sax-base/history
components/perl_modules/xml-sax-base/xml-sax-base-GENFRAG.p5m
components/perl_modules/xml-sax-base/xml-sax-base-PERLVER.p5m
components/perl_modules/xml-sax/Makefile
components/perl_modules/xml-sax/history
components/perl_modules/xml-sax/xml-sax-GENFRAG.p5m
components/perl_modules/xml-sax/xml-sax-PERLVER.p5m
components/perl_modules/xml-simple/Makefile
components/perl_modules/xml-simple/history
components/perl_modules/xml-simple/patches/t-8_Namespaces.patch
components/perl_modules/xml-simple/xml-simple-GENFRAG.p5m
components/perl_modules/xml-simple/xml-simple-PERLVER.p5m
components/pkgbuild/Makefile
components/rpm2cpio/Makefile
components/samba/Makefile
components/sendmail/Makefile
components/squid/Makefile
components/subversion/Makefile
components/texinfo/Makefile
components/texinfo/test/results-64.master
components/texinfo/texinfo.p5m
components/w3m/Makefile
make-rules/makemaker.mk
make-rules/shared-macros.mk
--- a/components/a2ps/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/a2ps/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -55,8 +55,13 @@
 	     ln -s $$sheet ; \
 	 done)
 
+# Adjust '#!/usr/bin/perl'
+PERL_SCRIPTS = \
+	$(PROTOUSRBINDIR)/composeglyphs \
+	$(PROTOUSRBINDIR)/ogonkify
+
 REQUIRED_PACKAGES += developer/gperf
 REQUIRED_PACKAGES += editor/gnu-emacs
-REQUIRED_PACKAGES += runtime/perl-522
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library/math
--- a/components/ant/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/ant/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -63,6 +63,12 @@
 COMPONENT_INSTALL_TARGETS =	dist
 COMPONENT_INSTALL_ENV +=	$(ANT_ENV)
 
+# Adjust '#!/usr/bin/perl'
+PERL_SCRIPTS = \
+        $(PROTOUSRBINDIR)/antRun.pl \
+        $(PROTOUSRBINDIR)/complete-ant-cmd.pl \
+        $(PROTOUSRBINDIR)/runant.pl
+
 COMPONENT_TEST_TARGETS =	test
 COMPONENT_TEST_ENV +=		$(ANT_ENV)
 
@@ -79,5 +85,5 @@
 
 REQUIRED_PACKAGES += developer/java/junit
 REQUIRED_PACKAGES += developer/parser/antlr-2
-REQUIRED_PACKAGES += runtime/perl-522
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/apache24/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/apache24/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -88,7 +88,7 @@
 REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/lua
-REQUIRED_PACKAGES += runtime/perl-522
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library/math
--- a/components/avahi/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/avahi/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -100,6 +100,7 @@
 REQUIRED_PACKAGES += library/expat
 REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += library/libdaemon
+REQUIRED_PACKAGES += library/perl-5/xml-parser
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += service/network/dns/mdns
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/convmv/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/convmv/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -47,11 +47,9 @@
 COMPONENT_SYSTEM_TEST_TARGETS=	test
 COMPONENT_SYSTEM_TEST_ENV=	CONVMV=$(USRBINDIR)/convmv
 
-# Adjust the '#!/usr/bin/perl' at the beginning of the convmv script to use
-# '#!/usr/perl5/$(PERL_VERSION)/bin/perl'
-COMPONENT_POST_INSTALL_ACTION += \
-	$(GSED) -i -e 's?/usr/bin/perl?$(PERL)?' \
-		$(PROTOUSRBINDIR)/convmv;
+# Adjust '#!/usr/bin/perl'
+PERL_SCRIPTS = \
+	$(PROTOUSRBINDIR)/convmv
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
--- a/components/cups/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/cups/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -102,7 +102,7 @@
 REQUIRED_PACKAGES += library/print/cups-libs
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += service/security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
--- a/components/desktop/libgtkspell/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/desktop/libgtkspell/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -61,4 +61,5 @@
 
 REQUIRED_PACKAGES += library/desktop/gtk2
 REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/perl-5/xml-parser
 REQUIRED_PACKAGES += library/spell-checking/enchant
--- a/components/desktop/pidgin-otr/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/desktop/pidgin-otr/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -53,4 +53,5 @@
 
 REQUIRED_PACKAGES += communication/im/libotr
 REQUIRED_PACKAGES += communication/im/pidgin
+REQUIRED_PACKAGES += library/perl-5/xml-parser
 REQUIRED_PACKAGES += system/library/security/libgcrypt
--- a/components/desktop/pidgin/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/desktop/pidgin/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -66,10 +66,7 @@
 CONFIGURE_ENV +=	LIBS="$(LIBS)"
 CONFIGURE_ENV +=	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH.64)/gnutls-3
 
-# Version of Perl to use.
-PERL_VERSION =  5.20
-
-CONFIGURE_ENV += "ac_cv_path_perlpath=$(USRDIR)/perl5/$(PERL_VERSION)/bin/perl"
+CONFIGURE_ENV += "ac_cv_path_perlpath=$(PERL)"
 
 CONFIGURE_OPTIONS +=	--enable-cyrus-sasl
 CONFIGURE_OPTIONS +=	--disable-nss
@@ -100,8 +97,9 @@
 REQUIRED_PACKAGES += library/gnutls-3
 REQUIRED_PACKAGES += library/libidn
 REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/perl-5/xml-parser
 REQUIRED_PACKAGES += library/python/python-dbus-27
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += runtime/tcl-8
 REQUIRED_PACKAGES += runtime/tk-8
--- a/components/desktop/xscreensaver/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/desktop/xscreensaver/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -75,8 +75,8 @@
 CONFIGURE_OPTIONS += --with-xft=$(USRDIR)
 CONFIGURE_OPTIONS += PTHREAD_CFLAGS="-D_POSIX_PTHREAD_SEMANTICS"
 CONFIGURE_OPTIONS += PTHREAD_LIBS="-lc"
-CONFIGURE_OPTIONS += PERL=$(PERL.5.12)
-CONFIGURE_OPTIONS += INTLTOOL_PERL=$(PERL.5.12)
+CONFIGURE_OPTIONS += PERL=$(PERL)
+CONFIGURE_OPTIONS += INTLTOOL_PERL=$(PERL)
 
 # X extensions to support
 CONFIGURE_OPTIONS += --with-dpms-ext
@@ -136,6 +136,11 @@
 done ; \
 rm -f $(PROTO_DIR)$(XSS_LIBDIR)/hacks/webcollage-helper );
 
+# Adjust '#!/usr/bin/perl'
+PERL_SCRIPTS= \
+	$(PROTOUSRBINDIR)/xscreensaver-getimage-file \
+	$(PROTOUSRBINDIR)/xscreensaver-getimage-video \
+	$(PROTOUSRBINDIR)/xscreensaver-text
 
 REQUIRED_PACKAGES += gnome/accessibility/gnome-a11y-libs
 REQUIRED_PACKAGES += gnome/config/gconf
@@ -149,7 +154,7 @@
 REQUIRED_PACKAGES += library/gnome/gnome-component
 REQUIRED_PACKAGES += library/libxml2
 REQUIRED_PACKAGES += library/perl-5/xml-parser
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += x11/library/libx11
 REQUIRED_PACKAGES += x11/library/libxext
--- a/components/emacs/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/emacs/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -233,8 +233,7 @@
 REQUIRED_PACKAGES += library/libxml2
 REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library/fontconfig
 REQUIRED_PACKAGES += system/library/freetype-2
--- a/components/enscript/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/enscript/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -67,8 +67,11 @@
 	$(LN) $(PROTOUSRBINDIR)/enscript \
 		$(PROTOUSRBINDIR)/nenscript
 
+# Adjust '#!/usr/bin/perl'
+PERL_SCRIPTS = \
+	$(PROTOUSRBINDIR)/diffpp \
+	$(PROTOUSRBINDIR)/sliceprint
 
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library/math
--- a/components/ghostscript/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/ghostscript/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -102,6 +102,9 @@
 
 CONFIGURE_SCRIPT = ./configure
 
+# Adjust '#!/usr/bin/perl'
+PERL_SCRIPTS= $(PROTOUSRBINDIR)/fixmswrd.pl
+
 # ASLR disabled until sufficient testing can be performed.
 ASLR_MODE= $(ASLR_DISABLE)
 
@@ -126,7 +129,7 @@
 REQUIRED_PACKAGES += library/print/cups-libs
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += print/cups
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library/fontconfig
 REQUIRED_PACKAGES += system/library/math
--- a/components/ghostscript/patches/10-fixmswrd.pl.patch	Fri Apr 15 00:25:15 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-*** ghostscript-8.64/lib/fixmswrd.pl.orig	Mon Sep 29 16:54:53 2008
---- ghostscript-8.64/lib/fixmswrd.pl	Mon Sep 29 16:56:37 2008
-***************
-*** 1,4 ****
-! #!/usr/bin/perl
-  # $Id: fixmswrd.pl 6300 2005-12-28 19:56:24Z giles $
-  
-  #   (C) 1997 Anthony Shipman
---- 1,4 ----
-! #!/usr/perl5/bin/perl
-  # $Id: fixmswrd.pl 6300 2005-12-28 19:56:24Z giles $
-  
-  #   (C) 1997 Anthony Shipman
--- a/components/gnome/evince/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/gnome/evince/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -77,6 +77,7 @@
 REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += library/gnome/gnome-keyring
 REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/perl-5/xml-parser
 REQUIRED_PACKAGES += system/library/c++-runtime
 REQUIRED_PACKAGES += system/library/libdbus-glib
 REQUIRED_PACKAGES += system/library/math
--- a/components/golang/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/golang/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -255,6 +255,10 @@
 	($(RM) $(NO_ELFSIGN_MOG))
 endef
 
+# clear COMPONENT_POST_INSTALL_ACTION so we can append PERL_SCRIPTS_PROCESS
+# at the end
+COMPONENT_POST_INSTALL_ACTION =
+
 #
 # Magic to deliver supplemental package source into proto area.
 #
@@ -295,6 +299,31 @@
 		-asmflags -trimpath=$(PROTO_ROOT) -gcflags -trimpath=$(PROTO_ROOT) \
 		"github.com/golang/...");
 
+PERL_SCRIPTS= \
+  $(PROTOUSRLIBDIR)/gocode/1.5/src/golang.org/x/sys/plan9/mksyscall.pl \
+  $(PROTOUSRLIBDIR)/gocode/1.5/src/golang.org/x/sys/unix/mksysnum_netbsd.pl \
+  $(PROTOUSRLIBDIR)/gocode/1.5/src/golang.org/x/sys/unix/mksyscall_solaris.pl \
+  $(PROTOUSRLIBDIR)/gocode/1.5/src/golang.org/x/sys/unix/mksyscall.pl \
+  $(PROTOUSRLIBDIR)/gocode/1.5/src/golang.org/x/sys/unix/mksysnum_freebsd.pl \
+  $(PROTOUSRLIBDIR)/gocode/1.5/src/golang.org/x/sys/unix/mksysctl_openbsd.pl \
+  $(PROTOUSRLIBDIR)/gocode/1.5/src/golang.org/x/sys/unix/mksysnum_dragonfly.pl \
+  $(PROTOUSRLIBDIR)/gocode/1.5/src/golang.org/x/sys/unix/mksysnum_openbsd.pl \
+  $(PROTOUSRLIBDIR)/gocode/1.5/src/golang.org/x/sys/unix/mksysnum_linux.pl \
+  $(PROTOUSRLIBDIR)/gocode/1.5/src/golang.org/x/sys/unix/mksysnum_darwin.pl \
+  $(PROTOUSRLIBDIR)/golang/1.5/src/regexp/syntax/make_perl_groups.pl \
+  $(PROTOUSRLIBDIR)/golang/1.5/src/syscall/mksysnum_freebsd.pl \
+  $(PROTOUSRLIBDIR)/golang/1.5/src/syscall/mksysctl_openbsd.pl \
+  $(PROTOUSRLIBDIR)/golang/1.5/src/syscall/mksyscall.pl \
+  $(PROTOUSRLIBDIR)/golang/1.5/src/syscall/mksysnum_openbsd.pl \
+  $(PROTOUSRLIBDIR)/golang/1.5/src/syscall/mksysnum_darwin.pl \
+  $(PROTOUSRLIBDIR)/golang/1.5/src/syscall/mksysnum_netbsd.pl \
+  $(PROTOUSRLIBDIR)/golang/1.5/src/syscall/mksysnum_linux.pl \
+  $(PROTOUSRLIBDIR)/golang/1.5/src/syscall/mksyscall_solaris.pl \
+  $(PROTOUSRLIBDIR)/golang/1.5/src/syscall/mksysnum_dragonfly.pl \
+  $(PROTOUSRLIBDIR)/golang/1.5/test/errchk
+
+COMPONENT_POST_INSTALL_ACTION += $(PERL_SCRIPTS_PROCESS)
+
 # Go's test suite is currently designed to be run from the build area.
 
 # Used during the build.
@@ -309,7 +338,7 @@
 # Required to build man pages.
 REQUIRED_PACKAGES += developer/documentation-tool/xml2roff
 # There's a single test script which requires perl.
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += system/header
 REQUIRED_PACKAGES += system/library
 # Used for cgo support at runtime; we don't add a package dependency since cgo
--- a/components/golang/patches/0600-perl-env.patch	Fri Apr 15 00:25:15 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-One of the test scripts requires Perl, and probably would work with any
-version, but for dependency purposes, we need to pick one.
-
-Not suitable for upstream.
-diff -ru golang-1.5/test/errchk golang-1.5/test/errchk
---- golang-1.5/test/errchk	2015-09-08 18:24:03.000000000 -0700
-+++ golang-1.5/test/errchk	2015-11-03 14:59:16.457207463 -0800
[email protected]@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/perl5/5.20/bin/perl
- # Copyright 2009 The Go Authors. All rights reserved.
- # Use of this source code is governed by a BSD-style
- # license that can be found in the LICENSE file.
--- a/components/gparted/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/gparted/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -51,6 +51,7 @@
 REQUIRED_PACKAGES += library/desktop/c++/pangomm
 REQUIRED_PACKAGES += library/desktop/gtk2
 REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/perl-5/xml-parser
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library/c++-runtime
 REQUIRED_PACKAGES += system/library/math
--- a/components/graphviz/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/graphviz/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -34,6 +34,7 @@
 
 TPNO=			17707
 
+# publish for only one version of perl
 PERL_VERSIONS = $(PERL_VERSION)
 
 # There are tests, but they fail consistently because the test samples are out
@@ -103,6 +104,9 @@
 	$(PYTHON.2.7.32) -m compileall -l -d $(PYTHON.2.7.VENDOR_PACKAGES) \
 		$(PROTO_DIR)/$(PYTHON.2.7.VENDOR_PACKAGES)
 
+PKG_MACROS += PERL_PKG=$(PERL_PKG)
+PKG_MACROS += PERL_VERSION_NODOT=$(PERL_VERSION_NODOT)
+
 # The test infrastructure doesn't run in a VPATHed environment.
 COMPONENT_PRE_TEST_ACTION = \
 	(cd $(@D)/rtest; ln -s $(SOURCE_DIR)/rtest/* .)
--- a/components/graphviz/graphviz-perl-PERLVER.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/graphviz/graphviz-perl-PERLVER.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -47,11 +47,3 @@
 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 couple of unversioned files were migrated from graphviz-perl-512,
-# so an optional dependency is needed to make sure that package is at
-# least the migrated version if installed.
-depend type=optional \
-    fmri=image/graphviz/[email protected],5.12-5.12.0.0.0.87.0
-# perl 5.20 is EOF.  Make sure this package goes away.
-depend type=optional \
-    fmri=image/graphviz/[email protected],5.12-5.12.0.0.0.96.0
--- a/components/graphviz/graphviz.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/graphviz/graphviz.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -522,8 +522,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-522
+    fmri=image/graphviz/graphviz-perl-$(PERL_VERSION_NODOT)@$(IPS_COMPONENT_VERSION) \
+    predicate=$(PERL_PKG)
 depend type=conditional \
     fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
     predicate=web/php-53
--- a/components/groff/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/groff/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -77,8 +77,10 @@
 COMPONENT_PRE_INSTALL_ACTION = \
 	($(MKDIR) $(PROTOUSRBINDIR) )
 
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+# Adjust '#!/usr/bin/perl'
+PERL_SCRIPTS= $(PROTOUSRLIBDIR)/groff/groffer/perl_test.pl
+
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library/c++-runtime
--- a/components/gutenprint/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/gutenprint/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -60,8 +60,7 @@
 REQUIRED_PACKAGES += library/print/cups-libs
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += print/cups
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += x11/library/libx11
--- a/components/help2man/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/help2man/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -37,7 +37,7 @@
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/gnu-component.mk
 
-CONFIGURE_ENV +=	PERL=$(PERL.5.22)
+CONFIGURE_ENV +=	PERL=$(PERL)
 
 # Needed to successfully create the message files.
 COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR) $(@D));
@@ -45,4 +45,4 @@
 # Needed to get all the localized files.
 COMPONENT_INSTALL_TARGETS += install_l10n
 
-REQUIRED_PACKAGES += runtime/perl-522
+REQUIRED_PACKAGES += $(PERL_PKG)
--- a/components/hplip/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/hplip/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -137,7 +137,7 @@
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += print/cups
 REQUIRED_PACKAGES += image/scanner/xsane/sane-backends
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += system/library/c++-runtime
 REQUIRED_PACKAGES += system/library/libdbus
--- a/components/lftp/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/lftp/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -47,8 +47,7 @@
 REQUIRED_PACKAGES += library/gnutls-3
 REQUIRED_PACKAGES += library/readline
 REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library/c++-runtime
 REQUIRED_PACKAGES += system/library/math
--- a/components/mc/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/mc/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -50,6 +50,5 @@
 REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += library/libssh2
 REQUIRED_PACKAGES += library/slang
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/mrtg/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/mrtg/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -50,5 +50,5 @@
 COMPONENT_PRE_BUILD_ACTION=(cd $(@D) ; mkdir -p bin)
 
 REQUIRED_PACKAGES += library/gd
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += system/library/math
--- a/components/mutt/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/mutt/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -64,8 +64,7 @@
 REQUIRED_PACKAGES += library/libidn
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/slang
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += system/library/security/libsasl
--- a/components/mysql-5-5/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/mysql-5-5/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -84,9 +84,20 @@
 CMAKE_OPTIONS += '-DCOMPILATION_COMMENT=MySQL Community Server (GPL)'
 CMAKE_OPTIONS += -DFEATURE_SET=community
 
+# Adjust '#!/usr/bin/perl'
+$(INSTALL_64): PERL_SCRIPTS= \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysql_convert_table_format \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysql_find_rows \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysql_fix_extensions \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysql_setpermission \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysql_zap \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysqlaccess \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysqld_multi \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysqldumpslow \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysqlhotcopy
+
 REQUIRED_PACKAGES += library/security/openssl
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library/c++-runtime
--- a/components/mysql-5-6/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/mysql-5-6/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -94,11 +94,24 @@
 COMPONENT_PRE_BUILD_ACTION += echo Running cmake with $(CMAKE_OPTIONS);
 COMPONENT_PRE_BUILD_ACTION += $(CMAKE) . $(CMAKE_OPTIONS);
 
+# Adjust '#!/usr/bin/perl'
+$(INSTALL_64): PERL_SCRIPTS= \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysql_convert_table_format \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysql_find_rows \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysql_fix_extensions \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysql_install_db \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysql_secure_installation \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysql_setpermission \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysql_zap \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysqlaccess \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysqld_multi \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysqldumpslow \
+	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysqlhotcopy
+
 REQUIRED_PACKAGES += database/mysql-56/client
 REQUIRED_PACKAGES += developer/build/cmake
 REQUIRED_PACKAGES += library/security/openssl
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library/c++-runtime
--- a/components/ntp/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/ntp/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -67,8 +67,7 @@
 
 REQUIRED_PACKAGES += library/libedit
 REQUIRED_PACKAGES += library/security/openssl
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += service/network/dns/mdns
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
--- a/components/open-fabrics/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/open-fabrics/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -110,8 +110,7 @@
 FORCE:
 
 REQUIRED_PACKAGES += library/glib2
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += runtime/tcl-8
 REQUIRED_PACKAGES += shell/bash
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/open-fabrics/ibutils/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/open-fabrics/ibutils/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -48,6 +48,11 @@
 CONFIGURE_OPTIONS +=	--with-osm=$(PROTOUSRDIR)
 CONFIGURE_OPTIONS +=	--with-osm-libs=$(PROTOUSRLIBDIR64)
 
+# Adjust '#!/usr/bin/perl'
+PERL_SCRIPTS= \
+	$(PROTOUSRSBINDIR)/dump2psl.pl \
+	$(PROTOUSRSBINDIR)/dump2slvl.pl
+
 CLEANUP_FILES =\
 	$(PROTOUSRLIBDIR)/libibdm.la\
 	$(PROTOUSRLIBDIR)/libibdmcom.la\
@@ -92,7 +97,6 @@
 	$(PROTOUSRLIBDIR)/ibdiagui1.*\
 	$(PROTOUSRLIBDIR)/ibdiagpath1.*
 
-COMPONENT_POST_INSTALL_ACTION=\
-	$(RM) $(CLEANUP_FILES);\
+COMPONENT_POST_INSTALL_ACTION+= \
+	$(RM) $(CLEANUP_FILES); \
 	$(RM) -r $(CLEANUP_DIRS)
-
--- a/components/open-fabrics/infiniband-diags/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/open-fabrics/infiniband-diags/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -42,10 +42,10 @@
 COMPONENT_PREP_ACTION = \
         cp solaris_set_nodedesc.c $(@D)/src
 
-COMPONENT_INSTALL_ENV +=	PERL=$(PERL.5.12)
+CONFIGURE_ENV += PERL=$(PERL)
+COMPONENT_INSTALL_ENV += PERL=$(PERL)
 
 LDFLAGS += -L$(PROTOUSRLIBDIR64)
-CONFIGURE_ENV +=	PERL=$(PERL.5.12)
 
 #
 # For some weird reason PKG_CONFIG is generating
@@ -68,6 +68,18 @@
 COMPONENT_POST_CONFIGURE_ACTION=\
 	$(SYMLINK) ../../../$(COMPONENT_SRC)/scripts/IBswcountlimits.pm $(@D)/scripts
 
+# Adjust '#!/usr/bin/perl'
+PERL_SCRIPTS= \
+	$(PROTOUSRSBINDIR)/ibdiscover.pl \
+	$(PROTOUSRSBINDIR)/ibfindnodesusing.pl \
+	$(PROTOUSRSBINDIR)/ibidsverify.pl \
+	$(PROTOUSRSBINDIR)/iblinkinfo.pl \
+	$(PROTOUSRSBINDIR)/ibprintca.pl \
+	$(PROTOUSRSBINDIR)/ibprintrt.pl \
+	$(PROTOUSRSBINDIR)/ibprintswitch.pl \
+	$(PROTOUSRSBINDIR)/ibqueryerrors.pl \
+	$(PROTOUSRSBINDIR)/ibswportwatch.pl
+
 CLEANUP_FILES =\
 	$(PROTO_DIR)/$(CONFIGURE_LIBDIR.32)/libibnetdisc.la\
 	$(PROTO_DIR)/$(CONFIGURE_LIBDIR.32)/libibnetdisc.so \
@@ -83,8 +95,8 @@
 	$(PROTOUSRSHAREMAN8DIR)/ibfindnodesusing.8 \
 	$(PROTOUSRINCDIR)/infiniband/ibnetdisc.h\
 
-COMPONENT_POST_INSTALL_ACTION =\
-	$(RM) $(CLEANUP_FILES);\
+COMPONENT_POST_INSTALL_ACTION+= \
+	$(RM) $(CLEANUP_FILES); \
 	$(INSTALL) -m 644 manpages/set_nodedesc.sh.8 $(PROTOUSRSHAREMAN8DIR)
 
 # common targets
--- a/components/open-fabrics/open-fabrics.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/open-fabrics/open-fabrics.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -177,7 +177,7 @@
 link path=usr/lib/secure/$(MACH64)/libsdp.so target=libsdp.so.1.0.0
 link path=usr/lib/secure/$(MACH64)/libsdp.so.1 target=libsdp.so.1.0.0
 file path=usr/lib/secure/$(MACH64)/libsdp.so.1.0.0
-file path=usr/perl5/vendor_perl/5.12/IBswcountlimits.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/IBswcountlimits.pm
 file path=usr/sbin/dump2psl.pl
 file path=usr/sbin/dump2slvl.pl
 file path=usr/sbin/ibaddr
--- a/components/openjade/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/openjade/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -69,6 +69,9 @@
 
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 
+COMPONENT_TEST_TRANSFORMS += \
+	'-e "/^[mM]ake/d" '
+
 COMPONENT_INSTALL_TARGETS += install-man
 
 # Workaround broken install targets.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openjade/patches/openjade-04-perl.patch	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,17 @@
+# getopts.pl is deprecated from perl.
+# Offer this upstream.
+
+
+--- openjade-1.3.2/msggen.pl_orig	2002-10-20 14:47:23.000000000 -0700
++++ openjade-1.3.2/msggen.pl	2016-04-01 14:48:13.950400177 -0700
[email protected]@ -18,8 +18,8 @@
+ undef $opt_l;
+ undef $opt_p;
+ undef $opt_t;
+-do 'getopts.pl';
+-&Getopts('l:p:t:');
++use Getopt::Std;
++getopts('l:p:t:');
+ $module = $opt_l;
+ $pot_file = $opt_p;
+ 
--- a/components/openjade/test/results-all.master	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/openjade/test/results-all.master	Mon Apr 18 13:01:02 2016 -0700
@@ -1,4 +1,3 @@
-make[1]: Entering directory `$(@D)/testsuite'
 ../jade/openjade -c ../dsssl/catalog -t sgml -d expr-lang.dsl null.sgml > expr-lang.actual
 diff expr-lang.actual expr-lang.expected
 7c7
@@ -17,6 +16,4 @@
 < (char>=? #\a #\A --> #f
 ---
 > (char>=? #\a #\A --> #t
-make[1]: [expr-lang.expected] Error 1 (ignored)
 All tests passed.
-make[1]: Leaving directory `$(@D)/testsuite'
--- a/components/openscap/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/openscap/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -40,6 +40,7 @@
 
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
 
+# publish for only one version of perl
 PERL_VERSIONS = $(PERL_VERSION)
 
 include $(WS_MAKE_RULES)/common.mk
--- a/components/parallel/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/parallel/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -44,18 +44,11 @@
 COMPONENT_BUILD_ENV += \
 	PATH="$(USRBINDIR):$(GNUBIN):$(USRDIR)/perl5/$(PERL_VERSION)/bin"
 
-# Adjust the '#!/usr/bin/env perl' and '#!/usr/bin/perl' at the beginning of
-# the Perl scripts to use '#!/usr/perl5/$(PERL_VERSION)/bin/perl'
-COMPONENT_POST_INSTALL_ACTION += \
-	$(GSED) -i -e 's?/usr/bin/perl?/usr/perl5/$(PERL_VERSION)/bin/perl?' \
-		$(PROTOUSRBINDIR)/niceload;
-COMPONENT_POST_INSTALL_ACTION += \
-	$(GSED) -i -e \
-		's?/usr/bin/env perl?/usr/perl5/$(PERL_VERSION)/bin/perl?' \
-		$(PROTOUSRBINDIR)/parallel;
-COMPONENT_POST_INSTALL_ACTION += \
-	$(GSED) -i -e 's?/usr/bin/perl?/usr/perl5/$(PERL_VERSION)/bin/perl?' \
-		$(PROTOUSRBINDIR)/sql;
+# Adjust '#!/usr/bin/perl'
+PERL_SCRIPTS = \
+	$(PROTOUSRBINDIR)/niceload \
+	$(PROTOUSRBINDIR)/parallel \
+	$(PROTOUSRBINDIR)/sql
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
--- a/components/patchutils/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/patchutils/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -50,6 +50,6 @@
 # Note that the gendiff tests will fail on Solaris, because the gendiff utility
 # is missing; this is delivered by rpm.
 
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += text/gnu-diffutils
 REQUIRED_PACKAGES += text/gnu-patch
--- a/components/perl/perl522/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl/perl522/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -27,7 +27,7 @@
 
 COMPONENT_NAME=		perl
 COMPONENT_VERSION=	5.22.1
-PERL_VERSION=		5.22
+PERL_VERSION_LOCAL=	5.22
 COMPONENT_PROJECT_URL=	http://www.perl.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
@@ -77,19 +77,19 @@
 			-de \
 			-Dmksymlinks \
 			-Ulocincpth= \
-                        -Dbin=/usr/perl5/$(PERL_VERSION)/bin \
+                        -Dbin=/usr/perl5/$(PERL_VERSION_LOCAL)/bin \
 			-Dcc="cc" \
 			-Dcf_email="[email protected]" \
 			-Dcf_by="perl-bugs" \
 			-Dlibperl=libperl.so \
 			-Dmyhostname="localhost" \
 			-Dperl_static_inline="static" \
-			-Dprefix=/usr/perl5/$(PERL_VERSION) \
-                        -Dprivlib=/usr/perl5/$(PERL_VERSION)/lib \
-			-Dsitelib=/usr/perl5/site_perl/$(PERL_VERSION) \
-			-Dsiteprefix=/usr/perl5/$(PERL_VERSION) \
-			-Dvendorlib=/usr/perl5/vendor_perl/$(PERL_VERSION) \
-			-Dvendorprefix=/usr/perl5/$(PERL_VERSION) \
+			-Dprefix=/usr/perl5/$(PERL_VERSION_LOCAL) \
+                        -Dprivlib=/usr/perl5/$(PERL_VERSION_LOCAL)/lib \
+			-Dsitelib=/usr/perl5/site_perl/$(PERL_VERSION_LOCAL) \
+			-Dsiteprefix=/usr/perl5/$(PERL_VERSION_LOCAL) \
+			-Dvendorlib=/usr/perl5/vendor_perl/$(PERL_VERSION_LOCAL) \
+			-Dvendorprefix=/usr/perl5/$(PERL_VERSION_LOCAL) \
 			-Duseshrplib \
 			-Dusedtrace \
 			-Duse64bitall \
@@ -142,7 +142,8 @@
 # perl's install path for sparc is based off the value of the
 # "arch" command.  So we must package that way also.
 #
-PKG_MACROS		+=	P_ARCH=$(shell arch)
+PKG_MACROS 		+=	P_ARCH=$(shell arch)
+PKG_MACROS		+=	PERL_VERSION=$(PERL_VERSION_LOCAL)
 
 ASLR_MODE = $(ASLR_ENABLE)
 
--- a/components/perl_modules/DBI/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/DBI/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -40,21 +40,26 @@
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/makemaker.mk
 
+COMPONENT_TEST_ARGS = -k -i
 COMPONENT_TEST_TARGETS = test
+COMPONENT_TEST_TRANSFORMS += \
+	'-e "/^[mM]ake/d" ' \
+	'-e "/^Files/d" ' \
+	'-e "/^PERL/d" ' \
+	'-e "/^Running/d" ' \
+	'-e "/^chmod/d" ' \
+	'-e "/^connect /d" ' \
+	'-e "/^Testing/d" ' \
+	'-e "/NullP/d" '
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
-# Testing suspended until consistent results: 22909079
-#test:		$(TEST_32_and_64)
+test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
-
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
 REQUIRED_PACKAGES += system/library
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/DBI/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,2 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/DBI/test/results-5.22-64.master	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,340 @@
+t/01basics.t .................... ok
+t/02dbidrv.t .................... ok
+t/03handle.t .................... ok
+t/04mods.t ...................... ok
+t/05concathash.t ................ ok
+t/06attrs.t ..................... ok
+t/07kids.t ...................... ok
+t/08keeperr.t ................... ok
+t/09trace.t ..................... ok
+t/10examp.t ..................... ok
+t/11fetch.t ..................... ok
+t/12quote.t ..................... ok
+t/13taint.t ..................... ok
+t/14utf8.t ...................... ok
+t/15array.t ..................... ok
+Possible precedence issue with control flow operator at t/16destroy.t line 81.
+t/16destroy.t ................... ok
+t/19fhtrace.t ................... ok
+t/20meta.t ...................... ok
+t/30subclass.t .................. ok
+t/31methcache.t ................. ok
+t/35thrclone.t .................. ok
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+t/40profile.t ................... ok
+t/41prof_dump.t ................. ok
+t/42prof_data.t ................. ok
+t/43prof_env.t .................. ok
+t/48dbi_dbd_sqlengine.t ......... ok
+t/49dbd_file.t .................. ok
+t/50dbm_simple.t ................ ok
+t/51dbm_file.t .................. ok
+t/52dbm_complex.t ............... skipped: DBI::SQL::Nano is being used
+t/60preparse.t .................. ok
+t/65transact.t .................. ok
+t/70callbacks.t ................. ok
+t/72childhandles.t .............. ok
+t/80proxy.t ..................... skipped: modules required for proxy are probably not installed (e.g., RPC/PlClient.pm)
+t/85gofer.t ..................... ok
+t/86gofer_fail.t ................ ok
+
+#   Failed test 'should make 1 round trip'
+#   at t/87gofer_cache.t line 70.
+#          got: '1'
+#     expected: '0'
+
+#   Failed test at t/87gofer_cache.t line 72.
+#          got: '0'
+#     expected: '1'
+
+#   Failed test at t/87gofer_cache.t line 73.
+#          got: '2'
+#     expected: '1'
+
+#   Failed test at t/87gofer_cache.t line 74.
+#          got: '2'
+#     expected: '1'
+
+#   Failed test 'should make 1 round trip'
+#   at t/87gofer_cache.t line 70.
+#          got: '1'
+#     expected: '0'
+
+#   Failed test at t/87gofer_cache.t line 72.
+#          got: '0'
+#     expected: '1'
+
+#   Failed test at t/87gofer_cache.t line 73.
+#          got: '2'
+#     expected: '1'
+
+#   Failed test at t/87gofer_cache.t line 74.
+#          got: '2'
+#     expected: '1'
+# Looks like you failed 8 tests of 47.
+t/87gofer_cache.t ............... 
+Dubious, test returned 8 (wstat 2048, 0x800)
+Failed 8/47 subtests 
+t/90sql_type_cast.t ............. ok
+t/pod-coverage.t ................ skipped: Test::Pod::Coverage 1.04 required for testing POD coverage
+t/pod.t ......................... skipped: Test::Pod 1.00 required for testing POD
+t/zvg_01basics.t ................ ok
+t/zvg_02dbidrv.t ................ ok
+t/zvg_03handle.t ................ ok
+t/zvg_04mods.t .................. ok
+t/zvg_05concathash.t ............ ok
+t/zvg_06attrs.t ................. ok
+t/zvg_07kids.t .................. ok
+t/zvg_08keeperr.t ............... ok
+t/zvg_09trace.t ................. ok
+t/zvg_10examp.t ................. ok
+t/zvg_11fetch.t ................. ok
+t/zvg_12quote.t ................. ok
+t/zvg_13taint.t ................. skipped: Taint attribute tests not functional with DBI_AUTOPROXY
+t/zvg_14utf8.t .................. ok
+t/zvg_15array.t ................. ok
+Possible precedence issue with control flow operator at ./t/16destroy.t line 81.
+t/zvg_16destroy.t ............... ok
+t/zvg_19fhtrace.t ............... ok
+t/zvg_20meta.t .................. ok
+t/zvg_30subclass.t .............. ok
+t/zvg_31methcache.t ............. ok
+t/zvg_35thrclone.t .............. ok
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+Redundant argument in sprintf at $(@D)/blib/lib/DBI/Profile.pm line 835.
+t/zvg_40profile.t ............... ok
+t/zvg_41prof_dump.t ............. ok
+t/zvg_42prof_data.t ............. ok
+t/zvg_43prof_env.t .............. ok
+t/zvg_48dbi_dbd_sqlengine.t ..... ok
+t/zvg_49dbd_file.t .............. ok
+t/zvg_50dbm_simple.t ............ ok
+t/zvg_51dbm_file.t .............. ok
+t/zvg_52dbm_complex.t ........... skipped: DBI::SQL::Nano is being used
+t/zvg_60preparse.t .............. ok
+t/zvg_65transact.t .............. skipped: Transactions not supported by DBD::Gofer
+t/zvg_70callbacks.t ............. ok
+t/zvg_72childhandles.t .......... ok
+t/zvg_80proxy.t ................. skipped: modules required for proxy are probably not installed (e.g., RPC/PlClient.pm)
+t/zvg_85gofer.t ................. ok
+t/zvg_86gofer_fail.t ............ skipped: Gofer DBI_AUTOPROXY
+t/zvg_87gofer_cache.t ........... skipped: Gofer DBI_AUTOPROXY
+t/zvg_90sql_type_cast.t ......... ok
+t/zvn_48dbi_dbd_sqlengine.t ..... ok
+t/zvn_49dbd_file.t .............. ok
+t/zvn_50dbm_simple.t ............ ok
+t/zvn_51dbm_file.t .............. ok
+t/zvn_52dbm_complex.t ........... skipped: DBI::SQL::Nano is being used
+t/zvn_85gofer.t ................. ok
+t/zvp_01basics.t ................ ok
+t/zvp_02dbidrv.t ................ ok
+t/zvp_03handle.t ................ ok
+t/zvp_04mods.t .................. ok
+t/zvp_05concathash.t ............ ok
+t/zvp_06attrs.t ................. ok
+t/zvp_07kids.t .................. skipped: $h->{Kids} attribute not supported for DBI::PurePerl
+t/zvp_08keeperr.t ............... ok
+t/zvp_09trace.t ................. ok
+t/zvp_10examp.t ................. ok
+t/zvp_11fetch.t ................. ok
+t/zvp_12quote.t ................. ok
+t/zvp_13taint.t ................. skipped: Taint attributes not supported with DBI::PurePerl
+t/zvp_14utf8.t .................. ok
+t/zvp_15array.t ................. ok
+Possible precedence issue with control flow operator at ./t/16destroy.t line 81.
+t/zvp_16destroy.t ............... ok
+t/zvp_19fhtrace.t ............... ok
+t/zvp_20meta.t .................. ok
+t/zvp_30subclass.t .............. ok
+t/zvp_31methcache.t ............. ok
+t/zvp_35thrclone.t .............. ok
+t/zvp_40profile.t ............... skipped: profiling not supported for DBI::PurePerl
+t/zvp_41prof_dump.t ............. skipped: profiling not supported for DBI::PurePerl
+t/zvp_42prof_data.t ............. skipped: profiling not supported for DBI::PurePerl
+t/zvp_43prof_env.t .............. skipped: profiling not supported for DBI::PurePerl
+t/zvp_48dbi_dbd_sqlengine.t ..... ok
+t/zvp_49dbd_file.t .............. ok
+t/zvp_50dbm_simple.t ............ ok
+t/zvp_51dbm_file.t .............. ok
+t/zvp_52dbm_complex.t ........... skipped: DBI::SQL::Nano is being used
+t/zvp_60preparse.t .............. skipped: preparse not supported for DBI::PurePerl
+t/zvp_65transact.t .............. ok
+t/zvp_70callbacks.t ............. skipped: $h->{Callbacks} attribute not supported for DBI::PurePerl
+t/zvp_72childhandles.t .......... ok
+t/zvp_80proxy.t ................. skipped: modules required for proxy are probably not installed (e.g., RPC/PlClient.pm)
+t/zvp_85gofer.t ................. ok
+t/zvp_86gofer_fail.t ............ skipped: requires Callbacks which are not supported with PurePerl
+
+#   Failed test 'should make 1 round trip'
+#   at ./t/87gofer_cache.t line 70.
+#          got: '1'
+#     expected: '0'
+
+#   Failed test at ./t/87gofer_cache.t line 72.
+#          got: '0'
+#     expected: '1'
+
+#   Failed test at ./t/87gofer_cache.t line 73.
+#          got: '2'
+#     expected: '1'
+
+#   Failed test at ./t/87gofer_cache.t line 74.
+#          got: '2'
+#     expected: '1'
+
+#   Failed test 'should make 1 round trip'
+#   at ./t/87gofer_cache.t line 70.
+#          got: '1'
+#     expected: '0'
+
+#   Failed test at ./t/87gofer_cache.t line 72.
+#          got: '0'
+#     expected: '1'
+
+#   Failed test at ./t/87gofer_cache.t line 73.
+#          got: '2'
+#     expected: '1'
+
+#   Failed test at ./t/87gofer_cache.t line 74.
+#          got: '2'
+#     expected: '1'
+# Looks like you failed 8 tests of 47.
+t/zvp_87gofer_cache.t ........... 
+Dubious, test returned 8 (wstat 2048, 0x800)
+Failed 8/47 subtests 
+t/zvp_90sql_type_cast.t ......... ok
+t/zvxgn_48dbi_dbd_sqlengine.t ... ok
+t/zvxgn_49dbd_file.t ............ ok
+t/zvxgn_50dbm_simple.t .......... ok
+t/zvxgn_51dbm_file.t ............ ok
+t/zvxgn_52dbm_complex.t ......... skipped: DBI::SQL::Nano is being used
+t/zvxgn_85gofer.t ............... ok
+t/zvxgnp_48dbi_dbd_sqlengine.t .. ok
+t/zvxgnp_49dbd_file.t ........... ok
+t/zvxgnp_50dbm_simple.t ......... ok
+t/zvxgnp_51dbm_file.t ........... ok
+t/zvxgnp_52dbm_complex.t ........ skipped: DBI::SQL::Nano is being used
+t/zvxgnp_85gofer.t .............. ok
+t/zvxgp_01basics.t .............. ok
+t/zvxgp_02dbidrv.t .............. ok
+t/zvxgp_03handle.t .............. ok
+t/zvxgp_04mods.t ................ ok
+t/zvxgp_05concathash.t .......... ok
+t/zvxgp_06attrs.t ............... ok
+t/zvxgp_07kids.t ................ skipped: $h->{Kids} attribute not supported for DBI::PurePerl
+t/zvxgp_08keeperr.t ............. ok
+t/zvxgp_09trace.t ............... ok
+t/zvxgp_10examp.t ............... ok
+t/zvxgp_11fetch.t ............... ok
+t/zvxgp_12quote.t ............... ok
+t/zvxgp_13taint.t ............... skipped: Taint attributes not supported with DBI::PurePerl
+t/zvxgp_14utf8.t ................ ok
+t/zvxgp_15array.t ............... ok
+Possible precedence issue with control flow operator at ./t/16destroy.t line 81.
+t/zvxgp_16destroy.t ............. ok
+t/zvxgp_19fhtrace.t ............. ok
+t/zvxgp_20meta.t ................ ok
+t/zvxgp_30subclass.t ............ ok
+t/zvxgp_31methcache.t ........... ok
+t/zvxgp_35thrclone.t ............ ok
+t/zvxgp_40profile.t ............. skipped: profiling not supported for DBI::PurePerl
+t/zvxgp_41prof_dump.t ........... skipped: profiling not supported for DBI::PurePerl
+t/zvxgp_42prof_data.t ........... skipped: profiling not supported for DBI::PurePerl
+t/zvxgp_43prof_env.t ............ skipped: profiling not supported for DBI::PurePerl
+t/zvxgp_48dbi_dbd_sqlengine.t ... ok
+t/zvxgp_49dbd_file.t ............ ok
+t/zvxgp_50dbm_simple.t .......... ok
+t/zvxgp_51dbm_file.t ............ ok
+t/zvxgp_52dbm_complex.t ......... skipped: DBI::SQL::Nano is being used
+t/zvxgp_60preparse.t ............ skipped: preparse not supported for DBI::PurePerl
+t/zvxgp_65transact.t ............ skipped: Transactions not supported by DBD::Gofer
+t/zvxgp_70callbacks.t ........... skipped: $h->{Callbacks} attribute not supported for DBI::PurePerl
+t/zvxgp_72childhandles.t ........ ok
+t/zvxgp_80proxy.t ............... skipped: modules required for proxy are probably not installed (e.g., RPC/PlClient.pm)
+t/zvxgp_85gofer.t ............... ok
+t/zvxgp_86gofer_fail.t .......... skipped: requires Callbacks which are not supported with PurePerl
+t/zvxgp_87gofer_cache.t ......... skipped: Gofer DBI_AUTOPROXY
+t/zvxgp_90sql_type_cast.t ....... ok
+t/zvxnp_48dbi_dbd_sqlengine.t ... ok
+t/zvxnp_49dbd_file.t ............ ok
+t/zvxnp_50dbm_simple.t .......... ok
+t/zvxnp_51dbm_file.t ............ ok
+t/zvxnp_52dbm_complex.t ......... skipped: DBI::SQL::Nano is being used
+t/zvxnp_85gofer.t ............... ok
+
+Test Summary Report
+-------------------
+t/87gofer_cache.t             (Wstat: 2048 Tests: 47 Failed: 8)
+  Failed tests:  14-17, 31-34
+  Non-zero exit status: 8
+t/zvp_87gofer_cache.t         (Wstat: 2048 Tests: 47 Failed: 8)
+  Failed tests:  14-17, 31-34
+  Non-zero exit status: 8
+Result: FAIL
+Failed 2/182 test programs. 16/8553 subtests failed.
+test.pl 
+DBI test application $Revision: 12537 $
+Switch: DBI 1.623 by Tim Bunce, 1.623
+Available Drivers: DBM, ExampleP, File, Gofer, Proxy, Sponge
+dbi:ExampleP:: testing 3 sets of 20 connections:
+Connecting... 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 
+Disconnecting...
+Connecting... 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 
+Disconnecting...
+Connecting... 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 
+Disconnecting...
+
+test.pl done
--- a/components/perl_modules/authen-pam/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/authen-pam/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -38,9 +38,6 @@
 
 TPNO=			9303
 
-# build threaded 5.12 support too
-PERL_VERSIONS += 5.12-mt
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/makemaker.mk
@@ -56,24 +53,19 @@
 # This does not have a master test file because the test must be run manually.
 COMPONENT_TEST_TARGETS = test
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
 COMPONENT_POST_TEST_ACTION= \
     PERL5LIB=$(@D)/blib/lib:$(@D)/blib/arch $(PERL) test/PAM_NO_AUTHTOK_CHECK.pl
 
-#
 # Must have xml-parser installed for these tests to pass.
-#
 test:		
 		if tty -s; then  $(MAKE) realtest; else echo 'Skipping tests'; fi
 
-realtest:	$(TEST_32_and_64)
+realtest:	$(TEST_64)
 
 system-test:	$(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
 REQUIRED_PACKAGES += system/library
--- a/components/perl_modules/authen-pam/authen-pam-PERLVER.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/authen-pam/authen-pam-PERLVER.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -18,20 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform depend pkg.debug.depend.path=usr.*/5.12-mt/bin ->  set pkg.debug.depend.file perl-threaded>
-<transform depend pkg.debug.depend.path=(usr.*/5.12)-mt(/bin) ->  set pkg.debug.depend.path %<1>%<2>  >
-#
-<transform file path=usr.*/5.12-mt/(man|XML)/.* -> drop >
-# convert 5.12-mt to 5.12 in the path because that is where the threaded
-# perl bits really are.
-<transform file path=(usr.*/5.12)-mt(/.+) -> set path %<1>%<2>>
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-<transform set name=pkg.fmri value=(.*)512-mt(.+) -> set value %<1>threaded-512%<2>>
-<transform depend fmri=(.*)512-mt(.*) -> set fmri %<1>threaded-512%<2>>
-<transform depend predicate=(.*)512-mt(.*) -> set predicate %<1>threaded-512%<2>>
 set name=pkg.fmri \
     value=pkg:/library/perl-5/authen-pam-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Authen::PAM - PAM Perl Module"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/authen-pam/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,3 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- a/components/perl_modules/cssh/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/cssh/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -38,28 +38,24 @@
 
 TPNO=			13257
 
-PERL_VERSIONS=5.12 5.22
-
 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_64)
+
+install:	$(INSTALL_64)
 
-install:	$(INSTALL_32_and_64)
-
+# There are tests but:
+#   Can't locate Test/Trap.pm
+# they just fail.
 test:		$(NO_TESTS)
 
 system-test:    $(NO_TESTS)
 
-
-REQUIRED_PACKAGES += library/perl-5/perl-x11-protocol-512
-REQUIRED_PACKAGES += library/perl-5/perl-x11-protocol-522
-REQUIRED_PACKAGES += library/perl5/perl-tk-512
-REQUIRED_PACKAGES += library/perl5/perl-tk-522
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-522
+REQUIRED_PACKAGES += library/perl-5/perl-x11-protocol
+REQUIRED_PACKAGES += library/perl-5/perl-tk
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/cssh/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,1 @@
+terminal/[email protected],5.12-5.12.0.0.0.98.0
--- a/components/perl_modules/dbd-sqlite/DBD-SQLite-PERLVER.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/dbd-sqlite/DBD-SQLite-PERLVER.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -23,8 +23,6 @@
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 <transform file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/.*\.h$ -> default facet.devel all>
-# Perl 5.20 does not produce empty bootstrap files
-<transform file path=usr/perl5/vendor_perl/5.20/.*\.bs$ -> drop>
 set name=pkg.fmri \
     value=pkg:/library/perl-5/dbd-sqlite-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl SQLite Database Interface"
@@ -54,7 +52,6 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/SQLite/VirtualTable/FileContent.pm
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/DBD/SQLite/VirtualTable/PerlData.pm
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBD/SQLite/.packlist
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBD/SQLite/SQLite.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBD/SQLite/SQLite.so
 license DBD-SQLite.license license=Artistic
 
--- a/components/perl_modules/dbd-sqlite/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/dbd-sqlite/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -34,9 +34,6 @@
 
 TPNO=			24450
 
-# Limit packaging to only these perls.
-PERL_VERSIONS=5.12 5.20
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/makemaker.mk
@@ -44,41 +41,34 @@
 COMPONENT_TEST_TARGETS = test
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 COMPONENT_TEST_TRANSFORMS += \
-	'-e "/^Running Mkbootstrap/d" ' '-e "s/mY cOmMeNt/this is executed on older perl releases only/" ' \
-	'-e "/^chmod.*\.bs$$/d" '       '-e "s/mY cOmMeNt/this is executed on older perl releases only/" ' \
+	'-e "/^Running Mkbootstrap/d" ' \
 	'-e "s/[0-9][0-9]* wallclock secs (.*CPU)$$/<TIMINGS REMOVED>/" ' \
-	'-e "s/^PERL_DL_NONLAZY=1 \$$(PERL).*/<PERL TEST INVOCATION REMOVED>/" ' \
+	'-e "/^PERL_DL_NONLAZY/d" ' \
 	'-e "s/^\(\# sqlite_version=\)[0-9][0-9.]*/\1<USED SQLITE VERSION REMOVED>/" ' \
-	'-e "s/^\(\# \$$DBI::VERSION=\)[0-9][0-9.]*/\1<REPORTED DBI VERSION REMOVED>/" '
+	'-e "s/^\(\# \$$DBI::VERSION=\)[0-9][0-9.]*/\1<REPORTED DBI VERSION REMOVED>/" ' \
+	'-e "/^chmod/d" '
 
 # This makes the configuration process a bit more chatty
 COMPONENT_CONFIGURE_ENV += AUTOMATED_TESTING=1
+
 LICENSE=DBD-SQLite.license
+CLEAN_PATHS += $(LICENSE)
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# I have to list the targets directly instead of using $(BUILD_32_AND_64) in
-# order to avoid building DBD::SQLite for perl 5.12-mt which does not have DBI
-# available
-#
 $(LICENSE): $(LICENSE).template
 	$(PERL) -pe 's/COMPONENT_VERSION/$(COMPONENT_VERSION)/g' "$<" > "[email protected]"
 
-build:		$(BUILD_DIR)/$(MACH32)-5.12/.built \
-		$(BUILD_DIR)/$(MACH64)-5.20/.built \
+# DBI must be installed to build
+build:		$(BUILD_64) \
 		$(LICENSE)
 
-install:	$(BUILD_DIR)/$(MACH32)-5.12/.installed \
-		$(BUILD_DIR)/$(MACH64)-5.20/.installed
+install:	$(INSTALL_64)
 
-test:		$(BUILD_DIR)/$(MACH32)-5.12/.tested-and-compared \
-		$(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared
+test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
-clean::		$(LICENSE)
-
 REQUIRED_PACKAGES += database/sqlite-3
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += library/perl-5/database
 REQUIRED_PACKAGES += system/library
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/dbd-sqlite/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,2 @@
+library/perl-5/[email protected]48,5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- a/components/perl_modules/dbd-sqlite/test/results-all.master	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/dbd-sqlite/test/results-all.master	Mon Apr 18 13:01:02 2016 -0700
@@ -1,5 +1,4 @@
 make[1]: Entering directory '$(@D)'
-<PERL TEST INVOCATION REMOVED>
 # $DBI::VERSION=<REPORTED DBI VERSION REMOVED>
 # Compile Options:
 #   ENABLE_FTS3
--- a/components/perl_modules/gettext/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/gettext/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -52,14 +52,10 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
-test:		$(TEST_32_and_64)
+test:		$(TEST_64)
 
 system-test:	$(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/gettext/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,2 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- a/components/perl_modules/net-ssleay/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/net-ssleay/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -45,6 +45,8 @@
 # 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" |
+# Test failures.  keep going
+COMPONENT_TEST_ARGS = -k -i
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 COMPONENT_TEST_TARGETS = test
 COMPONENT_TEST_TRANSFORMS += \
@@ -59,17 +61,14 @@
 	'-e "/^chmod /d" ' \
 	'-e "/^Use of uninitialized/d" '
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
-test:		$(TEST_32_and_64)
+test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
 
 REQUIRED_PACKAGES += library/security/openssl
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
 REQUIRED_PACKAGES += system/library
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/net-ssleay/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,2 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- a/components/perl_modules/perl-tk/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/perl-tk/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+BUILD_BITS= 64
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		Tk
@@ -42,27 +43,25 @@
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/makemaker.mk
 
-# override LIBS so that the Tk.so RunPATH doesn't get set.
-CONFIGURE_OPTIONS += LIBS="-lXft -lX11 -lfontconfig -lm -lc"
+# This component loves openwin.
+CONFIGURE_OPTIONS += X11INC=/usr/X11/include
+CONFIGURE_OPTIONS += X11LIB=/usr/X11/lib/64
 
-# Disbale ASLR for this module.
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 COMPONENT_TEST_TARGETS = test
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
+
+install:	$(INSTALL_64)
 
-install:	$(INSTALL_32_and_64)
-
-# Testing suspended until 32-bit is gone: 22909079
-#test:		$(TEST_32_and_64)
+# Tests work but require an X display and for some reason does not like
+# our test harness.  Unable to connect to X display.
+# 23107507 perl-tk tests fail to work inside the userland test framework
+test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
-
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
 REQUIRED_PACKAGES += runtime/tk-8
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/fontconfig
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/perl-tk/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,4 @@
+library/perl5/[email protected],5.12-5.12.0.0.0.98.0 library/perl-5/perl-tk
+library/perl5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl5/[email protected],5.12-5.12.0.0.0.98.0 library/perl-5/perl-tk-522
--- a/components/perl_modules/perl-tk/tk-PERLVER.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/perl-tk/tk-PERLVER.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, 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/perl5/perl-tk-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/perl-5/perl-tk-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="CPAN Perl Tk module"
 set name=pkg.description \
     value="perl-tk provides a number of (GUI) widgets commonly needed to develop desktop applications such as buttons, menu, canvas, text, frame, label etc."
--- a/components/perl_modules/perl-x11-protocol/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/perl-x11-protocol/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -47,18 +47,13 @@
 COMPONENT_TEST_TRANSFORMS += \
 	'-e "/^PERL_DL_NONLAZY/d" '
 
-build:		$(BUILD_32_and_64)
-
-install:	$(INSTALL_32_and_64)
+build:		$(BUILD_64)
 
-# Testing suspended.  These work but they require an interactive X11 display.
-# 22909079
-#test:		$(TEST_32_and_64)
+install:	$(INSTALL_64)
+
+# These work but require an interactive X11 display.
+test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
-
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
 REQUIRED_PACKAGES += system/library
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/perl-x11-protocol/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,2 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- a/components/perl_modules/pmtools/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/pmtools/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -42,16 +42,12 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
 system-test:    $(NO_TESTS)
 
-
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
 REQUIRED_PACKAGES += system/core-os
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/pmtools/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,2 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- a/components/perl_modules/xml-libxml/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/xml-libxml/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -37,9 +37,6 @@
 
 TPNO=			22635
 
-# build threaded 5.12 support too
-PERL_VERSIONS += 5.12-mt
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/makemaker.mk
@@ -59,17 +56,14 @@
 	'-e "/\(^t\/90\).*/d" ' \
 	'-e "/\(^Hexadecimal\).*/d" '
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
-test:		$(TEST_32_and_64)
+test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
 
 REQUIRED_PACKAGES += library/libxml2
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
 REQUIRED_PACKAGES += system/library
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/xml-libxml/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,3 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- a/components/perl_modules/xml-libxml/xml-libxml-GENFRAG.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-depend type=conditional fmri=library/perl-5/xml-libxml-threaded-512 \
-    predicate=runtime/perl-threaded-512
--- a/components/perl_modules/xml-libxml/xml-libxml-PERLVER.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/xml-libxml/xml-libxml-PERLVER.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -18,20 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 #
-<transform depend pkg.debug.depend.path=usr.*/5.12-mt/bin ->  set pkg.debug.depend.file perl-threaded>
-<transform depend pkg.debug.depend.path=(usr.*/5.12)-mt(/bin) ->  set pkg.debug.depend.path %<1>%<2>  >
-#
-<transform file path=usr.*/5.12-mt/(man|XML)/.* -> drop >
-# convert 5.12-mt to 5.12 in the path because that is where the threaded
-# perl bits really are.
-<transform file path=(usr.*/5.12)-mt(/.+) -> set path %<1>%<2>>
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-<transform set name=pkg.fmri value=(.*)512-mt(.+) -> set value %<1>threaded-512%<2>>
-<transform depend fmri=(.*)512-mt(.*) -> set fmri %<1>threaded-512%<2>>
-<transform depend predicate=(.*)512-mt(.*) -> set predicate %<1>threaded-512%<2>>
 set name=pkg.fmri \
     value=pkg:/library/perl-5/xml-libxml-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value=XML-LibXML
--- a/components/perl_modules/xml-namespacesupport/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/xml-namespacesupport/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -37,9 +37,6 @@
 
 TPNO=			12996
 
-# build threaded 5.12 support too
-PERL_VERSIONS += 5.12-mt
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/makemaker.mk
@@ -57,15 +54,10 @@
 	'-e "/^PERL_DL_NONLAZY/d" ' \
 	'-e "s|\(^Files=1,\sTests=48\).*|\1|" '
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
-test:		$(TEST_32_and_64)
+test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
-
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/xml-namespacesupport/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,3 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- a/components/perl_modules/xml-namespacesupport/xml-namespacesupport-GENFRAG.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-depend type=conditional fmri=library/perl-5/xml-namespacesupport-threaded-512 \
-    predicate=runtime/perl-threaded-512
--- a/components/perl_modules/xml-namespacesupport/xml-namespacesupport-PERLVER.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/xml-namespacesupport/xml-namespacesupport-PERLVER.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -18,20 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 #
-<transform depend pkg.debug.depend.path=usr.*/5.12-mt/bin ->  set pkg.debug.depend.file perl-threaded>
-<transform depend pkg.debug.depend.path=(usr.*/5.12)-mt(/bin) ->  set pkg.debug.depend.path %<1>%<2>  >
-#
-<transform file path=usr.*/5.12-mt/(man|XML)/.* -> drop >
-# convert 5.12-mt to 5.12 in the path because that is where the threaded
-# perl bits really are.
-<transform file path=(usr.*/5.12)-mt(/.+) -> set path %<1>%<2>>
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-<transform set name=pkg.fmri value=(.*)512-mt(.+) -> set value %<1>threaded-512%<2>>
-<transform depend fmri=(.*)512-mt(.*) -> set fmri %<1>threaded-512%<2>>
-<transform depend predicate=(.*)512-mt(.*) -> set predicate %<1>threaded-512%<2>>
 set name=pkg.fmri \
     value=pkg:/library/perl-5/xml-namespacesupport-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value=XML-NamespaceSupport
--- a/components/perl_modules/xml-parser/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/xml-parser/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -23,12 +23,6 @@
 # Copyright (c) 2011, 2016, 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
@@ -43,15 +37,6 @@
 
 TPNO=			9386
 
-###
-### Fix these IPS manifests once 5.12-mt is gone, 22909338
-###
-### Add forced IPS dependencies to all manifests: 22909291
-###
-
-# build threaded 5.12 support too
-PERL_VERSIONS += 5.12-mt
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/makemaker.mk
@@ -67,19 +52,13 @@
 	'-e "1,/^PERL_DL_NONLAZY/d" ' \
         '-e "s|\(^Files=\).*|\1|" '
 
-PKG_MACROS +=	PERL_A=$(shell arch)
-
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
-test:		$(TEST_32_and_64)
+test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
-
 REQUIRED_PACKAGES += library/expat
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
 REQUIRED_PACKAGES += system/library
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/xml-parser/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,3 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- a/components/perl_modules/xml-parser/xml-parser-512.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +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.12 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.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
-file path=usr/perl5/5.12/man/man3/XML::Parser::Style::Objects.3
-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_A)-solaris-64int/XML/Parser.pm
-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
-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
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-64int/auto/XML/Parser/.packlist
-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
-link path=usr/share/man/man3/XML::Parser::Style::Objects.3 \
-    target=../../../perl5/5.12/man/man3/XML::Parser::Style::Objects.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
-license xml-parser.license license=Artistic
-depend type=optional fmri=library/perl-5/[email protected]
--- a/components/perl_modules/xml-parser/xml-parser-512thread.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +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) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri \
-    value=pkg:/library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
-    value="XML::Parser Threaded - A Threaded 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.  Threaded version."
-set name=com.oracle.info.description \
-    value="the Perl-5.12-threaded XML::Parser 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.12/lib/$(PERL_A)-solaris-thread-multi-64int/perllocal.pod
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/Japanese_Encodings.msg
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/README
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/big5.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/euc-kr.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/ibm866.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/iso-8859-2.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/iso-8859-3.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/iso-8859-4.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/iso-8859-5.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/iso-8859-7.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/iso-8859-8.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/iso-8859-9.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/koi8-r.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/windows-1250.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/windows-1251.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/windows-1252.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/windows-1255.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/x-euc-jp-unicode.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/x-sjis-cp932.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/x-sjis-jdk117.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/x-sjis-jisx0221.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Encodings/x-sjis-unicode.enc
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Expat.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/LWPExternEnt.pl
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Style/Debug.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Style/Objects.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Style/Stream.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Style/Subs.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser/Style/Tree.pm
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/auto/XML/Parser/.packlist
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/auto/XML/Parser/Expat/Expat.bs
-file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/auto/XML/Parser/Expat/Expat.so
-license xml-parser.license license=Artistic
-
-# force a dependency on the Perl runtime
-depend type=require fmri=__TBD pkg.debug.depend.file=perl-threaded \
-    pkg.debug.depend.path=usr/perl5/5.12/bin
-
-# This is additional support to base perl 5.12
-depend type=require fmri=library/perl-5/xml-parser-512
-
-# force a dependency on the xml-parser package
-depend type=require \
-    fmri=library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/perl_modules/xml-parser/xml-parser-520.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +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.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-522.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +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, 2016, 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.22 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.22/man/man3/XML::Parser.3
-file path=usr/perl5/5.22/man/man3/XML::Parser::Expat.3
-file path=usr/perl5/5.22/man/man3/XML::Parser::Style::Debug.3
-file path=usr/perl5/5.22/man/man3/XML::Parser::Style::Objects.3
-file path=usr/perl5/5.22/man/man3/XML::Parser::Style::Stream.3
-file path=usr/perl5/5.22/man/man3/XML::Parser::Style::Subs.3
-file path=usr/perl5/5.22/man/man3/XML::Parser::Style::Tree.3
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser.pm
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/Japanese_Encodings.msg
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/README
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/big5.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/euc-kr.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/ibm866.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-2.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-3.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-4.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-5.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-7.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-8.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/iso-8859-9.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/koi8-r.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/windows-1250.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/windows-1251.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/windows-1252.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/windows-1255.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/x-euc-jp-unicode.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/x-sjis-cp932.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/x-sjis-jdk117.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/x-sjis-jisx0221.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Encodings/x-sjis-unicode.enc
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Expat.pm
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/LWPExternEnt.pl
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Style/Debug.pm
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Style/Objects.pm
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Style/Stream.pm
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Style/Subs.pm
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/XML/Parser/Style/Tree.pm
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-64/auto/XML/Parser/.packlist
-file path=usr/perl5/vendor_perl/5.22/$(PERL_A)-solaris-thread-multi-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-GENFRAG.p5m	Mon Apr 18 13:01:02 2016 -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, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the perl version agnostic package to component version 5.12.1 because
+# the desktop delivered it at that version instead of the component version
+<transform set name=pkg.fmri value=(pkg:/library/perl-5/xml-parser)@$(IPS_COMPONENT_VERSION),($(BUILD_VERSION)$) -> set value %<1>@5.12.1,%<2> >
+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"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/xml-parser/xml-parser-PERLVER.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,79 @@
+#
+# 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, 2016, 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-$(PLV)@$(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 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/$(PERLVER)/man/man3/XML::Parser.3
+file path=usr/perl5/$(PERLVER)/man/man3/XML::Parser::Expat.3
+file path=usr/perl5/$(PERLVER)/man/man3/XML::Parser::Style::Debug.3
+file path=usr/perl5/$(PERLVER)/man/man3/XML::Parser::Style::Objects.3
+file path=usr/perl5/$(PERLVER)/man/man3/XML::Parser::Style::Stream.3
+file path=usr/perl5/$(PERLVER)/man/man3/XML::Parser::Style::Subs.3
+file path=usr/perl5/$(PERLVER)/man/man3/XML::Parser::Style::Tree.3
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/Japanese_Encodings.msg
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/README
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/big5.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/euc-kr.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/ibm866.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-2.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-3.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-4.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-5.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-7.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-8.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/iso-8859-9.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/koi8-r.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/windows-1250.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/windows-1251.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/windows-1252.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/windows-1255.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/x-euc-jp-unicode.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/x-sjis-cp932.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/x-sjis-jdk117.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/x-sjis-jisx0221.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Encodings/x-sjis-unicode.enc
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Expat.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/LWPExternEnt.pl
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Style/Debug.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Style/Objects.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Style/Stream.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Style/Subs.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML/Parser/Style/Tree.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/XML/Parser/.packlist
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/XML/Parser/Expat/Expat.so
+license xml-parser.license license=Artistic
--- a/components/perl_modules/xml-parser/xml-parser.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +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.
-#
-
-# The version is specifically set until there is a version that is
-# greater than this due to the way xml-parser was originally delivered from
-# the desktop consolidation.
-set name=pkg.fmri value=pkg:/library/perl-5/[email protected],$(BUILD_VERSION)
-set name=pkg.summary \
-    value="XML::Parser - A perl module for parsing XML documents"
-set name=pkg.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 Perl XML::Parser module"
-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.consolidation value=$(CONSOLIDATION)
-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"
-
-# perl 5.12
-depend type=conditional fmri=library/perl-5/xml-parser-512 \
-    predicate=runtime/perl-512
-
-# 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 \
-    predicate=runtime/perl-threaded-512
--- a/components/perl_modules/xml-sax-base/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/xml-sax-base/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -38,9 +38,6 @@
 
 TPNO=			13137
 
-# build threaded 5.12 support too
-PERL_VERSIONS += 5.12-mt
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/makemaker.mk
@@ -56,15 +53,10 @@
 	'-e "/^PERL_DL_NONLAZY/d" ' \
 	'-e "s|\(^Files=\).*|\1|" '
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
-test:		$(TEST_32_and_64)
+test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
-
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/xml-sax-base/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,3 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- a/components/perl_modules/xml-sax-base/xml-sax-base-GENFRAG.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-depend type=conditional fmri=library/perl-5/xml-sax-base-threaded-512 \
-    predicate=runtime/perl-threaded-512
--- a/components/perl_modules/xml-sax-base/xml-sax-base-PERLVER.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/xml-sax-base/xml-sax-base-PERLVER.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -18,22 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-#
-<transform depend pkg.debug.depend.path=usr.*/5.12-mt/bin ->  set pkg.debug.depend.file perl-threaded>
-<transform depend pkg.debug.depend.path=(usr.*/5.12)-mt(/bin) ->  set pkg.debug.depend.path %<1>%<2>  >
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-<transform file path=usr.*/5.12-mt/(man|XML)/.* -> drop >
-# convert 5.12-mt to 5.12 in the path because that is where the threaded
-# perl bits really are.
-<transform file path=(usr.*/5.12)-mt(/.+) -> set path %<1>%<2>>
+
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-<transform set name=pkg.fmri value=(.*)512-mt(.+) -> set value %<1>threaded-512%<2>>
-<transform depend fmri=(.*)512-mt(.*) -> set fmri %<1>threaded-512%<2>>
-<transform depend predicate=(.*)512-mt(.*) -> set predicate %<1>threaded-512%<2>>
-<transform depend fmri=(.*)512-mt(.*) -> set fmri %<1>threaded-512%<2>>
-<transform depend predicate=(.*)512-mt(.*) -> set predicate %<1>threaded-512%<2>>
 set name=pkg.fmri \
     value=pkg:/library/perl-5/xml-sax-base-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value=XML-SAX-Base
--- a/components/perl_modules/xml-sax/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/xml-sax/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -37,9 +37,6 @@
 
 TPNO=			12998
 
-# build threaded 5.12 support too
-PERL_VERSIONS += 5.12-mt
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/makemaker.mk
@@ -58,15 +55,10 @@
 	'-e "s|\(^Files=14,\sTests=106\).*|\1|" ' \
 	'-e "/\(parsed\).*/d" '
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
-test:		$(TEST_32_and_64)
+test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
-
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/xml-sax/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,3 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- a/components/perl_modules/xml-sax/xml-sax-GENFRAG.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-depend type=conditional fmri=library/perl-5/xml-sax-threaded-512 \
-    predicate=runtime/perl-threaded-512
--- a/components/perl_modules/xml-sax/xml-sax-PERLVER.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/xml-sax/xml-sax-PERLVER.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -18,20 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 #
-<transform depend pkg.debug.depend.path=usr.*/5.12-mt/bin ->  set pkg.debug.depend.file perl-threaded>
-<transform depend pkg.debug.depend.path=(usr.*/5.12)-mt(/bin) ->  set pkg.debug.depend.path %<1>%<2>  >
-#
-<transform file path=usr.*/5.12-mt/(man|XML)/.* -> drop >
-# convert 5.12-mt to 5.12 in the path because that is where the threaded
-# perl bits really are.
-<transform file path=(usr.*/5.12)-mt(/.+) -> set path %<1>%<2>>
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-<transform set name=pkg.fmri value=(.*)512-mt(.+) -> set value %<1>threaded-512%<2>>
-<transform depend fmri=(.*)512-mt(.*) -> set fmri %<1>threaded-512%<2>>
-<transform depend predicate=(.*)512-mt(.*) -> set predicate %<1>threaded-512%<2>>
 set name=pkg.fmri \
     value=pkg:/library/perl-5/xml-sax-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value=XML-SAX
--- a/components/perl_modules/xml-simple/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/xml-simple/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -38,9 +38,6 @@
 
 TPNO=			17624
 
-# build threaded 5.12 support too
-PERL_VERSIONS += 5.12-mt
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/makemaker.mk
@@ -57,16 +54,11 @@
 	'-e "/^\#/d" ' \
 	'-e "s|\(^Files=\).*|\1|" '
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
 # Must have xml-parser installed for these tests to pass.
-test:		$(TEST_32_and_64)
+test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
-
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/perl-522
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/xml-simple/history	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,3 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
+library/perl-5/[email protected],5.12-5.12.0.0.0.98.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/perl_modules/xml-simple/patches/t-8_Namespaces.patch	Mon Apr 18 13:01:02 2016 -0700
@@ -0,0 +1,26 @@
+# Regex pattern needs updating for newer versions of perl.
+# This fix is from a newer version of this component.
+
+
+--- XML-Simple-2.20/t/8_Namespaces.t_orig	2012-06-20 03:00:21.000000000 -0700
++++ XML-Simple-2.20/t/8_Namespaces.t	2016-04-05 09:07:27.004767331 -0700
[email protected]@ -122,16 +122,16 @@
+ };
+ 
+ $xml = XMLout($opt);
+-like($xml, qr{
++like($xml, qr[
+   ^\s*<opt
+   (\s+{http://www.w3.org/2000/xmlns/}perl="http://www.perl.com/"
+   |\s+{http://www.perl.com/}attr="value"
+   |\s+bare="Beer!"){3}
+   \s*>
+-  \s*<{http://www.perl.com/}element\s*>data</{http://www.perl.com/}element\s*>
++  \s*<\{http://www.perl.com/\}element\s*>data</\{http://www.perl.com/\}element\s*>
+   \s*</opt>
+   \s*$
+-}sx, 'clarkian names not converted to qnames on output by default');
++]sx, 'clarkian names not converted to qnames on output by default');
+ 
+ 
+ # Confirm nsexpand option works on output
--- a/components/perl_modules/xml-simple/xml-simple-GENFRAG.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-depend type=conditional fmri=library/perl-5/xml-simple-threaded-512 \
-    predicate=runtime/perl-threaded-512
--- a/components/perl_modules/xml-simple/xml-simple-PERLVER.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/perl_modules/xml-simple/xml-simple-PERLVER.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -18,20 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 #
-<transform depend pkg.debug.depend.path=usr.*/5.12-mt/bin ->  set pkg.debug.depend.file perl-threaded>
-<transform depend pkg.debug.depend.path=(usr.*/5.12)-mt(/bin) ->  set pkg.debug.depend.path %<1>%<2>  >
-#
-<transform file path=usr.*/5.12-mt/(man|XML)/.* -> drop >
-# convert 5.12-mt to 5.12 in the path because that is where the threaded
-# perl bits really are.
-<transform file path=(usr.*/5.12)-mt(/.+) -> set path %<1>%<2>>
+
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-<transform set name=pkg.fmri value=(.*)512-mt(.+) -> set value %<1>threaded-512%<2>>
-<transform depend fmri=(.*)512-mt(.*) -> set fmri %<1>threaded-512%<2>>
-<transform depend predicate=(.*)512-mt(.*) -> set predicate %<1>threaded-512%<2>>
 set name=pkg.fmri \
     value=pkg:/library/perl-5/xml-simple-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
@@ -46,8 +37,6 @@
 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/$(PERLVER)/lib/$(PERL_ARCH)/perllocal.pod
 file path=usr/perl5/$(PERLVER)/man/man3/XML::Simple.3
 file path=usr/perl5/$(PERLVER)/man/man3/XML::Simple::FAQ.3
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/XML/Simple/.packlist
--- a/components/pkgbuild/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/pkgbuild/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -41,4 +41,4 @@
 # Required due to patches to configure and/or automake files.
 COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fi;)
 
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
--- a/components/rpm2cpio/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/rpm2cpio/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -65,4 +65,4 @@
 system-test:    $(NO_TESTS)
 
 
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
--- a/components/samba/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/samba/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -167,7 +167,7 @@
 CONFIGURE_ENV += 	CC="$(CC)"
 CONFIGURE_ENV += 	CPP="$(CC) -E"
 CONFIGURE_ENV += 	AWK=gawk
-CONFIGURE_ENV += 	PERL=$(PERL.5.20)
+CONFIGURE_ENV += 	PERL=$(PERL)
 CONFIGURE_ENV += 	PYTHONDIR="$(PYTHON_VENDOR_PACKAGES)"
 CONFIGURE_ENV += 	PYTHONARCHDIR="$(PYTHON_VENDOR_PACKAGES)/samba"
 CONFIGURE_ENV += 	LD="$(LD)"
@@ -291,7 +291,7 @@
 REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/print/cups-libs
 REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += service/security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/sendmail/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/sendmail/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -195,7 +195,7 @@
 REQUIRED_PACKAGES += library/libmilter
 REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/security/openssl
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/network
--- a/components/squid/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/squid/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -84,6 +84,7 @@
 CONFIGURE_OPTIONS += --with-pthreads
 CONFIGURE_OPTIONS += --without-nettle
 CONFIGURE_OPTIONS += --disable-arch-native
+CONFIGURE_OPTIONS += PERL=$(PERL)
 
 # Appends the following line to the end of the squid.conf configuration
 # file. This line is necessary for running squid for testing. 
@@ -92,6 +93,9 @@
 	(cd $(PROTO_DIR)/etc/squid ; \
  	echo '\ncache_effective_user webservd' >> squid.conf)
 
+# Adjust '#!/usr/bin/perl'
+PERL_SCRIPTS= $(PROTOUSRDIR)/squid/libexec/helper-mux.pl
+
 # To test manually follow along in the book
 # Squid Proxy Server 3.1 Beginner's Guide Page 34
 #
@@ -131,8 +135,7 @@
 
 REQUIRED_PACKAGES += library/libtool/libltdl
 REQUIRED_PACKAGES += library/security/openssl
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
--- a/components/subversion/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/subversion/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -45,6 +45,8 @@
 JAVA_ROOT = $(JAVA_HOME)
 PERL_VERSION.32 = 5.12
 PERL_VERSION.64 = 5.16
+PERL.5.12 = /usr/perl5/5.12/bin/perl
+PERL.5.16 = /usr/perl5/5.16/bin/perl
 PERL_VERSION = $(PERL_VERSION.$(BITS))
 PERL = $(PERL.$(PERL_VERSION))
 GNUCP = $(GNUBIN)/cp
--- a/components/texinfo/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/texinfo/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -48,6 +48,21 @@
 
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 
+# PERL_SCRIPTS_PROCESS needs to be the last COMPONENT_POST_INSTALL_ACTION
+COMPONENT_POST_INSTALL_ACTION = 
+
+COMPONENT_POST_INSTALL_ACTION += \
+	$(INSTALL) -m 0755 texi2html.pl $(PROTOUSRBINDIR)/texi2html;
+
+# Adjust '#!/usr/bin/perl'
+PERL_SCRIPTS= \
+	$(PROTOUSRBINDIR)/makeinfo \
+	$(PROTOUSRBINDIR)/pod2texi \
+	$(PROTOUSRBINDIR)/texi2any \
+	$(PROTOUSRBINDIR)/texi2html
+
+COMPONENT_POST_INSTALL_ACTION += $(PERL_SCRIPTS_PROCESS)
+
 COMPONENT_TEST_TRANSFORMS += \
 	'-e "s|^.*$(CC).*$$|XXX_CC_XXX|g" ' \
 	'-e "s|^.*$(CXX).*$$|XXX_CC_XXX|g" ' \
@@ -56,10 +71,11 @@
 	'-e "s|^make.*: Nothing to be.*$$|XXX_CC_XXX|g" ' \
 	'-e "s|^make.*: Leaving directory.*$$|XXX_CC_XXX|g" ' \
 	'-e "s|^make.*: Entering directory.*$$|XXX_CC_XXX|g" ' \
+	'-e "s|.*ginstall.*$$|XXX_CC_XXX|g" ' \
 	'-e "/^XXX_CC_XXX$$/d" '
 
 REQUIRED_PACKAGES += library/ncurses
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += shell/bash
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/texinfo/test/results-64.master	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/texinfo/test/results-64.master	Mon Apr 18 13:01:02 2016 -0700
@@ -163,12 +163,6 @@
 Making check in po_document
 Making check in tp
 Making check in .
-/usr/bin/ginstall -c -m 644 $(SOURCE_DIR)/tp/t/include_reference/f--ile.png t/include_dir/f--ile.png
-/usr/bin/ginstall -c -m 644 $(SOURCE_DIR)/tp/t/include_reference/f--ile.txt t/include_dir/f--ile.txt
-/usr/bin/ginstall -c -m 644 $(SOURCE_DIR)/tp/t/include_reference/figure.txt t/include_dir/figure.txt
-/usr/bin/ginstall -c -m 644 $(SOURCE_DIR)/tp/t/include_reference/inc_file.texi t/include_dir/inc_file.texi
-/usr/bin/ginstall -c -m 644 $(SOURCE_DIR)/tp/t/include_reference/incl-incl.txi t/include_dir/incl-incl.txi
-/usr/bin/ginstall -c -m 644 $(SOURCE_DIR)/tp/t/include_reference/macro_included.texi t/include_dir/macro_included.texi
 /usr/gnu/bin/make  check-TESTS
 ============================================================================
 Testsuite summary for GNU Texinfo 6.0
--- a/components/texinfo/texinfo.p5m	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/texinfo/texinfo.p5m	Mon Apr 18 13:01:02 2016 -0700
@@ -51,7 +51,7 @@
 file path=usr/bin/pod2texi
 file path=usr/bin/texi2any
 file path=usr/bin/texi2dvi
-file texi2html.pl path=usr/bin/texi2html
+file path=usr/bin/texi2html
 file path=usr/bin/texi2pdf
 file path=usr/bin/texindex
 dir  path=usr/share/info
--- a/components/w3m/Makefile	Fri Apr 15 00:25:15 2016 -0700
+++ b/components/w3m/Makefile	Mon Apr 18 13:01:02 2016 -0700
@@ -75,6 +75,6 @@
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140
 REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += x11/library/libx11
--- a/make-rules/makemaker.mk	Fri Apr 15 00:25:15 2016 -0700
+++ b/make-rules/makemaker.mk	Mon Apr 18 13:01:02 2016 -0700
@@ -23,81 +23,53 @@
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-# Perl 5.12 and older are 32-bit only.
-# Perl 5.20 and newer are 64-bit only.
+# makemaker.mk is used to build, install, test perl modules for
+# each version of perl.
+# Packaging these multiple versions is still handled by ips.mk.
+# Look under perl_modules for examples of usage.
 
-COMMON_PERL_ENV +=	MAKE=$(GMAKE)
-COMMON_PERL_ENV +=	PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:$(PATH)
-COMMON_PERL_ENV +=	LANG=""
-COMMON_PERL_ENV +=	CC="$(CC)"
-COMMON_PERL_ENV +=	CFLAGS="$(PERL_OPTIMIZE)"
+# Multiple versions of perl processing is achieved by listing targets
+# for each version and adding BUILD_64/INSTALL_64 targets below.
+# Example:
+# $(BUILD_DIR)/$(MACH64)-5.24/.configured: PERL_VERSION=5.24
+# $(BUILD_DIR)/$(MACH64)-5.24/.configured: BITS=64
+# BUILD_64 +=     $(BUILD_DIR)/$(MACH64)-5.24/.built
+# INSTALL_64 +=   $(BUILD_DIR)/$(MACH64)-5.24/.installed
+# TEST_64 +=      $(BUILD_DIR)/$(MACH64)-5.24/.tested
+# TEST_64 +=      $(BUILD_DIR)/$(MACH64)-5.24/.tested-and-compared
+# and so on.
+
+COMMON_PERL_ENV += MAKE=$(GMAKE)
+COMMON_PERL_ENV += PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:$(PATH)
+COMMON_PERL_ENV += LANG=""
+COMMON_PERL_ENV += CC="$(CC)"
+COMMON_PERL_ENV += CFLAGS="$(PERL_OPTIMIZE)"
 
 # Yes.  Perl is just scripts, for now, but we need architecture
 # directories so that it populates all architecture prototype
 # directories.
 
-$(BUILD_DIR)/$(MACH32)-5.12/.configured:	PERL_VERSION=5.12
-$(BUILD_DIR)/$(MACH32)-5.12/.configured:	BITS=32
-$(BUILD_DIR)/$(MACH32)-5.12-mt/.configured:	PERL_VERSION=5.12-mt
-$(BUILD_DIR)/$(MACH32)-5.12-mt/.configured:	BITS=32
-$(BUILD_DIR)/$(MACH64)-5.20/.configured:	PERL_VERSION=5.20
-$(BUILD_DIR)/$(MACH64)-5.20/.configured:	BITS=64
-$(BUILD_DIR)/$(MACH64)-5.22/.configured:	PERL_VERSION=5.22
-$(BUILD_DIR)/$(MACH64)-5.22/.configured:	BITS=64
-
+$(BUILD_DIR)/$(MACH64)-5.22/.configured: PERL_VERSION=5.22
+$(BUILD_DIR)/$(MACH64)-5.22/.configured: BITS=64
 
-$(BUILD_DIR)/$(MACH32)-5.12/.tested:	PERL_VERSION=5.12
-$(BUILD_DIR)/$(MACH32)-5.12/.tested:	BITS=32
-$(BUILD_DIR)/$(MACH32)-5.12-mt/.tested:	PERL_VERSION=5.12-mt
-$(BUILD_DIR)/$(MACH32)-5.12-mt/.tested:	BITS=32
-$(BUILD_DIR)/$(MACH64)-5.20/.tested:	PERL_VERSION=5.20
-$(BUILD_DIR)/$(MACH64)-5.20/.tested:	BITS=64
-$(BUILD_DIR)/$(MACH64)-5.22/.tested:	PERL_VERSION=5.22
-$(BUILD_DIR)/$(MACH64)-5.22/.tested:	BITS=64
-
+$(BUILD_DIR)/$(MACH64)-5.22/.tested: PERL_VERSION=5.22
+$(BUILD_DIR)/$(MACH64)-5.22/.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
-$(BUILD_DIR)/$(MACH32)-5.12-mt/.tested-and-compared:	PERL_VERSION=5.12-mt
-$(BUILD_DIR)/$(MACH32)-5.12-mt/.tested-and-compared:	BITS=32
-$(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared:	PERL_VERSION=5.20
-$(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared:	BITS=64
-$(BUILD_DIR)/$(MACH64)-5.22/.tested-and-compared:	PERL_VERSION=5.22
-$(BUILD_DIR)/$(MACH64)-5.22/.tested-and-compared:	BITS=64
-
+$(BUILD_DIR)/$(MACH64)-5.22/.tested-and-compared: PERL_VERSION=5.22
+$(BUILD_DIR)/$(MACH64)-5.22/.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
-$(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested:	PERL_VERSION=5.12-mt
-$(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested:	BITS=32
-$(BUILD_DIR)/$(MACH64)-5.20/.system-tested:	PERL_VERSION=5.20
-$(BUILD_DIR)/$(MACH64)-5.20/.system-tested:	BITS=64
-$(BUILD_DIR)/$(MACH64)-5.22/.system-tested:	PERL_VERSION=5.22
-$(BUILD_DIR)/$(MACH64)-5.22/.system-tested:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.22/.system-tested: PERL_VERSION=5.22
+$(BUILD_DIR)/$(MACH64)-5.22/.system-tested: BITS=64
 
+$(BUILD_DIR)/$(MACH64)-5.22/.system-tested-and-compared: PERL_VERSION=5.22
+$(BUILD_DIR)/$(MACH64)-5.22/.system-tested-and-compared: 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
-$(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested-and-compared:	PERL_VERSION=5.12-mt
-$(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested-and-compared:	BITS=32
-$(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_DIR)/$(MACH64)-5.22/.system-tested-and-compared:	PERL_VERSION=5.22
-$(BUILD_DIR)/$(MACH64)-5.22/.system-tested-and-compared:	BITS=64
-
+BUILD_64 =	$(BUILD_DIR)/$(MACH64)-5.22/.built
 
-BUILD_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.built
-BUILD_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.built
-BUILD_64 =	$(BUILD_DIR)/$(MACH64)-5.20/.built
-BUILD_64 +=	$(BUILD_DIR)/$(MACH64)-5.22/.built
+INSTALL_64 =	$(BUILD_DIR)/$(MACH64)-5.22/.installed
 
-INSTALL_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.installed
-INSTALL_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.installed
-INSTALL_64 =	$(BUILD_DIR)/$(MACH64)-5.20/.installed
-INSTALL_64 +=	$(BUILD_DIR)/$(MACH64)-5.22/.installed
-
-COMPONENT_CONFIGURE_ENV +=	$(COMMON_PERL_ENV)
-COMPONENT_CONFIGURE_ENV +=	PERL="$(PERL)"
+COMPONENT_CONFIGURE_ENV += $(COMMON_PERL_ENV)
+COMPONENT_CONFIGURE_ENV += PERL="$(PERL)"
 $(BUILD_DIR)/%/.configured:	$(SOURCE_DIR)/.prep
 	($(RM) -r $(@D) ; $(MKDIR) $(@D))
 	$(CLONEY) $(SOURCE_DIR) $(@D)
@@ -145,27 +117,15 @@
 
 # determine the type of tests we want to run.
 ifeq ($(strip $(wildcard $(COMPONENT_TEST_RESULTS_DIR)/results-*.master)),)
-TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.tested
-TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.tested
-TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.20/.tested
-TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.22/.tested
+TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.22/.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.20/.tested-and-compared
-TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.22/.tested-and-compared
+TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.22/.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.20/.system-tested
-SYSTEM_TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.22/.system-tested
+SYSTEM_TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.22/.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.20/.system-tested-and-compared
-SYSTEM_TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.22/.system-tested-and-compared
+SYSTEM_TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.22/.system-tested-and-compared
 endif
 
 # test the built source
@@ -234,15 +194,6 @@
 	$(MAKE) PARFAIT_BUILD=yes parfait
 endif
 
-ifneq ($(findstring 5.12, $(PERL_VERSIONS)),)
-REQUIRED_PACKAGES += runtime/perl-512
-endif
-ifneq ($(findstring 5.12-mt, $(PERL_VERSIONS)),)
-REQUIRED_PACKAGES += runtime/perl-threaded-512
-endif
-ifneq ($(findstring 5.20, $(PERL_VERSIONS)),)
-REQUIRED_PACKAGES += runtime/perl-520
-endif
 ifneq ($(findstring 5.22, $(PERL_VERSIONS)),)
 REQUIRED_PACKAGES += runtime/perl-522
 endif
--- a/make-rules/shared-macros.mk	Fri Apr 15 00:25:15 2016 -0700
+++ b/make-rules/shared-macros.mk	Mon Apr 18 13:01:02 2016 -0700
@@ -574,18 +574,22 @@
 # This is the default BUILD version of perl
 # Not necessarily the system's default version, i.e. /usr/bin/perl
 PERL_VERSION ?= 5.22
-
-PERL_VERSIONS = 5.12 5.20 5.22
+PERL_VERSION_NODOT = $(subst .,,$(PERL_VERSION))
 
-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
+# Used for versionless perl packages.  Processed by ips.mk to stamp out
+# multiple packages for each version of perl listed here.  Used by
+# perl_modules/* but also used for those components that deliver a perl
+# package like graphviz and openscap.
+PERL_VERSIONS = 5.22
+
 PERL.5.22 =     /usr/perl5/5.22/bin/perl
 
+# Use these in a component's Makefile for building and packaging with the
+# BUILD's default perl and the package it comes from.
 PERL =          $(PERL.$(PERL_VERSION))
 PERL_PKG =	$(PERL_VERSION:5.%=runtime/perl-5%)
 
+# PERL_ARCH is perl's architecture string.  Use in ips manifests.
 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
@@ -598,6 +602,31 @@
 PKG_MACROS +=   PERL_ARCH=$(PERL_ARCH)
 PKG_MACROS +=   PERL_VERSION=$(PERL_VERSION)
 
+# If the component has perl scripts then the first line should probably
+# point at the userland default build perl so as not to be influenced
+# by the ips perl mediator.
+# In the component's Makefile define PERL_SCRIPTS with a list of files
+# to be editted.
+
+# Edit the leading #!/usr/bin/perl line in perl scripts to use the
+# BUILD's $(PERL).
+PERL_SCRIPT_SHEBANG_FIX_FUNC = \
+	$(GSED) -i \
+		-e '[email protected]/usr/bin/[email protected]$(PERL)@' \
+		-e '[email protected]/usr/perl5/bin/[email protected]$(PERL)@' \
+		-e '[email protected]/usr/bin/env\ [email protected]$(PERL)@' $(1);
+
+# PERL_SCRIPTS is a list of files from the calling Makefile.
+PERL_SCRIPTS_PROCESS= \
+	$(foreach s,$(PERL_SCRIPTS), \
+	        $(call PERL_SCRIPT_SHEBANG_FIX_FUNC,$(s)))
+
+# Finally if PERL_SCRIPTS is defined in a Makefile then process them here.
+# If multiple installs in the component then clear
+# COMPONENT_POST_INSTALL_ACTION =
+# and re-add $(PERL_SCRIPTS_PROCESS)
+COMPONENT_POST_INSTALL_ACTION += $(PERL_SCRIPTS_PROCESS)
+
 # This is the default BUILD version of tcl
 # Not necessarily the system's default version, i.e. /usr/bin/tclsh
 TCL_VERSION =  8.5