Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
17301901 update vim to 7.4
authorDanek Duvall <danek.duvall@oracle.com>
Tue, 13 Aug 2013 09:49:16 -0700
changeset 1431 9a892a7cb482
parent 1430 24f4aebfd6a5
child 1432 d90238e58d20
17301901 update vim to 7.4
components/vim/Makefile file | annotate | diff | comparison | revisions
components/vim/vim-core.p5m file | annotate | diff | comparison | revisions
components/vim/vim.p5m file | annotate | diff | comparison | revisions 
--- a/components/vim/Makefile	Tue Aug 13 08:45:47 2013 -0700
+++ b/components/vim/Makefile	Tue Aug 13 09:49:16 2013 -0700
@@ -28,16 +28,15 @@
 PATH=/usr/bin:/usr/gnu/bin
 
 COMPONENT_NAME=		vim
-COMPONENT_VERSION=	7.3
+COMPONENT_VERSION=	7.4
 IPS_COMPONENT_VERSION=	$(shell echo $(COMPONENT_HG_REV) | sed -e 's/-/./g' -e 's/v//')
 COMPONENT_SRC=		vim-$(COMPONENT_HG_REV)
 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:eda12f4f14b6456a579cc9d0ac29ebeecb8ff89ad9d5eb313fab75a751cf59ff
+COMPONENT_ARCHIVE_HASH=	sha256:e7f4f411d9ff4c9dbf0ec57cc5da2e9d5e586e69fe3d69f31cbce9118e443507
 COMPONENT_HG_URL=	https://vim.googlecode.com/hg
-COMPONENT_HG_REV=	v7-3-882
-COMPONENT_HG_REV_OLD:=	$(COMPONENT_HG_REV)
+COMPONENT_HG_REV=	v7-4
 
 COMPONENT_BUGDB=	utility/vim
 
@@ -51,30 +50,26 @@
 $(HGREPODIR)/.hg:
 	hg clone -U $(COMPONENT_HG_URL) $(@D)
 
-hgball-pull: $(HGREPODIR)/.hg
-	hg -R $(HGREPODIR) pull
-
-hgball: COMPONENT_HG_REV = $(shell hg -R $(HGREPODIR) tags | awk '$$1 ~ /^v7-/ {print $$1; exit}')
-
-# Create the tarball.  It should contain the working directory of the repo at
-# the desired revision, but not the .hg directory.  Note that the digest will
-# be different every time because .hg doesn't set the timestamps of the files
-# in the working directory.
-hgball: hgball-pull
-	rm -rf $(TARBALLDIR)
-	hg clone -u $(COMPONENT_HG_REV) $(HGREPODIR) $(TARBALLDIR)
-	rm -rf $(TARBALLDIR)/.hg
-	tar jcf $(COMPONENT_ARCHIVE) $(TARBALLDIR)
-	hg --cwd $(HGREPODIR) stat -ar --rev $(COMPONENT_HG_REV_OLD):$(COMPONENT_HG_REV) runtime src/po
-	digest=$$(digest -a sha256 $(COMPONENT_ARCHIVE)); \
-		/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)/" \
-			Makefile
+# Create the tarball.
+hgball: $(HGREPODIR)/.hg
+	cd $(HGREPODIR); \
+	hg pull; \
+	if [[ -n "$(COMPONENT_HG_NEWREV)" ]]; then \
+		newrev=$(COMPONENT_HG_NEWREV); \
+	else \
+		newrev=$$(hg tags | awk '$$1 ~ /^v7-/ {print $$1; exit}'); \
+	fi; \
+	hg archive -p vim-$$newrev -r $$newrev ../vim-$$newrev.tar.bz2; \
+	hg stat -ar --rev $(COMPONENT_HG_REV):$$newrev runtime src/po; \
+	digest=$$(digest -a sha256 ../vim-$$newrev.tar.bz2); \
+	$(GSED) -i \
+		-e "s/^COMPONENT_ARCHIVE_HASH=.*/COMPONENT_ARCHIVE_HASH=	sha256:$$digest/" \
+		-e "s/^COMPONENT_HG_REV=.*/COMPONENT_HG_REV=	$$newrev/" \
+		../Makefile
 
 PATCH_LEVEL =	0
 
