From rebum@mail.vx.sk  Mon Oct  2 10:35:36 2006
Return-Path: <rebum@mail.vx.sk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D6BD816A417
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  2 Oct 2006 10:35:36 +0000 (UTC)
	(envelope-from rebum@mail.vx.sk)
Received: from mail.vx.sk (neo.vx.sk [88.198.35.14])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 72E1F43D53
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  2 Oct 2006 10:35:36 +0000 (GMT)
	(envelope-from rebum@mail.vx.sk)
Received: from localhost (localhost [127.0.0.1])
	by mail.vx.sk (Postfix) with ESMTP id 85E053F9B5
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  2 Oct 2006 12:36:28 +0200 (CEST)
Received: from mail.vx.sk ([127.0.0.1])
	by localhost (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id xNycvocQC2Al for <FreeBSD-gnats-submit@freebsd.org>;
	Mon,  2 Oct 2006 12:36:26 +0200 (CEST)
Received: by mail.vx.sk (Postfix, from userid 1001)
	id F34B73F99F; Mon,  2 Oct 2006 12:36:25 +0200 (CEST)
Message-Id: <20061002103625.F34B73F99F@mail.vx.sk>
Date: Mon,  2 Oct 2006 12:36:25 +0200 (CEST)
From: Martin Matuska <martin@matuska.org>
Reply-To:
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] enhancement for Mk/bsd.tcl.mk
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         103897
>Category:       ports
>Synopsis:       [PATCH] enhancement for Mk/bsd.tcl.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 02 10:40:20 GMT 2006
>Closed-Date:    Mon Jan 08 00:01:35 GMT 2007
>Last-Modified:  Mon Jan  8 00:10:14 GMT 2007
>Originator:     Martin Matuska
>Release:        FreeBSD 6.1-RELEASE-p5 amd64
>Organization:
>Environment:
System: FreeBSD 6.1-RELEASE-p5 amd64/i386
>Description:
This PR supersedes:
ports/103759
ports/103760

bsd.tcl.mk does not support simultaneous dependency on tcl on 
buildtime and runtime. Several ports, e.g. lang/xotcl, databases/mysqltcl, www/aolserver 
might seriously require this.

In addition, this patch adds support for the requirement of threaded tcl 8.4
>How-To-Repeat:
>Fix:
--- Mk/bsd.tcl.mk.orig	Mon Oct  2 12:26:06 2006
+++ Mk/bsd.tcl.mk	Mon Oct  2 12:29:57 2006
@@ -13,7 +13,7 @@
 #				TCL versions the version can be specified directly. If version
 #				is not specified (USE_TCL=yes) then the latest version is
 #				used (8.4 currently).
-#				Available values are: 84, 83, 82, 81 and 80.
+#				Available values are: 84-thread, 84, 83, 82, 81 and 80.
 #
 # USE_TK:		Depend on tk to run. In case of incompatible APIs of different
 #				TK versions the version can be specified directly. If version
@@ -43,7 +43,11 @@
 
 .if defined(USE_TCL) || defined(USE_TCL_BUILD)
 
-_TCL_VERSIONS=	84 83 82 81 80
+_TCL_VERSIONS=	84-thread 84 83 82 81 80
+
+.if defined(USE_TCL)
+_RUN=           yes
+.endif
 
 .if defined(USE_TCL_BUILD)
 USE_TCL=	${USE_TCL_BUILD}
@@ -51,10 +55,11 @@
 .endif
 
 .if ${USE_TCL} == "yes"
-USE_TCL=	84
+USE_TCL=	84-thread
 .endif
 
-TCL_VER:=	${USE_TCL:S/8/8./}
+TCL_VER:=	${USE_TCL:S/-thread//}
+TCL_VER:=	${TCL_VER:S/8/8./}
 
 # Special case
 .if ${USE_TCL} == "81"
@@ -67,7 +72,8 @@
 _FOUND=		yes
 .  if defined(_BUILD)
 BUILD_DEPENDS+=	tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${USE_TCL}
-.  else
+.  endif
+.  if defined(_RUN)
 RUN_DEPENDS+=	tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${USE_TCL}
 .  endif
 TCL_INCLUDEDIR=	${LOCALBASE}/include/tcl${TCL_VER}
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: alexbl 
Responsible-Changed-When: Mon Oct 2 22:37:38 UTC 2006 
Responsible-Changed-Why:  
This is portmgr territory 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103897 
Responsible-Changed-From-To: portmgr->shaun 
Responsible-Changed-By: shaun 
Responsible-Changed-When: Sat Oct 7 21:21:35 UTC 2006 
Responsible-Changed-Why:  
Not portmgr territory, AFAIK; bsd.tcl.mk is unmaintained. 

I'm willing to do some testing of these patches. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103897 
Responsible-Changed-From-To: shaun->freebsd-ports-bugs 
Responsible-Changed-By: shaun 
Responsible-Changed-When: Mon Nov 6 17:00:00 UTC 2006 
Responsible-Changed-Why:  
Return to pool. ENOTIME at the moment. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103760 
Responsible-Changed-From-To: shaun->freebsd-ports-bugs 
Responsible-Changed-By: shaun 
Responsible-Changed-When: Mon Nov 6 17:00:00 UTC 2006 
Responsible-Changed-Why:  
Return to pool. ENOTIME at the moment. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103897 
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Sat Dec 2 13:39:31 UTC 2006 
State-Changed-Why:  
Why have you changed the default tcl version from 84 to 84-thread? 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Sat Dec 2 13:39:31 UTC 2006 
Responsible-Changed-Why:  
Why have you changed the default tcl version from 84 to 84-thread? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103897 
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Mon Jan 8 00:00:13 UTC 2007 
State-Changed-Why:  
Partially applied 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103897 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/103897: commit references a PR
Date: Mon,  8 Jan 2007 00:00:42 +0000 (UTC)

 pav         2007-01-08 00:00:33 UTC
 
   FreeBSD ports repository
 
   Modified files:
     Mk                   bsd.port.mk bsd.tcl.mk 
   Log:
   - Fix USE_TCL_BUILD to not disable runtime dependency on tcl from USE_TCL
   - Add a new knob: USE_TK_BUILD
   - Support a new tcl version: 84-thread
   
   PR:             ports/103897, ports/107372 (based on)
   
   Revision  Changes    Path
   1.545     +3 -3      ports/Mk/bsd.port.mk
   1.5       +30 -9     ports/Mk/bsd.tcl.mk
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
