diff -r 7b09b73a67a4 -r 0f62cc221c7e components/vim/vim.p5m
--- a/components/vim/vim.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/vim/vim.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -20,49 +20,63 @@
 #
 
 #
-# Copyright (c) 2011, 2013, 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>
-
-set name=pkg.fmri value=pkg:/editor/vim@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/editor/vim@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Vi IMproved"
-set name=pkg.description value="Vim is a clone of the Unix editor 'vi'.  It is a modal text editor with support for syntax highlighting, context-sensitive indentation, and extension scripting in numerous languages."
+set name=pkg.description \
+    value="Vim is a clone of the Unix editor 'vi'.  It is a modal text editor with support for syntax highlighting, context-sensitive indentation, and extension scripting in numerous languages."
 set name=com.oracle.info.description value="the Vi IMproved text editor"
 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 value=vim-dev@vim.org
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.upstream value="vim-dev@vim.org"
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2007/267
+set name=org.opensolaris.arc-caseid value=PSARC/2007/267
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
+link path=usr/bin/rview target=vim
+link path=usr/bin/rvim target=vim
+link path=usr/bin/vimdiff target=vim
 file path=usr/bin/vimtutor
 file path=usr/bin/xxd
 file path=usr/share/man/fr.ISO8859-1/man1/evim.1
+link path=usr/share/man/fr.ISO8859-1/man1/rview.1 target=vim.1
+link path=usr/share/man/fr.ISO8859-1/man1/rvim.1 target=vim.1
 file path=usr/share/man/fr.ISO8859-1/man1/vimdiff.1
 file path=usr/share/man/fr.ISO8859-1/man1/vimtutor.1
 file path=usr/share/man/fr.ISO8859-1/man1/xxd.1
 file path=usr/share/man/fr.UTF-8/man1/evim.1
+link path=usr/share/man/fr.UTF-8/man1/rview.1 target=vim.1
+link path=usr/share/man/fr.UTF-8/man1/rvim.1 target=vim.1
 file path=usr/share/man/fr.UTF-8/man1/vimdiff.1
 file path=usr/share/man/fr.UTF-8/man1/vimtutor.1
 file path=usr/share/man/fr.UTF-8/man1/xxd.1
 file path=usr/share/man/fr/man1/evim.1
+link path=usr/share/man/fr/man1/rview.1 target=vim.1
+link path=usr/share/man/fr/man1/rvim.1 target=vim.1
 file path=usr/share/man/fr/man1/vimdiff.1
 file path=usr/share/man/fr/man1/vimtutor.1
 file path=usr/share/man/fr/man1/xxd.1
 file path=usr/share/man/it.ISO8859-1/man1/evim.1
+link path=usr/share/man/it.ISO8859-1/man1/rview.1 target=vim.1
+link path=usr/share/man/it.ISO8859-1/man1/rvim.1 target=vim.1
 file path=usr/share/man/it.ISO8859-1/man1/vimdiff.1
 file path=usr/share/man/it.ISO8859-1/man1/vimtutor.1
 file path=usr/share/man/it.ISO8859-1/man1/xxd.1
 file path=usr/share/man/it.UTF-8/man1/evim.1
+link path=usr/share/man/it.UTF-8/man1/rview.1 target=vim.1
+link path=usr/share/man/it.UTF-8/man1/rvim.1 target=vim.1
 file path=usr/share/man/it.UTF-8/man1/vimdiff.1
 file path=usr/share/man/it.UTF-8/man1/vimtutor.1
 file path=usr/share/man/it.UTF-8/man1/xxd.1
 file path=usr/share/man/it/man1/evim.1
+link path=usr/share/man/it/man1/rview.1 target=vim.1
+link path=usr/share/man/it/man1/rvim.1 target=vim.1
 file path=usr/share/man/it/man1/vimdiff.1
 file path=usr/share/man/it/man1/vimtutor.1
 file path=usr/share/man/it/man1/xxd.1
@@ -71,26 +85,38 @@
 file path=usr/share/man/ja/man1/vimtutor.1
 file path=usr/share/man/ja/man1/xxd.1
 file path=usr/share/man/man1/evim.1
+link path=usr/share/man/man1/rview.1 target=vim.1
+link path=usr/share/man/man1/rvim.1 target=vim.1
 file path=usr/share/man/man1/vimdiff.1
 file path=usr/share/man/man1/vimtutor.1
 file path=usr/share/man/man1/xxd.1
 file path=usr/share/man/pl.ISO8859-2/man1/evim.1
+link path=usr/share/man/pl.ISO8859-2/man1/rview.1 target=vim.1
+link path=usr/share/man/pl.ISO8859-2/man1/rvim.1 target=vim.1
 file path=usr/share/man/pl.ISO8859-2/man1/vimdiff.1
 file path=usr/share/man/pl.ISO8859-2/man1/vimtutor.1
 file path=usr/share/man/pl.ISO8859-2/man1/xxd.1
 file path=usr/share/man/pl.UTF-8/man1/evim.1
+link path=usr/share/man/pl.UTF-8/man1/rview.1 target=vim.1
+link path=usr/share/man/pl.UTF-8/man1/rvim.1 target=vim.1
 file path=usr/share/man/pl.UTF-8/man1/vimdiff.1
 file path=usr/share/man/pl.UTF-8/man1/vimtutor.1
 file path=usr/share/man/pl.UTF-8/man1/xxd.1
 file path=usr/share/man/pl/man1/evim.1
+link path=usr/share/man/pl/man1/rview.1 target=vim.1
+link path=usr/share/man/pl/man1/rvim.1 target=vim.1
 file path=usr/share/man/pl/man1/vimdiff.1
 file path=usr/share/man/pl/man1/vimtutor.1
 file path=usr/share/man/pl/man1/xxd.1
 file path=usr/share/man/ru.KOI8-R/man1/evim.1
