ports/103897: [PATCH] enhancement for Mk/bsd.tcl.mk
Martin Matuska
martin at matuska.org
Mon Oct 2 10:40:59 UTC 2006
>Number: 103897
>Category: ports
>Synopsis: [PATCH] enhancement for Mk/bsd.tcl.mk
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 02 10:40:20 GMT 2006
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list