16609699 update vim to 7.3.882
authorDanek Duvall <danek.duvall@oracle.com>
Fri, 05 Apr 2013 15:35:37 -0700
changeset 1250 c7a246ecccbb
parent 1249 57ecc19cd86f
child 1251 f1fb66b52f41
16609699 update vim to 7.3.882
components/vim/Makefile
components/vim/gvim.p5m
components/vim/patches/7031620.patch
components/vim/vim.p5m
--- a/components/vim/Makefile	Fri Apr 05 05:33:50 2013 -0700
+++ b/components/vim/Makefile	Fri Apr 05 15:35:37 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -34,10 +34,10 @@
 COMPONENT_PROJECT_URL=	http://www.vim.org/
 COMPONENT_ARCHIVE=	vim-$(COMPONENT_HG_REV).tar.bz2
 COMPONENT_ARCHIVE_URL=	$(EXTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE)
-COMPONENT_ARCHIVE_HASH=	sha256:08875264e852cc2021e605f26353ba64874064d59dd8ec1ff5fc62265c4be3ac
+COMPONENT_ARCHIVE_HASH=	sha256:eda12f4f14b6456a579cc9d0ac29ebeecb8ff89ad9d5eb313fab75a751cf59ff
 COMPONENT_HG_URL=	https://vim.googlecode.com/hg
-COMPONENT_HG_REV=	v7-3-684
-COMPONENT_HG_REV_OLD=	v7-3-684
+COMPONENT_HG_REV=	v7-3-882
+COMPONENT_HG_REV_OLD:=	$(COMPONENT_HG_REV)
 
 COMPONENT_BUGDB=	utility/vim
 
@@ -70,30 +70,40 @@
 		/usr/gnu/bin/sed -i \
 			-e "s/^COMPONENT_ARCHIVE_HASH=.*/COMPONENT_ARCHIVE_HASH=	sha256:$$digest/" \
 			-e "s/^COMPONENT_HG_REV=.*/COMPONENT_HG_REV=	$(COMPONENT_HG_REV)/" \
-			-e "s/^COMPONENT_HG_REV_OLD=.*/COMPONENT_HG_REV_OLD=	$(COMPONENT_HG_REV)/" \
 			Makefile
 
 PATCH_LEVEL =	0
 
 PKG_MACROS +=	VIMVER=vim73
 
-X_VARIANT =	$(BUILD_DIR)/$(MACH32)-gvim
-NOX_VARIANT =	$(BUILD_DIR)/$(MACH32)-vim
+ASLR_MODE =	$(ASLR_ENABLE)
+
+X_VARIANT =	$(BUILD_DIR)/$(MACH64)-gvim
+NOX_VARIANT =	$(BUILD_DIR)/$(MACH64)-vim
 
 VARIANTS =	$(X_VARIANT) $(NOX_VARIANT)
 
-$(VARIANTS:%=%/.configured):	BITS=32
+$(VARIANTS:%=%/.configured):	BITS=64
 
-BUILD_32 = 	$(VARIANTS:%=%/.built)
+BUILD_64 = 	$(VARIANTS:%=%/.built)
 
 # Only install the non-X variant.  We will cherry-pick gvim out of the build
 # directory to avoid re-installing everything.
-INSTALL_32 = 	$(NOX_VARIANT)/.installed
+INSTALL_64 = 	$(NOX_VARIANT)/.installed
+
+TEST_64 = 	$(NOX_VARIANT)/.tested
+
+# Necessary to pass 64-bit flags to the link stage.
+CC +=			$(CC_BITS)
 
-TEST_32 = 	$(NOX_VARIANT)/.tested
+# Put all the binaries directly in /usr/bin, not in /usr/bin/64.
+CONFIGURE_BINDIR.64 =	$(CONFIGURE_PREFIX)/bin
 
