From owner-svn-ports-head@freebsd.org Thu Jan 2 06:01:57 2020 Return-Path: Delivered-To: svn-ports-head@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 BEBDD1EDE51; Thu, 2 Jan 2020 06:01:57 +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) 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 47pHVY4jNsz3Pkb; Thu, 2 Jan 2020 06:01:57 +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 9CD79ECE2; Thu, 2 Jan 2020 06:01:57 +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 00261veL014405; Thu, 2 Jan 2020 06:01:57 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00261vYr014404; Thu, 2 Jan 2020 06:01:57 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202001020601.00261vYr014404@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Thu, 2 Jan 2020 06:01:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521798 - head/emulators/wine-devel X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: head/emulators/wine-devel X-SVN-Commit-Revision: 521798 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2020 06:01:57 -0000 Author: gerald Date: Thu Jan 2 06:01:57 2020 New Revision: 521798 URL: https://svnweb.freebsd.org/changeset/ports/521798 Log: Make sure we employ USES=xorg only when X11/Xorg are actually used, much as we have had this for USE_XORG and USE_GL for a while. Without this building with option X11 off actually fails now due to increased checks in the FreeBSD ports infrastructure. PR: 242996 Reported by: Patrick McMunn Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Thu Jan 2 05:52:17 2020 (r521797) +++ head/emulators/wine-devel/Makefile Thu Jan 2 06:01:57 2020 (r521798) @@ -24,7 +24,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 xorg +USES= bison desktop-file-utils gmake localbase shebangfix tar:xz CONFLICTS_INSTALL= wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \ i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* @@ -113,7 +113,7 @@ VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loade WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:textproc/p5-XML-LibXML X11_CONFIGURE_WITH= x cms fontconfig freetype glu jpeg opengl png xinerama xinput2 xrandr xrender -X11_USES= gl jpeg +X11_USES= gl jpeg xorg X11_USE= GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \