summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/vim-lang/PLIST10
-rw-r--r--editors/vim-share/Makefile6
-rw-r--r--editors/vim-share/Makefile.common4
-rw-r--r--editors/vim-share/PLIST15
-rw-r--r--editors/vim-share/distinfo10
-rw-r--r--editors/vim-share/patches/patch-Makefile14
-rw-r--r--editors/vim-share/version.mk8
7 files changed, 45 insertions, 22 deletions
diff --git a/editors/vim-lang/PLIST b/editors/vim-lang/PLIST
index fe536878459..a259314445c 100644
--- a/editors/vim-lang/PLIST
+++ b/editors/vim-lang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2013/06/13 21:41:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2013/10/07 19:26:28 morr Exp $
man/fr.ISO8859-1/man1/evim.1
man/fr.ISO8859-1/man1/ex.1
man/fr.ISO8859-1/man1/rview.1
@@ -47,6 +47,14 @@ man/it/man1/view.1
man/it/man1/vim.1
man/it/man1/vimdiff.1
man/it/man1/vimtutor.1
+man/ja/man1/evim.1
+man/ja/man1/ex.1
+man/ja/man1/rview.1
+man/ja/man1/rvim.1
+man/ja/man1/view.1
+man/ja/man1/vim.1
+man/ja/man1/vimdiff.1
+man/ja/man1/vimtutor.1
man/pl.ISO8859-2/man1/evim.1
man/pl.ISO8859-2/man1/ex.1
man/pl.ISO8859-2/man1/rview.1
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index 726d8c6c8e8..c6d8474834d 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2012/10/03 11:43:46 asau Exp $
+# $NetBSD: Makefile,v 1.31 2013/10/07 19:26:28 morr Exp $
PKGNAME= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
@@ -16,7 +16,7 @@ INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} TOOLS_AWK=${TOOLS_AWK} TOOLS_SETENV=${TOOLS_S
PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR}
-CHECK_INTERPRETER_SKIP+= share/vim/vim73/doc/*.pl
-CHECK_INTERPRETER_SKIP+= share/vim/vim73/tools/*.pl
+CHECK_INTERPRETER_SKIP+= share/vim/vim74/doc/*.pl
+CHECK_INTERPRETER_SKIP+= share/vim/vim74/tools/*.pl
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 48c9beb4d33..a654e7342a3 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.148 2012/10/30 22:39:07 morr Exp $
+# $NetBSD: Makefile.common,v 1.149 2013/10/07 19:26:28 morr Exp $
# used by editors/vim/Makefile
# used by editors/vim-gtk/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= no # At least on Solaris
# http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=38710
-CHECK_INTERPRETER_SKIP= share/vim/vim73/tools/vim132
+CHECK_INTERPRETER_SKIP= share/vim/vim74/tools/vim132
.include "options.mk"
diff --git a/editors/vim-share/PLIST b/editors/vim-share/PLIST
index 63725bafaab..95e3f992ae2 100644
--- a/editors/vim-share/PLIST
+++ b/editors/vim-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2013/06/12 14:53:56 morr Exp $
+@comment $NetBSD: PLIST,v 1.21 2013/10/07 19:26:28 morr Exp $
bin/xxd
man/man1/evim.1
man/man1/vim.1
@@ -103,11 +103,13 @@ share/vim/${VIM_SUBDIR}/compiler/modelsim_vcom.vim
share/vim/${VIM_SUBDIR}/compiler/msbuild.vim
share/vim/${VIM_SUBDIR}/compiler/msvc.vim
share/vim/${VIM_SUBDIR}/compiler/neato.vim
+share/vim/${VIM_SUBDIR}/compiler/ocaml.vim
share/vim/${VIM_SUBDIR}/compiler/onsgmls.vim
share/vim/${VIM_SUBDIR}/compiler/pbx.vim
share/vim/${VIM_SUBDIR}/compiler/perl.vim
share/vim/${VIM_SUBDIR}/compiler/php.vim
share/vim/${VIM_SUBDIR}/compiler/pyunit.vim
+share/vim/${VIM_SUBDIR}/compiler/rake.vim
share/vim/${VIM_SUBDIR}/compiler/rspec.vim
share/vim/${VIM_SUBDIR}/compiler/rst.vim
share/vim/${VIM_SUBDIR}/compiler/ruby.vim
@@ -334,6 +336,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/htmldjango.vim
share/vim/${VIM_SUBDIR}/ftplugin/indent.vim
share/vim/${VIM_SUBDIR}/ftplugin/initex.vim
share/vim/${VIM_SUBDIR}/ftplugin/ishd.vim
+share/vim/${VIM_SUBDIR}/ftplugin/j.vim
share/vim/${VIM_SUBDIR}/ftplugin/java.vim
share/vim/${VIM_SUBDIR}/ftplugin/javascript.vim
share/vim/${VIM_SUBDIR}/ftplugin/jsp.vim
@@ -422,6 +425,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/tcsh.vim
share/vim/${VIM_SUBDIR}/ftplugin/terminfo.vim
share/vim/${VIM_SUBDIR}/ftplugin/tex.vim
share/vim/${VIM_SUBDIR}/ftplugin/treetop.vim
+share/vim/${VIM_SUBDIR}/ftplugin/tt2html.vim
share/vim/${VIM_SUBDIR}/ftplugin/udevconf.vim
share/vim/${VIM_SUBDIR}/ftplugin/udevperm.vim
share/vim/${VIM_SUBDIR}/ftplugin/udevrules.vim
@@ -489,6 +493,7 @@ share/vim/${VIM_SUBDIR}/indent/html.vim
share/vim/${VIM_SUBDIR}/indent/htmldjango.vim
share/vim/${VIM_SUBDIR}/indent/idlang.vim
share/vim/${VIM_SUBDIR}/indent/ishd.vim
+share/vim/${VIM_SUBDIR}/indent/j.vim
share/vim/${VIM_SUBDIR}/indent/java.vim
share/vim/${VIM_SUBDIR}/indent/javascript.vim
share/vim/${VIM_SUBDIR}/indent/jsp.vim
@@ -866,6 +871,7 @@ share/vim/${VIM_SUBDIR}/syntax/ipfilter.vim
share/vim/${VIM_SUBDIR}/syntax/ishd.vim
share/vim/${VIM_SUBDIR}/syntax/iss.vim
share/vim/${VIM_SUBDIR}/syntax/ist.vim
+share/vim/${VIM_SUBDIR}/syntax/j.vim
share/vim/${VIM_SUBDIR}/syntax/jal.vim
share/vim/${VIM_SUBDIR}/syntax/jam.vim
share/vim/${VIM_SUBDIR}/syntax/jargon.vim
@@ -992,6 +998,7 @@ share/vim/${VIM_SUBDIR}/syntax/pilrc.vim
share/vim/${VIM_SUBDIR}/syntax/pine.vim
share/vim/${VIM_SUBDIR}/syntax/pinfo.vim
share/vim/${VIM_SUBDIR}/syntax/plaintex.vim
+share/vim/${VIM_SUBDIR}/syntax/pli.vim
share/vim/${VIM_SUBDIR}/syntax/plm.vim
share/vim/${VIM_SUBDIR}/syntax/plp.vim
share/vim/${VIM_SUBDIR}/syntax/plsql.vim
@@ -1008,6 +1015,7 @@ share/vim/${VIM_SUBDIR}/syntax/procmail.vim
share/vim/${VIM_SUBDIR}/syntax/progress.vim
share/vim/${VIM_SUBDIR}/syntax/prolog.vim
share/vim/${VIM_SUBDIR}/syntax/promela.vim
+share/vim/${VIM_SUBDIR}/syntax/proto.vim
share/vim/${VIM_SUBDIR}/syntax/protocols.vim
share/vim/${VIM_SUBDIR}/syntax/psf.vim
share/vim/${VIM_SUBDIR}/syntax/ptcap.vim
@@ -1153,6 +1161,11 @@ share/vim/${VIM_SUBDIR}/syntax/udevrules.vim
share/vim/${VIM_SUBDIR}/syntax/uil.vim
share/vim/${VIM_SUBDIR}/syntax/updatedb.vim
share/vim/${VIM_SUBDIR}/syntax/upstart.vim
+share/vim/${VIM_SUBDIR}/syntax/upstreamdat.vim
+share/vim/${VIM_SUBDIR}/syntax/upstreaminstalllog.vim
+share/vim/${VIM_SUBDIR}/syntax/upstreamlog.vim
+share/vim/${VIM_SUBDIR}/syntax/usserverlog.vim
+share/vim/${VIM_SUBDIR}/syntax/usw2kagtlog.vim
share/vim/${VIM_SUBDIR}/syntax/valgrind.vim
share/vim/${VIM_SUBDIR}/syntax/vb.vim
share/vim/${VIM_SUBDIR}/syntax/vera.vim
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 4a3fe837a17..e2df7a757e7 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.139 2013/06/12 14:53:56 morr Exp $
+$NetBSD: distinfo,v 1.140 2013/10/07 19:26:28 morr Exp $
-SHA1 (vim-7.3.1140.tar.bz2) = 5c53a0ad130754c148fa99efa8cfb53c40be04d9
-RMD160 (vim-7.3.1140.tar.bz2) = ebdb50b960d5cd093ec4d90eb6a3c1fc311a0c9a
-Size (vim-7.3.1140.tar.bz2) = 9348496 bytes
-SHA1 (patch-Makefile) = 6b859d3ec6ff06c91516e05416b413d4e9cdb4b2
+SHA1 (vim-7.4.052.tar.bz2) = 33c193320f5671b18fd140d69bf6e1c8a84f7037
+RMD160 (vim-7.4.052.tar.bz2) = e6fb8205e2a310b2d78f6a336e8be3e499cd6a91
+Size (vim-7.4.052.tar.bz2) = 9386499 bytes
+SHA1 (patch-Makefile) = 741f2b59d843094dbc1677aef9df93cf97c8d5a1
SHA1 (patch-auto_configure) = e25c8821182231074033132d70dab077c273d5f8
SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56
SHA1 (patch-feature.h) = 7fc572f7d94e5342b32b9395c2632fa7ae528c39
diff --git a/editors/vim-share/patches/patch-Makefile b/editors/vim-share/patches/patch-Makefile
index 747a4737ece..2d3e2faa39e 100644
--- a/editors/vim-share/patches/patch-Makefile
+++ b/editors/vim-share/patches/patch-Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.2 2013/01/15 00:06:23 morr Exp $
+$NetBSD: patch-Makefile,v 1.3 2013/10/07 19:26:28 morr Exp $
---- src/Makefile.orig 2012-11-22 15:18:52.000000000 +0100
-+++ src/Makefile 2013-01-14 23:51:58.000000000 +0100
-@@ -1196,22 +1196,27 @@
+--- src/Makefile.orig 2013-08-10 15:07:12.000000000 +0000
++++ src/Makefile
+@@ -1201,22 +1201,27 @@ MOTIF_BUNDLE =
### Athena GUI
### Use Xaw3d to make the menus look a little bit nicer
#XAW_LIB = -lXaw3d
@@ -37,7 +37,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/01/15 00:06:23 morr Exp $
ATHENA_IPATH = $(GUI_INC_LOC)
ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
-@@ -1917,7 +1922,7 @@
+@@ -1947,7 +1952,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES
-$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
@echo generating help tags
# Generate the help tags with ":helptags" to handle all languages.
@@ -46,7 +46,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/01/15 00:06:23 morr Exp $
cd $(HELPSOURCE); \
files=`ls *.txt tags`; \
files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
-@@ -2046,25 +2051,25 @@
+@@ -2076,26 +2081,26 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_
fi
-chmod $(FILEMOD) $(DEST_TOOLS)/*
# replace the path in some tools
@@ -66,6 +66,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/01/15 00:06:23 morr Exp $
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
+- -$(SHELL) ./installman.sh xxd $(DEST_MAN_JA_U) "-ja.UTF-8" $(INSTALLMANARGS)
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
@@ -77,6 +78,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/01/15 00:06:23 morr Exp $
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
++ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_JA_U) "-ja.UTF-8" $(INSTALLMANARGS)
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk
index 8598b8695b3..de3f5231331 100644
--- a/editors/vim-share/version.mk
+++ b/editors/vim-share/version.mk
@@ -1,5 +1,5 @@
-# $NetBSD: version.mk,v 1.90 2013/06/12 14:53:56 morr Exp $
+# $NetBSD: version.mk,v 1.91 2013/10/07 19:26:28 morr Exp $
-VIM_VERSION= 7.3
-VIM_PATCHLEVEL= 1140
-VIM_SUBDIR= vim73
+VIM_VERSION= 7.4
+VIM_PATCHLEVEL= 052
+VIM_SUBDIR= vim74
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 17:45:09 +0000