-PKG_MACROS +=	VIMVER=vim73
+PKG_MACROS +=	VIMVER=vim74
 
 ASLR_MODE =	$(ASLR_ENABLE)
 
--- a/components/vim/vim-core.p5m	Tue Aug 13 08:45:47 2013 -0700
+++ b/components/vim/vim-core.p5m	Tue Aug 13 09:49:16 2013 -0700
@@ -47,6 +47,7 @@
 file path=usr/share/man/it.ISO8859-1/man1/vim.1
 file path=usr/share/man/it.UTF-8/man1/vim.1
 file path=usr/share/man/it/man1/vim.1
+file path=usr/share/man/ja/man1/vim.1
 file path=usr/share/man/man1/vim.1
 file path=usr/share/man/pl.ISO8859-2/man1/vim.1
 file path=usr/share/man/pl.UTF-8/man1/vim.1
@@ -75,6 +76,9 @@
 link path=usr/share/man/it/man1/ex.1 target=vim.1
 link path=usr/share/man/it/man1/vi.1 target=vim.1
 link path=usr/share/man/it/man1/view.1 target=vim.1
+link path=usr/share/man/ja/man1/ex.1 target=vim.1
+link path=usr/share/man/ja/man1/vi.1 target=vim.1
+link path=usr/share/man/ja/man1/view.1 target=vim.1
 link path=usr/share/man/man1/ex.1 target=vim.1
 link path=usr/share/man/man1/vi.1 target=vim.1
 link path=usr/share/man/man1/view.1 target=vim.1
--- a/components/vim/vim.p5m	Tue Aug 13 08:45:47 2013 -0700
+++ b/components/vim/vim.p5m	Tue Aug 13 09:49:16 2013 -0700
@@ -66,6 +66,10 @@
 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
+file path=usr/share/man/ja/man1/evim.1
+file path=usr/share/man/ja/man1/vimdiff.1
+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
 file path=usr/share/man/man1/vimdiff.1
 file path=usr/share/man/man1/vimtutor.1
@@ -171,6 +175,7 @@
 file path=usr/share/vim/$(VIMVER)/compiler/gcc.vim
 file path=usr/share/vim/$(VIMVER)/compiler/gfortran.vim
 file path=usr/share/vim/$(VIMVER)/compiler/gnat.vim
+file path=usr/share/vim/$(VIMVER)/compiler/haml.vim
 file path=usr/share/vim/$(VIMVER)/compiler/hp_acc.vim
 file path=usr/share/vim/$(VIMVER)/compiler/icc.vim
 file path=usr/share/vim/$(VIMVER)/compiler/ifort.vim
@@ -184,22 +189,27 @@
 file path=usr/share/vim/$(VIMVER)/compiler/mipspro_c89.vim
 file path=usr/share/vim/$(VIMVER)/compiler/mipspro_cpp.vim
 file path=usr/share/vim/$(VIMVER)/compiler/modelsim_vcom.vim
+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/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
 file path=usr/share/vim/$(VIMVER)/compiler/pyunit.vim
+file path=usr/share/vim/$(VIMVER)/compiler/rake.vim
 file path=usr/share/vim/$(VIMVER)/compiler/rspec.vim
 file path=usr/share/vim/$(VIMVER)/compiler/rst.vim
 file path=usr/share/vim/$(VIMVER)/compiler/ruby.vim
 file path=usr/share/vim/$(VIMVER)/compiler/rubyunit.vim
