From owner-dev-commits-ports-all@freebsd.org Mon Aug 2 22:35:50 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 887C567B9AF; Mon, 2 Aug 2021 22:35:50 +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 4GdtBZ35Wnz3hlB; Mon, 2 Aug 2021 22:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5338727C8C; Mon, 2 Aug 2021 22:35:50 +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 172MZoV1072340; Mon, 2 Aug 2021 22:35:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 172MZoNu072339; Mon, 2 Aug 2021 22:35:50 GMT (envelope-from git) Date: Mon, 2 Aug 2021 22:35:50 GMT Message-Id: <202108022235.172MZoNu072339@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: 6cfa70cdefcc - main - editors/vim: Explicitly disable libcanberra support 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: 6cfa70cdefcc68a5ff8afb9469c643a91cc25273 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Aug 2021 22:35:50 -0000 The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=6cfa70cdefcc68a5ff8afb9469c643a91cc25273 commit 6cfa70cdefcc68a5ff8afb9469c643a91cc25273 Author: Adam Weinberger AuthorDate: 2021-08-02 22:32:55 +0000 Commit: Adam Weinberger CommitDate: 2021-08-02 22:35:45 +0000 editors/vim: Explicitly disable libcanberra support Vim will link against libcanberra if it's installed. It really doesn't serve any particular purpose for a text editor, so it makes sense for us to just disable it explicitly. This change existed before, but was hidden in the GNOME option and got removed when libgnomeui was purged. PR: 257565 Reported by: Philipp Ost --- editors/vim/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/editors/vim/Makefile b/editors/vim/Makefile index d58e342f362e..24ed2902e873 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -2,6 +2,7 @@ PORTNAME= vim PORTVERSION= 8.2.3273 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= editors @@ -18,7 +19,9 @@ USE_GITHUB= yes CONFLICTS_INSTALL?= vim-console vim-tiny -CONFIGURE_ARGS= --enable-gui=${GUI} \ +# Vim will try to link against libcanberra if it's installed +CONFIGURE_ARGS= --disable-canberra \ + --enable-gui=${GUI} \ --enable-multibyte \ --with-tlib=ncursesw MAKE_ARGS= STRIP="${STRIP_CMD}" \ @@ -33,7 +36,7 @@ PORTSCOUT= ignore:1 SHEBANG_FILES= runtime/tools/demoserver.py runtime/tools/efm_perl.pl VIM_VER= ${PORTNAME}${PORTVERSION:R:S|.||g} -# OPTIONS +# OPTIONS for normal (non-tiny) vim # ### Make sure any new options are excluded below in CONSOLE/TINY OPTIONS_DEFAULT= CSCOPE DEFAULT_VIMRC CTAGS_EXUBERANT GTK3 PERL PYTHON RUBY OPTIONS_DEFINE= CSCOPE DEFAULT_VIMRC MAKE_JOBS NLS XTERM_SAVE @@ -44,9 +47,9 @@ 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 .if defined(CONSOLE) || defined(TINY) OPTIONS_SLAVE= CONSOLE -# Exclude everything except CONSOLE, DEFAULT_VIMRC, MAKE_JOBS OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NDEFAULT_VIMRC:NMAKE_JOBS} \ ${OPTIONS_SINGLE_UI:NCONSOLE} \ ${OPTIONS_GROUP_LANGBIND} \