5 files changed, 29 insertions, 26 deletions

diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index 778334b40cb3..5f37bc3bf93c 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -3,24 +3,24 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.9 1998/11/14 09:43:19 asami Exp $
+# $Id: Makefile,v 1.10 1998/12/13 08:49:05 asami Exp $
 #
 
-DISTNAME=	tcl8.0p2
-PKGNAME=	tcl-8.0.2
+DISTNAME=	tcl8.0.4
+PKGNAME=	tcl-8.0.4
 CATEGORIES=	lang tcl80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
 
 MAINTAINER=	jkh@freebsd.org
 
-WRKSRC=		${WRKDIR}/tcl8.0/unix
+WRKSRC=		${WRKDIR}/tcl8.0.4/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 PKGINSTALL=	${PKGDIR}/INSTALL.tclsh
 
 SHLIB_MAJOR=	1
-SHLIB_MINOR=	2
+SHLIB_MINOR=	4
 MAKEFILE=	makefile
 TCL_LIB=	libtcl80.so
 
diff --git a/lang/tcl80/distinfo b/lang/tcl80/distinfo
index 14fd04e2ba2f..c3caaa5197a8 100644
--- a/lang/tcl80/distinfo
+++ b/lang/tcl80/distinfo
@@ -1 +1 @@
-MD5 (tcl8.0p2.tar.gz) = c1ee11750153717cb8237b830867a0e6
+MD5 (tcl8.0.4.tar.gz) = 62e1fcb1c000e12e33909f830670e360
diff --git a/lang/tcl80/files/patch-aa b/lang/tcl80/files/patch-aa
index 19c49a252d5b..a719ec14e6b0 100644
--- a/lang/tcl80/files/patch-aa
+++ b/lang/tcl80/files/patch-aa
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	Tue Nov 25 10:31:41 1997
-+++ Makefile.in	Thu Sep 17 17:29:28 1998
++++ Makefile.in		Mon Nov 30 16:28:20 1998
 @@ -55,7 +55,9 @@
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
  
@@ -37,8 +37,8 @@
  
 +libtcl80.a: ${OBJS}
 +	rm -f libtcl80.a
-+	ar cr libtcl80.a ${OBJS}	
-+	$(RANLIB) libtcl80.a
++	ar cr libtcl80.a ${OBJS}
++	ranlib libtcl80.a
 +
  # Make target which outputs the list of the .o contained in the Tcl lib
  # usefull to build a single big shared library containing Tcl and other
diff --git a/lang/tcl80/files/patch-ab b/lang/tcl80/files/patch-ab
index 43f2075d98bd..9efd5e02837c 100644
--- a/lang/tcl80/files/patch-ab
+++ b/lang/tcl80/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Tue Nov 25 10:31:42 1997
-+++ configure	Tue Sep 22 13:29:15 1998
-@@ -3782,14 +3782,22 @@
+--- configure	Wed Nov 18 14:54:26 1998
++++ configure	Mon Nov 30 15:05:10 1998
+@@ -4065,15 +4065,23 @@
    echo "$ac_t""yes" 1>&6
    
  	    SHLIB_CFLAGS="-fpic"
@@ -16,12 +16,14 @@
  	    DL_LIBS=""
  	    LD_FLAGS=""
  	    LD_SEARCH_FLAGS=""
--	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
+-	    TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+-	
 +	    if [ "$PORTOBJFORMAT" = "elf" ]; then
 +		TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
 +	    else
-+		TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.2'
++		TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.4'
 +	    fi
- 	
++
  else
    echo "$ac_t""no" 1>&6
+ 
diff --git a/lang/tcl80/pkg-plist b/lang/tcl80/pkg-plist
index 94868eca0561..a46dcb749000 100644
--- a/lang/tcl80/pkg-plist
+++ b/lang/tcl80/pkg-plist
@@ -1,36 +1,37 @@
 bin/tclsh8.0
 lib/libtcl80.a
 lib/libtcl80.so
