--- a/components/common/gcmn.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/common/gcmn.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,30 +18,26 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, 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:/system/prerequisite/gnu@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU prerequisites"
-set name=info.classification \
-    value="org.opensolaris.category.2008:Development/GNU"
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2000/487
+set name=info.classification value=org.opensolaris.category.2008:Development/GNU
+set name=org.opensolaris.arc-caseid value=PSARC/2000/487
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=usr/sfw/lib/locale
-dir path=usr/sfw/share/doc
-dir path=usr/sfw/share/info
-dir path=usr/sfw/share/man
-dir path=usr/sfw/share/src
+#
+link path=usr/sfw/doc target=share/doc
 link path=usr/sfw/info target=share/info
+dir  path=usr/sfw/lib/locale
+link path=usr/sfw/man target=share/man
+dir  path=usr/sfw/share/doc
+dir  path=usr/sfw/share/info
 link path=usr/sfw/share/locale target=../lib/locale
-link path=usr/sfw/doc target=share/doc
+dir  path=usr/sfw/share/man
+dir  path=usr/sfw/share/src
 link path=usr/sfw/src target=share/src
-link path=usr/sfw/man target=share/man
 
 
-legacy pkg=SUNWgcmn \
-    desc="Common GNU package" \
-    name="gcmn - Common GNU package"
+legacy pkg=SUNWgcmn desc="Common GNU package" name="gcmn - Common GNU package"