From owner-svn-ports-head@freebsd.org Thu Feb 4 17:30:37 2021 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 B6FAA5298F3; Thu, 4 Feb 2021 17:30:37 +0000 (UTC) (envelope-from jbeich@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 4DWlv14snyz4f73; Thu, 4 Feb 2021 17:30:37 +0000 (UTC) (envelope-from jbeich@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 99E407B9E; Thu, 4 Feb 2021 17:30:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 114HUbrL008188; Thu, 4 Feb 2021 17:30:37 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 114HUbeU008166; Thu, 4 Feb 2021 17:30:37 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202102041730.114HUbeU008166@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 4 Feb 2021 17:30:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564053 - head/games/joequake X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/games/joequake X-SVN-Commit-Revision: 564053 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.34 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, 04 Feb 2021 17:30:37 -0000 Author: jbeich Date: Thu Feb 4 17:30:37 2021 New Revision: 564053 URL: https://svnweb.freebsd.org/changeset/ports/564053 Log: games/joequake: properly fix OPENGL vs. X11 after r564045 Modified: head/games/joequake/Makefile (contents, props changed) Modified: head/games/joequake/Makefile ============================================================================== --- head/games/joequake/Makefile Thu Feb 4 17:21:27 2021 (r564052) +++ head/games/joequake/Makefile Thu Feb 4 17:30:37 2021 (r564053) @@ -40,8 +40,8 @@ X86_ASM_DESC= Enable x86 assembly code .if ${PORT_OPTIONS:MOPENGL} USES+= gl jpeg xorg -USE_GL= yes -USE_XORG+= xxf86vm +USE_GL+= gl +USE_XORG+= x11 xext xxf86dga xxf86vm ALL_TARGET+= glx PLIST_SUB+= GLX="" .else @@ -78,7 +78,7 @@ MAKE_ENV+= USE_${f}=NO .if ${PORT_OPTIONS:MX11} USES+= xorg -USE_XORG+= xxf86dga +USE_XORG+= x11 xext ALL_TARGET+= x11 PLIST_SUB+= X11="" .else