diff --git i/Mk/bsd.wx.mk w/Mk/bsd.wx.mk index 507118dc9104..68bfec216d7b 100644 --- i/Mk/bsd.wx.mk +++ w/Mk/bsd.wx.mk @@ -111,8 +111,8 @@ _WX_Definitions_Done= yes _WX_COMPS_ALL= wx contrib python _WX_DEP_TYPES_ALL= build lib run -_WX_VERS_ALL= 2.8 3.0 -_WX_VERS_UC_ALL= 2.8 3.0 +_WX_VERS_ALL= 2.8 3.0 3.1 +_WX_VERS_UC_ALL= 2.8 3.0 3.1 _WX_VERS_SKIP= 3.0 _WX_VERS_LISTS= WANT_WX_VER WITH_WX_VER _WX_VER_INSTALLED @@ -142,6 +142,10 @@ _WX_LIB_wx_3.0= wx_baseu-3.0 _WX_PORT_python_3.0= x11-toolkits/py-wxPython30 _WX_FILE_python_3.0= ${PYTHON_SITELIBDIR}/wx-3.0-gtk2/wx/__init__.py +# wxgtk 3.1 +_WX_PORT_wx_3.1= x11-toolkits/wxgtk31 +_WX_LIB_wx_3.1= wx_baseu-3.1 + # Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropiately. # Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib". @@ -405,8 +409,9 @@ _WX_VER= ${ver} # Set variables. # -WX_CONFIG?= ${LOCALBASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config -WXRC_CMD?= ${LOCALBASE}/bin/wxrc-gtk2${_WX_UC}-${_WX_VER} +WX_FLAVOR?= gtk2 +WX_CONFIG?= ${LOCALBASE}/bin/wx${WX_FLAVOR}${_WX_UC}-${_WX_VER}-config +WXRC_CMD?= ${LOCALBASE}/bin/wxrc-${WX_FLAVOR}${_WX_UC}-${_WX_VER} WX_VERSION?= ${_WX_VER} .endif # _WX_Need_Version