-# Override a broken imake that's always providing a 64-bit library directory.
-CONFIGURE_OPTIONS +=	--x-libraries=$(CONFIGURE_LIBDIR.$(BITS))
+# Use the 64-bit versions of pkg-config files (or GTK+ will add -R/usr/lib)
+CONFIGURE_ENV +=	PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)"
+
+# Necessary to pass 64-bit flags to the compilation stage.
+CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS +=	--with-features=huge
 CONFIGURE_OPTIONS +=	--with-compiledby="the Solaris Userland build environment"
 CONFIGURE_OPTIONS +=	--with-modified-by="Solaris Userland <[email protected]>"
@@ -131,11 +141,11 @@
 	nawk '/begin of license/ {p=1; getline; next} /end of license/ {p=0} p == 1 {print}' $< > [email protected]
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32) $(X_VARIANT)/.built $(BUILD_DIR)/license
+install:	$(INSTALL_64) $(X_VARIANT)/.built $(BUILD_DIR)/license
 
-test:		$(TEST_32)
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/vim/gvim.p5m	Fri Apr 05 05:33:50 2013 -0700
+++ b/components/vim/gvim.p5m	Fri Apr 05 15:35:37 2013 -0700
@@ -39,7 +39,7 @@
     value=PSARC/2008/546
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-file $(MACH32)-gvim/src/gvim path=usr/bin/gvim
+file $(MACH64)-gvim/src/gvim path=usr/bin/gvim
 link path=usr/bin/rgvim target=gvim
 link path=usr/bin/rgview target=gvim
 link path=usr/bin/gview target=gvim
--- a/components/vim/patches/7031620.patch	Fri Apr 05 05:33:50 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- src/os_unix.c	Tue May  1 09:52:21 2012
-+++ src/os_unix.c	Tue May  1 09:52:24 2012
[email protected]@ -2509,7 +2509,7 @@
- 	}
- 
- 	l = STRLEN(buf);
--	if (l >= len)
-+	if (l >= len - 1)
- 	    retval = FAIL;
- #ifndef VMS
- 	else
--- a/components/vim/vim.p5m	Fri Apr 05 05:33:50 2013 -0700
+++ b/components/vim/vim.p5m	Fri Apr 05 15:35:37 2013 -0700
@@ -199,6 +199,7 @@
 file path=usr/share/vim/$(VIMVER)/autoload/ada.vim
 file path=usr/share/vim/$(VIMVER)/autoload/adacomplete.vim
 file path=usr/share/vim/$(VIMVER)/autoload/ccomplete.vim
+file path=usr/share/vim/$(VIMVER)/autoload/clojurecomplete.vim
 file path=usr/share/vim/$(VIMVER)/autoload/csscomplete.vim
 file path=usr/share/vim/$(VIMVER)/autoload/decada.vim
 file path=usr/share/vim/$(VIMVER)/autoload/getscript.vim
@@ -463,6 +464,7 @@
 file path=usr/share/vim/$(VIMVER)/ftplugin/cdrdaoconf.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/ch.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/changelog.vim
+file path=usr/share/vim/$(VIMVER)/ftplugin/clojure.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/cobol.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/conf.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/config.vim
@@ -575,6 +577,7 @@
 file path=usr/share/vim/$(VIMVER)/ftplugin/quake.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/racc.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/readline.vim
+file path=usr/share/vim/$(VIMVER)/ftplugin/redif.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/reva.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/rnc.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/rpl.vim
@@ -640,6 +643,7 @@
 file path=usr/share/vim/$(VIMVER)/indent/ch.vim
 file path=usr/share/vim/$(VIMVER)/indent/chaiscript.vim
 file path=usr/share/vim/$(VIMVER)/indent/changelog.vim
+file path=usr/share/vim/$(VIMVER)/indent/clojure.vim
 file path=usr/share/vim/$(VIMVER)/indent/cmake.vim
 file path=usr/share/vim/$(VIMVER)/indent/cobol.vim
 file path=usr/share/vim/$(VIMVER)/indent/config.vim
@@ -726,6 +730,7 @@
 file path=usr/share/vim/$(VIMVER)/indent/xsd.vim
 file path=usr/share/vim/$(VIMVER)/indent/xslt.vim
 file path=usr/share/vim/$(VIMVER)/indent/yacc.vim