+file path=usr/share/vim/$(VIMVER)/compiler/sass.vim
 file path=usr/share/vim/$(VIMVER)/compiler/se.vim
 file path=usr/share/vim/$(VIMVER)/compiler/splint.vim
 file path=usr/share/vim/$(VIMVER)/compiler/tcl.vim
 file path=usr/share/vim/$(VIMVER)/compiler/tex.vim
 file path=usr/share/vim/$(VIMVER)/compiler/tidy.vim
+file path=usr/share/vim/$(VIMVER)/compiler/xbuild.vim
 file path=usr/share/vim/$(VIMVER)/compiler/xmllint.vim
 file path=usr/share/vim/$(VIMVER)/compiler/xmlwf.vim
 file path=usr/share/vim/$(VIMVER)/delmenu.vim
@@ -343,6 +353,7 @@
 file path=usr/share/vim/$(VIMVER)/ftplugin/README.txt
 file path=usr/share/vim/$(VIMVER)/ftplugin/a2ps.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/aap.vim
+file path=usr/share/vim/$(VIMVER)/ftplugin/abap.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/abaqus.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/ada.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/alsaconf.vim
@@ -400,6 +411,7 @@
 file path=usr/share/vim/$(VIMVER)/ftplugin/gitrebase.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/gitsendemail.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/gpg.vim
+file path=usr/share/vim/$(VIMVER)/ftplugin/gprof.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/group.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/grub.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/haml.vim
@@ -472,7 +484,6 @@
 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
@@ -502,6 +513,7 @@
 file path=usr/share/vim/$(VIMVER)/ftplugin/terminfo.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/tex.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/treetop.vim
+file path=usr/share/vim/$(VIMVER)/ftplugin/tt2html.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/udevconf.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/udevperm.vim
 file path=usr/share/vim/$(VIMVER)/ftplugin/udevrules.vim
@@ -708,6 +720,7 @@
 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/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
@@ -1129,6 +1142,7 @@
 file path=usr/share/vim/$(VIMVER)/syntax/gnuplot.vim
 file path=usr/share/vim/$(VIMVER)/syntax/gp.vim
 file path=usr/share/vim/$(VIMVER)/syntax/gpg.vim
+file path=usr/share/vim/$(VIMVER)/syntax/gprof.vim
 file path=usr/share/vim/$(VIMVER)/syntax/grads.vim
 file path=usr/share/vim/$(VIMVER)/syntax/gretl.vim
 file path=usr/share/vim/$(VIMVER)/syntax/groff.vim
@@ -1297,6 +1311,7 @@
 file path=usr/share/vim/$(VIMVER)/syntax/pine.vim
 file path=usr/share/vim/$(VIMVER)/syntax/pinfo.vim
 file path=usr/share/vim/$(VIMVER)/syntax/plaintex.vim
+file path=usr/share/vim/$(VIMVER)/syntax/pli.vim
 file path=usr/share/vim/$(VIMVER)/syntax/plm.vim
 file path=usr/share/vim/$(VIMVER)/syntax/plp.vim
 file path=usr/share/vim/$(VIMVER)/syntax/plsql.vim
@@ -1313,6 +1328,7 @@
 file path=usr/share/vim/$(VIMVER)/syntax/progress.vim
 file path=usr/share/vim/$(VIMVER)/syntax/prolog.vim
 file path=usr/share/vim/$(VIMVER)/syntax/promela.vim
+file path=usr/share/vim/$(VIMVER)/syntax/proto.vim
 file path=usr/share/vim/$(VIMVER)/syntax/protocols.vim
 file path=usr/share/vim/$(VIMVER)/syntax/psf.vim
 file path=usr/share/vim/$(VIMVER)/syntax/ptcap.vim
@@ -1330,6 +1346,7 @@
 file path=usr/share/vim/$(VIMVER)/syntax/rcslog.vim
 file path=usr/share/vim/$(VIMVER)/syntax/readline.vim
 file path=usr/share/vim/$(VIMVER)/syntax/rebol.vim
