--- a/components/libexpat/expat.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/libexpat/expat.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,44 +18,40 @@
 #
 # 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.
 #
 
 set name=pkg.fmri \
     value=pkg:/library/expat@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="libexpat - XML parser library"
-set name=pkg.description value="A fast, non-validating, stream-oriented XML parsing library"
+set name=pkg.description \
+    value="A fast, non-validating, stream-oriented XML parsing library"
 set name=com.oracle.info.description value="the libexpat XML parser library"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 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/2007/378
+set name=org.opensolaris.arc-caseid value=LSARC/2007/378
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license COPYING license="expat license"
-
-dir path=usr
-dir path=usr/include
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-file path=usr/lib/libexpat.so.1.6.0
-file path=usr/lib/$(MACH64)/libexpat.so.1.6.0
-file path=usr/lib/$(MACH64)/pkgconfig/expat.pc
-file path=usr/lib/pkgconfig/expat.pc
+dir  path=usr
+dir  path=usr/include
+file path=usr/include/expat.h
 file path=usr/include/expat_external.h
-file path=usr/include/expat.h
+dir  path=usr/lib
+dir  path=usr/lib/$(MACH64)
+link path=usr/lib/$(MACH64)/libexpat.so target=libexpat.so.1.6.0
 link path=usr/lib/$(MACH64)/libexpat.so.0 target=libexpat.so.1.6.0
 link path=usr/lib/$(MACH64)/libexpat.so.1 target=libexpat.so.1.6.0
-link path=usr/lib/$(MACH64)/libexpat.so target=libexpat.so.1.6.0
+file path=usr/lib/$(MACH64)/libexpat.so.1.6.0
+dir  path=usr/lib/$(MACH64)/pkgconfig
+file path=usr/lib/$(MACH64)/pkgconfig/expat.pc
+link path=usr/lib/libexpat.so target=libexpat.so.1.6.0
 link path=usr/lib/libexpat.so.0 target=libexpat.so.1.6.0
 link path=usr/lib/libexpat.so.1 target=libexpat.so.1.6.0
-link path=usr/lib/libexpat.so target=libexpat.so.1.6.0
-
-legacy pkg=SUNWlexpt \
-    name="libexpat - XML parser library" \
-    desc="libexpat - XML parser library"
+file path=usr/lib/libexpat.so.1.6.0
+dir  path=usr/lib/pkgconfig
+file path=usr/lib/pkgconfig/expat.pc
+legacy pkg=SUNWlexpt desc="libexpat - XML parser library" \
+    name="libexpat - XML parser library"
+license COPYING license="expat license"