From nobody Sun Sep 4 16:07:05 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 4MLGkK5YBXz4c5RG; Sun, 4 Sep 2022 16:07:05 +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 4MLGkK52H6z3rTS; Sun, 4 Sep 2022 16:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662307625; 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=amTO6DwPrB6G/aedl/bMs6P9EspgHCssg3PnAYQ/HdA=; b=JOgIikCG5VdSk7NJk2/TnXYkOHK/z2uI2NnqgKJguLzFhDWDXEXolM14mSxDoN9SSpYbY6 42A1u7MUfDqjVGjH5y4NcSyjawYuDrMCYomFgHjs29dMudWbqI77440zj0uv0Abe6Dj914 oglhyM+3llUM77pE5tMPpOgrPZiZVBxih7C3X8TpTexveoRy1XsPm7Kj7Uc6QZfv3xYbby uPJXGAlyby+P/cD/YzxL/kuEO6LQuNkZaGPnSMSfXc35Pkv3U+PuSDz9juQwAtJVty5hPM crkDXy7ZPmcp9J438wBU7WFyrKrNaKCU70IrRdCDP6/SAsyd7eYSSSOlQscoIA== 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 4MLGkK458tzXqs; Sun, 4 Sep 2022 16:07:05 +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 284G75tU099011; Sun, 4 Sep 2022 16:07:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 284G75lf099010; Sun, 4 Sep 2022 16:07:05 GMT (envelope-from git) Date: Sun, 4 Sep 2022 16:07:05 GMT Message-Id: <202209041607.284G75lf099010@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: 91ef78b58bbb - main - editors/vim: Allow system vimrc, and include defaults.vim for vim-tiny 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: 91ef78b58bbb458e079b717826f692984fc8100c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662307625; 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=amTO6DwPrB6G/aedl/bMs6P9EspgHCssg3PnAYQ/HdA=; b=yUNkiDhApHrFto7aI2zdjyNY0KQW+L3a1ifRMYCxAEjSpR3WnhTUACEMSzpQs3+VrbysXN SwuO9Qm7fB5ynAgenqYZQT2ZNQnBlJzto54UiNP5AJpah5kj8Oo6S2F5yuMrdTJa7XyBMo rsxzv36awUrYl9zV9TtYaKdId43BMkwcypl9+vZmN6fXuM7ay+Zg7b3sd9FUcXZX69XmXt ohy4Nz2QBF7uqYSkvuWsKP9E508tHIIQoc1rmm3w+7C299cf0ODve0Udei49DC8cCb4eY9 sOGpknTWGS9R06jKIBEaRmpOEWpyxaU5VbV3H2zq7L30aiwsQXnk5Ftf65oe7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662307625; a=rsa-sha256; cv=none; b=mRxR8oT+2W1LKmKa7ioPz3cf14G0fUE6qaiRfJpszbbgdLogUfCUnpllKh8b/RvbmqjWp/ tZepFxDMq+TR6k34WwFmJCH9TB2RholryfYkzlyJFJ4/Lo79+SMPL6DYlXYWaI67Mn+2q8 QKTrP8bg9A0yqLzObBmLMBxgNmLqLmz0eXqmOTgCrQ2csnBILWKjDIWG99IdajUHxKNFXN PaYk6OCyuYBja9iC035Nu63sM8zt6WluR1bgjNqRAtVYtW4wzVfCt9JDQtPRkhvmV+6YfD IbjpJr2hRxAenOlF1ADl3r+2v/qqDHxcOZFL7kM8QxlytXmtSf7F6gERNZW/Gg== 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=91ef78b58bbb458e079b717826f692984fc8100c commit 91ef78b58bbb458e079b717826f692984fc8100c Author: Adam Weinberger AuthorDate: 2022-09-04 16:00:01 +0000 Commit: Adam Weinberger CommitDate: 2022-09-04 16:07:01 +0000 editors/vim: Allow system vimrc, and include defaults.vim for vim-tiny Two changes here (along with bumping to the latest upstream patch): 1) In the previous Vim commit, support for the system-wide vimrc/gvimrc was dropped because we went through contortions to fix loading order and monkey around with various defaults. However, many people used that file for their system. This commit re-adds support for loading it. All work for untangling the mess of loading defaults.vim and preventing circular loads is left to the user. We just support loading that file; what you do with it is your call. 2) vim-tiny is supposed to be the smallest possible Vim experience, being just the binary and no runtime library. However, without a viable defaults.vim, it's essentially just a larger, slower Vi. The vim-tiny package now ships with defaults.vim, which is patched to prevent errors from Vim loading the syntax library (which is not installed). --- editors/vim/Makefile | 9 +++++---- editors/vim/distinfo | 6 +++--- editors/vim/files/patch-runtime_defaults.vim | 24 ++++++++++++++++++++++++ editors/vim/files/patch-src_feature.h | 21 +++++++++++++++++++++ 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 5df59d5429eb..932ff7cc5d32 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -1,5 +1,5 @@ PORTNAME= vim -PORTVERSION= 9.0.0369 +PORTVERSION= 9.0.0379 DISTVERSIONPREFIX= v CATEGORIES= editors @@ -160,7 +160,7 @@ post-extract: ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${WRKSRC}/runtime/keymap post-patch: - ${ECHO_CMD} 'source $$VIMRUNTIME/defaults_freebsd.vim' >> ${WRKSRC}/runtime/defaults.vim + ${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|' ${WRKSRC}/src/feature.h ${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|g; s|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/src/auto/configure @@ -172,12 +172,13 @@ post-configure: do-install: ${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER} ${INSTALL_PROGRAM} ${WRKSRC}/src/vim ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${FILESDIR}/defaults_freebsd.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/defaults.vim + ${INSTALL_DATA} ${WRKSRC}/runtime/defaults.vim ${STAGEDIR}${DATADIR}/${VIM_VER} + ${INSTALL_DATA} ${FILESDIR}/defaults_freebsd.vim ${STAGEDIR}${DATADIR}/${VIM_VER} ${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}/ + ${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 fabbe4801854..abb472c05e19 100644 --- a/editors/vim/distinfo +++ b/editors/vim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662223469 -SHA256 (vim-vim-v9.0.0369_GH0.tar.gz) = 990710ef46e581461e39f38778dd38654f1b61b5768f846553e7c16a8ecb3231 -SIZE (vim-vim-v9.0.0369_GH0.tar.gz) = 16822389 +TIMESTAMP = 1662305587 +SHA256 (vim-vim-v9.0.0379_GH0.tar.gz) = 24aba67af6eee677f367a7f58facfb1fa58cb0f9565c60a3fa5fc1a39e4c0481 +SIZE (vim-vim-v9.0.0379_GH0.tar.gz) = 16828444 diff --git a/editors/vim/files/patch-runtime_defaults.vim b/editors/vim/files/patch-runtime_defaults.vim new file mode 100644 index 000000000000..0523e79e1ee2 --- /dev/null +++ b/editors/vim/files/patch-runtime_defaults.vim @@ -0,0 +1,24 @@ +We wrap `syntax on` in a try block so that it won't produce errors for +vim-tiny, which doens't include the runtime library. + +We also source our own FreeBSD-specific defaults file. + +--- runtime/defaults.vim.orig 2022-09-04 15:43:53 UTC ++++ runtime/defaults.vim +@@ -130,7 +130,9 @@ endif + " GUI (which always has colors). + if &t_Co > 2 || has("gui_running") + " Revert with ":syntax off". +- syntax on ++ try ++ syntax on ++ catch | endtry + + " I like highlighting strings inside C comments. + " Revert with ":unlet c_comment_strings". +@@ -152,3 +154,5 @@ if has('langmap') && exists('+langremap') + " compatible). + set nolangremap + endif ++ ++source $VIMRUNTIME/defaults_freebsd.vim diff --git a/editors/vim/files/patch-src_feature.h b/editors/vim/files/patch-src_feature.h new file mode 100644 index 000000000000..88691a17bba4 --- /dev/null +++ b/editors/vim/files/patch-src_feature.h @@ -0,0 +1,21 @@ +This allows /usr/local/etc/vim/vimrc to be loaded as a system +vimrc. Note that creating that file will prevent loading +defaults.vim from Vim's runtime. + +--- src/feature.h.orig 2022-09-04 15:48:55 UTC ++++ src/feature.h +@@ -710,12 +710,12 @@ + /* + * SYS_VIMRC_FILE Name of the system-wide .vimrc file. + */ +-// #define SYS_VIMRC_FILE "/etc/vimrc" ++#define SYS_VIMRC_FILE "%%ETCDIR%%/vimrc" + + /* + * SYS_GVIMRC_FILE Name of the system-wide .gvimrc file. + */ +-// #define SYS_GVIMRC_FILE "/etc/gvimrc" ++#define SYS_GVIMRC_FILE "%%ETCDIR%%/gvimrc" + + /* + * DFLT_HELPFILE Name of the help file.