svn commit: r318663 - head/Mk

[Bryan Drewery]

On 5/21/2013 10:55 AM, Pietro Cerutti wrote:
> On 2013-May-21, 10:42, Bryan Drewery wrote:
>> On 5/21/2013 3:59 AM, Pietro Cerutti wrote:
>>> Author: gahr
>>> Date: Tue May 21 08:59:02 2013
>>> New Revision: 318663
>>> URL: http://svnweb.freebsd.org/changeset/ports/318663
>>>
>>> Log:
>>>   - Switch default version of Tcl/Tk from 8.5 to 8.6
>>>   
>>>   PR:		178369
>>>   Submitted by:	gahr
>>>   Approved by:	portmgr (after exp-run)
>>>
>>> Modified:
>>>   head/Mk/bsd.tcl.mk
>>>
>>> Modified: head/Mk/bsd.tcl.mk
>>> ==============================================================================
>>> --- head/Mk/bsd.tcl.mk	Tue May 21 08:56:40 2013	(r318662)
>>> +++ head/Mk/bsd.tcl.mk	Tue May 21 08:59:02 2013	(r318663)
>>> @@ -13,7 +13,7 @@ Tcl_Include_MAINTAINER=		mm at FreeBSD.org
>>>  #			  via the port or by the user via defined variable try to find the highest
>>>  #			  stable installed version.
>>>  #			  Available values: yes 86+ 85+ 84+ 85 84
>>> -#			  NOTE: - default value 85 is used in case of USE_TCL=yes
>>> +#			  NOTE: - default value 86 is used in case of USE_TCL=yes
>>>  #
>>>  # USE_TCL_BUILD		- Add buildtime dependency on Tcl (tclsh).
>>>  #			  Available values: see USE_TCL
>>> @@ -28,12 +28,12 @@ Tcl_Include_MAINTAINER=		mm at FreeBSD.org
>>>  #			  a specific tclsh version may use this.
>>>  #			  The tclsh wrapper script installs into ${LOCALBASE}/bin/tclsh
>>>  #			  NOTE: - USE_TCL_WRAPPER and USE_TCL can be used together
>>> -#			        - ports using the wrapper should support default Tcl (8.5)
>>> +#			        - ports using the wrapper should support default Tcl (8.6)
>>>  ##
>>>  # INVALID_TCL_VER	- This variable contains a list of Tcl versions not supported by the port.
>>> -#			  This setting is effective only when USE_TCL is set to a range (e.g. 84+)
>>> +#			  This setting is effective only when USE_TCL is set to a range (e.g. 85+)
>>>  # WITH_TCL_VER		- User defined global variable to set Tcl version
>>> -#			  This variable is effective only if USE_TCL is set to a range (e.g. 84+)
>>> +#			  This variable is effective only if USE_TCL is set to a range (e.g. 85+)
>>>  #			  and WITH_TCL_VER points inside that range.
>>>  #			  NOTE: INVALID_TCL_VER takes precedence
>>>  # <UNIQUENAME>_WITH_TCL_VER	- User defined port specific variable to set Tcl version
>>> @@ -46,7 +46,7 @@ Tcl_Include_MAINTAINER=		mm at FreeBSD.org
>>>  #			  stable installed version.
>>>  #			  Avaliable values: yes 86+ 85+ 84+ 85 84
>>>  #			  NOTE: - overrides USE_TCL
>>> -#			        - default value 85 is used in case of USE_TK=yes
>>> +#			        - default value 86 is used in case of USE_TK=yes
>>>  #
>>>  # USE_TK_BUILD		- Add buildtime dependency on Tk (wish).
>>>  #			  Available values: see USE_TK
>>> @@ -61,12 +61,12 @@ Tcl_Include_MAINTAINER=		mm at FreeBSD.org
>>>  #			  a specific wish version may use this.
>>>  #			  The wish wrapper script installs into ${LOCALBASE}/bin/wish
>>>  #			  NOTE: - USE_TK_WRAPPER and USE_TK can be used together.
>>> -#			        - ports using the wrapper should support default Tk (8.5)
>>> +#			        - ports using the wrapper should support default Tk (8.6)
>>>  ##
>>>  # INVALID_TK_VER	- This variable contains a list of Tk versions not supported by the port
>>> -#			  This setting is effective only when USE_TK is set to a range (e.g. 84+)
>>> +#			  This setting is effective only when USE_TK is set to a range (e.g. 85+)
>>>  # WITH_TK_VER		- User defined global variable to set Tk version.
>>> -#			  This variable is effective only if USE_TK is set to a range (e.g. 84+)
>>> +#			  This variable is effective only if USE_TK is set to a range (e.g. 85+)
>>>  #			  and WITH_TK_VER points inside that range.
>>>  #			  NOTE: overrides WITH_TCL_VER.
>>>  # <UNIQUENAME>_WITH_TK_VER	- User defined port specific variable to set Tk version
>>> @@ -157,7 +157,7 @@ INVALID_TCL_VER:=	${INVALID_TK_VER}
>>>  #
>>>  . if defined(USE_TCL)
>>>  
>>> -_TCL_DEFAULT_VERSION=		85
>>> +_TCL_DEFAULT_VERSION=		86
>>
>> Would you consider adding TCL_DEFAULT_VERSION?= 86 instead? I would like
>> to default to 85 still on my systems.
> 
> Can't you use WITH_TCL_VER / WITH_TK_VER for that?
> 
> 

Missed that. Thanks.

Doesn't help that all of the bsd.LANG.mk us different conventions.


-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 898 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20130521/56fa620a/attachment.sig>