From nobody Sat Apr 02 22:22:56 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 ACE871A63049; Sat, 2 Apr 2022 22:22:56 +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 4KWBPX4STDz3lss; Sat, 2 Apr 2022 22:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648938176; 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=zJeXDUdlqqQWfwpFiiujC3Pg9fJQq/ZkiOyaKOBYNiE=; b=JNNW2q3X4EIOblVprjZNgssrECRoAFDV+7pSFEoEvcCdabezUtGifwXeDveokfiFLzG5bz B7ery0ELW39eidyG3qtuOUOMawrBEbdKnzVqurjAhUutYXanO4VwbQcLS59AgaPv0gY7rO 6Vw8EhOJmjKzYCL9hpB8r27OoxeXgs+NlRaEDyuzoYX10QViQrLwv8En2Sc4Rd73Zx/dW9 CGvSlPYchBUDJWJtIUU+5DpauMFCVgFCe4lq5QvFmOMuSBOOhpEN0qP74R8qtTUVB5GaGO MXSzjEilEjJYqkPKOHPR/wTR/D06CeFPOsyIB952KTU6zovOCBP9zzooeJHwmg== 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 799C711C86; Sat, 2 Apr 2022 22:22: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 232MMutn021223; Sat, 2 Apr 2022 22:22:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 232MMuLr021222; Sat, 2 Apr 2022 22:22:56 GMT (envelope-from git) Date: Sat, 2 Apr 2022 22:22:56 GMT Message-Id: <202204022222.232MMuLr021222@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: de02b1a9d209 - main - editors/vim: Update to 8.2.4669, add x11 support, drop Athena 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: de02b1a9d209f0b6727e63848bc58c9b4ef1c064 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648938176; 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=zJeXDUdlqqQWfwpFiiujC3Pg9fJQq/ZkiOyaKOBYNiE=; b=igwlRHH+Pf+A/OrjcL+hpyDGJU2kcxKxlSAvQUar320bw0TbqHmuQV5mYT3SzOKN8EXCfw k0X3ytmXsmVphRhiWY3k7nyKESJkL1cUpsOeA9ZliYMdmj19oTi2Vj6Owv+zkv2sSac3Mr l7mDdFD4CxPmxYxYwRS28UhmxEA8moRv8x0uFl1ZGf+SNSa0E6JY3h/+aUsGypcAcqEijh Rl1d+dCV2plXOC4sJhnAwXDi6HyNp2P5lf/t/fl9kkEPg2n8mJEObqkWniprPLxQXsRvwk gqFPYvvN9N008yP2vM+eH3ONhm+ud2VyLqlkXvSS5B1kO8VaU0X99E/xv6zjgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648938176; a=rsa-sha256; cv=none; b=Rn+D3jmlPnl0oyqfru61SlhG/+qhvkS+G9HJiX/FYW87CKWHb4g/j7oTWBoA3SeJ/K7QMg yWRENJLuy1ERW+FH+bdg43O4l9sBRgsUYMiRK/ndH1q9t9Ua4kW80v64eAl14AeOKSWrxs evPfddeVYdUteA40lKo9TGMJ1SobT8G3OQAS+Ehk5iYUFkI8CWZ0+I9pt5TXYk5saSs71u hpMxRWyed4xgf4T8OONijsaJgKTt4NFvu9D3TNWb+s5jJh9SLETrQAt8Z1oHwJzpboyeD5 GeNxa0Od0B6DHhI4u8dULjTjT7POou2wFZl7Rr4hZxN5O5vodCLnG9r9hcLn4g== 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=de02b1a9d209f0b6727e63848bc58c9b4ef1c064 commit de02b1a9d209f0b6727e63848bc58c9b4ef1c064 Author: Adam Weinberger AuthorDate: 2022-04-02 22:13:32 +0000 Commit: Adam Weinberger CommitDate: 2022-04-02 22:13:32 +0000 editors/vim: Update to 8.2.4669, add x11 support, drop Athena Vim no longer includes the Athena (Xaw) frontend, so drop the athena flavor. As requested by many (and based on a patch from scf), restore the x11 flavor. The x11 flavor is a bit odd; it doesn't actually include an X GUI. As a result, when Vim got flavorized I dropped it as I thought it was vestigial. What the x11 flavor actually provides is support for some X interaction (mainly xclipboard), and is highly useful to people who run console Vim within X. The outcry was pretty swift, and I'd like to thank all the people who took the time to email me about it, and especially scf who provided the bulk of this patch. I'm going to MFH this due to the athena build failure. --- editors/vim/Makefile | 18 +++++++++--------- editors/vim/distinfo | 6 +++--- editors/vim/pkg-descr | 3 ++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 38ca4e1367c6..6e894ed81e0a 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -1,7 +1,7 @@ # Created by: David O'Brien PORTNAME= vim -PORTVERSION= 8.2.4659 +PORTVERSION= 8.2.4669 DISTVERSIONPREFIX= v CATEGORIES= editors @@ -37,7 +37,7 @@ VIM_VER= ${PORTNAME}${PORTVERSION:R:S|.||g} # Flavors {{{1 # FLAVORS are used to build various Vim GUIs. The default flavor (`vim') is # console-only. -FLAVORS= console athena gtk2 gtk3 motif tiny +FLAVORS= console gtk2 gtk3 motif x11 tiny FLAVOR?= ${FLAVORS:[1]} # Register conflicts with all other flavors CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:S/^/vim-/} @@ -57,13 +57,6 @@ GUI= no CONFIGURE_ARGS+=--without-x PLIST= ${.CURDIR}/pkg-plist-tiny -.elif ${FLAVOR:U} == athena -GUI= athena -CONFIGURE_ARGS+=--enable-xim --enable-fontset -PLIST_SUB+= GUI="" DESKTOP="@comment " -USES+= xorg -USE_XORG+= ice sm x11 xaw xmu xpm xt - .elif ${FLAVOR:U} == gtk2 GUI= gtk2 CONFIGURE_ARGS+=--enable-xim --enable-fontset @@ -87,6 +80,13 @@ CONFIGURE_ENV+= MOTIFHOME=${LOCALBASE} PLIST_SUB+= GUI="" DESKTOP="@comment " USES+= motif xorg USE_XORG= ice sm x11 xmu xt + +.elif ${FLAVOR:U} == x11 +GUI= x11 +CONFIGURE_ARGS+=--with-x +PLIST_SUB+= GUI="@comment " DESKTOP="@comment " +USES+= xorg +USE_XORG= ice sm x11 xmu xpm xt .endif # Options {{{1 diff --git a/editors/vim/distinfo b/editors/vim/distinfo index 20e2259ce63a..654d89e50d93 100644 --- a/editors/vim/distinfo +++ b/editors/vim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648806173 -SHA256 (vim-vim-v8.2.4659_GH0.tar.gz) = daa9252e215548221d24f51cd1e773d3cd5d8c53d29220a8136a0835a3983acc -SIZE (vim-vim-v8.2.4659_GH0.tar.gz) = 16304340 +TIMESTAMP = 1648936763 +SHA256 (vim-vim-v8.2.4669_GH0.tar.gz) = cca3c98dd36423a5c968260e5ee1b04f0acd36161388e284232b189cadebb3db +SIZE (vim-vim-v8.2.4669_GH0.tar.gz) = 16305422 diff --git a/editors/vim/pkg-descr b/editors/vim/pkg-descr index daacdb5d7419..02f7be21f003 100644 --- a/editors/vim/pkg-descr +++ b/editors/vim/pkg-descr @@ -8,7 +8,8 @@ configuration files. FreeBSD has the following Vim packages: * vim: Console-only Vim (vim binary) with all runtime files -* vim-gtk3, -gtk2, -athena, -motif, -x11: Console Vim plus a GUI (gvim binary) +* vim-gtk3, -gtk2, -motif: Console Vim plus a GUI (gvim binary) +* vim-x11: Console Vim only, with xclipboard support * vim-tiny: Vim binary only, with no runtime files. Not useful for most people; intended for minimal (ex. jail) installations