From owner-svn-ports-all@freebsd.org Thu May 21 08:01:56 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 AD6D532CFAB; Thu, 21 May 2020 08:01:56 +0000 (UTC) (envelope-from gerald@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49SMXN4FQFz4YlJ; Thu, 21 May 2020 08:01:56 +0000 (UTC) (envelope-from gerald@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 8D16FA24C; Thu, 21 May 2020 08:01:56 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04L81u4R091279; Thu, 21 May 2020 08:01:56 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04L81uXG091277; Thu, 21 May 2020 08:01:56 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202005210801.04L81uXG091277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Thu, 21 May 2020 08:01:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r536086 - branches/2020Q2/emulators/wine X-SVN-Group: ports-branches X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: branches/2020Q2/emulators/wine X-SVN-Commit-Revision: 536086 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.33 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: Thu, 21 May 2020 08:01:56 -0000 Author: gerald Date: Thu May 21 08:01:56 2020 New Revision: 536086 URL: https://svnweb.freebsd.org/changeset/ports/536086 Log: MFH: r535834 Backport r534205 | gerald | 2020-05-06 from emulators/wine-devel: Push USES=pkgconfig to the global level instead just contingent on the VKD3D option. This makes a real difference for the GNUTLS option (on by default) and others. Accordingly bump PORTREVISION. Reported by: Benny Goemans Approved by: ports-secteam (joneum), portmgr (blanket: dependency issue) Modified: branches/2020Q2/emulators/wine/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/wine/Makefile ============================================================================== --- branches/2020Q2/emulators/wine/Makefile Thu May 21 07:58:39 2020 (r536085) +++ branches/2020Q2/emulators/wine/Makefile Thu May 21 08:01:56 2020 (r536086) @@ -3,6 +3,7 @@ PORTNAME= wine DISTVERSION= 5.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -21,7 +22,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex LIB_DEPENDS= libFAudio.so:audio/faudio \ libxml2.so:textproc/libxml2 -USES= bison desktop-file-utils gmake localbase shebangfix tar:xz +USES= bison desktop-file-utils gmake localbase pkgconfig shebangfix tar:xz CONFLICTS_INSTALL= wine-staging-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \ i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* @@ -105,7 +106,6 @@ V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l VKD3D_CONFIGURE_WITH= vkd3d -VKD3D_USES= pkgconfig VKD3D_LIB_DEPENDS= libvkd3d.so:graphics/vkd3d VULKAN_CONFIGURE_WITH= vulkan