From owner-svn-ports-all@freebsd.org Sun Apr 12 16:12:07 2020 Return-Path: Delivered-To: svn-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 F12132C1A36; Sun, 12 Apr 2020 16:12:07 +0000 (UTC) (envelope-from adamw@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 490cFz5k9Wz4Jg7; Sun, 12 Apr 2020 16:12:07 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BFC634513; Sun, 12 Apr 2020 16:12:07 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03CGC712078231; Sun, 12 Apr 2020 16:12:07 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03CGC77g078230; Sun, 12 Apr 2020 16:12:07 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <202004121612.03CGC77g078230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sun, 12 Apr 2020 16:12:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r531529 - branches/2020Q2/editors/vim X-SVN-Group: ports-branches X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: branches/2020Q2/editors/vim X-SVN-Commit-Revision: 531529 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2020 16:12:08 -0000 Author: adamw Date: Sun Apr 12 16:12:07 2020 New Revision: 531529 URL: https://svnweb.freebsd.org/changeset/ports/531529 Log: MFH: r531528 Approved by: portmgr (with hat) vim: Fix environment contamination from libcanberra Vim will link against libcanberra if it's present, leading to an undeclared link and breakage risk if canberra is removed. It only really makes sense for it to do this during a gnome build, so explicitly enable it there and disable it elsewhere. PR: 245460 Reported by: Andy Mender Modified: branches/2020Q2/editors/vim/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/editors/vim/Makefile ============================================================================== --- branches/2020Q2/editors/vim/Makefile Sun Apr 12 16:10:58 2020 (r531528) +++ branches/2020Q2/editors/vim/Makefile Sun Apr 12 16:12:07 2020 (r531529) @@ -3,6 +3,7 @@ PORTNAME= vim PORTVERSION= 8.2.0491 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= editors @@ -95,6 +96,8 @@ CONSOLE_CONFIGURE_OFF= --enable-xim --enable-fontset CONSOLE_PLIST_SUB= GUI="@comment " DESKTOP="@comment " CONSOLE_VARS= GUI=no +GNOME_CONFIGURE_ENABLE= canberra +GNOME_LIB_DEPENDS= libcanberra.so:audio/libcanberra GNOME_PLIST_SUB= GUI="" DESKTOP="" GNOME_IMPLIES= NLS GNOME_USE= GNOME=gdkpixbuf2,libgnomeui XORG=ice,sm,xorgproto,x11,xpm,xt