Change Installion of tclConfig.sh

Fixes a problem with deskutils/ical
that assumes the macro TCL_LIB_FILE
can be accessed in quoutes.
Reduced some dynamic expansions on the way.

-TCL_LIB_FILE='libtcl83${TCL_DBGX}.so.1'
+TCL_LIB_FILE='libtcl83.so.1'

-TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`${DBGX}.so.1'
+TCL_SHARED_LIB_SUFFIX='83${TCL_DBGX}.so.1'

-TCL_UNSHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`${DBGX}.a'
+TCL_UNSHARED_LIB_SUFFIX='83${DBGX}.a'

2 files changed, 11 insertions, 1 deletions

diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index f0fc1f7d96fa..6818c14f829a 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.3.4
+PORTREVISION=	1
 CATEGORIES=	lang tcl83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
diff --git a/lang/tcl84/files/patch-configure b/lang/tcl84/files/patch-configure
index f44c39d0f4e1..6e9818bd397c 100644
--- a/lang/tcl84/files/patch-configure
+++ b/lang/tcl84/files/patch-configure
@@ -1,5 +1,14 @@
 --- configure.orig	Sat Oct 20 02:24:15 2001
 +++ configure	Sat Oct 20 10:45:39 2001
+@@ -4648,7 +4648,7 @@
+     EXTRA_CFLAGS=""
+     TCL_EXPORT_FILE_SUFFIX=""
+     UNSHARED_LIB_SUFFIX=""
+-    TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
++    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
+     ECHO_VERSION='`echo ${VERSION}`'
+     TCL_LIB_VERSIONS_OK=ok
+     CFLAGS_DEBUG=-g
 @@ -5391,11 +5391,11 @@
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
@@ -10,7 +19,7 @@
  	    # FreeBSD doesn't handle version numbers with dots.
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 -	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	Rhapsody-*|Darwin-*)