From nobody Thu Dec 22 17:47:28 2022 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 4NdHns4k31z1H5qm for ; Thu, 22 Dec 2022 17:47:29 +0000 (UTC) (envelope-from 010001853af27be8-2fb1dba4-d24f-48f2-ae9e-b304fd7b6cc4-000000@amazonses.com) Received: from a8-237.smtp-out.amazonses.com (a8-237.smtp-out.amazonses.com [54.240.8.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4NdHns2jDzz45PW for ; Thu, 22 Dec 2022 17:47:29 +0000 (UTC) (envelope-from 010001853af27be8-2fb1dba4-d24f-48f2-ae9e-b304fd7b6cc4-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=vnqrkfnvu6csdl6mwgk5t6ix3nnepx57; d=tarsnap.com; t=1671731248; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=eVVFqgG5yRvMK25ixE6/K2Qv3kD1mb7dvyI5CQkzUS4=; b=VJj+qx6EXSSwrK0xQ/7N44vLAupOWuKvyAuM9CM41lrkyhRa2rZjp4Wi1NjvTNv6 56jXrdoJw0uTqPi4OPmCXFsXHiiRR5/lphUxhG3krdG9acUneMsTONm17izuXolyyrh cl6dLJWjBlBKufeeUzET0kSKojnhio0HGmO+TACM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1671731248; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=eVVFqgG5yRvMK25ixE6/K2Qv3kD1mb7dvyI5CQkzUS4=; b=H+IKAUJvpl8Ps+tpLWAEP+SRca+rVZods89yNynyjUt/rqx71NftcNF4HLuNziNC NLcGcr3HaCkhIxx2QiB/OAOBbk2TnAmNStr2vWNjphBv9UUyB1t0Q681JgyOfBa528d SIvgNlbXyMEhxPAln5DyBIaMFmS6rvD9MDlsCOJI= Message-ID: <010001853af27be8-2fb1dba4-d24f-48f2-ae9e-b304fd7b6cc4-000000@email.amazonses.com> Date: Thu, 22 Dec 2022 17:47:28 +0000 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: git: ba3f1e00370d - main - Mk/bsd.wx.mk: remove wxgtk28 in USE_WX Content-Language: en-US To: =?UTF-8?Q?Lo=c3=afc_Bartoletti?= , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202212221201.2BMC1CAC065352@gitrepo.freebsd.org> From: Colin Percival In-Reply-To: <202212221201.2BMC1CAC065352@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Feedback-ID: 1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2022.12.22-54.240.8.237 X-Rspamd-Queue-Id: 4NdHns2jDzz45PW X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Looks like this broke `make describe`: make[3]: "/usr/ports/Mk/bsd.wx.mk" line 307: warning: String comparison operator should be either == or != make[3]: "/usr/ports/Mk/bsd.wx.mk" line 307: Malformed conditional (${_WX_VER_MIN} <= ${:U3.0} && ${_WX_VER_MAX} >= ${:U3.0} && ${_WX_${:UVER}_LIST:M${:U3.0}} == "") make[3]: "/usr/ports/Mk/bsd.wx.mk" line 307: warning: String comparison operator should be either == or != make[3]: "/usr/ports/Mk/bsd.wx.mk" line 307: Malformed conditional (${_WX_VER_MIN} <= ${:U3.2} && ${_WX_VER_MAX} >= ${:U3.2} && ${_WX_${:UVER}_LIST:M${:U3.2}} == "") make[3]: "/usr/ports/Mk/bsd.wx.mk" line 401: Malformed conditional (${_WX_VER} == 3.2) make[3]: Fatal errors encountered -- cannot continue===> cad/basicdsp failed Can this be reverted until the deprecated ports which use wxgtk28 are removed? Colin Percival On 12/22/22 04:01, Loïc Bartoletti wrote: > The branch main has been updated by lbartoletti: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=ba3f1e00370d69b693977b156905673d6ca1f07c > > commit ba3f1e00370d69b693977b156905673d6ca1f07c > Author: Loïc Bartoletti > AuthorDate: 2022-10-26 05:17:04 +0000 > Commit: Loïc Bartoletti > CommitDate: 2022-12-22 12:00:50 +0000 > > Mk/bsd.wx.mk: remove wxgtk28 in USE_WX > --- > Mk/bsd.wx.mk | 48 +++++++++++++++++++----------------------------- > 1 file changed, 19 insertions(+), 29 deletions(-) > > diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk > index a22b7e61ee0b..209be9829acd 100644 > --- a/Mk/bsd.wx.mk > +++ b/Mk/bsd.wx.mk > @@ -11,9 +11,9 @@ > # USE_WX - Set to the list of wxWidgets versions that can be used by > # the port. The syntax allows the following elements: > # - Single version (e.g. "3.0"). > -# - Range of versions (e.g. "2.8-3.0"). Must be ascending. > -# - Partial range: single version and upper (e.g. "2.8+"). > -# - Partial range: single version and lower (e.g. "-2.8"). > +# - Range of versions (e.g. "3.0-3.2"). Must be ascending. > +# - Partial range: single version and upper (e.g. "3.2+"). > +# - Partial range: single version and lower (e.g. "-3.2"). > # Multiple elements can be specified separated by spaces. > # USE_WX_NOT - Set to the list of wxWidgets versions that can't be used by > # the port. In other words, it removes some versions from > @@ -26,7 +26,6 @@ > # dependency type. > # The available components are: > # wx - The wxWidgets library. > -# contrib - The wxWidgets contributed libraries. > # python - The wxWidgets API for Python. > # The available dependency types are: > # build - Requires component for building. > @@ -49,7 +48,7 @@ > # components and add them to the variable HAVE_WX. If a > # version is selected, HAVE_WX will contain a list of > # components in the other case it will contain a list of > -# "component-version" pairs (e.g. wx-2.8, contrib-2.8, etc). > +# "component-version" pairs (e.g. wx-3.0, etc). > # It has to be used before bsd.port.pre.mk. > # WANT_WX_VER - Set to the preferred wxWidgets version for the port. It must > # be present in USE_WX or missing in USE_WX_NOT. This is > @@ -72,23 +71,23 @@ > # set to "yes". > # > # Examples: > -# - A port that needs wxWidgets 2.8 and contributed libraries > -# USE_WX= 2.8 > -# WX_COMPS= wx contrib > -# - A port that needs WxPython 2.8 for running. > +# - A port that needs wxWidgets 3.0 > +# USE_WX= 3.0 > +# WX_COMPS= wx > +# - A port that needs WxPython 3.0 for running. > # USE_PYTHON= yes > -# USE_WX= 2.8 > +# USE_WX= 3.0 > # WX_COMPS= python:run > -# - A port that needs WxPython 2.8 or 3.0 for building. > +# - A port that needs WxPython 3.0 or 3.2 for building. > # USE_PYTHON= yes > -# USE_WX= 2.8 3.0 > +# USE_WX= 3.0 3.2 > # WX_COMPS= python:build > -# - A port that needs wxWidgets version 2.8 or higher and contributed > +# - A port that needs wxWidgets version 3.0 or higher > # libraries. > -# USE_WX= 2.8+ > -# WX_COMPS= wx contrib > -# - A port that needs wxWidgets of any version other than 2.8. > -# USE_WX_NOT= 2.8 > +# USE_WX= 3.0+ > +# WX_COMPS= wx > +# - A port that needs wxWidgets of any version other than 3.0. > +# USE_WX_NOT= 3.0 > # > > WX_Include_MAINTAINER= desktop@FreeBSD.org > @@ -109,10 +108,10 @@ _WX_Definitions_Done= yes > # _WX_VERS_LISTS - Reverse lists preference order. > # > > -_WX_COMPS_ALL= wx contrib python > +_WX_COMPS_ALL= wx python > _WX_DEP_TYPES_ALL= build lib run > -_WX_VERS_ALL= 2.8 3.0 3.2 > -_WX_VERS_UC_ALL= 2.8 3.0 3.2 > +_WX_VERS_ALL= 3.0 3.2 > +_WX_VERS_UC_ALL= 3.0 3.2 > _WX_VERS_SKIP= 3.0 3.2 > _WX_VERS_LISTS= WANT_WX_VER WITH_WX_VER _WX_VER_INSTALLED > > @@ -125,13 +124,6 @@ _WX_VERS_LISTS= WANT_WX_VER WITH_WX_VER _WX_VER_INSTALLED > # _WX_DEPTYPE_comp_ver - Default dependency type (optional). > # > > -# wxgtk 2.8 > -_WX_PORT_wx_2.8= x11-toolkits/wxgtk28 > -_WX_LIB_wx_2.8= wx_base${_WX_UC}-2.8 > - > -_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@${_GTKFLAVOR} > _WX_LIB_wx_3.0= wx_baseu-3.0 > @@ -411,8 +403,6 @@ _GTKVER= 3 > . elif ${_WX_VER} == 3.0 > _GTKVER= ${WANT_WXGTK_VER:U3} > _GTKFLAVOR= gtk${_GTKVER} > -. else > -_GTKVER= 2 > . endif > > WX_CONFIG?= ${LOCALBASE}/bin/wxgtk${_GTKVER}${_WX_UC}-${_WX_VER}-config > -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid