--- a/components/vim/Makefile	Mon Apr 27 19:48:28 2015 -0700
+++ b/components/vim/Makefile	Tue Apr 28 04:24:13 2015 -0500
@@ -35,6 +35,8 @@
 
 HG_REPO=	https://vim.googlecode.com/hg
 HG_REV=		v7-4
+HG_HASH= sha256:0c823290aebf4ea341be2f8280cc5906cdbbf772c54fa675afb0845983f23b60
+
 
 COMPONENT_BUGDB=	utility/vim
 

--- a/make-rules/shared-macros.mk	Mon Apr 27 19:48:28 2015 -0700
+++ b/make-rules/shared-macros.mk	Tue Apr 28 04:24:13 2015 -0500
@@ -384,6 +384,7 @@
 BUILD_TOOLS ?=	/ws/on12-tools
 
 SPRO_ROOT =	$(BUILD_TOOLS)/SUNWspro
+SPRO_ROOT =	/opt
 SPRO_VROOT =	$(SPRO_ROOT)/solarisstudio12.4
 
 PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.5.1
@@ -926,9 +927,10 @@
 REQUIRED_PACKAGES += developer/gcc-47
 endif
 ifeq ($(COMPILER),studio)
-ifeq ($(findstring /opt/solarisstudio12.4,$(CC)),)
-# uncomment this line if you need to install Studio
-REQUIRED_PACKAGES += developer/solarisstudio-124
+ifneq ($(findstring /opt/solarisstudio12.4,$(CC)),)
+# If we are setup to build with an installed compiler, require the package
+# we can uncomment this when we know that pkglint can find it.
+#REQUIRED_PACKAGES += /solarisstudio/developer/solarisstudio-124
 endif
 endif
 ifeq ($(PARFAIT_BUILD),yes)