--- a/components/tcl/expect/expect.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/tcl/expect/expect.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,46 +18,34 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/demo/expect/.+ ->default mode 0555>
 <transform file path=usr/demo/expect/man/.+ -> set mode 0444>
-
 set name=pkg.fmri \
     value=pkg:/shell/expect@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="expect - Programmed dialogue with other interactive programs"
 set name=pkg.description \
     value="Expect is a tool for automating interactive applications, such as telnet, ftp, passwd, fsck, rlogin, tip, etc."
-set name=pkg.summary \
-    value="expect - Programmed dialogue with other interactive programs"
 set name=com.oracle.info.description value="the Expect tool"
 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/2007/612
+set name=org.opensolaris.arc-caseid value=PSARC/2007/612
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/bin/$(MACH32)
-dir path=usr/bin/$(MACH64)
-dir path=usr/demo
-dir path=usr/demo/expect
-dir path=usr/demo/expect/man
-dir path=usr/demo/expect/man/man1
-dir path=usr/include
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/expect$(COMPONENT_VERSION)
-dir path=usr/lib/expect$(COMPONENT_VERSION)
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3
+dir  path=usr
+dir  path=usr/bin
+dir  path=usr/bin/$(MACH32)
+file usr/bin/expect path=usr/bin/$(MACH32)/expect
+dir  path=usr/bin/$(MACH64)
 file path=usr/bin/$(MACH64)/expect
-file usr/bin/expect path=usr/bin/$(MACH32)/expect
+link path=usr/bin/expect target=$(MACH64)/expect
+dir  path=usr/demo
+dir  path=usr/demo/expect
 file path=usr/demo/expect/autoexpect
 file path=usr/demo/expect/autopasswd
 file path=usr/demo/expect/cryptdir
@@ -66,6 +54,8 @@
 file path=usr/demo/expect/ftp-rfc
 file path=usr/demo/expect/kibitz
 file path=usr/demo/expect/lpunlock
+dir  path=usr/demo/expect/man
+dir  path=usr/demo/expect/man/man1
 file path=usr/demo/expect/man/man1/autoexpect.1
 file path=usr/demo/expect/man/man1/cryptdir.1
 file path=usr/demo/expect/man/man1/decryptdir.1
@@ -90,15 +80,23 @@
 file path=usr/demo/expect/weather
 file path=usr/demo/expect/xkibitz
 file path=usr/demo/expect/xpstat
+dir  path=usr/include
 file path=usr/include/expect.h
 file path=usr/include/expect_comm.h
 file path=usr/include/expect_tcl.h
 file path=usr/include/tcldbg.h
+dir  path=usr/lib
+dir  path=usr/lib/$(MACH64)
+dir  path=usr/lib/$(MACH64)/expect$(COMPONENT_VERSION)
 file path=usr/lib/$(MACH64)/expect$(COMPONENT_VERSION)/libexpect$(COMPONENT_VERSION).so
 file path=usr/lib/$(MACH64)/expect$(COMPONENT_VERSION)/pkgIndex.tcl
+dir  path=usr/lib/expect$(COMPONENT_VERSION)
 file path=usr/lib/expect$(COMPONENT_VERSION)/libexpect$(COMPONENT_VERSION).so
 file path=usr/lib/expect$(COMPONENT_VERSION)/pkgIndex.tcl
+dir  path=usr/share
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file path=usr/share/man/man1/expect.1
+dir  path=usr/share/man/man3
 file path=usr/share/man/man3/libexpect.3
-link path=usr/bin/expect target=$(MACH64)/expect
-license license.terms license="BSD-like"
+license license.terms license=BSD-like