-lib/libtcl80.so.1.2
+lib/libtcl80.so.1.4
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 include/tcl8.0/tcl.h
-include/tcl8.0/unix/tclUnixPort.h
 include/tcl8.0/generic/tcl.h
 include/tcl8.0/generic/tclCompile.h
+include/tcl8.0/generic/tclInitScript.h
 include/tcl8.0/generic/tclInt.h
 include/tcl8.0/generic/tclMath.h
 include/tcl8.0/generic/tclPort.h
 include/tcl8.0/generic/tclRegexp.h
+include/tcl8.0/unix/tclUnixPort.h
 lib/tcl8.0/history.tcl
 lib/tcl8.0/init.tcl
+lib/tcl8.0/ldAix
 lib/tcl8.0/ldAout.tcl
 lib/tcl8.0/parray.tcl
 lib/tcl8.0/safe.tcl
-lib/tcl8.0/word.tcl
 lib/tcl8.0/tclAppInit.c
-lib/tcl8.0/ldAix
-lib/tcl8.0/tclIndex
 lib/tcl8.0/tclConfig.sh
-lib/tcl8.0/http2.0/http.tcl
-lib/tcl8.0/http2.0/pkgIndex.tcl
+lib/tcl8.0/tclIndex
+lib/tcl8.0/word.tcl
 lib/tcl8.0/http1.0/http.tcl
 lib/tcl8.0/http1.0/pkgIndex.tcl
+lib/tcl8.0/http2.0/http.tcl
+lib/tcl8.0/http2.0/pkgIndex.tcl
 lib/tcl8.0/opt0.1/optparse.tcl
 lib/tcl8.0/opt0.1/pkgIndex.tcl
 man/man1/tclsh.1.gz
-man/man3/Alloc.3.gz
 man/man3/AddErrInfo.3.gz
+man/man3/Alloc.3.gz
 man/man3/AllowExc.3.gz
 man/man3/AppInit.3.gz
 man/man3/AssocData.3.gz
@@ -44,7 +45,6 @@ man/man3/Concat.3.gz
 man/man3/CrtChannel.3.gz
 man/man3/CrtChnlHdlr.3.gz
 man/man3/CrtCloseHdlr.3.gz
-man/man3/Eval.3.gz
 man/man3/CrtCommand.3.gz
 man/man3/CrtFileHdlr.3.gz
 man/man3/CrtInterp.3.gz
@@ -58,6 +58,7 @@ man/man3/DetachPids.3.gz
 man/man3/DoOneEvent.3.gz
 man/man3/DoWhenIdle.3.gz
 man/man3/DoubleObj.3.gz
+man/man3/Eval.3.gz
 man/man3/EvalObj.3.gz
 man/man3/Exit.3.gz
 man/man3/ExprLong.3.gz
@@ -84,10 +85,10 @@ man/man3/PrintDbl.3.gz
 man/man3/RecEvalObj.3.gz
 man/man3/RecordEval.3.gz
 man/man3/RegExp.3.gz
-man/man3/SetVar.3.gz
 man/man3/SetErrno.3.gz
 man/man3/SetRecLmt.3.gz
 man/man3/SetResult.3.gz
+man/man3/SetVar.3.gz
 man/man3/Sleep.3.gz
 man/man3/SplitList.3.gz
 man/man3/SplitPath.3.gz
@@ -122,7 +123,6 @@ man/mann/expr.n.gz
 man/mann/fblocked.n.gz
 man/mann/fconfigure.n.gz
 man/mann/fcopy.n.gz
-man/mann/if.n.gz
 man/mann/file.n.gz
 man/mann/fileevent.n.gz
 man/mann/filename.n.gz
@@ -135,6 +135,7 @@ man/mann/glob.n.gz
 man/mann/global.n.gz
 man/mann/history.n.gz
 man/mann/http.n.gz
+man/mann/if.n.gz
 man/mann/incr.n.gz
 man/mann/info.n.gz
 man/mann/interp.n.gz