--- a/components/librsync/librsync.p5m	Thu Jan 29 08:22:55 2015 -0800
+++ b/components/librsync/librsync.p5m	Fri Feb 13 07:22:10 2015 -0800
@@ -37,10 +37,7 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/245
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-
-file path=usr/bin/$(MACH64)/rdiff
-file path=usr/bin/rdiff
+file usr/bin/$(MACH64)/rdiff path=usr/bin/rdiff
 file path=usr/include/librsync-config.h
 file path=usr/include/librsync.h
 link path=usr/lib/$(MACH64)/librsync.so target=librsync.so.1.0.2

--- a/components/libsndfile/libsndfile.p5m	Thu Jan 29 08:22:55 2015 -0800
+++ b/components/libsndfile/libsndfile.p5m	Fri Feb 13 07:22:10 2015 -0800
@@ -35,10 +35,10 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/767
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/sndfile-convert
-file path=usr/bin/sndfile-info
-file path=usr/bin/sndfile-play
-file path=usr/bin/sndfile-regtest
+file usr/bin/$(MACH64)/sndfile-convert path=usr/bin/sndfile-convert
+file usr/bin/$(MACH64)/sndfile-info path=usr/bin/sndfile-info
+file usr/bin/$(MACH64)/sndfile-play path=usr/bin/sndfile-play
+file usr/bin/$(MACH64)/sndfile-regtest path=usr/bin/sndfile-regtest
 file path=usr/include/sndfile.h
 file path=usr/include/sndfile.hh
 link path=usr/lib/$(MACH64)/libsndfile.so \

--- a/components/slang/Makefile	Thu Jan 29 08:22:55 2015 -0800
+++ b/components/slang/Makefile	Fri Feb 13 07:22:10 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -48,9 +48,18 @@
 CONFIGURE_OPTIONS  +=		LDFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		--sysconfdir=$(ETCDIR)/slsh
 
+# Master test results are the same for 32-bit and 64-bit, so override
+# here, rather than create multiple identical master files.
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
+# The additional slang specific set of transforms to be applied to the
+# test results to try to normalize them.
+COMPONENT_TEST_TRANSFORMS += \
+	'-e "s|^.*$(CC).*$$|XXX_CC_XXX|g" ' \
+	'-e "/^XXX_CC_XXX$$/d" '
+
 ASLR_MODE = $(ASLR_ENABLE)
 
-# common targets
 configure:	$(CONFIGURE_32_and_64)
 
 build:		$(BUILD_32_and_64)

--- a/components/slang/slang.p5m	Thu Jan 29 08:22:55 2015 -0800
+++ b/components/slang/slang.p5m	Fri Feb 13 07:22:10 2015 -0800
@@ -42,7 +42,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=etc/slsh/slsh.rc
 file path=usr/bin/$(MACH64)/slsh
