18328743 pkg:/library/aalib still delivering 32-bit executables
18328791 pkg:/library/libconfuse still delivering 32-bit executables
18328811 pkg:/text/tidy still delivering 32-bit executables
18328851 pkg:/web/curl still delivering 32-bit executables
--- a/components/aalib/aalib.p5m Wed Mar 05 10:00:52 2014 -0800
+++ b/components/aalib/aalib.p5m Wed Mar 05 10:05:59 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -36,10 +36,10 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
file path=usr/bin/$(MACH64)/aalib-config
file path=usr/bin/aalib-config
-file usr/bin/aafire path=usr/demo/aalib/aafire mode=0555
-file usr/bin/aainfo path=usr/demo/aalib/aainfo mode=0555
-file usr/bin/aasavefont path=usr/demo/aalib/aasavefont mode=0555
-file usr/bin/aatest path=usr/demo/aalib/aatest mode=0555
+file usr/bin/$(MACH64)/aafire path=usr/demo/aalib/aafire mode=0555
+file usr/bin/$(MACH64)/aainfo path=usr/demo/aalib/aainfo mode=0555
+file usr/bin/$(MACH64)/aasavefont path=usr/demo/aalib/aasavefont mode=0555
+file usr/bin/$(MACH64)/aatest path=usr/demo/aalib/aatest mode=0555
file path=usr/include/aalib.h
link path=usr/lib/$(MACH64)/libaa.so target=libaa.so.1.0.4
link path=usr/lib/$(MACH64)/libaa.so.1 target=libaa.so.1.0.4
--- a/components/curl/curl.p5m Wed Mar 05 10:00:52 2014 -0800
+++ b/components/curl/curl.p5m Wed Mar 05 10:05:59 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
<transform file path=usr/share/doc/curl/html/(.+)$ -> \
@@ -41,7 +41,7 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
#
-file path=usr/bin/curl
+file usr/bin/$(MACH64)/curl path=usr/bin/curl
file path=usr/bin/curl-config
file path=usr/bin/$(MACH64)/curl
file path=usr/bin/$(MACH64)/curl-config
--- a/components/libconfuse/libconfuse.p5m Wed Mar 05 10:00:52 2014 -0800
+++ b/components/libconfuse/libconfuse.p5m Wed Mar 05 10:05:59 2014 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -107,9 +107,6 @@
file path=usr/share/doc/confuse/doc/tutorial-html/tutorial.css
file path=usr/share/doc/confuse/doc/tutorial.css
file path=usr/share/doc/confuse/doc/tutorial.xml
-file $(MACH32)/examples/.libs/ftpconf path=usr/share/doc/confuse/examples/ftpconf mode=0555
-file $(MACH32)/examples/.libs/reread path=usr/share/doc/confuse/examples/reread mode=0555
-file $(MACH32)/examples/.libs/simple path=usr/share/doc/confuse/examples/simple mode=0555
file examples/ftp.conf path=usr/share/doc/confuse/examples/ftp.conf
file examples/ftpconf.c path=usr/share/doc/confuse/examples/ftpconf.c
file examples/reread.c path=usr/share/doc/confuse/examples/reread.c
--- a/components/tidy/tidy.p5m Wed Mar 05 10:00:52 2014 -0800
+++ b/components/tidy/tidy.p5m Wed Mar 05 10:05:59 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -35,8 +35,8 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2007/134
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/tab2space
-file path=usr/bin/tidy
+file usr/bin/$(MACH64)/tab2space path=usr/bin/tab2space
+file usr/bin/$(MACH64)/tidy path=usr/bin/tidy
file include/buffio.h path=usr/include/tidy/buffio.h
file include/platform.h path=usr/include/tidy/platform.h
file include/tidy.h path=usr/include/tidy/tidy.h