Date: Thu, 22 Dec 2022 23:10:55 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 31b86664636f - main - Mk/bsd.wx.mk: Revert and fix Message-ID: <202212222310.2BMNAtpZ022505@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=31b86664636fd6a0f1a8dcaa3a21b12480402906 commit 31b86664636fd6a0f1a8dcaa3a21b12480402906 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2022-12-22 23:03:12 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212222310.2BMNAtpZ022505>