10 files changed, 50 insertions, 36 deletions

diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index 79cbc4975f91..f8fd614914da 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.5.b.1
+PORTVERSION=	8.5.0
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
 PKGNAMESUFFIX?=		${THREADS_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.b./b/}-src
+DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Tool Command Language (development version)
diff --git a/lang/tcl85/distinfo b/lang/tcl85/distinfo
index eb4fcb908474..8e730f77b283 100644
--- a/lang/tcl85/distinfo
+++ b/lang/tcl85/distinfo
@@ -1,3 +1,3 @@
-MD5 (tcl8.5b1-src.tar.gz) = 52cd1e2df2f6d1c6508ea502ff776663
-SHA256 (tcl8.5b1-src.tar.gz) = 1b85f2589ccd84c3131be560a94f1af86aa4deb0fbf8747ba16553cd27410832
-SIZE (tcl8.5b1-src.tar.gz) = 4285527
+MD5 (tcl8.5.0-src.tar.gz) = d890c505465411b25050b6cd95971d2c
+SHA256 (tcl8.5.0-src.tar.gz) = f364c89117ac833950bfedd84818c309fafdf6d600aa9e6df91096869672797c
+SIZE (tcl8.5.0-src.tar.gz) = 4352897
diff --git a/lang/tcl85/files/patch-unix-configure b/lang/tcl85/files/patch-unix-configure
index 2ee97ec6e969..2f596f9521a7 100644
--- a/lang/tcl85/files/patch-unix-configure
+++ b/lang/tcl85/files/patch-unix-configure
@@ -1,6 +1,6 @@
---- configure.orig	2007-09-24 17:46:44.000000000 +0200
-+++ configure	2007-09-27 20:24:15.000000000 +0200
-@@ -6615,7 +6615,7 @@
+--- configure.orig	2007-12-19 22:50:13.000000000 +0100
++++ configure	2007-12-26 11:49:03.000000000 +0100
+@@ -6633,7 +6633,7 @@
      LDFLAGS_ARCH=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
@@ -9,22 +9,26 @@
      ECHO_VERSION='`echo ${VERSION}`'
      TCL_LIB_VERSIONS_OK=ok
      CFLAGS_DEBUG=-g
-@@ -7490,20 +7490,20 @@
+@@ -7624,7 +7624,7 @@
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
 +	    LDFLAGS=""
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    if test "${TCL_THREADS}" = "1" ; then
+ 	    if test $doRpath = yes; then
+ 
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -7635,16 +7635,16 @@
+ 
  		# The -pthread needs to go in the CFLAGS, not LIBS
  		LIBS=`echo $LIBS | sed s/-pthread//`
 -		CFLAGS="$CFLAGS -pthread"
 -	    	LDFLAGS="$LDFLAGS -pthread"
 +		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 +	    	LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- 	    fi
+ 
+ fi
+ 
  	    case $system in
 -	    FreeBSD-3.*)
 +	    FreeBSD-*)
diff --git a/lang/tcl85/pkg-descr b/lang/tcl85/pkg-descr
index bfb9510fa683..d23cfffa4e3c 100644
--- a/lang/tcl85/pkg-descr
+++ b/lang/tcl85/pkg-descr
@@ -1,8 +1,11 @@
-This is Tcl8.5, an embeddable tool command language.
+This is Tcl version 8.5, an embeddable tool command language.
 
-The best way to get started with Tcl is to read ``Tcl and the Tk
-Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
+Tcl (Tool Command Language) is a very powerful but easy to learn dynamic 
+programming language, suitable for a very wide range of uses, including web 
+and desktop applications, networking, administration, testing and many more. 
+Open source and business-friendly, Tcl is a mature yet evolving language that 
+is truly cross platform, easily deployed and highly extensible.
 
-A full set of manual pages is also provided with this package.
+A full set of manual pages is also provided with this port.
 
 WWW: http://www.tcl.tk/
diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist
index 847b941dea8e..bc921c0c8f48 100644
--- a/lang/tcl85/pkg-plist
+++ b/lang/tcl85/pkg-plist
@@ -815,7 +815,7 @@ lib/tcl8/8.4/http-2.5.3.tm
 lib/tcl8/8.4/platform/shell-1.1.3.tm
 lib/tcl8/8.4/platform-1.0.3.tm
 lib/tcl8/8.5/msgcat-1.4.2.tm
-lib/tcl8/8.5/tcltest-2.3b1.tm
+lib/tcl8/8.5/tcltest-2.3.0.tm
 %%INSTMAN%%%%DATADIR%%/man.macros
 %%INSTMAN%%@dirrm %%DATADIR%%
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/US
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 79cbc4975f91..f8fd614914da 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.5.b.1
+PORTVERSION=	8.5.0
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
 PKGNAMESUFFIX?=		${THREADS_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.b./b/}-src
+DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Tool Command Language (development version)
diff --git a/lang/tcl86/distinfo b/lang/tcl86/distinfo
index eb4fcb908474..8e730f77b283 100644
--- a/lang/tcl86/distinfo
+++ b/lang/tcl86/distinfo
@@ -1,3 +1,3 @@
-MD5 (tcl8.5b1-src.tar.gz) = 52cd1e2df2f6d1c6508ea502ff776663
-SHA256 (tcl8.5b1-src.tar.gz) = 1b85f2589ccd84c3131be560a94f1af86aa4deb0fbf8747ba16553cd27410832
-SIZE (tcl8.5b1-src.tar.gz) = 4285527
+MD5 (tcl8.5.0-src.tar.gz) = d890c505465411b25050b6cd95971d2c
+SHA256 (tcl8.5.0-src.tar.gz) = f364c89117ac833950bfedd84818c309fafdf6d600aa9e6df91096869672797c
+SIZE (tcl8.5.0-src.tar.gz) = 4352897
diff --git a/lang/tcl86/files/patch-unix-configure b/lang/tcl86/files/patch-unix-configure
index 2ee97ec6e969..2f596f9521a7 100644
--- a/lang/tcl86/files/patch-unix-configure
+++ b/lang/tcl86/files/patch-unix-configure
@@ -1,6 +1,6 @@
---- configure.orig	2007-09-24 17:46:44.000000000 +0200
-+++ configure	2007-09-27 20:24:15.000000000 +0200
-@@ -6615,7 +6615,7 @@
+--- configure.orig	2007-12-19 22:50:13.000000000 +0100
++++ configure	2007-12-26 11:49:03.000000000 +0100
+@@ -6633,7 +6633,7 @@
      LDFLAGS_ARCH=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
@@ -9,22 +9,26 @@
      ECHO_VERSION='`echo ${VERSION}`'
      TCL_LIB_VERSIONS_OK=ok
      CFLAGS_DEBUG=-g
-@@ -7490,20 +7490,20 @@
+@@ -7624,7 +7624,7 @@
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
 +	    LDFLAGS=""
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    if test "${TCL_THREADS}" = "1" ; then
+ 	    if test $doRpath = yes; then
+ 
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -7635,16 +7635,16 @@
+ 
  		# The -pthread needs to go in the CFLAGS, not LIBS
  		LIBS=`echo $LIBS | sed s/-pthread//`
 -		CFLAGS="$CFLAGS -pthread"
 -	    	LDFLAGS="$LDFLAGS -pthread"
 +		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 +	    	LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- 	    fi
+ 
+ fi
+ 
  	    case $system in
 -	    FreeBSD-3.*)
 +	    FreeBSD-*)
diff --git a/lang/tcl86/pkg-descr b/lang/tcl86/pkg-descr
index bfb9510fa683..d23cfffa4e3c 100644
--- a/lang/tcl86/pkg-descr
+++ b/lang/tcl86/pkg-descr
@@ -1,8 +1,11 @@
-This is Tcl8.5, an embeddable tool command language.
+This is Tcl version 8.5, an embeddable tool command language.
 
-The best way to get started with Tcl is to read ``Tcl and the Tk
-Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
+Tcl (Tool Command Language) is a very powerful but easy to learn dynamic 
+programming language, suitable for a very wide range of uses, including web 
+and desktop applications, networking, administration, testing and many more. 
+Open source and business-friendly, Tcl is a mature yet evolving language that 
+is truly cross platform, easily deployed and highly extensible.
 
-A full set of manual pages is also provided with this package.
+A full set of manual pages is also provided with this port.
 
 WWW: http://www.tcl.tk/
diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist
index 847b941dea8e..bc921c0c8f48 100644
--- a/lang/tcl86/pkg-plist
+++ b/lang/tcl86/pkg-plist
@@ -815,7 +815,7 @@ lib/tcl8/8.4/http-2.5.3.tm
 lib/tcl8/8.4/platform/shell-1.1.3.tm
 lib/tcl8/8.4/platform-1.0.3.tm
 lib/tcl8/8.5/msgcat-1.4.2.tm
-lib/tcl8/8.5/tcltest-2.3b1.tm
+lib/tcl8/8.5/tcltest-2.3.0.tm
 %%INSTMAN%%%%DATADIR%%/man.macros
 %%INSTMAN%%@dirrm %%DATADIR%%
 %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/US