From nobody Thu May 23 09:27:03 2024 X-Original-To: dev-commits-ports-main@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 4VlN9M5Xnrz5LK3d; Thu, 23 May 2024 09:27:03 +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 4VlN9M54Hcz4mc5; Thu, 23 May 2024 09:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716456423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZUujjJceXbJkKrMJhIawRIkgXFt16WbbAx8dkY3NU5M=; b=uEOj6eQLFF/XnMBrUxQI1eMBQPyrxIOP9/7yYs6o7d82hMoxF9BNqe1UWx1tJhvM0PJAkd RIu/p722KGmPYeXGNouPhdDtbqo5RqmRjqX3zTzTHTVlSI/oSN9CJ6NaqVJEKX1o2TWaMV XgVki+55Mas/dZbKo9YLxeGmKdydrRvkhHcOcTDSxVypbo9WKg8HPzoIm7eAikZnMxGEIa hZiF9YaCZsCQLZqs/xYUCPOQkU64WO1y3qvx2PHn7zsZp3GBOSNUlBZzZ2H/3KLq2SVJ3p 1DILhhVCjnzJN06VIUSh6/GLqXnplF5VBzj61sekcCF9A3E8BX2ZRy+EkuhPnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716456423; a=rsa-sha256; cv=none; b=jc7ziv0wrn/FzFt6a6JMWNePhQkC5dfPy6MbzBmmvHnuH6ciuVwvvDt+x+Zja5ubMZwdyG dLuXHsERu3fQPb2udA1sDWQdU6KoyiXDIxWygF/2a0WDrLKJp7/VkVvMCTxAStgz3upS3E pzfYtd2IiOJLADqKVRxtoGEOvVOBECDx3Eqa4HABz/SKC9jyMi9g9PsW99C+rJquj8uuEc InAsL+4+3P2SjAJpCyLYVWsFbf8u2MrVzySZ7It0cpclc6C2wJj3KCUK31v1BKpBQ0uks0 VplH7st0SIgp9EIfPvoDSkJ0fNX9x3Tq+iSSzLO4mqhEsDcG/IICnwpWOsQmgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716456423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZUujjJceXbJkKrMJhIawRIkgXFt16WbbAx8dkY3NU5M=; b=aPrkGhKWXeF2nUyxLrNgCFJCFyWIrhK1LCI1JAR7O+tv0G+PVDqEiO0PpFSGdczw+//eC1 nP5BF1KR0hy6HrbvmAlRi1TRZ58P/Mx8SddENTcOEqPlVFf+gpaqWiGZzRmVjdVSIdAjQT tVVWHS7EYH2Kbov/ZnPJspWp5HspqYXxwxeVQq99D9rL1aE+o6p8lw24Lfx7H90Kr+Umq5 I6bJJpoIriBryZZYpqSDWM7Z1PGRoG5wlvqmDubRW27Rdf05RTdZ3fDfHXnwmg41Ri5i/d n8IvVoV/GcnP2kz8Xa/vKT0U5Dw1k7s0wP80Ty41NYTUkBiJoTlhGSviVRqawg== 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 4VlN9M4gbCzktB; Thu, 23 May 2024 09:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44N9R3jw037270; Thu, 23 May 2024 09:27:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44N9R3Ik037267; Thu, 23 May 2024 09:27:03 GMT (envelope-from git) Date: Thu, 23 May 2024 09:27:03 GMT Message-Id: <202405230927.44N9R3Ik037267@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: aa50e1eb06b8 - main - Mk/bsd.wx.mk: extend GTK flavor support over both wxWidgets versions. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: aa50e1eb06b89c52f12d3b2683a3f776eff074c9 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa50e1eb06b89c52f12d3b2683a3f776eff074c9 commit aa50e1eb06b89c52f12d3b2683a3f776eff074c9 Author: Alexey Dokuchaev AuthorDate: 2024-05-23 09:26:24 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-05-23 09:26:24 +0000 Mk/bsd.wx.mk: extend GTK flavor support over both wxWidgets versions. --- Mk/bsd.wx.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk index a036ce1284c0..bbf84d1b1283 100644 --- a/Mk/bsd.wx.mk +++ b/Mk/bsd.wx.mk @@ -1,6 +1,5 @@ # bsd.wx.mk - Support for wxWidgets based ports. # -# # The following variables can be defined in a port that uses the wxWidgets # library, contributed libraries, WxPython and/or more wxWidgets related # components (with run and/or build dependencies). It can be used after and/or @@ -56,7 +55,7 @@ # 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 default. # # The following variables are intended for the user and can be defined in # make.conf. @@ -132,7 +131,7 @@ _WX_PORT_python_3.2= x11-toolkits/py-wxPython4@${PY_FLAVOR} _WX_FILE_python_3.2= ${PYTHON_SITELIBDIR}/wx/__init__.py # wxgtk 3.2 -_WX_PORT_wx_3.2= x11-toolkits/wxgtk32 +_WX_PORT_wx_3.2= x11-toolkits/wxgtk32@${_GTKFLAVOR} _WX_LIB_wx_3.2= wx_baseu-3.2 # Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropriately. @@ -398,12 +397,8 @@ _WX_VER= ${ver} # Set variables. # -. if ${_WX_VER} == 3.2 -_GTKVER= 3 -. elif ${_WX_VER} == 3.0 _GTKVER= ${WANT_WXGTK_VER:U3} _GTKFLAVOR= gtk${_GTKVER} -. endif WX_CONFIG?= ${LOCALBASE}/bin/wxgtk${_GTKVER}${_WX_UC}-${_WX_VER}-config WXRC_CMD?= ${LOCALBASE}/bin/wxrc-gtk${_GTKVER}${_WX_UC}-${_WX_VER}