summaryrefslogtreecommitdiff
path: root/Mk/bsd.wx.mk
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2013-09-19 09:49:52 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2013-09-19 09:49:52 +0000
commitc8209f84b4ca26ff7fd774b864408375dcac320c (patch)
treec4559c1a0e4f6c9d0100ce186a8e4e8dc55266df /Mk/bsd.wx.mk
parentDo not recommand to drop ltverhack because it needs to be done with cautious, (diff)
- Implement USES+=tcl and USES+=tk
- Use bsd.default-versions.mk to specify the default Tcl/Tk version (8.6) - Add warnings about the now deprecated use of USE_TCL, USE_TK, ... Notes: * USES+=tcl and USES+=tk take the following optional arguments - either a version in the form of XY or XY+, or 'wrapper' to depend on lang/tcl-wrapper or x11-toolkits/tk-wrapper - either 'build' (bring in build depend) or 'run' (bring in run depend) * it is an error to specify both 'tcl' and 'tk' in USES. * The functionality currently implemented via INVALID_TCL_VER and INVALID_TK_VER is not yet available. Approved by: bapt (portmgr)
Notes
Notes: svn path=/head/; revision=327607
Diffstat (limited to 'Mk/bsd.wx.mk')
-rw-r--r--Mk/bsd.wx.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk
index 738dd3548729..ac72b4bc428b 100644
--- a/Mk/bsd.wx.mk
+++ b/Mk/bsd.wx.mk
@@ -241,7 +241,7 @@ _WX_WANT_UNICODE= yes
# These variables are reprocessed later so they won't affect other parts.
-. if defined(WX_UNICODE) || defined(_WX_WANT_UNICODE)
+. if defined(WX_UNICODE) || defined(_WX_WANT_UNICODE) || ${_WANT_WX} == "2.9"
_WX_VER_FINAL= ${_WX_VERS_UC_ALL}
_WX_UC= u
_WX_UCL= -unicode