--- a/components/zlib/zlib.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/zlib/zlib.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,7 +18,7 @@
 #
 # 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 committed>
@@ -29,34 +29,30 @@
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+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/2006/537
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-
-
+set name=org.opensolaris.arc-caseid value=PSARC/2006/537
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+link path=lib/$(MACH64)/libz.so target=libz.so.1
+file usr/lib/$(MACH64)/libz.so.1 path=lib/$(MACH64)/libz.so.1
+file usr/lib/$(MACH64)/llib-lz.ln path=lib/$(MACH64)/llib-lz.ln
+link path=lib/libz.so target=libz.so.1
 file usr/lib/libz.so.1 path=lib/libz.so.1
 file usr/lib/llib-lz.ln path=lib/llib-lz.ln
-file usr/lib/$(MACH64)/libz.so.1 path=lib/$(MACH64)/libz.so.1
-file usr/lib/$(MACH64)/llib-lz.ln path=lib/$(MACH64)/llib-lz.ln
 file path=usr/include/zconf.h
 file path=usr/include/zlib.h
-file path=usr/lib/llib-lz
-file usr/share/man/man3/zlib.3 path=usr/share/man/man3/libz.3
-file zlib.3.sunman path=usr/share/man/man3/zlib.3
-
-link path=lib/$(MACH64)/libz.so target=libz.so.1
-link path=lib/libz.so target=libz.so.1
 link path=usr/lib/$(MACH64)/libz.so target=libz.so.1
 link path=usr/lib/$(MACH64)/libz.so.1 target=../../../lib/$(MACH64)/libz.so.1
 link path=usr/lib/$(MACH64)/llib-lz.ln target=../../../lib/$(MACH64)/llib-lz.ln
 link path=usr/lib/libz.so target=./libz.so.1
 link path=usr/lib/libz.so.1 target=../../lib/libz.so.1
+file path=usr/lib/llib-lz
 link path=usr/lib/llib-lz.ln target=../../lib/llib-lz.ln
-
+file usr/share/man/man3/zlib.3 path=usr/share/man/man3/libz.3
+file zlib.3.sunman path=usr/share/man/man3/zlib.3
+#
+legacy pkg=SUNWzlib desc="The Zip compression library" \
+    name="The Zip compression library"
+#
 license zlib.license license="zlib license"
-
-legacy pkg=SUNWzlib \
-    name="The Zip compression library" \
-    desc="The Zip compression library"