From nobody Thu Jun 02 17:41:51 2022 X-Original-To: dev-commits-ports-main@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 6831119563E0; Thu, 2 Jun 2022 17:41:51 +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 4LDYH32YXhz3Nw8; Thu, 2 Jun 2022 17:41:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654191711; 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=+cfYjAQCDuxud6+r7TlWTz03qbMrxj2QlEXDeFciTOQ=; b=SSWUQV9Zs59B4TwLS2vSPvlI5H8/jEWwTfJ2eehNs5eCZ6mqjPFDx4hMEOXj+w/sJoOXgP H6rtKbC6aUL7xQY5TeDfa7RFG1+JHbkZQ+Fql50VwJJWRqpkgWn87jG0RGWeVCKaHFE4b3 uA1P7PHo8iu9Bnv46aABdrljpgzp5tWufPRrv7rclT9R9QX5Kms1z5uUtYH3Bbs5Om7nHN E0tURgegX6lc07l8lDtw9xqK5HTh2EoE5T5VVjfO2q+5q+85yUxpKwMG1SzMeFK+USiGel mEhEb/97gzooGJNRISQkryQf6ccd6v7ylfYnSXTPJBNIosxutiNRYvasaNTnQA== 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 3884818F7C; Thu, 2 Jun 2022 17:41:51 +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 252HfpMY045691; Thu, 2 Jun 2022 17:41:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 252Hfp7H045690; Thu, 2 Jun 2022 17:41:51 GMT (envelope-from git) Date: Thu, 2 Jun 2022 17:41:51 GMT Message-Id: <202206021741.252Hfp7H045690@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: f27ea6b18516 - main - editors/vim: Update to 8.2.5052 and fix vimrc clobbering List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: f27ea6b18516fad5be76ba20ce8f53f5ba9c1081 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654191711; 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=+cfYjAQCDuxud6+r7TlWTz03qbMrxj2QlEXDeFciTOQ=; b=agFHR/PetLG2dv5081pKwrJEpLVwFRsT0LmL62bBAc8ukP1d9Rh3fzqNxiFegrxwZWffVY 9QvkK67c3TUrcnGMsdlxum8PcTOq8NVvO4fzB53RTP6HAfROmg+HyB92V/aDNHiatfroGF 4mRjOMRKPVTUP9lnNM1MsGCD2sBNEA4fyKQbcu+dXiSquuO2BHNIut4qNMOF0VFyCwZQtP hd7zRsXn5IqZh8CYcxLh7vGIHnSkVrVORxSXn6BkkmegpB5sF8U+f2VkUYSYJwrWUp2sc7 2K2oP3UnkHx2no8tJOl7xQ415QqZFlr5uXSfgu0ErbZLZsWLKUVscB/40y9s8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654191711; a=rsa-sha256; cv=none; b=cUW5/70wXfVY+gxoDsJQdMkYvtkS2YtiZj6noXdLsYJ+/ucom2BAdjyNJyYFfQTSqPnrZk b3r1BwfhKGag9b1fpHBQ2nYPSLamMbTUogBAgWVGADaeTQ75LpAhrbBGTh6k7hWpSndYnl VKR6pfyNsJx6jvj+kqxPbpyazo5dX6LiAuK+zhGU5FjkHI748Sq4Ioy7pookM6Jid/pDjN PftOs7+PwcEWGoro8tD0avqDW4P/Yx6fDekog3EgldNpI4g461vlfOrqPXyPkV2gZXF8UM jrBpLijnkj+WBG+8ZS1Q43kyHAXL9w5Xr3egiaNdAt6zSNohl5Dgp/bQKIXIkQ== 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=f27ea6b18516fad5be76ba20ce8f53f5ba9c1081 commit f27ea6b18516fad5be76ba20ce8f53f5ba9c1081 Author: Adam Weinberger AuthorDate: 2022-06-02 17:36:43 +0000 Commit: Adam Weinberger CommitDate: 2022-06-02 17:41:47 +0000 editors/vim: Update to 8.2.5052 and fix vimrc clobbering Vim runtime's defaults.vim will clobber global vimrc settings. It's fine for the settings we provide, but other edits to that file can get lost. To work around this, defaults.vim is now directly sourced and a flag is set to stop that file from getting loaded a second time. Thanks go to Anton Saietskii for that bit of magic. PR: 251420 --- editors/vim/Makefile | 2 +- editors/vim/distinfo | 6 +++--- editors/vim/files/vimrc | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/editors/vim/Makefile b/editors/vim/Makefile index c3bea27736b1..65e94b241baf 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -1,7 +1,7 @@ # Created by: David O'Brien PORTNAME= vim -PORTVERSION= 8.2.5048 +PORTVERSION= 8.2.5052 DISTVERSIONPREFIX= v CATEGORIES= editors diff --git a/editors/vim/distinfo b/editors/vim/distinfo index 2694953f8907..14b9046c259d 100644 --- a/editors/vim/distinfo +++ b/editors/vim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1654075235 -SHA256 (vim-vim-v8.2.5048_GH0.tar.gz) = 78098f6f61dac7fe2ff8fa3b30e2c464b37c5d3ba41cb313945047916689c989 -SIZE (vim-vim-v8.2.5048_GH0.tar.gz) = 16496596 +TIMESTAMP = 1654191285 +SHA256 (vim-vim-v8.2.5052_GH0.tar.gz) = e96be06c4955cd5b75f0ea026d7845e136d435b9e7621f9534a1034c1a0ca724 +SIZE (vim-vim-v8.2.5052_GH0.tar.gz) = 16496957 diff --git a/editors/vim/files/vimrc b/editors/vim/files/vimrc index b62c245beaa2..6faf60ca412d 100644 --- a/editors/vim/files/vimrc +++ b/editors/vim/files/vimrc @@ -1,3 +1,8 @@ +" 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