--- a/components/vim/gvim.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/vim/gvim.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -20,34 +20,31 @@
 #
 
 #
-# 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:/editor/gvim@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/editor/gvim@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Vi IMproved (GUI)"
-set name=pkg.description value="GVim is the graphical interface to vim, found in editor/vim."
+set name=pkg.description \
+    value="GVim is the graphical interface to vim, found in editor/vim."
 set name=com.oracle.info.description value="the Vi IMproved text editor (GUI)"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Editors \
     value="org.opensolaris.category.2008:System/Text Tools"
+set name=info.repository-changeset value=$(COMPONENT_HG_REV)
 set name=info.repository-url value=$(COMPONENT_HG_URL)
-set name=info.repository-changeset value=$(COMPONENT_HG_REV)
+set name=info.upstream [email protected]
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.upstream value="[email protected]"
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2007/267 \
-    value=PSARC/2008/546
+set name=org.opensolaris.arc-caseid value=PSARC/2007/267 value=PSARC/2008/546
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
+link path=usr/bin/gview target=gvim
 file $(MACH32)-gvim/src/gvim path=usr/bin/gvim
+link path=usr/bin/gvimdiff target=gvim
+link path=usr/bin/rgview target=gvim
 link path=usr/bin/rgvim target=gvim
-link path=usr/bin/rgview target=gvim
-link path=usr/bin/gview target=gvim
-link path=usr/bin/gvimdiff target=gvim
 link path=usr/share/man/man1/gvim.1 target=vim.1
 link path=usr/share/man/man1/gvimdiff.1 target=vimdiff.1
-
 license license license="VIM License"
-
 depend type=require fmri=editor/vim@$(IPS_COMPONENT_VERSION)