-file path=usr/bin/slsh
+file usr/bin/$(MACH64)/slsh path=usr/bin/slsh
 file path=usr/include/slang.h
 file path=usr/include/slcurses.h
 link path=usr/lib/$(MACH64)/libslang.so target=libslang.so.2

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/slang/test/results-all.master	Fri Feb 13 07:22:10 2015 -0800
@@ -0,0 +1,117 @@
+make[1]: Entering directory `$(@D)'
+cd src; /usr/gnu/bin/make static
+make[2]: Entering directory `$(@D)/src'
+$(@D)/autoconf/mkinsdir.sh $(@D)/src/objs
+mkdir $(@D)/src/objs
+rm -f $(@D)/src/objs/libslang.a
+cd $(@D)/src/objs && ar cr libslang.a sltermin.o sldisply.o slutty.o slang.o slarray.o slclass.o slcmd.o slerr.o slgetkey.o slkeymap.o slmalloc.o slmath.o slmemchr.o slmemcmp.o slmemcpy.o slmemset.o slmisc.o slparse.o slprepr.o slregexp.o slrline.o slsearch.o slsmg.o slstd.o sltoken.o sltypes.o slxstrng.o slcurses.o slscroll.o slsignal.o slkeypad.o slerrno.o slstring.o slstruct.o slcmplex.o slarrfun.o slimport.o slpath.o slarith.o slassoc.o slcompat.o slposdir.o slstdio.o slproc.o sltime.o slstrops.o slbstr.o slpack.o slintall.o slistruc.o slposio.o slnspace.o slarrmis.o slospath.o slscanf.o sllower.o slupper.o slischar.o slutf8.o slwcwidth.o slwclut.o slcommon.o sllist.o slexcept.o slfpu.o slsig.o slboseos.o
+ranlib $(@D)/src/objs/libslang.a
+
+libslang.a created in $(@D)/src/objs
+make[2]: Leaving directory `$(@D)/src'
+cd src; /usr/gnu/bin/make runtests
+make[2]: Entering directory `$(@D)/src'
+make[3]: Entering directory `$(@D)/src/test'
+
+Running tests:
+
+Testing argv processing ...Ok
+Testing argv processing [UTF-8 mode] ...Ok
+Testing syntax ...Ok
+Testing syntax [UTF-8 mode] ...Ok
+Testing Short Ciruit Operators ...Ok
+Testing Short Ciruit Operators [UTF-8 mode] ...Ok
+Testing _eqs ...Ok
+Testing _eqs [UTF-8 mode] ...Ok
+Testing sscanf ...Ok
+Testing sscanf [UTF-8 mode] ...Ok
+Testing looping constructs ...Ok
+Testing looping constructs [UTF-8 mode] ...Ok
+Testing Arithmetic ...Ok
+Testing Arithmetic [UTF-8 mode] ...Ok
+Testing array functions ...Ok
+Testing array functions [UTF-8 mode] ...Ok
+Testing string functions ...Ok
+Testing string functions [UTF-8 mode] ...Ok
+Testing Binary Strings ...Ok
+Testing Binary Strings [UTF-8 mode] ...Ok
+Testing pack and unpack functions ...Ok
+Testing pack and unpack functions [UTF-8 mode] ...Ok
+Testing stdio routines ...Ok
+Testing stdio routines [UTF-8 mode] ...Ok
+Testing Associative Arrays ...Ok
+Testing Associative Arrays [UTF-8 mode] ...Ok
+Testing recursive function modifications ...Ok
+Testing recursive function modifications [UTF-8 mode] ...Ok
+Testing structures ...Ok
+Testing structures [UTF-8 mode] ...Ok
+Testing NameSpace routines ...Ok
+Testing NameSpace routines [UTF-8 mode] ...Ok
+Testing path ...Ok
+Testing path [UTF-8 mode] ...Ok
+Testing #ifeval ...Ok
+Testing #ifeval [UTF-8 mode] ...Ok
+Testing Any_Type ...Ok
+Testing Any_Type [UTF-8 mode] ...Ok
+Testing Matrix Multiplications ...Ok
+Testing Matrix Multiplications [UTF-8 mode] ...Ok
+Testing time functions ...Ok
+Testing time functions [UTF-8 mode] ...Ok
+Testing utf8 ...Ok
+Testing utf8 [UTF-8 mode] ...Ok
+Testing exceptions ...Ok
+Testing exceptions [UTF-8 mode] ...Ok
+Known Bugs or not yet implemented features:
+	Range arrays of Short, Long, LongLong types converted to Int_Type
+Known Bugs or not yet implemented features:
+	Range arrays of Short, Long, LongLong types converted to Int_Type
+Testing lists ...Ok
+Testing lists [UTF-8 mode] ...Ok
+Testing regexp ...Ok
+Testing regexp [UTF-8 mode] ...Ok
+Testing method calls ...Ok
+Testing method calls [UTF-8 mode] ...Ok
+Testing dereferences ...Ok
+Testing dereferences [UTF-8 mode] ...Ok
+Testing NaN and Inf ...Ok
+Testing NaN and Inf [UTF-8 mode] ...Ok
+Testing literal integer overflow ...Ok
+Testing literal integer overflow [UTF-8 mode] ...Ok
+Testing sorting ...Ok
+Testing sorting [UTF-8 mode] ...Ok
+Testing long long ...Ok
+Testing long long [UTF-8 mode] ...Ok
+Testing signals ...
+	Pausing for 3 seconds for alarm test..
+	Now try pressing ^C in next 5 seconds...
+Ok
+Testing signals [UTF-8 mode] ...
+	Pausing for 3 seconds for alarm test..
+	Now try pressing ^C in next 5 seconds...
+Ok
+Testing dollar strings ...Ok
+Testing dollar strings [UTF-8 mode] ...Ok
+Testing provide and require ...Ok
+Testing provide and require [UTF-8 mode] ...Ok
+Testing doc functions ...Ok
+Testing doc functions [UTF-8 mode] ...Ok
+Testing debugger support ...Ok
+Testing debugger support [UTF-8 mode] ...Ok
+Testing qualifiers ...Ok
+Testing qualifiers [UTF-8 mode] ...Ok
+Testing Comparison Operators ...Ok
+Testing Comparison Operators [UTF-8 mode] ...Ok
+Testing break and continue N ...Ok
+Testing break and continue N [UTF-8 mode] ...Ok
+Testing Multiline strings ...Ok
+Testing Multiline strings [UTF-8 mode] ...Ok
+Testing autoload ...Ok
+Testing autoload [UTF-8 mode] ...Ok
+Testing more NameSpace routines ...Ok
+Testing more NameSpace routines [UTF-8 mode] ...Ok
+Testing slprep ...Ok
+Testing slprep [UTF-8 mode] ...Ok
+touch sltest.c
+make[3]: Leaving directory `$(@D)/src/test'
+make[2]: Leaving directory `$(@D)/src'
+make[1]: Leaving directory `$(@D)'