--- a/components/patch/patch.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/patch/patch.p5m	Tue Feb 03 13:01:27 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 uncommitted>
@@ -27,23 +27,17 @@
 set name=pkg.summary value="The GNU Patch utility"
 set name=com.oracle.info.description value="GNU patch"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
-    value=org.opensolaris.category.2008:Development/GNU
+set name=info.classification value=org.opensolaris.category.2008:Development/GNU
 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/1999/555 value=PSARC/2014/324
+set name=org.opensolaris.arc-caseid value=PSARC/1999/555 value=PSARC/2014/324
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
+link path=usr/bin/gpatch target=../gnu/bin/patch facet.compat.gnulinks=true
+link path=usr/bin/patch target=../gnu/bin/patch
 file usr/bin/patch path=usr/gnu/bin/patch
 file usr/share/man/man1/patch.1 path=usr/gnu/share/man/man1/patch.1
-
+link path=usr/share/man/man1/gpatch.1 \
+    target=../../../gnu/share/man/man1/patch.1 facet.compat.gnulinks=all
+link path=usr/share/man/man1/patch.1 target=../../../gnu/share/man/man1/patch.1
 legacy pkg=SUNWgpch desc="The GNU Patch utility" name="The GNU Patch utility"
 license patch.license license=GPLv2
-
-link path=usr/bin/patch target=../gnu/bin/patch
-link path=usr/bin/gpatch target=../gnu/bin/patch facet.compat.gnulinks=true
-link path=usr/share/man/man1/patch.1 \
-    target=../../../gnu/share/man/man1/patch.1
-link path=usr/share/man/man1/gpatch.1 \
-    target=../../../gnu/share/man/man1/patch.1 facet.compat.gnulinks=all