+link path=usr/share/man/ru.KOI8-R/man1/rview.1 target=vim.1
+link path=usr/share/man/ru.KOI8-R/man1/rvim.1 target=vim.1
 file path=usr/share/man/ru.KOI8-R/man1/vimdiff.1
 file path=usr/share/man/ru.KOI8-R/man1/vimtutor.1
 file path=usr/share/man/ru.KOI8-R/man1/xxd.1
 file path=usr/share/man/ru.UTF-8/man1/evim.1
+link path=usr/share/man/ru.UTF-8/man1/rview.1 target=vim.1
+link path=usr/share/man/ru.UTF-8/man1/rvim.1 target=vim.1
 file path=usr/share/man/ru.UTF-8/man1/vimdiff.1
 file path=usr/share/man/ru.UTF-8/man1/vimtutor.1
 file path=usr/share/man/ru.UTF-8/man1/xxd.1
@@ -192,8 +218,8 @@
 file path=usr/share/vim/$(VIMVER)/compiler/msbuild.vim
 file path=usr/share/vim/$(VIMVER)/compiler/msvc.vim
 file path=usr/share/vim/$(VIMVER)/compiler/neato.vim
+file path=usr/share/vim/$(VIMVER)/compiler/ocaml.vim
 file path=usr/share/vim/$(VIMVER)/compiler/onsgmls.vim
-file path=usr/share/vim/$(VIMVER)/compiler/ocaml.vim
 file path=usr/share/vim/$(VIMVER)/compiler/pbx.vim
 file path=usr/share/vim/$(VIMVER)/compiler/perl.vim
 file path=usr/share/vim/$(VIMVER)/compiler/php.vim
@@ -719,8 +745,8 @@
 file path=usr/share/vim/$(VIMVER)/lang/fr/LC_MESSAGES/vim.mo
 file path=usr/share/vim/$(VIMVER)/lang/ga/LC_MESSAGES/vim.mo
 file path=usr/share/vim/$(VIMVER)/lang/it/LC_MESSAGES/vim.mo
+file path=usr/share/vim/$(VIMVER)/lang/ja.euc-jp/LC_MESSAGES/vim.mo
 file path=usr/share/vim/$(VIMVER)/lang/ja/LC_MESSAGES/vim.mo
-file path=usr/share/vim/$(VIMVER)/lang/ja.euc-jp/LC_MESSAGES/vim.mo
 file path=usr/share/vim/$(VIMVER)/lang/ko.UTF-8/LC_MESSAGES/vim.mo
 file path=usr/share/vim/$(VIMVER)/lang/ko/LC_MESSAGES/vim.mo
 file path=usr/share/vim/$(VIMVER)/lang/menu_af.latin1.vim
@@ -1610,35 +1636,6 @@
 file path=usr/share/vim/$(VIMVER)/tutor/tutor.zh_cn.utf-8
 file path=usr/share/vim/$(VIMVER)/tutor/tutor.zh_tw.utf-8
 file path=usr/share/vim/$(VIMVER)/vimrc_example.vim
-link path=usr/bin/rview target=vim
-link path=usr/bin/rvim target=vim
-link path=usr/bin/vimdiff target=vim
-link path=usr/share/man/fr.ISO8859-1/man1/rview.1 target=vim.1
-link path=usr/share/man/fr.ISO8859-1/man1/rvim.1 target=vim.1
-link path=usr/share/man/fr.UTF-8/man1/rview.1 target=vim.1
-link path=usr/share/man/fr.UTF-8/man1/rvim.1 target=vim.1
-link path=usr/share/man/fr/man1/rview.1 target=vim.1
-link path=usr/share/man/fr/man1/rvim.1 target=vim.1
-link path=usr/share/man/it.ISO8859-1/man1/rview.1 target=vim.1
-link path=usr/share/man/it.ISO8859-1/man1/rvim.1 target=vim.1
-link path=usr/share/man/it.UTF-8/man1/rview.1 target=vim.1
-link path=usr/share/man/it.UTF-8/man1/rvim.1 target=vim.1
-link path=usr/share/man/it/man1/rview.1 target=vim.1
-link path=usr/share/man/it/man1/rvim.1 target=vim.1
-link path=usr/share/man/man1/rview.1 target=vim.1
-link path=usr/share/man/man1/rvim.1 target=vim.1
-link path=usr/share/man/pl.ISO8859-2/man1/rview.1 target=vim.1
-link path=usr/share/man/pl.ISO8859-2/man1/rvim.1 target=vim.1
-link path=usr/share/man/pl.UTF-8/man1/rview.1 target=vim.1
-link path=usr/share/man/pl.UTF-8/man1/rvim.1 target=vim.1
-link path=usr/share/man/pl/man1/rview.1 target=vim.1
-link path=usr/share/man/pl/man1/rvim.1 target=vim.1
-link path=usr/share/man/ru.KOI8-R/man1/rview.1 target=vim.1
-link path=usr/share/man/ru.KOI8-R/man1/rvim.1 target=vim.1
-link path=usr/share/man/ru.UTF-8/man1/rview.1 target=vim.1
-link path=usr/share/man/ru.UTF-8/man1/rvim.1 target=vim.1
-
 license license license="VIM License"
-
+depend type=optional fmri=editor/gvim@$(IPS_COMPONENT_VERSION)
 depend type=require fmri=editor/vim/vim-core@$(IPS_COMPONENT_VERSION)
-depend type=optional fmri=editor/gvim@$(IPS_COMPONENT_VERSION)