From 39d2d3a91b90408d5cc3cc7cf3d167864457d2fb Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Fri, 14 Sep 2018 09:11:41 +0000
Subject: [PATCH] update to vim-8.1.0388

- remove bogus "CFLAGS/LDFLAGS=-pthread" setting for the gtk flavour
(very old - probably a remnant of uthread and not needed any more),
it was done as an override rather than addition, so the wanted CFLAGS
were not used for gtk builds.

- don't strip if this is a DEBUG build.
---
 editors/vim/Makefile       | 10 ++++++----
 editors/vim/distinfo       |  4 ++--
 editors/vim/pkg/PLIST-main |  9 +++++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 991de59748b..c8109637f12 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.174 2018/08/21 16:55:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.175 2018/09/14 09:11:41 sthen Exp $
 
 COMMENT-main=	vi clone, many additional features
 COMMENT-lang=	vi clone, NLS subpackage
 
 # XXX if updating major version, sync editors/vim-spell
-V=		8.1.0309
+V=		8.1.0388
 GH_ACCOUNT=	vim
 GH_PROJECT=	vim
 GH_TAGNAME=	v$V
@@ -48,6 +48,10 @@ AUTOCONF_VERSION= 2.69
 BUILD_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS} \
 		devel/gettext-tools
 
+.if defined(DEBUG)
+MAKE_FLAGS+= STRIP=:
+.endif
+
 .if ${FLAVOR:Mhuge}
 CONFIGURE_ARGS+= --with-features=huge
 .endif
@@ -124,8 +128,6 @@ CONFIGURE_ARGS+= --enable-gui="athena" \
 WANTLIB +=	m ICE SM X11 Xaw Xmu Xpm Xt
 .elif ${FLAVOR:Mgtk2} && \
 		!${FLAVOR:Mmotif} && !${FLAVOR:Mno_x11} && !${FLAVOR:Mathena}
-MAKE_FLAGS+=	'LDFLAGS=-pthread'
-MAKE_FLAGS+=	'CFLAGS=-pthread'
 LIB_DEPENDS+=	x11/gtk+2
 CONFIGURE_ARGS+= --enable-gui="gtk2" \
 		--disable-gtk-check \
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 4965096999a..580c74743e0 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vim-8.1.0309.tar.gz) = kC3vgzokff9H4J4HZTaiX5RBnxnFuVYwKS/wUKXQOPw=
-SIZE (vim-8.1.0309.tar.gz) = 13790431
+SHA256 (vim-8.1.0388.tar.gz) = NM/zCWpxLuBoLdyev8jfit6DA89waaGJ8UvKSN0NArc=
+SIZE (vim-8.1.0388.tar.gz) = 13856289
diff --git a/editors/vim/pkg/PLIST-main b/editors/vim/pkg/PLIST-main
index ccebbbae291..05b693c23c1 100644
--- a/editors/vim/pkg/PLIST-main
+++ b/editors/vim/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.26 2018/08/21 16:55:08 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.27 2018/09/14 09:11:42 sthen Exp $
 @pkgpath ${BASE_PKGPATH}
 %%gtk2%%
 bin/ex
@@ -35,6 +35,7 @@ share/vim/${P}/autoload/dist/ft.vim
 share/vim/${P}/autoload/getscript.vim
 share/vim/${P}/autoload/gnat.vim
 share/vim/${P}/autoload/gzip.vim
+share/vim/${P}/autoload/haskellcomplete.vim
 share/vim/${P}/autoload/htmlcomplete.vim
 share/vim/${P}/autoload/javascriptcomplete.vim
 share/vim/${P}/autoload/netrw.vim
@@ -154,6 +155,7 @@ share/vim/${P}/compiler/rustc.vim
 share/vim/${P}/compiler/sass.vim
 share/vim/${P}/compiler/se.vim
 share/vim/${P}/compiler/splint.vim
+share/vim/${P}/compiler/stack.vim
 share/vim/${P}/compiler/tcl.vim
 share/vim/${P}/compiler/tex.vim
 share/vim/${P}/compiler/tidy.vim
@@ -552,6 +554,7 @@ share/vim/${P}/indent/d.vim
 share/vim/${P}/indent/dictconf.vim
 share/vim/${P}/indent/dictdconf.vim
 share/vim/${P}/indent/docbk.vim
+share/vim/${P}/indent/dosbatch.vim
 share/vim/${P}/indent/dtd.vim
 share/vim/${P}/indent/dtrace.vim
 share/vim/${P}/indent/dylan.vim
@@ -745,7 +748,6 @@ share/vim/${P}/macros/matchit.vim
 share/vim/${P}/macros/maze/
 share/vim/${P}/macros/maze/Makefile
 share/vim/${P}/macros/maze/README.txt
-share/vim/${P}/macros/maze/main.aap
 share/vim/${P}/macros/maze/maze.c
 share/vim/${P}/macros/maze/maze_5.78
 share/vim/${P}/macros/maze/maze_mac
@@ -765,6 +767,9 @@ share/vim/${P}/optwin.vim
 share/vim/${P}/pack/
 share/vim/${P}/pack/dist/
 share/vim/${P}/pack/dist/opt/
+share/vim/${P}/pack/dist/opt/cfilter/
+share/vim/${P}/pack/dist/opt/cfilter/plugin/
+share/vim/${P}/pack/dist/opt/cfilter/plugin/cfilter.vim
 share/vim/${P}/pack/dist/opt/dvorak/
 share/vim/${P}/pack/dist/opt/dvorak/dvorak/
 share/vim/${P}/pack/dist/opt/dvorak/dvorak/disable.vim