--- a/components/a2ps/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/a2ps/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -80,8 +80,7 @@
REQUIRED_PACKAGES += developer/gperf
REQUIRED_PACKAGES += editor/gnu-emacs
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += runtime/perl-522
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
--- a/components/ant/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/ant/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -93,6 +93,5 @@
REQUIRED_PACKAGES += developer/java/junit
REQUIRED_PACKAGES += developer/parser/antlr-2
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += runtime/perl-522
REQUIRED_PACKAGES += shell/ksh93
--- a/components/apache24/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/apache24/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -18,7 +18,7 @@
#
# 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.
#
include ../../make-rules/shared-macros.mk
@@ -96,12 +96,10 @@
REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += runtime/lua
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += runtime/perl-522
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/core-os
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += system/library/security/gss
REQUIRED_PACKAGES += system/network
-
--- a/components/aspell/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/aspell/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -93,7 +93,7 @@
test: $(NO_TESTS)
REQUIRED_PACKAGES += library/ncurses
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
--- a/components/autoconf/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/autoconf/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -63,5 +63,5 @@
REQUIRED_PACKAGES += developer/macro/gnu-m4
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += shell/ksh93
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/autoconf/patches/autoscan.patch Mon Mar 21 13:57:26 2016 -0700
@@ -0,0 +1,15 @@
+autoscan is getting a warning from perl on this RE. Fix it.
+Should pass this upstream.
+
+
+--- autoconf-2.69/bin/autoscan.in_orig 2016-03-15 17:17:51.090635380 -0700
++++ autoconf-2.69/bin/autoscan.in 2016-03-15 17:18:10.667432500 -0700
+@@ -358,7 +358,7 @@
+ {
+ # Strip out comments and variable references.
+ s/#.*//;
+- s/\${[^\}]*}//g;
++ s/\$\{[^\}]*}//g;
+ s/@[^@]*@//g;
+
+ # Tokens in the code.
--- a/components/autoconf/test/results-32.master Mon Mar 21 13:11:55 2016 -0700
+++ b/components/autoconf/test/results-32.master Mon Mar 21 13:57:26 2016 -0700
@@ -1,4 +1,4 @@
-make[1]: Entering directory `$(@D)'
+make[1]: Entering directory '$(@D)'
if test -d $(SOURCE_DIR)/.git; then \
cd $(SOURCE_DIR) && \
git submodule --quiet foreach test '$(git rev-parse $sha1)' \
@@ -9,59 +9,59 @@
: ; \
fi
/usr/gnu/bin/make check-recursive
-make[2]: Entering directory `$(@D)'
+make[2]: Entering directory '$(@D)'
Making check in bin
-make[3]: Entering directory `$(@D)/bin'
-make[3]: Nothing to be done for `check'.
-make[3]: Leaving directory `$(@D)/bin'
+make[3]: Entering directory '$(@D)/bin'
+make[3]: Nothing to be done for 'check'.
+make[3]: Leaving directory '$(@D)/bin'
Making check in .
-make[3]: Entering directory `$(@D)'
-make[3]: Nothing to be done for `check-am'.
-make[3]: Leaving directory `$(@D)'
+make[3]: Entering directory '$(@D)'
+make[3]: Nothing to be done for 'check-am'.
+make[3]: Leaving directory '$(@D)'
Making check in lib
-make[3]: Entering directory `$(@D)/lib'
+make[3]: Entering directory '$(@D)/lib'
Making check in Autom4te
-make[4]: Entering directory `$(@D)/lib/Autom4te'
-make[4]: Nothing to be done for `check'.
-make[4]: Leaving directory `$(@D)/lib/Autom4te'
+make[4]: Entering directory '$(@D)/lib/Autom4te'
+make[4]: Nothing to be done for 'check'.
+make[4]: Leaving directory '$(@D)/lib/Autom4te'
Making check in m4sugar
-make[4]: Entering directory `$(@D)/lib/m4sugar'
+make[4]: Entering directory '$(@D)/lib/m4sugar'
/usr/gnu/bin/make check-local
-make[5]: Entering directory `$(@D)/lib/m4sugar'
-make[5]: Leaving directory `$(@D)/lib/m4sugar'
-make[4]: Leaving directory `$(@D)/lib/m4sugar'
+make[5]: Entering directory '$(@D)/lib/m4sugar'
+make[5]: Leaving directory '$(@D)/lib/m4sugar'
+make[4]: Leaving directory '$(@D)/lib/m4sugar'
Making check in autoconf
-make[4]: Entering directory `$(@D)/lib/autoconf'
+make[4]: Entering directory '$(@D)/lib/autoconf'
/usr/gnu/bin/make check-local
-make[5]: Entering directory `$(@D)/lib/autoconf'
-make[5]: Leaving directory `$(@D)/lib/autoconf'
-make[4]: Leaving directory `$(@D)/lib/autoconf'
+make[5]: Entering directory '$(@D)/lib/autoconf'
+make[5]: Leaving directory '$(@D)/lib/autoconf'
+make[4]: Leaving directory '$(@D)/lib/autoconf'
Making check in autotest
-make[4]: Entering directory `$(@D)/lib/autotest'
+make[4]: Entering directory '$(@D)/lib/autotest'
/usr/gnu/bin/make check-local
-make[5]: Entering directory `$(@D)/lib/autotest'
-make[5]: Leaving directory `$(@D)/lib/autotest'
-make[4]: Leaving directory `$(@D)/lib/autotest'
+make[5]: Entering directory '$(@D)/lib/autotest'
+make[5]: Leaving directory '$(@D)/lib/autotest'
+make[4]: Leaving directory '$(@D)/lib/autotest'
Making check in autoscan
-make[4]: Entering directory `$(@D)/lib/autoscan'
-make[4]: Nothing to be done for `check'.
-make[4]: Leaving directory `$(@D)/lib/autoscan'
+make[4]: Entering directory '$(@D)/lib/autoscan'
+make[4]: Nothing to be done for 'check'.
+make[4]: Leaving directory '$(@D)/lib/autoscan'
Making check in emacs
-make[4]: Entering directory `$(@D)/lib/emacs'
-make[4]: Nothing to be done for `check'.
-make[4]: Leaving directory `$(@D)/lib/emacs'
-make[4]: Entering directory `$(@D)/lib'
-make[4]: Nothing to be done for `check-am'.
-make[4]: Leaving directory `$(@D)/lib'
-make[3]: Leaving directory `$(@D)/lib'
+make[4]: Entering directory '$(@D)/lib/emacs'
+make[4]: Nothing to be done for 'check'.
+make[4]: Leaving directory '$(@D)/lib/emacs'
+make[4]: Entering directory '$(@D)/lib'
+make[4]: Nothing to be done for 'check-am'.
+make[4]: Leaving directory '$(@D)/lib'
+make[3]: Leaving directory '$(@D)/lib'
Making check in doc
-make[3]: Entering directory `$(@D)/doc'
-make[3]: Nothing to be done for `check'.
-make[3]: Leaving directory `$(@D)/doc'
+make[3]: Entering directory '$(@D)/doc'
+make[3]: Nothing to be done for 'check'.
+make[3]: Leaving directory '$(@D)/doc'
Making check in tests
-make[3]: Entering directory `$(@D)/tests'
+make[3]: Entering directory '$(@D)/tests'
/usr/gnu/bin/make check-local
-make[4]: Entering directory `$(@D)/tests'
+make[4]: Entering directory '$(@D)/tests'
:;{ \
echo '# Signature of the current package.' && \
echo 'm4_define([AT_PACKAGE_NAME], [GNU Autoconf])' && \
@@ -73,9 +73,9 @@
} > package.m4-t
mv package.m4-t package.m4
cd ../lib/autotest && /usr/gnu/bin/make autotest.m4f
-make[5]: Entering directory `$(@D)/lib/autotest'
-make[5]: `autotest.m4f' is up to date.
-make[5]: Leaving directory `$(@D)/lib/autotest'
+make[5]: Entering directory '$(@D)/lib/autotest'
+make[5]: 'autotest.m4f' is up to date.
+make[5]: Leaving directory '$(@D)/lib/autotest'
autom4te_perllibdir='$(SOURCE_DIR)'/lib AUTOM4TE_CFG='../lib/autom4te.cfg' ../bin/autom4te -B '..'/lib -B '$(SOURCE_DIR)'/lib --language=autotest -I . -I $(SOURCE_DIR)/tests suite.at -o testsuite.tmp
mv testsuite.tmp testsuite
/bin/ksh93 ./testsuite
@@ -119,7 +119,7 @@
32: autoupdating AC_LANG_SAVE ok
33: autoupdating AC_FOREACH ok
34: autoupdating with aclocal and m4_include ok
- 35: autom4te preselections ok
+ 35: autom4te preselections skipped (tools.at:1200)
36: autom4te cache creation ok
37: autom4te cache locking ok
38: autotools and whitespace in file names ok
@@ -671,13 +671,13 @@
## Test results. ##
## ------------- ##
-488 tests behaved as expected.
-15 tests were skipped.
-make[4]: Leaving directory `$(@D)/tests'
-make[3]: Leaving directory `$(@D)/tests'
+487 tests behaved as expected.
+16 tests were skipped.
+make[4]: Leaving directory '$(@D)/tests'
+make[3]: Leaving directory '$(@D)/tests'
Making check in man
-make[3]: Entering directory `$(@D)/man'
-make[3]: Nothing to be done for `check'.
-make[3]: Leaving directory `$(@D)/man'
-make[2]: Leaving directory `$(@D)'
-make[1]: Leaving directory `$(@D)'
+make[3]: Entering directory '$(@D)/man'
+make[3]: Nothing to be done for 'check'.
+make[3]: Leaving directory '$(@D)/man'
+make[2]: Leaving directory '$(@D)'
+make[1]: Leaving directory '$(@D)'
--- a/components/automake/automake-1.10/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/automake/automake-1.10/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -59,5 +59,5 @@
system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += shell/ksh93
--- a/components/automake/automake-1.11.2/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/automake/automake-1.11.2/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -59,5 +59,5 @@
system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += shell/ksh93
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/automake/automake-1.11.2/patches/automake.patch Mon Mar 21 13:57:26 2016 -0700
@@ -0,0 +1,18 @@
+Perl 5.22 complaining about:
+Unescaped left brace in regex is deprecated, passed through in regex;
+marked by <-- HERE in m/\${ <-- HERE ([^ \t=:+{}]+)}/ at
+/builds/userland/automake/automake-1.11.2/build/i386/bin/automake line 393
+
+Should send this upstream.
+
+--- automake-1.11.2/automake.in_orig 2016-03-16 10:45:17.884191948 -0700
++++ automake-1.11.2/automake.in 2016-03-16 10:46:39.539918802 -0700
+@@ -4150,7 +4150,7 @@
+ sub substitute_ac_subst_variables ($)
+ {
+ my ($text) = @_;
+- $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
++ $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
+ return $text;
+ }
+
--- a/components/automake/automake-1.11.2/test/results-32.master Mon Mar 21 13:11:55 2016 -0700
+++ b/components/automake/automake-1.11.2/test/results-32.master Mon Mar 21 13:57:26 2016 -0700
@@ -1,62 +1,61 @@
-make[1]: Entering directory `$(@D)'
+make[1]: Entering directory '$(@D)'
Making check in lib
-make[2]: Entering directory `$(@D)/lib'
+make[2]: Entering directory '$(@D)/lib'
Making check in Automake
-make[3]: Entering directory `$(@D)/lib/Automake'
+make[3]: Entering directory '$(@D)/lib/Automake'
Making check in .
-make[4]: Entering directory `$(@D)/lib/Automake'
-make[4]: Nothing to be done for `check-am'.
-make[4]: Leaving directory `$(@D)/lib/Automake'
+make[4]: Entering directory '$(@D)/lib/Automake'
+make[4]: Nothing to be done for 'check-am'.
+make[4]: Leaving directory '$(@D)/lib/Automake'
Making check in tests
-make[4]: Entering directory `$(@D)/lib/Automake/tests'
+make[4]: Entering directory '$(@D)/lib/Automake/tests'
/usr/gnu/bin/make check-TESTS
-make[5]: Entering directory `$(@D)/lib/Automake/tests'
-make[6]: Entering directory `$(@D)/lib/Automake/tests'
+make[5]: Entering directory '$(@D)/lib/Automake/tests'
+make[6]: Entering directory '$(@D)/lib/Automake/tests'
PASS: Condition.pl
-SKIP: Condition-t.pl
+PASS: Condition-t.pl
PASS: DisjConditions.pl
-SKIP: DisjConditions-t.pl
+PASS: DisjConditions-t.pl
PASS: Version.pl
PASS: Wrap.pl
-======================
-All 4 tests passed
-(2 tests were not run)
-======================
-make[6]: Leaving directory `$(@D)/lib/Automake/tests'
-make[5]: Leaving directory `$(@D)/lib/Automake/tests'
-make[4]: Leaving directory `$(@D)/lib/Automake/tests'
-make[3]: Leaving directory `$(@D)/lib/Automake'
+==================
+All 6 tests passed
+==================
+make[6]: Leaving directory '$(@D)/lib/Automake/tests'
+make[5]: Leaving directory '$(@D)/lib/Automake/tests'
+make[4]: Leaving directory '$(@D)/lib/Automake/tests'
+make[3]: Leaving directory '$(@D)/lib/Automake'
Making check in am
-make[3]: Entering directory `$(@D)/lib/am'
-make[3]: Nothing to be done for `check'.
-make[3]: Leaving directory `$(@D)/lib/am'
-make[3]: Entering directory `$(@D)/lib'
-make[3]: Nothing to be done for `check-am'.
-make[3]: Leaving directory `$(@D)/lib'
-make[2]: Leaving directory `$(@D)/lib'
+make[3]: Entering directory '$(@D)/lib/am'
+make[3]: Nothing to be done for 'check'.
+make[3]: Leaving directory '$(@D)/lib/am'
+make[3]: Entering directory '$(@D)/lib'
+make[3]: Nothing to be done for 'check-am'.
+make[3]: Leaving directory '$(@D)/lib'
+make[2]: Leaving directory '$(@D)/lib'
Making check in .
-make[2]: Entering directory `$(@D)'
-make[2]: Nothing to be done for `check-am'.
-make[2]: Leaving directory `$(@D)'
+make[2]: Entering directory '$(@D)'
+make[2]: Nothing to be done for 'check-am'.
+make[2]: Leaving directory '$(@D)'
Making check in doc
-make[2]: Entering directory `$(@D)/doc'
-make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `$(@D)/doc'
+make[2]: Entering directory '$(@D)/doc'
+make[2]: Nothing to be done for 'check'.
+make[2]: Leaving directory '$(@D)/doc'
Making check in m4
-make[2]: Entering directory `$(@D)/m4'
-make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `$(@D)/m4'
+make[2]: Entering directory '$(@D)/m4'
+make[2]: Nothing to be done for 'check'.
+make[2]: Leaving directory '$(@D)/m4'
Making check in tests
-make[2]: Entering directory `$(@D)/tests'
+make[2]: Entering directory '$(@D)/tests'
/usr/gnu/bin/make defs aclocal-1.11 automake-1.11
-make[3]: Entering directory `$(@D)/tests'
-make[3]: `defs' is up to date.
-make[3]: `aclocal-1.11' is up to date.
-make[3]: `automake-1.11' is up to date.
-make[3]: Leaving directory `$(@D)/tests'
+make[3]: Entering directory '$(@D)/tests'
+make[3]: 'defs' is up to date.
+make[3]: 'aclocal-1.11' is up to date.
+make[3]: 'automake-1.11' is up to date.
+make[3]: Leaving directory '$(@D)/tests'
/usr/gnu/bin/make check-TESTS
-make[3]: Entering directory `$(@D)/tests'
-make[4]: Entering directory `$(@D)/tests'
+make[3]: Entering directory '$(@D)/tests'
+make[4]: Entering directory '$(@D)/tests'
PASS: self-check-env-sanitize.test
PASS: self-check-report.test
PASS: aclibobj.test
@@ -66,7 +65,7 @@
SKIP: aclocal5.test
SKIP: aclocal6.test
PASS: aclocal7.test
-PASS: aclocal8.test
+FAIL: aclocal8.test
PASS: aclocal9.test
PASS: acloca10.test
PASS: acloca11.test
@@ -94,7 +93,7 @@
PASS: acoutqnl.test
PASS: acoutbs.test
PASS: acoutbs2.test
-PASS: acsilent.test
+FAIL: acsilent.test
PASS: acsubst.test
PASS: acsubst2.test
XFAIL: all.test
@@ -224,7 +223,7 @@
SKIP: compile4.test
SKIP: compile5.test
PASS: compile6.test
-PASS: compile_f90_c_cxx.test
+FAIL: compile_f90_c_cxx.test
PASS: compile_f_c_cxx.test
PASS: cond.test
PASS: cond2.test
@@ -712,7 +711,7 @@
PASS: primary.test
PASS: primary2.test
PASS: primary3.test
-PASS: primary-prefix-invalid-couples.test
+FAIL: primary-prefix-invalid-couples.test
PASS: primary-prefix-valid-couples.test
PASS: primary-prefix-couples-force-valid.test
PASS: primary-prefix-couples-documented-valid.test
@@ -899,7 +898,7 @@
PASS: transform2.test
PASS: uninstall-pr9578.test
PASS: uninstall-fail.test
-PASS: unused.test
+FAIL: unused.test
SKIP: upc.test
PASS: upc2.test
SKIP: upc3.test
@@ -968,11 +967,21 @@
PASS: exeext4-p.test
PASS: maken3-p.test
SKIP: maken4-p.test
-========================================================
-All 839 tests behaved as expected (12 expected failures)
+=====================================
+5 of 839 tests failed
(72 tests were not run)
-========================================================
-make[4]: Leaving directory `$(@D)/tests'
-make[3]: Leaving directory `$(@D)/tests'
-make[2]: Leaving directory `$(@D)/tests'
-make[1]: Leaving directory `$(@D)'
+See tests/test-suite.log
+Please report to [email protected]
+=====================================
+Makefile:1283: recipe for target 'test-suite.log' failed
+make[4]: *** [test-suite.log] Error 1
+make[4]: Leaving directory '$(@D)/tests'
+Makefile:1362: recipe for target 'check-TESTS' failed
+make[3]: *** [check-TESTS] Error 2
+make[3]: Leaving directory '$(@D)/tests'
+Makefile:1439: recipe for target 'check-am' failed
+make[2]: *** [check-am] Error 2
+make[2]: Leaving directory '$(@D)/tests'
+Makefile:467: recipe for target 'check-recursive' failed
+make[1]: *** [check-recursive] Error 1
+make[1]: Leaving directory '$(@D)'
--- a/components/automake/automake-1.15/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/automake/automake-1.15/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -59,6 +59,6 @@
system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/core-os
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/automake/automake-1.15/patches/automake.patch Mon Mar 21 13:57:26 2016 -0700
@@ -0,0 +1,18 @@
+Perl 5.22 complaining about:
+Unescaped left brace in regex is deprecated, passed through in regex;
+marked by <-- HERE in m/\${ <-- HERE ([^ \t=:+{}]+)}/ at
+/builds/userland/automake/automake-1.15/build/i386/bin/automake line 393
+
+Should send this upstream.
+
+--- automake-1.15/bin/automake.in_orig 2016-03-16 10:40:04.299092544 -0700
++++ automake-1.15/bin/automake.in 2016-03-16 10:40:39.216683002 -0700
+@@ -3878,7 +3878,7 @@
+ sub substitute_ac_subst_variables
+ {
+ my ($text) = @_;
+- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
++ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
+ return $text;
+ }
+
--- a/components/automake/automake-1.15/test/results-32.master Mon Mar 21 13:11:55 2016 -0700
+++ b/components/automake/automake-1.15/test/results-32.master Mon Mar 21 13:57:26 2016 -0700
@@ -1,15 +1,15 @@
/usr/gnu/bin/make check-TESTS check-local
-make[1]: Entering directory `$(@D)'
-make[2]: Entering directory `$(@D)'
+make[1]: Entering directory '$(@D)'
+make[2]: Entering directory '$(@D)'
SKIP: t/get-sysconf.sh
XFAIL: t/pm/Cond2.pl
XFAIL: t/pm/Cond3.pl
PASS: t/pm/Condition.pl
-SKIP: t/pm/Condition-t.pl
+PASS: t/pm/Condition-t.pl
XFAIL: t/pm/DisjCon2.pl
XFAIL: t/pm/DisjCon3.pl
PASS: t/pm/DisjConditions.pl
-SKIP: t/pm/DisjConditions-t.pl
+PASS: t/pm/DisjConditions-t.pl
PASS: t/pm/Version.pl
XFAIL: t/pm/Version2.pl
XFAIL: t/pm/Version3.pl
@@ -1415,8 +1415,7 @@
PASS: t/man2.sh
PASS: t/man3.sh
PASS: t/man5.sh
-man6: skipped test: required program 'help2man' not available
-SKIP: t/man6.sh
+PASS: t/man6.sh
PASS: t/man7.sh
PASS: t/man8.sh
PASS: t/mdate.sh
@@ -2993,8 +2992,8 @@
Testsuite summary for GNU Automake 1.15
============================================================================
# TOTAL: 2953
-# PASS: 2846
-# SKIP: 63
+# PASS: 2849
+# SKIP: 60
# XFAIL: 42
# FAIL: 2
# XPASS: 0
@@ -3003,8 +3002,11 @@
See ./test-suite.log
Please report to [email protected]
============================================================================
+Makefile:3026: recipe for target 'test-suite.log' failed
make[2]: *** [test-suite.log] Error 1
-make[2]: Leaving directory `$(@D)'
+make[2]: Leaving directory '$(@D)'
+Makefile:3132: recipe for target 'check-TESTS' failed
make[1]: *** [check-TESTS] Error 2
-make[1]: Leaving directory `$(@D)'
+make[1]: Leaving directory '$(@D)'
+Makefile:3366: recipe for target 'check-am' failed
make: *** [check-am] Error 2
--- a/components/convmv/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/convmv/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -43,9 +43,6 @@
PATCH_LEVEL=0
-# Version of Perl to use in the convmv script.
-PERL_VERSION = 5.20
-
COMPONENT_TEST_TRANSFORMS += \
'-e "s/ in [0-9][0-9]*\.*[0-9]* seconds.//" ' \
'-e "/^unimplemented function: utime.*$$/d" '
@@ -57,7 +54,7 @@
# 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?/usr/perl5/$(PERL_VERSION)/bin/perl?' \
+ $(GSED) -i -e 's?/usr/bin/perl?$(PERL)?' \
$(PROTOUSRBINDIR)/convmv;
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
@@ -70,4 +67,4 @@
system-test: $(SYSTEM_TEST_64)
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
--- a/components/desktop/xscreensaver/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/desktop/xscreensaver/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -72,8 +72,8 @@
CONFIGURE_OPTIONS += --with-xft=$(USRDIR)
CONFIGURE_OPTIONS += PTHREAD_CFLAGS="-D_POSIX_PTHREAD_SEMANTICS"
CONFIGURE_OPTIONS += PTHREAD_LIBS="-lc"
-CONFIGURE_OPTIONS += PERL=$(PERL)
-CONFIGURE_OPTIONS += INTLTOOL_PERL=$(PERL)
+CONFIGURE_OPTIONS += PERL=$(PERL.5.12)
+CONFIGURE_OPTIONS += INTLTOOL_PERL=$(PERL.5.12)
# X extensions to support
CONFIGURE_OPTIONS += --with-dpms-ext
@@ -156,7 +156,7 @@
REQUIRED_PACKAGES += library/gnome/gnome-component
REQUIRED_PACKAGES += library/libxml2
REQUIRED_PACKAGES += library/perl-5/xml-parser
-REQUIRED_PACKAGES += $(PERL_PKG)
+REQUIRED_PACKAGES += runtime/perl-512
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += x11/library/libx11
--- a/components/foomatic/db-engine/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/foomatic/db-engine/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -18,7 +18,7 @@
#
# 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.
#
include ../../../make-rules/shared-macros.mk
@@ -76,6 +76,6 @@
REQUIRED_PACKAGES += library/libxml2
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += shell/bash
REQUIRED_PACKAGES += system/library
--- a/components/foomatic/db-engine/foomatic-db-engine.p5m Mon Mar 21 13:11:55 2016 -0700
+++ b/components/foomatic/db-engine/foomatic-db-engine.p5m Mon Mar 21 13:57:26 2016 -0700
@@ -18,7 +18,7 @@
#
# 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 file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -45,15 +45,14 @@
file path=usr/bin/foomatic-searchprinter
link path=usr/lib/cups/driver/foomatic \
target=../../../../usr/bin/foomatic-ppdfile
-file path=usr/perl5/5.12/lib/$(PERL_ARCH)/perllocal.pod
-file path=usr/perl5/vendor_perl/5.12/$(PERL_ARCH)/auto/Foomatic/.packlist
-file path=usr/perl5/vendor_perl/5.12/Foomatic/DB.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Foomatic/.packlist
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Foomatic/DB.pm
# Defaults.pm are not built by the perl module, but by external utility, so it's in
# wrong place
file $(MACH32)/lib/Foomatic/Defaults.pm \
- path=usr/perl5/vendor_perl/5.12/Foomatic/Defaults.pm
-file path=usr/perl5/vendor_perl/5.12/Foomatic/PPD.pm
-file path=usr/perl5/vendor_perl/5.12/Foomatic/UIElem.pm
+ path=usr/perl5/vendor_perl/$(PERL_VERSION)/Foomatic/Defaults.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Foomatic/PPD.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Foomatic/UIElem.pm
file path=usr/sbin/foomatic-addpjloptions
file path=usr/sbin/foomatic-cleanupdrivers
file path=usr/sbin/foomatic-extract-text
--- a/components/git/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/git/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -112,7 +112,7 @@
REQUIRED_PACKAGES += library/pcre
REQUIRED_PACKAGES += library/security/openssl
REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += runtime/python-27
REQUIRED_PACKAGES += shell/bash
REQUIRED_PACKAGES += shell/ksh93
--- a/components/graphviz/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/graphviz/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -20,10 +20,9 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
-PERL_VERSION = 5.20
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= graphviz
@@ -38,6 +37,8 @@
TPNO= 17707
+PERL_VERSIONS = $(PERL_VERSION)
+
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
@@ -124,7 +125,7 @@
REQUIRED_PACKAGES += print/filter/ghostscript
REQUIRED_PACKAGES += runtime/lua
REQUIRED_PACKAGES += runtime/ocaml
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += runtime/ruby-21
REQUIRED_PACKAGES += runtime/tk-8
REQUIRED_PACKAGES += shell/ksh93
--- a/components/graphviz/graphviz-perl-520.p5m Mon Mar 21 13:11:55 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) 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-set name=pkg.fmri \
- value=pkg:/image/graphviz/graphviz-perl-520@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Perl 5.20 bindings for Graphviz"
-set name=pkg.linted.pkglint.dupaction001.1 value=true
-set name=com.oracle.info.description value="Perl 5.20 bindings for Graphviz"
-set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
- value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2011/269
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/lib/$(MACH64)/graphviz/perl/gv.pm
-link path=usr/lib/$(MACH64)/graphviz/perl/gv.so target=libgv_perl.so
-file path=usr/lib/$(MACH64)/graphviz/perl/libgv_perl.so
-link path=usr/perl5/vendor_perl/5.20/$(PERL_ARCH)/gv.pm \
- target=../../../../lib/$(MACH64)/graphviz/perl/gv.pm
-link path=usr/perl5/vendor_perl/5.20/$(PERL_ARCH)/gv.so \
- target=../../../../lib/$(MACH64)/graphviz/perl/libgv_perl.so
-file path=usr/share/graphviz/demo/modgraph.pl
-file usr/share/man/man3/gv.3perl path=usr/share/man/man3/gv-perl.3
-license COPYING license=EPL1.0
-license graphviz.license.extra license="Other Notices"
-# A 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/graphviz/graphviz-perl-PERLVER.p5m Mon Mar 21 13:57:26 2016 -0700
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2015, 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:/image/graphviz/graphviz-perl-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Perl $(MAYBE_PERLVER_SPACE)bindings for Graphviz"
+set name=pkg.linted.pkglint.dupaction001.1 value=true
+set name=com.oracle.info.description \
+ value="Perl $(MAYBE_PERLVER_SPACE)bindings for Graphviz"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+ value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2011/269
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/$(MACH64)/graphviz/perl/gv.pm
+link path=usr/lib/$(MACH64)/graphviz/perl/gv.so target=libgv_perl.so
+file path=usr/lib/$(MACH64)/graphviz/perl/libgv_perl.so
+link path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/gv.pm \
+ target=../../../../lib/$(MACH64)/graphviz/perl/gv.pm
+link path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/gv.so \
+ target=../../../../lib/$(MACH64)/graphviz/perl/libgv_perl.so
+file path=usr/share/graphviz/demo/modgraph.pl
+file usr/share/man/man3/gv.3perl path=usr/share/man/man3/gv-perl.3
+license COPYING license=EPL1.0
+license graphviz.license.extra license="Other Notices"
+# A 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
--- a/components/imagemagick/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/imagemagick/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -52,8 +52,8 @@
COMPONENT_POST_UNPACK_ACTION= ( $(MV) $(COMPONENT_SRC)-$(COMPONENT_SUBVERSION) \
$(COMPONENT_SRC))
-# To get the Perl modules built it is necessary to copy the PerlMagick directory
-# to the build directory
+# To get the Perl modules built it is necessary to copy the PerlMagick
+# directory to the build directory
COMPONENT_PRE_CONFIGURE_ACTION= ($(CP) -R $(SOURCE_DIR)/PerlMagick $(@D))
ifeq ($(OS_VERSION),5.11)
@@ -86,9 +86,9 @@
# might not have ghostscript fonts installed.
CONFIGURE_OPTIONS+= --with-gs-font-dir="/usr/share/ghostscript/fonts"
CONFIGURE_OPTIONS+= --x-libraries=$(CONFIGURE_LIBDIR.$(BITS))
-CONFIGURE_OPTIONS.32+= --with-perl=$(PERL)
-CONFIGURE_OPTIONS.32+= --with-perl-options="INSTALLDIRS=vendor"
-CONFIGURE_OPTIONS.64+= --without-perl
+CONFIGURE_OPTIONS.32+= --without-perl
+CONFIGURE_OPTIONS.64+= --with-perl=$(PERL)
+CONFIGURE_OPTIONS.64+= --with-perl-options="INSTALLDIRS=vendor"
# Needed for "gmake test" to work successfully. If SHELLOPTS is exported (as
# it is by the Userland Makefiles), then all shell options get exported to
--- a/components/imagemagick/imagemagick.p5m Mon Mar 21 13:11:55 2016 -0700
+++ b/components/imagemagick/imagemagick.p5m Mon Mar 21 13:57:26 2016 -0700
@@ -18,7 +18,7 @@
#
# 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 file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -507,9 +507,7 @@
file path=usr/perl5/$(PERL_VERSION)/man/man3/Image::Magick::Q16.3
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image/Magick.pm
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image/Magick/Q16.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Q16/Q16.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Q16/Q16.so
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Q16/autosplit.ix
--- a/components/irssi/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/irssi/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -46,15 +46,7 @@
# Part of the build just runs "cc" (not the path that configure finds).
COMPONENT_BUILD_ENV += PATH=$(dir $(CC)):$(PATH)
-# Need 64-bit perl.
-PERL_VERSION = 5.20
-
-CONFIGURE_ENV += "ac_cv_path_perlpath=/usr/perl5/$(PERL_VERSION)/bin/perl"
-
-# Architecture specific perl subdirectory.
-PERL_ARCH_i386 = i86pc
-PERL_ARCH_sparc = sun4
-PERL_ARCH = $(PERL_ARCH_$(MACH))-solaris-thread-multi-64
+CONFIGURE_ENV += "ac_cv_path_perlpath=$(PERL)"
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
@@ -77,5 +69,5 @@
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += library/ncurses
REQUIRED_PACKAGES += library/security/openssl
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += system/library
--- a/components/net-snmp/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/net-snmp/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -74,14 +74,13 @@
PYTHON_ARGS = --basedir=/usr/bin
CONFIGURE_OPTIONS += --with-python-modules="$(PYTHON_ARGS)"
-# Only build 32 bit Perl support
+# Only build 64 bit Perl support
PERL_ARGS = DESTDIR=$(PROTO_DIR) INSTALLDIRS=vendor
-CONFIGURE_OPTIONS.32 += PERLPROG="$(PERL)"
-CONFIGURE_OPTIONS.32 += --with-perl-modules="$(PERL_ARGS)"
-CONFIGURE_OPTIONS.32 += --disable-perl-cc-checks
-
-CONFIGURE_OPTIONS.64 += --disable-embedded-perl
-CONFIGURE_OPTIONS.64 += --without-perl-modules
+CONFIGURE_OPTIONS.32 += --disable-embedded-perl
+CONFIGURE_OPTIONS.32 += --without-perl-modules
+CONFIGURE_OPTIONS.64 += PERLPROG="$(PERL)"
+CONFIGURE_OPTIONS.64 += --with-perl-modules="$(PERL_ARGS)"
+CONFIGURE_OPTIONS.64 += --disable-perl-cc-checks
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS)"
@@ -101,6 +100,9 @@
COMPONENT_TEST_CMD = $(KSH93)
COMPONENT_TEST_TARGETS = ./run-tests $(BUILD_DIR) $(MACH32) $(MACH64)
+# perl man pages hiding here in 64-bit PROTO_DIR
+PKG_PROTO_DIRS += $(BUILD_DIR)/prototype/$(MACH64)
+
$(BUILD_32): COMPONENT_POST_BUILD_ACTION= \
(cd $(BUILD_DIR)/$(MACH32)/sun ; ls agent; $(CCSMAKE) -e $(CCSMAKE_ARGS))
@@ -137,7 +139,7 @@
$(TOUCH) $@
REQUIRED_PACKAGES += developer/documentation-tool/doxygen
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += runtime/python-27
REQUIRED_PACKAGES += shell/bash
REQUIRED_PACKAGES += shell/ksh93
--- a/components/net-snmp/net-snmp-base.p5m Mon Mar 21 13:11:55 2016 -0700
+++ b/components/net-snmp/net-snmp-base.p5m Mon Mar 21 13:57:26 2016 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -640,25 +640,18 @@
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/default_store.pm
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/SNMP.pm
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle/NetSNMP/.packlist
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/ASN.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/ASN.so
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/OID.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/OID.so
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/TrapReceiver.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/TrapReceiver.so
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/agent.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/agent.so
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/autosplit.ix
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store/default_store.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store/default_store.so
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store/default_store.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store/default_store.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/SNMP.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/SNMP.so
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/autosplit.ix
file usr/sbin/snmpd path=usr/sbin/$(MACH32)/snmpd
--- a/components/open-fabrics/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/open-fabrics/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -108,8 +108,7 @@
FORCE:
-REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += runtime/perl-522
REQUIRED_PACKAGES += runtime/tcl-8
REQUIRED_PACKAGES += shell/bash
REQUIRED_PACKAGES += shell/ksh93
--- a/components/open-fabrics/open-fabrics.p5m Mon Mar 21 13:11:55 2016 -0700
+++ b/components/open-fabrics/open-fabrics.p5m Mon Mar 21 13:57:26 2016 -0700
@@ -183,12 +183,8 @@
link path=usr/lib/secure/libsdp.so target=libsdp.so.1.0.0
link path=usr/lib/secure/libsdp.so.1 target=libsdp.so.1.0.0
file path=usr/lib/secure/libsdp.so.1.0.0
-dir path=usr/perl5/site_perl/5.12/i86pc-solaris-64int variant.arch=i386
-file path=usr/perl5/site_perl/5.12/i86pc-solaris-64int/IBswcountlimits.pm \
+file path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/IBswcountlimits.pm \
group=root mode=0444 variant.arch=i386
-dir path=usr/perl5/site_perl/5.12/sun4-solaris-64int variant.arch=sparc
-file path=usr/perl5/site_perl/5.12/sun4-solaris-64int/IBswcountlimits.pm \
- group=root mode=0444 variant.arch=sparc
dir path=usr/sbin
file path=usr/sbin/dump2psl.pl
file path=usr/sbin/dump2slvl.pl
--- a/components/openscap/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/openscap/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
#
COMPILER = gcc
@@ -44,16 +44,12 @@
PYTHON_VERSIONS= $(PYTHON2_VERSIONS)
-PERL_VERSIONS = 5.20
+PERL_VERSIONS = $(PERL_VERSION)
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
-PERL_VERSION.64 = 5.20
-PERL_VERSION = $(PERL_VERSION.$(BITS))
-PERL = $(PERL.$(PERL_VERSION))
-PKG_MACROS += P_ARCH=$(shell arch)
CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
CPPFLAGS += -I/usr/include/openldap
@@ -93,10 +89,8 @@
DOCS_DIR = $(PROTO_DIR)/usr/share/doc/openscap/html/
-# Enable ASLR for this component
ASLR_MODE = $(ASLR_ENABLE)
-# common targets
configure: $(CONFIGURE_64)
build: $(BUILD_64)
@@ -117,7 +111,7 @@
REQUIRED_PACKAGES += library/libxslt
REQUIRED_PACKAGES += library/openldap
REQUIRED_PACKAGES += library/pcre
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += runtime/python-27
REQUIRED_PACKAGES += security/compliance/openscap
REQUIRED_PACKAGES += system/library
--- a/components/openscap/openscap.p5m Mon Mar 21 13:11:55 2016 -0700
+++ b/components/openscap/openscap.p5m Mon Mar 21 13:57:26 2016 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -1810,8 +1810,8 @@
# Bring in the language bindings if the language platforms are installed.
depend type=conditional \
- fmri=library/perl-5/openscap-520@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/perl-520
+ fmri=library/perl-5/openscap-522@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/perl-522
depend type=conditional \
fmri=library/python/openscap-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
predicate=runtime/python-27
--- a/components/parallel/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/parallel/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -44,9 +44,6 @@
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
-# Version of Perl to use in the Perl scripts in the parallel package.
-PERL_VERSION = 5.20
-
# Set PATH to find the correct pod2man, so that the man pages can be
# automatically generated
COMPONENT_BUILD_ENV += \
@@ -78,6 +75,6 @@
system-test: $(NO_TESTS)
-REQUIRED_PACKAGES += runtime/perl-520
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += shell/which
REQUIRED_PACKAGES += system/core-os
--- a/components/psutils/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/psutils/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -18,7 +18,7 @@
#
# 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.
#
include ../../make-rules/shared-macros.mk
include $(WS_MAKE_RULES)/shared-targets.mk
@@ -81,6 +81,6 @@
system-test: $(NO_TESTS)
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
--- a/components/quilt/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/quilt/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -98,7 +98,7 @@
REQUIRED_PACKAGES += archiver/gnu-tar
REQUIRED_PACKAGES += file/gnu-coreutils
REQUIRED_PACKAGES += file/gnu-findutils
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += service/network/smtp/sendmail
REQUIRED_PACKAGES += shell/bash
REQUIRED_PACKAGES += shell/gnu-getopt
--- a/components/quilt/quilt.p5m Mon Mar 21 13:11:55 2016 -0700
+++ b/components/quilt/quilt.p5m Mon Mar 21 13:57:26 2016 -0700
@@ -18,7 +18,7 @@
#
# 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 file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -66,7 +66,8 @@
link path=usr/share/quilt/compat/getopt target=../../../gnu/bin/getopt
link path=usr/share/quilt/compat/grep target=../../../gnu/bin/grep
link path=usr/share/quilt/compat/patch target=../../../gnu/bin/patch
-link path=usr/share/quilt/compat/perl target=../../../perl5/5.12/bin/perl
+link path=usr/share/quilt/compat/perl \
+ target=../../../perl5/$(PERL_VERSION)/bin/perl
link path=usr/share/quilt/compat/sed target=../../../gnu/bin/sed
link path=usr/share/quilt/compat/sendmail target=../../../sbin/sendmail
link path=usr/share/quilt/compat/tail target=../../../gnu/bin/tail
--- a/components/rrdtool/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/rrdtool/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -44,16 +44,11 @@
PATH=$(dir $(CC)):/usr/bin:/usr/sbin:/usr/gnu/bin
-PERL_VERSION.32 = 5.12
-PERL_VERSION.64 = 5.16
-PERL_VERSION = $(PERL_VERSION.$(BITS))
-
COMPONENT_PRE_CONFIGURE_ACTION = \
($(CLONEY) $(SOURCE_DIR) $(@D))
COMPONENT_PREP_ACTION = ( cd $(@D); autoconf -f)
-CONFIGURE_OPTIONS += --enable-perl
CONFIGURE_OPTIONS += --enable-python
CONFIGURE_OPTIONS += --disable-ruby
CONFIGURE_OPTIONS += --enable-tcl
@@ -61,35 +56,35 @@
CONFIGURE_OPTIONS += CC="$(CC) $(CC_BITS)"
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)"
-CONFIGURE_OPTIONS += PERL=/usr/perl5/$(PERL_VERSION)/bin/perl
CONFIGURE_OPTIONS += POD2MAN=/usr/perl5/$(PERL_VERSION)/bin/pod2man
CONFIGURE_OPTIONS += POD2HTML=/usr/perl5/$(PERL_VERSION)/bin/pod2html
-CONFIGURE_OPTIONS += PERLCC="\"$(CC) $(CC_BITS)\""
-CONFIGURE_OPTIONS += PERLCCFLAGS="\"$(CFLAGS)\""
-CONFIGURE_OPTIONS += PERLLD="\"$(CC) $(CC_BITS)\""
-CONFIGURE_OPTIONS += PERLLIB=/usr/perl5/$(PERL_VERSION)/lib
-CONFIGURE_OPTIONS += PERLINSTALLMAN3DIR=/usr/share/man/man3
-CONFIGURE_OPTIONS += PERLINSTALLSITEMAN3DIR=/usr/share/man/man3
-CONFIGURE_OPTIONS += PERLINSTALLVENDORMAN3DIR=/usr/share/man/man3
-CONFIGURE_OPTIONS += am_cv_python_pythondir=$(PYTHON_VENDOR_PACKAGES)
-CONFIGURE_OPTIONS += am_cv_python_pyexecdir=$(PYTHON_VENDOR_PACKAGES)
+CONFIGURE_OPTIONS += am_cv_python_pythondir=$(PYTHON_VENDOR_PACKAGES)
+CONFIGURE_OPTIONS += am_cv_python_pyexecdir=$(PYTHON_VENDOR_PACKAGES)
CONFIGURE_OPTIONS += PYTHON=$(PYTHON.$(PYTHON_VERSION).$(BITS))
-$(CONFIGURE_64): CONFIGURE_OPTIONS += LUARRDLIBDIR=64
+$(CONFIGURE_64): CONFIGURE_OPTIONS += LUARRDLIBDIR=64
+
+$(CONFIGURE_32): CONFIGURE_OPTIONS += --disable-perl
+$(CONFIGURE_64): CONFIGURE_OPTIONS += --enable-perl
+$(CONFIGURE_64): CONFIGURE_OPTIONS += PERL=$(PERL)
+$(CONFIGURE_64): CONFIGURE_OPTIONS += PERLCC="\"$(CC) $(CC_BITS)\""
+$(CONFIGURE_64): CONFIGURE_OPTIONS += PERLCCFLAGS="\"$(CFLAGS)\""
+$(CONFIGURE_64): CONFIGURE_OPTIONS += PERLLD="\"$(CC) $(CC_BITS)\""
+$(CONFIGURE_64): CONFIGURE_OPTIONS += PERLLIB=/usr/perl5/$(PERL_VERSION)/lib
+$(CONFIGURE_64): CONFIGURE_OPTIONS += PERLINSTALLMAN3DIR=$(USRSHAREMAN3DIR)
+$(CONFIGURE_64): CONFIGURE_OPTIONS += PERLINSTALLSITEMAN3DIR=$(USRSHAREMAN3DIR)
+$(CONFIGURE_64): CONFIGURE_OPTIONS += PERLINSTALLVENDORMAN3DIR=$(USRSHAREMAN3DIR)
PYTHON_ENV = CC="$(CC)"
PYTHON_ENV += CFLAGS="$(CFLAGS)"
COMPONENT_BUILD_ENV += $(PYTHON_ENV)
COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-PKG_MACROS += P_ARCH=$(shell arch)
-
-ASLR_MODE = $(ASLR_ENABLE)
+ASLR_MODE = $(ASLR_ENABLE)
PKG_MACROS += PYVER=$(PYTHON_VERSION)
PKG_MACROS += PYV=$(shell echo $(PYTHON_VERSION) | tr -d .)
-# common targets
configure: $(CONFIGURE_32_and_64)
build: $(BUILD_32_and_64)
--- a/components/rrdtool/rrdtool.p5m Mon Mar 21 13:11:55 2016 -0700
+++ b/components/rrdtool/rrdtool.p5m Mon Mar 21 13:57:26 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
@@ -65,18 +65,11 @@
file path=usr/lib/lua/5.2/rrd.so.0.0.0
file path=usr/lib/pkgconfig/librrd.pc
file path=usr/lib/tclrrd$(COMPONENT_VERSION).so
-file path=usr/perl5/5.12/lib/$(P_ARCH)-solaris-64int/RRDs.pm
-file path=usr/perl5/5.12/lib/$(P_ARCH)-solaris-64int/auto/RRDp/.packlist
-file path=usr/perl5/5.12/lib/$(P_ARCH)-solaris-64int/auto/RRDs/.packlist
-file path=usr/perl5/5.12/lib/$(P_ARCH)-solaris-64int/auto/RRDs/RRDs.bs
-file path=usr/perl5/5.12/lib/$(P_ARCH)-solaris-64int/auto/RRDs/RRDs.so
-file path=usr/perl5/5.12/lib/RRDp.pm
-file path=usr/perl5/5.16/lib/$(P_ARCH)-solaris-64/RRDs.pm
-file path=usr/perl5/5.16/lib/$(P_ARCH)-solaris-64/auto/RRDp/.packlist
-file path=usr/perl5/5.16/lib/$(P_ARCH)-solaris-64/auto/RRDs/.packlist
-file path=usr/perl5/5.16/lib/$(P_ARCH)-solaris-64/auto/RRDs/RRDs.bs
-file path=usr/perl5/5.16/lib/$(P_ARCH)-solaris-64/auto/RRDs/RRDs.so
-file path=usr/perl5/5.16/lib/RRDp.pm
+file path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/RRDs.pm
+file path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/RRDp/.packlist
+file path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/RRDs/.packlist
+file path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/RRDs/RRDs.so
+file path=usr/perl5/$(PERL_VERSION)/lib/RRDp.pm
file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/RRDp.html
file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/RRDs.html
file path=usr/share/doc/rrdtool-$(COMPONENT_VERSION)/html/bin_dec_hex.html
--- a/components/subversion/Makefile Mon Mar 21 13:11:55 2016 -0700
+++ b/components/subversion/Makefile Mon Mar 21 13:57:26 2016 -0700
@@ -167,6 +167,7 @@
$(GNUCP) -rpd vendor-packages-32/svn vendor-packages/ ; \
fi ; )
+PKG_MACROS += PERL_ARCH_12="$(PERL_ARCH_12)"
PKG_MACROS += PERL_ARCH_16="$(PERL_ARCH_16)"
PKG_MACROS += PYVER=$(PYTHON_VERSION)
--- a/components/subversion/subversion-perl-512.p5m Mon Mar 21 13:11:55 2016 -0700
+++ b/components/subversion/subversion-perl-512.p5m Mon Mar 21 13:57:26 2016 -0700
@@ -18,12 +18,12 @@
#
# 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 file path=usr/perl5/$(PERL_VERSION)/man.+ -> default mangler.man.stability uncommitted>
<transform file path=(usr/perl5/vendor_perl/$(PERL_VERSION)/)(SVN/.+) -> \
- set action.hash %<1>$(PERL_ARCH)/%<2> >
+ set action.hash %<1>$(PERL_ARCH_12)/%<2> >
set name=pkg.fmri \
value=pkg:/library/perl-5/subversion-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Perl bindings for the Subversion SCM"
@@ -49,22 +49,22 @@
file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Ra.3
file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Repos.3
file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Wc.3
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Client/_Client.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Client/_Client.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Core/_Core.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Client/_Client.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Client/_Client.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Core/_Core.bs
file \
- path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Core/_Core.so \
+ path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Core/_Core.so \
pkg.depend.bypass-generate=.*
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Delta/_Delta.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Delta/_Delta.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Fs/_Fs.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Fs/_Fs.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Ra/_Ra.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Ra/_Ra.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Repos/_Repos.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Repos/_Repos.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Wc/_Wc.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Wc/_Wc.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Delta/_Delta.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Delta/_Delta.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Fs/_Fs.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Fs/_Fs.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Ra/_Ra.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Ra/_Ra.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Repos/_Repos.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Repos/_Repos.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Wc/_Wc.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Wc/_Wc.so
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Base.pm
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Client.pm
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Core.pm
--- a/make-rules/shared-macros.mk Mon Mar 21 13:11:55 2016 -0700
+++ b/make-rules/shared-macros.mk Mon Mar 21 13:57:26 2016 -0700
@@ -549,7 +549,7 @@
# This is the default BUILD version of perl
# Not necessarily the system's default version, i.e. /usr/bin/perl
-PERL_VERSION ?= 5.12
+PERL_VERSION ?= 5.22
PERL_VERSIONS = 5.12 5.20 5.22