From 1cb8950dacbc85a6aef552f48c8feabd75d89be5 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Fri, 1 Feb 2019 13:54:07 +0000 Subject: [PATCH] Update vim to patchlevel 865 After discussion on freebsd-ports@, switch the default UI toolkit from GTK2 to GTK3. There isn't a huge visual difference, so it's more predicated on the idea that people are more likely to have GTK3 already installed for other things. --- editors/vim/Makefile | 4 ++-- editors/vim/distinfo | 6 +++--- editors/vim/files/patch-src_Makefile | 11 +++++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 editors/vim/files/patch-src_Makefile diff --git a/editors/vim/Makefile b/editors/vim/Makefile index caca03ae644b..c1746f6d80cc 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vim -PORTVERSION= 8.1.0676 +PORTVERSION= 8.1.0865 DISTVERSIONPREFIX= v CATEGORIES= editors @@ -38,7 +38,7 @@ VIM_VER= ${PORTNAME}${PORTVERSION:R:S|.||g} # OPTIONS # ### Make sure any new options are excluded below in CONSOLE/TINY -OPTIONS_DEFAULT= CSCOPE DEFAULT_VIMRC CTAGS_EXUBERANT GTK2 PERL PYTHON2 RUBY +OPTIONS_DEFAULT= CSCOPE DEFAULT_VIMRC CTAGS_EXUBERANT GTK3 PERL PYTHON2 RUBY OPTIONS_DEFINE= CSCOPE DEFAULT_VIMRC NLS XTERM_SAVE OPTIONS_SINGLE= CTAGS UI OPTIONS_SINGLE_CTAGS= CTAGS_BASE CTAGS_EXUBERANT CTAGS_UNIVERSAL diff --git a/editors/vim/distinfo b/editors/vim/distinfo index 9fe97f4f6f9c..b060d5653bfb 100644 --- a/editors/vim/distinfo +++ b/editors/vim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546372379 -SHA256 (vim-vim-v8.1.0676_GH0.tar.gz) = a9e14909783d73079e609979cb874d20ff433c4cf407f1d04bddd0cc5b1113fc -SIZE (vim-vim-v8.1.0676_GH0.tar.gz) = 14067488 +TIMESTAMP = 1549028505 +SHA256 (vim-vim-v8.1.0865_GH0.tar.gz) = 1b679ca5c0a1e26edd935682f3e9a8e28deafc363b3378acd3f64afa3f6658c5 +SIZE (vim-vim-v8.1.0865_GH0.tar.gz) = 14065678 diff --git a/editors/vim/files/patch-src_Makefile b/editors/vim/files/patch-src_Makefile new file mode 100644 index 000000000000..a830899f5fbe --- /dev/null +++ b/editors/vim/files/patch-src_Makefile @@ -0,0 +1,11 @@ +--- src/Makefile.orig 2019-02-01 13:48:12 UTC ++++ src/Makefile +@@ -3497,7 +3497,7 @@ objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h protodef.h au + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h version.h + objects/indent.o: indent.c vim.h protodef.h auto/config.h feature.h os_unix.h \ +- os_mac.h ascii.h keymap.h term.h macros.h option.h beval.h structs.h \ ++ os_mac.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h structs.h \ + regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h farsi.h \ + arabic.h + objects/json.o: json.c vim.h protodef.h auto/config.h feature.h os_unix.h \