+file path=usr/share/vim/$(VIMVER)/syntax/redif.vim
 file path=usr/share/vim/$(VIMVER)/syntax/registry.vim
 file path=usr/share/vim/$(VIMVER)/syntax/remind.vim
 file path=usr/share/vim/$(VIMVER)/syntax/resolv.vim
@@ -1338,6 +1355,7 @@
 file path=usr/share/vim/$(VIMVER)/syntax/rhelp.vim
 file path=usr/share/vim/$(VIMVER)/syntax/rib.vim
 file path=usr/share/vim/$(VIMVER)/syntax/rnc.vim
+file path=usr/share/vim/$(VIMVER)/syntax/rng.vim
 file path=usr/share/vim/$(VIMVER)/syntax/rnoweb.vim
 file path=usr/share/vim/$(VIMVER)/syntax/robots.vim
 file path=usr/share/vim/$(VIMVER)/syntax/rpcgen.vim
@@ -1446,6 +1464,9 @@
 file path=usr/share/vim/$(VIMVER)/syntax/tsscl.vim
 file path=usr/share/vim/$(VIMVER)/syntax/tssgm.vim
 file path=usr/share/vim/$(VIMVER)/syntax/tssop.vim
+file path=usr/share/vim/$(VIMVER)/syntax/tt2.vim
+file path=usr/share/vim/$(VIMVER)/syntax/tt2html.vim
+file path=usr/share/vim/$(VIMVER)/syntax/tt2js.vim
 file path=usr/share/vim/$(VIMVER)/syntax/uc.vim
 file path=usr/share/vim/$(VIMVER)/syntax/udevconf.vim
 file path=usr/share/vim/$(VIMVER)/syntax/udevperm.vim
@@ -1453,6 +1474,11 @@
 file path=usr/share/vim/$(VIMVER)/syntax/uil.vim
 file path=usr/share/vim/$(VIMVER)/syntax/updatedb.vim
 file path=usr/share/vim/$(VIMVER)/syntax/upstart.vim
+file path=usr/share/vim/$(VIMVER)/syntax/upstreamdat.vim
+file path=usr/share/vim/$(VIMVER)/syntax/upstreaminstalllog.vim
+file path=usr/share/vim/$(VIMVER)/syntax/upstreamlog.vim
+file path=usr/share/vim/$(VIMVER)/syntax/usserverlog.vim
+file path=usr/share/vim/$(VIMVER)/syntax/usw2kagtlog.vim
 file path=usr/share/vim/$(VIMVER)/syntax/valgrind.vim
 file path=usr/share/vim/$(VIMVER)/syntax/vb.vim
 file path=usr/share/vim/$(VIMVER)/syntax/vera.vim
@@ -1556,6 +1582,8 @@
 file path=usr/share/vim/$(VIMVER)/tutor/tutor.ko.utf-8
 file path=usr/share/vim/$(VIMVER)/tutor/tutor.nb
 file path=usr/share/vim/$(VIMVER)/tutor/tutor.nb.utf-8
+file path=usr/share/vim/$(VIMVER)/tutor/tutor.nl
+file path=usr/share/vim/$(VIMVER)/tutor/tutor.nl.utf-8
 file path=usr/share/vim/$(VIMVER)/tutor/tutor.no
 file path=usr/share/vim/$(VIMVER)/tutor/tutor.no.utf-8
 file path=usr/share/vim/$(VIMVER)/tutor/tutor.pl
@@ -1578,6 +1606,7 @@
 file path=usr/share/vim/$(VIMVER)/tutor/tutor.vim
 file path=usr/share/vim/$(VIMVER)/tutor/tutor.zh.big5
 file path=usr/share/vim/$(VIMVER)/tutor/tutor.zh.euc
+file path=usr/share/vim/$(VIMVER)/tutor/tutor.zh.utf-8
 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
upstream/oracle/userland-gate