+file path=usr/share/vim/$(VIMVER)/indent/yaml.vim
 file path=usr/share/vim/$(VIMVER)/indent/zimbu.vim
 file path=usr/share/vim/$(VIMVER)/indent/zsh.vim
 file path=usr/share/vim/$(VIMVER)/indoff.vim
@@ -827,6 +832,7 @@
 file path=usr/share/vim/$(VIMVER)/lang/menu_cs_cz.cp1250.vim
 file path=usr/share/vim/$(VIMVER)/lang/menu_cs_cz.iso_8859-2.vim
 file path=usr/share/vim/$(VIMVER)/lang/menu_cs_cz.latin1.vim
+file path=usr/share/vim/$(VIMVER)/lang/menu_cs_cz.utf-8.vim
 file path=usr/share/vim/$(VIMVER)/lang/menu_czech_czech_republic.1250.vim
 file path=usr/share/vim/$(VIMVER)/lang/menu_czech_czech_republic.1252.vim
 file path=usr/share/vim/$(VIMVER)/lang/menu_czech_czech_republic.ascii.vim
@@ -1068,6 +1074,7 @@
 file path=usr/share/vim/$(VIMVER)/syntax/aptconf.vim
 file path=usr/share/vim/$(VIMVER)/syntax/arch.vim
 file path=usr/share/vim/$(VIMVER)/syntax/art.vim
+file path=usr/share/vim/$(VIMVER)/syntax/asciidoc.vim
 file path=usr/share/vim/$(VIMVER)/syntax/asm.vim
 file path=usr/share/vim/$(VIMVER)/syntax/asm68k.vim
 file path=usr/share/vim/$(VIMVER)/syntax/asmh8300.vim
@@ -1114,6 +1121,7 @@
 file path=usr/share/vim/$(VIMVER)/syntax/cl.vim
 file path=usr/share/vim/$(VIMVER)/syntax/clean.vim
 file path=usr/share/vim/$(VIMVER)/syntax/clipper.vim
+file path=usr/share/vim/$(VIMVER)/syntax/clojure.vim
 file path=usr/share/vim/$(VIMVER)/syntax/cmake.vim
 file path=usr/share/vim/$(VIMVER)/syntax/cmusrc.vim
 file path=usr/share/vim/$(VIMVER)/syntax/cobol.vim
@@ -1128,6 +1136,7 @@
 file path=usr/share/vim/$(VIMVER)/syntax/crontab.vim
 file path=usr/share/vim/$(VIMVER)/syntax/cs.vim
 file path=usr/share/vim/$(VIMVER)/syntax/csc.vim
+file path=usr/share/vim/$(VIMVER)/syntax/csdl.vim
 file path=usr/share/vim/$(VIMVER)/syntax/csh.vim
 file path=usr/share/vim/$(VIMVER)/syntax/csp.vim
 file path=usr/share/vim/$(VIMVER)/syntax/css.vim
@@ -1315,6 +1324,7 @@
 file path=usr/share/vim/$(VIMVER)/syntax/mailaliases.vim
 file path=usr/share/vim/$(VIMVER)/syntax/mailcap.vim
 file path=usr/share/vim/$(VIMVER)/syntax/make.vim
+file path=usr/share/vim/$(VIMVER)/syntax/mallard.vim
 file path=usr/share/vim/$(VIMVER)/syntax/man.vim
 file path=usr/share/vim/$(VIMVER)/syntax/manconf.vim
 file path=usr/share/vim/$(VIMVER)/syntax/manual.vim
@@ -1495,6 +1505,7 @@
 file path=usr/share/vim/$(VIMVER)/syntax/sql.vim
 file path=usr/share/vim/$(VIMVER)/syntax/sqlanywhere.vim
 file path=usr/share/vim/$(VIMVER)/syntax/sqlforms.vim
+file path=usr/share/vim/$(VIMVER)/syntax/sqlhana.vim
 file path=usr/share/vim/$(VIMVER)/syntax/sqlinformix.vim
 file path=usr/share/vim/$(VIMVER)/syntax/sqlj.vim
 file path=usr/share/vim/$(VIMVER)/syntax/sqloracle.vim