From nobody Sat Sep 3 18:03:56 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MKjMd0shmz4c3qP; Sat, 3 Sep 2022 18:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MKjMd0LYRz3tR9; Sat, 3 Sep 2022 18:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662228237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UEM+azPWmaemVOtSTwk01vmdc5VC5vpM1P7szgkbImk=; b=lOPiBo+vgnVpR2hJPy7qy5vvxsoM0uomgrXCdgPh3xjLOjf3dkoOZnVR9pU8tckzFVXD90 mEY/wY7YGq+r8RC3cs8/qWkZI39gF3vSFBdQ44qIOJgSEwGY+LDeNljZGyYfx9SZBFf4i5 gdlcdyvVgKspDgQVMgr+ObBEr0tKjjRJheTEteLeCGA6/Z2o9leBPYYRDXvnh7v/9nq7cR eWpQ8juzdK1hTvMWW7mJDdI2gVPR3dl0qnPsMxhZe/7/MtPPAgK5Hk34JVwgZod3G/2CUF fCg3GAgFPjXDKwVBckC3Rhsu45kNKzWWU1w57LOT/HC5gVa1NoXtNFUX8GaAcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MKjMc6TmJz1CsP; Sat, 3 Sep 2022 18:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 283I3uAE047435; Sat, 3 Sep 2022 18:03:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 283I3uuI047434; Sat, 3 Sep 2022 18:03:56 GMT (envelope-from git) Date: Sat, 3 Sep 2022 18:03:56 GMT Message-Id: <202209031803.283I3uuI047434@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: a058c61ea36c - main - editors/vim: Update to 9.0.0369, and drop the FreeBSD vimrc List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a058c61ea36c0cb64a61c83563b55a157cf549f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662228237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UEM+azPWmaemVOtSTwk01vmdc5VC5vpM1P7szgkbImk=; b=SR+Ie6tIuTAYowJ9vOC2v9s3fTcgg5yJeN0KwCSZ0xSnqw6qXFfVkXy6h18wnafp/KBBtN Okj1LVPTv6M6hNDN5cDMX8EoibpVpNAgvOdCPvjzn7yFG0n2klvIA5E1Gk5sG01Mi1qg6J c9k9qKcFUrR9S26gTCEatYPkwc9YPoYrZerm8/C6r4xjEBYr+mee5Mwh7QEb3ANEL0+8Sf nZBpPZR+0RMUXOVErrWZjJDuHDPVcAeqHiHhf71XKj6YEGMgpomuSPm8TqM99yhgCFb41g jGzSUHvr3hMh4scAuL7o8TrfwBWtS4SUZb8lrgHwVCuKzjXa04xaqWXmIZWmCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662228237; a=rsa-sha256; cv=none; b=c3fPpJ0lZbCD9n5eBq4EAmJ1WU/5OQ/lekkK26CKJLwt5px3WK5x4IPTNA4kLfOLBV3sBM mU+KZv6VpIJbQbvT+K0ZvnNfyRCjsF7MUAfiSgC9lB0zZOelILkTK3rLdBLW5Id4O1gCNp m8wGKoL8PbmcFRW4b1/YhFTk2BdMM4cEZ+2PQSgwImseKERYbLWzd47aOAmRvg84UJw6m9 HqxOybWhC+0zvpufbMZ2GFo7D4ErGwlDhqjBKBH1hBm8tmg6JgYu64/GqucFZ/N0aEE4IX fiUymeLFagAMhZuFQSC/Qv4BpyQlbsTMXxwz2abX/5dA1i+77wtnj7pKucHx0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=a058c61ea36c0cb64a61c83563b55a157cf549f4 commit a058c61ea36c0cb64a61c83563b55a157cf549f4 Author: Adam Weinberger AuthorDate: 2022-09-03 17:56:00 +0000 Commit: Adam Weinberger CommitDate: 2022-09-03 18:03:52 +0000 editors/vim: Update to 9.0.0369, and drop the FreeBSD vimrc Our FreeBSD vimrc has caused a lot of trouble. It seriously mangles config loading order (see below PR for the 21 comments it took before I could get my head around it), clobbers defaults, duplicates defaults, and simply isn't how Vim does things. In this patch, the system vimrc is dropped entirely. Instead, $VIMRUNTIME/defaults.vim sources $VIMRUNTIME/defaults_freebsd.vim, which contains only FreeBSD-specific settings (today, a convenience augroup for port creation, and a flag to let syntax/sh.vim know that /bin/sh isn't bash). There is no perfect solution here, but by not clobbering anything anymore, we at least don't *prevent* other solutions. You now get Vim's defaults, and you are free to override them in your ~/.vimrc. PR: 251420 --- editors/vim/Makefile | 21 ++++++---------- editors/vim/distinfo | 6 ++--- editors/vim/files/defaults_freebsd.vim | 10 ++++++++ editors/vim/files/vimrc | 45 ---------------------------------- editors/vim/pkg-message | 11 +++++++++ editors/vim/pkg-plist | 1 - editors/vim/pkg-plist-tiny | 1 - 7 files changed, 32 insertions(+), 63 deletions(-) diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 2781e77292f9..5df59d5429eb 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -1,5 +1,5 @@ PORTNAME= vim -PORTVERSION= 9.0.0129 +PORTVERSION= 9.0.0369 DISTVERSIONPREFIX= v CATEGORIES= editors @@ -90,23 +90,22 @@ USE_XORG= ice sm x11 xmu xpm xt # Options {{{1 # The bulk of the OPTIONS are for normal (non-tiny) vim ### Make sure any new options are excluded below in CONSOLE/TINY -OPTIONS_DEFAULT= CTAGS_BASE DEFAULT_VIMRC PYTHON -OPTIONS_DEFINE= DEFAULT_VIMRC MAKE_JOBS NLS XTERM_SAVE +OPTIONS_DEFAULT= CTAGS_BASE PYTHON +OPTIONS_DEFINE= MAKE_JOBS NLS XTERM_SAVE OPTIONS_SINGLE= CTAGS OPTIONS_SINGLE_CTAGS= CTAGS_BASE CTAGS_EXUBERANT CTAGS_UNIVERSAL OPTIONS_GROUP= LANGBIND OPTIONS_GROUP_LANGBIND= LUA PERL PYTHON RUBY SCHEME TCL OPTIONS_SUB= yes -# vim-tiny excludes everything except CONSOLE, DEFAULT_VIMRC, MAKE_JOBS +# vim-tiny excludes everything except CONSOLE, MAKE_JOBS .if ${FLAVOR:U} == tiny -OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NDEFAULT_VIMRC:NMAKE_JOBS} \ +OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NMAKE_JOBS} \ ${OPTIONS_SINGLE_UI:NCONSOLE} \ ${OPTIONS_GROUP_LANGBIND} \ ${OPTIONS_SINGLE_CTAGS} .endif -DEFAULT_VIMRC_DESC= Install bundled vimrc as default setting MAKE_JOBS_DESC= Enable parallel build XTERM_SAVE_DESC= Restore xterm screen after exit @@ -161,8 +160,7 @@ post-extract: ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${WRKSRC}/runtime/keymap post-patch: - ${ECHO_CMD} '#define SYS_VIMRC_FILE "'${ETCDIR}'/vimrc"' >> ${WRKSRC}/src/feature.h - ${ECHO_CMD} '#define SYS_GVIMRC_FILE "'${ETCDIR}'/gvimrc"' >> ${WRKSRC}/src/feature.h + ${ECHO_CMD} 'source $$VIMRUNTIME/defaults_freebsd.vim' >> ${WRKSRC}/runtime/defaults.vim ${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|g; s|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/src/auto/configure @@ -170,19 +168,16 @@ post-configure: # Needed when devel/libsysinfo is installed: ${REINPLACE_CMD} -e '/^#define HAVE_SYSINFO/ d' ${WRKSRC}/src/auto/config.h -post-install-DEFAULT_VIMRC-on: - ${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/vimrc.sample - .if ${FLAVOR:U} == tiny do-install: ${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER} ${INSTALL_PROGRAM} ${WRKSRC}/src/vim ${STAGEDIR}${PREFIX}/bin - ${TOUCH} ${STAGEDIR}${DATADIR}/${VIM_VER}/defaults.vim + ${INSTALL_DATA} ${FILESDIR}/defaults_freebsd.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/defaults.vim ${INSTALL_MAN} ${WRKSRC}/runtime/doc/vim.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .else # flavor != tiny post-install: + ${INSTALL_DATA} ${FILESDIR}/defaults_freebsd.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/ ${RM} ${STAGEDIR}${PREFIX}/bin/ex ${RM} ${STAGEDIR}${PREFIX}/bin/view . for F in eview evim gview gvim gvimdiff rgview rgvim rview rvim vimdiff diff --git a/editors/vim/distinfo b/editors/vim/distinfo index ac8f23f0d48c..fabbe4801854 100644 --- a/editors/vim/distinfo +++ b/editors/vim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659361348 -SHA256 (vim-vim-v9.0.0129_GH0.tar.gz) = 4d8c80d4f9bfbded3749016f84636f5038c9679370d12f81ca18f7f660ac2d2b -SIZE (vim-vim-v9.0.0129_GH0.tar.gz) = 16723651 +TIMESTAMP = 1662223469 +SHA256 (vim-vim-v9.0.0369_GH0.tar.gz) = 990710ef46e581461e39f38778dd38654f1b61b5768f846553e7c16a8ecb3231 +SIZE (vim-vim-v9.0.0369_GH0.tar.gz) = 16822389 diff --git a/editors/vim/files/defaults_freebsd.vim b/editors/vim/files/defaults_freebsd.vim new file mode 100644 index 000000000000..7af379c40118 --- /dev/null +++ b/editors/vim/files/defaults_freebsd.vim @@ -0,0 +1,10 @@ +let g:is_posix = 1 " Our /bin/sh is POSIX, not bash + +" Load a port template when creating a Makefile under the ports tree +augroup FreeBSD + autocmd! + autocmd BufNewFile /usr/ports/*/*/Makefile 0r /usr/ports/Templates/Makefile + if !empty($PORTSDIR) + autocmd BufNewFile $PORTSDIR/*/*/Makefile 0r $PORTSDIR/Templates/Makefile + endif +augroup END diff --git a/editors/vim/files/vimrc b/editors/vim/files/vimrc deleted file mode 100644 index cc200a086c9d..000000000000 --- a/editors/vim/files/vimrc +++ /dev/null @@ -1,45 +0,0 @@ -" FreeBSD provides this file for three reasons: -" 1. Some of the default settings are not great (e.g. backspace) -" 2. FreeBSD requires some special handling (e.g. g:is_posix) -" 3. vim-tiny doesn't ship with $VIMRUNTIME/defaults.vim, so any -" settings that vim-tiny gets must appear in this file - -" defaults.vim will override this file. Sourcing it here and -" setting the skip flag prevents clobbering settings -source $VIMRUNTIME/defaults.vim -let skip_defaults_vim = 1 - -set nocompatible " Enable Vim mode (instead of vi emulation) - -let g:is_posix = 1 " Our /bin/sh is POSIX, not bash -set autoindent " Intelligent indentation matching -set autoread " Update the file if it's changed externally -set backspace=indent,eol,start " Allow backspacing over anything -set belloff=all " Turn off bells -set display=truncate " Show '@@@' when the last screen line overflows -set formatoptions+=j " Delete comment char when joining lines -set history=100 " Undo up to this many commands -set hlsearch " Highlight search results -set incsearch " Highlight search matches as you type them -set ruler " Show cursor position -set ttyfast " Redraw faster for smoother scrolling -set wildmenu " Show menu for tab completion in command mode - -try - syntax on " Enable syntax highlighting -catch | endtry " vim-tiny is installed without the syntax files - -if v:lang =~ "utf8$" || v:lang =~ "UTF-8$" - set fileencodings=ucs-bom,utf-8,latin1 -endif - -" CTRL-L will mute highlighted search results -nnoremap :nohlsearch - -augroup FreeBSD - autocmd! - autocmd BufNewFile /usr/ports/*/*/Makefile 0r /usr/ports/Templates/Makefile - if !empty($PORTSDIR) - autocmd BufNewFile $PORTSDIR/*/*/Makefile 0r $PORTSDIR/Templates/Makefile - endif -augroup END diff --git a/editors/vim/pkg-message b/editors/vim/pkg-message new file mode 100644 index 000000000000..1def839e84fb --- /dev/null +++ b/editors/vim/pkg-message @@ -0,0 +1,11 @@ +[ + { type: upgrade + maximum_version: "9.0.0129" + message: <