From 272618278f0497efcab95aa78ecf80a89637e312 Mon Sep 17 00:00:00 2001 From: Max Khon Date: Sun, 3 Dec 2006 15:24:25 +0000 Subject: [PATCH] - Add support for wxgtk2 2.8. - Fix path to wxsvg. --- Mk/bsd.wx.mk | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk index 21fb6aa6ff75..842ab999310f 100644 --- a/Mk/bsd.wx.mk +++ b/Mk/bsd.wx.mk @@ -132,8 +132,8 @@ _WX_Definitions_Done= yes _WX_COMPS_ALL= wx contrib python mozilla svg _WX_DEP_TYPES_ALL= build lib run -_WX_VERS_ALL= 2.4 2.6 -_WX_VERS_UC_ALL= 2.6 +_WX_VERS_ALL= 2.4 2.6 2.8 +_WX_VERS_UC_ALL= 2.6 2.8 _WX_VERS_LISTS= WANT_WX_VER WITH_WX_VER # @@ -145,6 +145,7 @@ _WX_VERS_LISTS= WANT_WX_VER WITH_WX_VER # _WX_DEPTYPE_comp_ver - Default dependency type (optional). # +# wxgtk 2.4 _WX_PORT_wx_2.4= x11-toolkits/wxgtk24 _WX_LIB_wx_2.4= wx_gtk2-2.4 @@ -157,6 +158,7 @@ _WX_FILE_python_2.4= ${PYTHON_SITELIBDIR}/wx/__init__.py _WX_PORT_mozilla_2.4= x11-toolkits/wxmozilla _WX_LIB_mozilla_2.4= wxmozilla_gtk2-2.4 +# wxgtk 2.6 _WX_PORT_wx_2.6= x11-toolkits/wxgtk26${_WX_UCL} _WX_LIB_wx_2.6= wx_base${_WX_UC}-2.6 @@ -166,9 +168,16 @@ _WX_LIB_contrib_2.6= wx_gtk2${_WX_UC}_animate-2.6 _WX_PORT_python_2.6= x11-toolkits/py-wxPython26${_WX_UCL} _WX_FILE_python_2.6= ${PYTHON_SITELIBDIR}/wx-2.6-gtk2${_WX_PYSUFX}/wx/__init__.py -_WX_PORT_svg_2.6= x11-toolkits/wxsvg +_WX_PORT_svg_2.6= graphics/wxsvg _WX_LIB_svg_2.6= wxsvg +# wxgtk 2.8 +_WX_PORT_wx_2.8= x11-toolkits/wxgtk28${_WX_UCL} +_WX_LIB_wx_2.8= wx_base${_WX_UC}-2.8 + +_WX_PORT_contrib_2.8= x11-toolkits/wxgtk28${_WX_UCL}-contrib +_WX_LIB_contrib_2.8= wx_gtk2${_WX_UC}_fl-2.8 + # 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".