From nobody Mon Oct 25 10:47:16 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4EE721821E7F; Mon, 25 Oct 2021 10:47:17 +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 4HdBVF1fyTz3thL; Mon, 25 Oct 2021 10:47:17 +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 15B6E2757A; Mon, 25 Oct 2021 10:47:17 +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 19PAlG27046430; Mon, 25 Oct 2021 10:47:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19PAlGDP046429; Mon, 25 Oct 2021 10:47:16 GMT (envelope-from git) Date: Mon, 25 Oct 2021 10:47:16 GMT Message-Id: <202110251047.19PAlGDP046429@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 3fb819409bdc - main - Mk/bsd.wx.mk: allow to specify preferred GTK+ for wxWidgets 3.0. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fb819409bdc388fe69c98c43fd7de763e15f36d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3fb819409bdc388fe69c98c43fd7de763e15f36d commit 3fb819409bdc388fe69c98c43fd7de763e15f36d Author: Alexey Dokuchaev AuthorDate: 2021-10-25 10:45:18 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-10-25 10:45:20 +0000 Mk/bsd.wx.mk: allow to specify preferred GTK+ for wxWidgets 3.0. --- Mk/bsd.wx.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk index bd6bc9b1c6d8..e3729cd0d744 100644 --- a/Mk/bsd.wx.mk +++ b/Mk/bsd.wx.mk @@ -57,6 +57,8 @@ # overridden by the user variable WITH_WX_VER if set. It can # contain multiple versions in order of preference (last ones # are tried first). +# WANT_WXGTK_VER - Set to the preferred GTK+ version, "2" or "3", "3" being +# the default (only applicable to wxWidgets 3.0 for now). # # The following variables are intended for the user and can be defined in # make.conf. @@ -132,7 +134,7 @@ _WX_PORT_contrib_2.8= x11-toolkits/wxgtk28-contrib _WX_LIB_contrib_2.8= wx_gtk2${_WX_UC}_fl-2.8 # wxgtk 3.0 -_WX_PORT_wx_3.0= x11-toolkits/wxgtk30 +_WX_PORT_wx_3.0= x11-toolkits/wxgtk30@${_GTKFLAVOR} _WX_LIB_wx_3.0= wx_baseu-3.0 _WX_PORT_python_3.0= x11-toolkits/py-wxPython40@${PY_FLAVOR} @@ -405,8 +407,11 @@ _WX_VER= ${ver} # Set variables. # -.if ${_WX_VER:R} == 3 +.if ${_WX_VER} == 3.1 _GTKVER= 3 +.elif ${_WX_VER} == 3.0 +_GTKVER= ${WANT_WXGTK_VER:U3} +_GTKFLAVOR= gtk${_GTKVER} .else _GTKVER= 2 .endif