View | Details | Raw Unified | Return to bug 265093 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/bsd.wx.mk (-4 / +11 lines)
Lines 112-120 Link Here
112
112
113
_WX_COMPS_ALL=		wx contrib python
113
_WX_COMPS_ALL=		wx contrib python
114
_WX_DEP_TYPES_ALL=	build lib run
114
_WX_DEP_TYPES_ALL=	build lib run
115
_WX_VERS_ALL=		2.8 3.0 3.1
115
_WX_VERS_ALL=		2.8 3.0 3.1 3.2
116
_WX_VERS_UC_ALL=	2.8 3.0 3.1
116
_WX_VERS_UC_ALL=	2.8 3.0 3.1 3.2
117
_WX_VERS_SKIP=		3.0 3.1
117
_WX_VERS_SKIP=		3.0 3.1 3.2
118
_WX_VERS_LISTS=		WANT_WX_VER WITH_WX_VER _WX_VER_INSTALLED
118
_WX_VERS_LISTS=		WANT_WX_VER WITH_WX_VER _WX_VER_INSTALLED
119
119
120
#
120
#
Lines 144-149 Link Here
144
_WX_PORT_wx_3.1=	x11-toolkits/wxgtk31
144
_WX_PORT_wx_3.1=	x11-toolkits/wxgtk31
145
_WX_LIB_wx_3.1=		wx_baseu-3.1
145
_WX_LIB_wx_3.1=		wx_baseu-3.1
146
146
147
_WX_PORT_python_3.2=	x11-toolkits/py-wxPython4@${PY_FLAVOR}
148
_WX_FILE_python_3.2=	${PYTHON_SITELIBDIR}/wx/__init__.py
149
150
# wxgtk 3.2
151
_WX_PORT_wx_3.2=	x11-toolkits/wxgtk32
152
_WX_LIB_wx_3.2=		wx_baseu-3.2
153
147
# Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropriately.
154
# Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropriately.
148
# Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib".
155
# Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib".
149
156
Lines 407-413 Link Here
407
# Set variables.
414
# Set variables.
408
#
415
#
409
416
410
.  if ${_WX_VER} == 3.1
417
.  if ${_WX_VER} == 3.1 || ${_WX_VER} == 3.2
411
_GTKVER=	3
418
_GTKVER=	3
412
.  elif ${_WX_VER} == 3.0
419
.  elif ${_WX_VER} == 3.0
413
_GTKVER=	${WANT_WXGTK_VER:U3}
420
_GTKVER=	${WANT_WXGTK_VER:U3}

Return to bug 265093