4 files changed, 20 insertions, 10 deletions

diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 60148f1fb597..fbc1e8a01944 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -8,13 +8,19 @@
 PORTNAME=	tcl
 PORTVERSION=	8.3.0
 CATEGORIES=	lang tcl83
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
+MASTER_SITES=	${MASTER_SITE_TCLTK}
+MASTER_SITE_SUBDIR=	tcl8_3
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
+PATCH_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/devel/ \
+		http://www.neosoft.com/tcl/ftparchive/sorted/packages-8.0/devel/
+PATCHFILES=	${PORTNAME}${PORTVERSION}plus.patch.gz
+
 MAINTAINER=	jseger@FreeBSD.org
 
 Y2K=            http://www.scriptics.com/Y2K.html
 
+PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -34,8 +40,8 @@ MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	DetachPids.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 \
 	Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetHostName.3 \
 	GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 \
-	InitStubs.3 IntObj.3 Interp.3 LinkVar.3 ListObj.3 Notifier.3 Object.3 \
-	ObjectType.3 OpenFileChnl.3 OpenTcp.3 ParseCmd.3 PkgRequire.3 \
+	InitStubs.3 IntObj.3 Interp.3 LinkVar.3 ListObj.3 MainLoop.3 Notifier.3\
+	Object.3 ObjectType.3 OpenFileChnl.3 OpenTcp.3 ParseCmd.3 PkgRequire.3 \
 	Preserve.3 PrintDbl.3 RecEvalObj.3 RecordEval.3 RegExp.3 SaveResult.3 \
 	SetErrno.3 SetRecLmt.3 SetResult.3 SetVar.3 Sleep.3 SplitList.3 \
 	SplitPath.3 StaticPkg.3 StrMatch.3 StringObj.3 Tcl_Main.3 Thread.3 \
diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo
index dcc5dd1f02ea..986bdae3c3a5 100644
--- a/lang/tcl84/distinfo
+++ b/lang/tcl84/distinfo
@@ -1 +1,2 @@
 MD5 (tcl8.3.0.tar.gz) = 0fc2ee5c79692fe13316d85939fda62b
+MD5 (tcl8.3.0plus.patch.gz) = 09c7889cf432fce84935c6a006a68a05
diff --git a/lang/tcl84/files/patch-ab b/lang/tcl84/files/patch-ab
index 3ea44c1a975d..3a52b40a9af3 100644
--- a/lang/tcl84/files/patch-ab
+++ b/lang/tcl84/files/patch-ab
@@ -1,5 +1,5 @@
---- configure.orig	Thu Feb 10 06:09:57 2000
-+++ configure	Mon Apr 24 14:58:01 2000
+--- configure.orig	Mon May  1 10:07:11 2000
++++ configure	Mon May  1 10:08:59 2000
 @@ -4902,7 +4902,7 @@
  	    LDFLAGS="-Wl,-Bexport"
  	    LD_SEARCH_FLAGS=""
@@ -9,24 +9,23 @@
  	    # Not available on all versions:  check for include file.
  	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -4986,19 +4986,9 @@
+@@ -4986,18 +4986,8 @@
  	    # FreeBSD doesn't handle version numbers with dots.
  
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 +	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
  	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
+-	    ;;
 -	FreeBSD-*)
 -	    # FreeBSD 3.* and greater have ELF.
 -	    SHLIB_CFLAGS="-fPIC"
 -	    SHLIB_LD="ld -Bshareable -x"
 -	    SHLIB_LD_LIBS=""
 -	    SHLIB_SUFFIX=".so"
--	    DL_OBJS="tclLoadDl.o"
+-	    DL_OBJS=""
 -	    DL_LIBS=""
 -	    LDFLAGS="-export-dynamic"
 -	    LD_SEARCH_FLAGS=""
--	    ;;
+ 	    ;;
  	NEXTSTEP-*)
  	    SHLIB_CFLAGS=""
- 	    SHLIB_LD="cc -nostdlib -r"
diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist
index 4280ebbf81a5..0209069c4d86 100644
--- a/lang/tcl84/pkg-plist
+++ b/lang/tcl84/pkg-plist
@@ -5,6 +5,7 @@ include/tcl%%TCL_VER%%/generic/regex.h
 include/tcl%%TCL_VER%%/generic/regguts.h
 include/tcl%%TCL_VER%%/generic/tcl.h
 include/tcl%%TCL_VER%%/generic/tclCompile.h
+include/tcl%%TCL_VER%%/generic/tclCompileDecls.h
 include/tcl%%TCL_VER%%/generic/tclDecls.h
 include/tcl%%TCL_VER%%/generic/tclInitScript.h
 include/tcl%%TCL_VER%%/generic/tclInt.h
@@ -57,12 +58,14 @@ lib/tcl%%TCL_VER%%/encoding/cp936.enc
 lib/tcl%%TCL_VER%%/encoding/cp949.enc
 lib/tcl%%TCL_VER%%/encoding/cp950.enc
 lib/tcl%%TCL_VER%%/encoding/dingbats.enc
+lib/tcl%%TCL_VER%%/encoding/ebcdic.enc
 lib/tcl%%TCL_VER%%/encoding/euc-cn.enc
 lib/tcl%%TCL_VER%%/encoding/euc-jp.enc
 lib/tcl%%TCL_VER%%/encoding/euc-kr.enc
 lib/tcl%%TCL_VER%%/encoding/gb12345.enc
 lib/tcl%%TCL_VER%%/encoding/gb1988.enc
 lib/tcl%%TCL_VER%%/encoding/gb2312.enc
+lib/tcl%%TCL_VER%%/encoding/ibm1047.enc
 lib/tcl%%TCL_VER%%/encoding/iso2022-jp.enc
 lib/tcl%%TCL_VER%%/encoding/iso2022-kr.enc
 lib/tcl%%TCL_VER%%/encoding/iso2022.enc
@@ -80,6 +83,7 @@ lib/tcl%%TCL_VER%%/encoding/jis0208.enc
 lib/tcl%%TCL_VER%%/encoding/jis0212.enc
 lib/tcl%%TCL_VER%%/encoding/koi8-r.enc
 lib/tcl%%TCL_VER%%/encoding/ksc5601.enc
+lib/tcl%%TCL_VER%%/encoding/latin.enc
 lib/tcl%%TCL_VER%%/encoding/macCentEuro.enc
 lib/tcl%%TCL_VER%%/encoding/macCroatian.enc
 lib/tcl%%TCL_VER%%/encoding/macCyrillic.enc