From nobody Thu Dec 22 23:10:55 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 4NdQz41nmSz1J9g5; Thu, 22 Dec 2022 23:10:56 +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 4NdQz41HtBz3tQX; Thu, 22 Dec 2022 23:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671750656; 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=TKEA8kxw6sF3nHwE0C/GVlVIudKbHZ2QRTlaGwBsozk=; b=rq4zx0POFILcXEvQ6KRgxS6D8QWwaZuPqPydJZH2wb69rBiIk/0IT1lnEnpVy/Iwc655FY 5O9GwHCYHsdT30ywK06Oe6pLczjcZDLS6wemcWjKNozKVz5ecBCKDa1blOI9aeJMneTWFS rwAp6cSh4CahjSjsl0Ua4srgfPpq1TFtSaYp/cJ7VA9RDyxFnGIJKuz871uDYIIIt0nCgt I1K3Blqe/OtFIxBTsaXwWXSYe+CrFyJUzmSP+fJ5qo7KLHu7jo1nw0weEyZoPQgAUSSUqu j0tEJLHgz9WkZPJuJs8qJN7KfoJQkiJboxZGta6eSWfQp+LCZjiKMUNR82oedg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671750656; 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=TKEA8kxw6sF3nHwE0C/GVlVIudKbHZ2QRTlaGwBsozk=; b=tEXju7aT24FcGLimRNqqQNZw1Wfn1wWd4dtMDWB0yoIfO6OmguYXsnlCKxvmv7lEuiYCQG +CeeViqNM1lWo3IWVCRwYoKUJGAzm4ssZ5DdZwtkxHg4dh1KJIQEUNWQgryu/uiY3F8T6/ dW/fFWaXrBK3t0F7EzkYF5c4H70RSyzInrzkggbL9ZQDRBkWlWJe7wgDJwlU6g573GNNmM yNMT2UHqu2wDfbEDR7eFDhvBPsSWn6RUQJieBlO2bFxTpiygxR6cGrC9i0dAb5kzO1S98Y Ru8Ea40UWS9L+kjVXOA/CIGUDwGNmAtfPjKqZ5eFp/ul4DDKx+uYZJ5YHcr8mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671750656; a=rsa-sha256; cv=none; b=xoelPwcDJkzTBarcOW6L4S/i4qBksmH1aNtLr3UfkgPRURjJDkK3z4ROMYiYVXSq+BqCV3 7RDIXsTBftNjoBjYm77w6ppqoIfn3XzfLKe5bElwGzVzQtGp5RPwh5kMJj6oMno8y/AoeW 5lEssv5/xJlOElR4x86/uOq8BqS2UsK3UL9CPfVmN4aiJXcMax5XAGO40ViKRyNldbvxLY mxofPUaanAd7dosQ+tvMs1MWSF3HZR5A3qfuHbL04azuCiclAXdaieFF2/Ho/tXcnEaza3 lp++fo2y6T0AP9aNmFWVujD4G1jeYYQos4bHOx+qRI+/TqAse8LUitiikquikQ== 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 4NdQz40Lpxz1Bqy; Thu, 22 Dec 2022 23:10:56 +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 2BMNAtE5022506; Thu, 22 Dec 2022 23:10:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BMNAtpZ022505; Thu, 22 Dec 2022 23:10:55 GMT (envelope-from git) Date: Thu, 22 Dec 2022 23:10:55 GMT Message-Id: <202212222310.2BMNAtpZ022505@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 31b86664636f - main - Mk/bsd.wx.mk: Revert and fix 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31b86664636fd6a0f1a8dcaa3a21b12480402906 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=31b86664636fd6a0f1a8dcaa3a21b12480402906 commit 31b86664636fd6a0f1a8dcaa3a21b12480402906 Author: Muhammad Moinur Rahman AuthorDate: 2022-12-22 23:03:12 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-12-22 23:10:42 +0000 Mk/bsd.wx.mk: Revert and fix Version 2.8 was removed without proper testing of the tree. The removal of 2.8 has created multiple BROKEN ports with BROKEN INDEX. The proper sequence should be removal of the consumers and then removing the depricated version. Approved by: portmgr (just-fix-it) Fixes: ba3f1e0 remove wxgtk28 in USE_WX --- Mk/bsd.wx.mk | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk index 209be9829acd..a22b7e61ee0b 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. "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"). +# - 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"). # 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,6 +26,7 @@ # 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. @@ -48,7 +49,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-3.0, etc). +# "component-version" pairs (e.g. wx-2.8, contrib-2.8, 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 @@ -71,23 +72,23 @@ # set to "yes". # # Examples: -# - A port that needs wxWidgets 3.0 -# USE_WX= 3.0 -# WX_COMPS= wx -# - A port that needs WxPython 3.0 for running. +# - 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. # USE_PYTHON= yes -# USE_WX= 3.0 +# USE_WX= 2.8 # WX_COMPS= python:run -# - A port that needs WxPython 3.0 or 3.2 for building. +# - A port that needs WxPython 2.8 or 3.0 for building. # USE_PYTHON= yes -# USE_WX= 3.0 3.2 +# USE_WX= 2.8 3.0 # WX_COMPS= python:build -# - A port that needs wxWidgets version 3.0 or higher +# - A port that needs wxWidgets version 2.8 or higher and contributed # libraries. -# USE_WX= 3.0+ -# WX_COMPS= wx -# - A port that needs wxWidgets of any version other than 3.0. -# USE_WX_NOT= 3.0 +# 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 # WX_Include_MAINTAINER= desktop@FreeBSD.org @@ -108,10 +109,10 @@ _WX_Definitions_Done= yes # _WX_VERS_LISTS - Reverse lists preference order. # -_WX_COMPS_ALL= wx python +_WX_COMPS_ALL= wx contrib python _WX_DEP_TYPES_ALL= build lib run -_WX_VERS_ALL= 3.0 3.2 -_WX_VERS_UC_ALL= 3.0 3.2 +_WX_VERS_ALL= 2.8 3.0 3.2 +_WX_VERS_UC_ALL= 2.8 3.0 3.2 _WX_VERS_SKIP= 3.0 3.2 _WX_VERS_LISTS= WANT_WX_VER WITH_WX_VER _WX_VER_INSTALLED @@ -124,6 +125,13 @@ _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 @@ -403,6 +411,8 @@ _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