From nobody Sat Apr 02 22:24:27 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 65A3C1A63EBB; Sat, 2 Apr 2022 22:24:27 +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 4KWBRH2PKCz3mfS; Sat, 2 Apr 2022 22:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648938267; 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=ZbLO5mvsap4J6aMA69O/EB29WpMB6Y2a+T1nhyug6Vk=; b=pkAfkyhrY6UyTm1V4jytf05WlGtMawopoXpj2hkEb5u0GQLdWp0+oDakQNvFvcMszswvVg NERB8ZBezlbwzT0ozymhyMgkLiSjDaz62xL6QhadbpNSyD/1iVgouGkezNGFcwnMBu2IuL BNbLZi9EqUHnwNlY9NmPAWspH8pba9Glc3y36IssoG7RXyfndKeM8LuQ0lQrl6hqyD7HNB 8ppl4gPRHtxcqhRF10Y+mfyUAAVSStMjBhYVhfRYjxO7ncJ4rkyMlcj6iPFX19Dv5ZbcOy V062mFaaH/msUPvESmU5G+13FxlNq8veAa/rB4iLAsYf8Ritb5pPFG2lUhlNxw== 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 327DB11C87; Sat, 2 Apr 2022 22:24:27 +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 232MORlZ021464; Sat, 2 Apr 2022 22:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 232MORWW021463; Sat, 2 Apr 2022 22:24:27 GMT (envelope-from git) Date: Sat, 2 Apr 2022 22:24:27 GMT Message-Id: <202204022224.232MORWW021463@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Adam Weinberger Subject: git: 2b7ddfe9b84a - 2022Q2 - editors/vim: Update to 8.2.4669, add x11 support, drop Athena 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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 2b7ddfe9b84a8e01ca5bf6b6331d10dda75e2035 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648938267; 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=ZbLO5mvsap4J6aMA69O/EB29WpMB6Y2a+T1nhyug6Vk=; b=mQF3yLyBxPRVq6f87Xm8pxMPmqLBJakbISPAmM23zSGgdihQHZhvClDAiQODz9jcLQGpDn V2LDPP451XKZnPhHMJWjaB67m0HbunuxB9oggkZ6sHRlhGjomWIITyDrzOMW3ByWK+QUt+ L07X42B18aViq2LC3+sgv5+Tk3upg5lpuKdvXcNrRB1xydkg7h0JB1KyM90ub4VEflVYYt ka7GMPUfK0BZhwJW1rGWLnKRuE3g7R0Zhau06EhBGAfnSyftfxOZUpZi7Vm9F+XSTm2HWZ Fe4MvZByOBmgAKinE+EH92VPCgJZmC2csevMubWkg2uaiKYEjD9vepdhpxsutg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648938267; a=rsa-sha256; cv=none; b=ZsYeTvVone/mOKbeGFGCeUUCxa36gIQtDVVhCdfdYLuPBvcsiVE15GK2OYnbNQi7u3mXly WsUx+LdUK5zRlo3fe9I2j+KpCHQ4woqGpyvomhD35cgSEAlS3iVG/H6SU+a6YrO8dRfCDO MoOzbJ7eyLUL47K59pswinQP/XzDOpLTlqYkTP02uSqSj3j4rp1KP5M8CWRWvXVIfEFVFk KNKt9IUJSrITVu/a98qhRx/QCZCP/jZ+OKm+rBc2LbCOkom9y2V3Xz/Ct8boOcfZVuLIb1 OqEEpLU8TpJAY63611tnXFntoOJgKDYFCf/8LUc9tKQYkWE70Ynfqq1vOCGv7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b7ddfe9b84a8e01ca5bf6b6331d10dda75e2035 commit 2b7ddfe9b84a8e01ca5bf6b6331d10dda75e2035 Author: Adam Weinberger AuthorDate: 2022-04-02 22:13:32 +0000 Commit: Adam Weinberger CommitDate: 2022-04-02 22:24:16 +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. (cherry picked from commit de02b1a9d209f0b6727e63848bc58c9b4ef1c064) --- 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