From 28b16a0a159647ec2eb3b3ce0a4b5e8d7e5707a2 Mon Sep 17 00:00:00 2001 From: "Justin M. Seger" Date: Sun, 20 Jun 1999 14:05:44 +0000 Subject: Upgrade to tcl and tk 8.1. Move NO_LATEST_LINK from tcl81 and tk81 to tcl80 and tk80. Submitted by: YAZAKI Hiroyuki --- lang/tcl80/Makefile | 3 ++- lang/tcl82/Makefile | 68 ++++++++++++++++++++++++++--------------------- lang/tcl82/distinfo | 2 +- lang/tcl82/files/patch-aa | 57 +++++++++++++++++++++++---------------- lang/tcl82/files/patch-ab | 45 +++++++++++++++++++++++++++---- lang/tcl82/pkg-plist | 9 +++++++ lang/tcl83/Makefile | 68 ++++++++++++++++++++++++++--------------------- lang/tcl83/distinfo | 2 +- lang/tcl83/files/patch-aa | 57 +++++++++++++++++++++++---------------- lang/tcl83/files/patch-ab | 45 +++++++++++++++++++++++++++---- lang/tcl83/pkg-plist | 9 +++++++ lang/tcl84/Makefile | 68 ++++++++++++++++++++++++++--------------------- lang/tcl84/distinfo | 2 +- lang/tcl84/files/patch-aa | 57 +++++++++++++++++++++++---------------- lang/tcl84/files/patch-ab | 45 +++++++++++++++++++++++++++---- lang/tcl84/pkg-plist | 9 +++++++ 16 files changed, 368 insertions(+), 178 deletions(-) (limited to 'lang') diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile index 5a6ad867bb8e..280130f1a3a4 100644 --- a/lang/tcl80/Makefile +++ b/lang/tcl80/Makefile @@ -3,7 +3,7 @@ # Date created: 19 August 1997 # Whom: jkh # -# $Id: Makefile,v 1.18 1999/05/06 20:14:38 cwt Exp $ +# $Id: Makefile,v 1.19 1999/05/25 18:10:35 hoek Exp $ # DISTNAME= tcl8.0.5 @@ -15,6 +15,7 @@ MAINTAINER= cwt@freebsd.org Y2K= http://www.scriptics.com/Y2K.html +NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/tcl8.0.5/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile index df299de4ca3f..3b52c0662c51 100644 --- a/lang/tcl82/Makefile +++ b/lang/tcl82/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: tcl8.1 -# Version required: 8.1.a2 +# Version required: 8.1 # Date created: 19 August 1997 # Whom: jkh # -# $Id: Makefile,v 1.17 1999/04/22 00:17:07 scrappy Exp $ +# $Id: Makefile,v 1.18 1999/05/04 20:49:59 fenner Exp $ # -DISTNAME= tcl8.1b1 -PKGNAME= tcl-8.1.b1 +DISTNAME= tcl8.1 +PKGNAME= tcl-8.1 CATEGORIES= lang tcl81 MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/ @@ -17,7 +17,6 @@ Y2K= http://www.scriptics.com/Y2K.html FILE_DEPENDS= ${PORTSDIR}/lang/tcl80 -NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared @@ -26,35 +25,38 @@ PKGINSTALL= ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh MAN1= tclsh.1 -MAN3= AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 Async.3 \ - BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 CmdCmplt.3 \ - Concat.3 CrtChannel.3 CrtChnlHdlr.3 CrtCloseHdlr.3 CrtCommand.3 \ - CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 CrtObjCmd.3 CrtSlave.3 \ - CrtTimerHdlr.3 CrtTrace.3 DString.3 DetachPids.3 DoOneEvent.3 \ - DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 Exit.3 ExprLong.3 \ - ExprLongObj.3 FindExec.3 GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.3 \ - Hash.3 IntObj.3 Interp.3 LinkVar.3 ListObj.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 \ - ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 +MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \ + Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \ + CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 CrtCloseHdlr.3 \ + CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 CrtObjCmd.3 \ + CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 DetachPids.3 \ + DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 Exit.3 \ + ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetIndex.3 GetInt.3 \ + GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 IntObj.3 Interp.3 \ + LinkVar.3 ListObj.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_InitStubs.3 Tcl_Main.3 Thread.3 ToUpper.3 TraceVar.3 \ + Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \ - catch.n cd.n clock.n close.n concat.n continue.n encoding.n eof.n \ - error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.n fcopy.n \ - file.n fileevent.n filename.n flush.n for.n foreach.n format.n gets.n \ - glob.n global.n history.n http.n if.n incr.n info.n interp.n join.n \ - lappend.n library.n lindex.n linsert.n list.n llength.n load.n \ - lrange.n lreplace.n lsearch.n lsort.n msgcat.n namespace.n open.n \ - package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n read.n regexp.n \ - registry.n regsub.n rename.n resource.n return.n safe.n scan.n seek.n \ - set.n socket.n source.n split.n string.n subst.n switch.n tclvars.n \ - tell.n time.n trace.n unknown.n unset.n update.n uplevel.n upvar.n \ - variable.n vwait.n while.n + catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \ + eof.n error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.n \ + fcopy.n file.n fileevent.n filename.n flush.n for.n foreach.n \ + format.n gets.n glob.n global.n history.n http.n if.n incr.n info.n \ + interp.n join.n lappend.n library.n lindex.n linsert.n list.n \ + llength.n load.n lrange.n lreplace.n lsearch.n lsort.n msgcat.n \ + namespace.n open.n package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n \ + read.n regexp.n registry.n regsub.n rename.n resource.n return.n \ + safe.n scan.n seek.n set.n socket.n source.n split.n string.n subst.n \ + switch.n tclvars.n tell.n time.n trace.n unknown.n unset.n update.n \ + uplevel.n upvar.n variable.n vwait.n while.n # MLINKS generated via awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks -MLINKS= AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ +MLINKS= Access.3 Tcl_Access.3 \ + Access.3 Tcl_Stat.3 \ + AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ AddErrInfo.3 Tcl_AddErrorInfo.3 \ AddErrInfo.3 Tcl_SetErrorCode.3 \ AddErrInfo.3 Tcl_PosixError.3 \ @@ -180,6 +182,8 @@ MLINKS= AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ ExprLongObj.3 Tcl_ExprObj.3 \ FindExec.3 Tcl_FindExecutable.3 \ FindExec.3 Tcl_GetNameOfExecutable.3 \ + GetCwd.3 Tcl_GetCwd.3 \ + GetCwd.3 Tcl_Chdir.3 \ GetIndex.3 Tcl_GetIndexFromObj.3 \ GetInt.3 Tcl_GetInt.3 \ GetInt.3 Tcl_GetDouble.3 \ @@ -187,6 +191,7 @@ MLINKS= AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ GetOpnFl.3 Tcl_GetOpenFile.3 \ GetStdChan.3 Tcl_GetStdChannel.3 \ GetStdChan.3 Tcl_SetStdChannel.3 \ + GetVersion.3 Tcl_GetVersion.3 \ Hash.3 Tcl_InitHashTable.3 \ Hash.3 Tcl_DeleteHashTable.3 \ Hash.3 Tcl_CreateHashEntry.3 \ @@ -361,6 +366,9 @@ MANCOMPRESSED= yes .include +post-extract: + ${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \ + ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3 post-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .if exists(${PKGINSTALL}) diff --git a/lang/tcl82/distinfo b/lang/tcl82/distinfo index 4b6578f01d73..85a27d9f66cc 100644 --- a/lang/tcl82/distinfo +++ b/lang/tcl82/distinfo @@ -1 +1 @@ -MD5 (tcl8.1b1.tar.gz) = 608c36993dfa52f06499f5c2004c7633 +MD5 (tcl8.1.tar.gz) = 78d3e8057950528b840f51fe6a51d205 diff --git a/lang/tcl82/files/patch-aa b/lang/tcl82/files/patch-aa index 8cbda8008feb..b158373c4290 100644 --- a/lang/tcl82/files/patch-aa +++ b/lang/tcl82/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Dec 11 18:36:13 1998 -+++ Makefile.in Sat Jan 2 14:47:02 1999 +--- Makefile.in.orig Fri Apr 30 08:23:33 1999 ++++ Makefile.in Tue May 11 01:48:45 1999 @@ -55,7 +55,9 @@ BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin @@ -20,7 +20,7 @@ # To disable ANSI-C procedure prototypes reverse the comment characters -@@ -152,7 +154,7 @@ +@@ -161,7 +163,7 @@ # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. @@ -29,16 +29,16 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -@@ -357,15 +359,21 @@ +@@ -391,15 +393,21 @@ - SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) + SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS) --all: ${TCL_LIB_FILE} tclsh -+all: ${TCL_LIB_FILE} libtcl81.a tclsh +-all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh ++all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) libtcl81.a tclsh # The following target is configured by autoconf to generate either # a shared library or non-shared library for Tcl. - ${TCL_LIB_FILE}: ${OBJS} + ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f ${TCL_LIB_FILE} @MAKE_LIB@ + ln -sf ${TCL_LIB_FILE} libtcl81.so @@ -49,19 +49,19 @@ + ar cr libtcl81.a ${OBJS} + $(RANLIB) libtcl81.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 - # extensions. used for the Tcl Plugin. -- dl -@@ -459,7 +467,7 @@ - # some ranlibs write to current directory, and this might not always be + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} + rm -f ${STUB_LIB_FILE} + @MAKE_STUB_LIB@ +@@ -499,7 +507,7 @@ # possible (e.g. if installing as root). --install-binaries: $(TCL_LIB_FILE) tclsh -+install-binaries: $(TCL_LIB_FILE) libtcl81.a tclsh + install-binaries: $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ +- tclsh ++ libtcl81.a tclsh @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -471,16 +479,22 @@ +@@ -511,8 +519,13 @@ done; @echo "Installing $(TCL_LIB_FILE)" @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) @@ -72,12 +72,21 @@ + @$(INSTALL_DATA) libtcl81.a $(LIB_INSTALL_DIR)/libtcl81.a + @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl81.a) + @chmod 555 $(LIB_INSTALL_DIR)/libtcl81.a + @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ + echo "Installing $(TCL_EXP_FILE)"; \ + $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ +@@ -521,7 +534,8 @@ @echo "Installing tclsh" @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) @echo "Installing tclConfig.sh" - @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh + @mkdir -p $(SCRIPT_INSTALL_DIR) + @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh + @if test "$(TCL_STUB_LIB_FILE)" != "" ; then \ + echo "Installing $(TCL_STUB_LIB_FILE)"; \ + $(INSTALL_DATA) $(STUB_LIB_FILE) \ +@@ -529,8 +543,8 @@ + fi install-libraries: - @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ @@ -87,25 +96,26 @@ do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ -@@ -498,8 +512,15 @@ +@@ -548,11 +562,16 @@ else true; \ fi; \ done; -- @echo "Installing tcl.h" -- @$(INSTALL_DATA) $(GENERIC_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h +- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \ + @echo "Installing libraries, tcl.h and other headers" + @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ echo "Installing $$i"; \ + do \ + echo "Installing $$i"; \ +- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ + $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; + done; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h ++ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h + @echo "Installing $(TOP_DIR)unix/tclUnixPort.h" + @$(INSTALL_DATA) $(TOP_DIR)/unix/tclUnixPort.h $(UNIX_INCLUDE_INSTALL_DIR) @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ do \ echo "Installing $$i"; \ -@@ -531,30 +552,34 @@ +@@ -584,30 +603,35 @@ @cd $(TOP_DIR)/doc; for i in *.1; \ do \ echo "Installing doc/$$i"; \ @@ -147,6 +157,7 @@ + @echo "**********" + @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh" + @echo "tcl.h in $(INCLUDE_INSTALL_DIR)/tcl.h" ++ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h" + @echo "There are NOT default place, but good place to avoid" + @echo "conflicting with another version of Tcl/Tks." diff --git a/lang/tcl82/files/patch-ab b/lang/tcl82/files/patch-ab index 76921d7569df..551b0c24760a 100644 --- a/lang/tcl82/files/patch-ab +++ b/lang/tcl82/files/patch-ab @@ -1,6 +1,15 @@ ---- configure.orig Fri Dec 11 18:36:14 1998 -+++ configure Sat Jan 2 15:04:24 1999 -@@ -4330,14 +4330,19 @@ +--- configure.orig Fri Apr 30 08:23:33 1999 ++++ configure Tue May 11 01:25:32 1999 +@@ -4384,7 +4384,7 @@ + LD_FLAGS="-Wl,-Bexport" + LD_SEARCH_FLAGS="" + ;; +- NetBSD-*|FreeBSD-12.*|OpenBSD-*) ++ NetBSD-*|FreeBSD-*|OpenBSD-*) + # Not available on all versions: check for include file. + ac_safe=`echo "dlfcn.h" | tr './\055' '___'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +@@ -4413,14 +4413,19 @@ echo "$ac_t""yes" 1>&6 SHLIB_CFLAGS="-fpic" @@ -13,12 +22,38 @@ LD_SEARCH_FLAGS="" - TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' + if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then -+ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1' ++ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' + SHLIB_LD="ld -shared -x -soname \$@" + else -+ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0' ++ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' + SHLIB_LD="ld -Bshareable -x" + fi else echo "$ac_t""no" 1>&6 +@@ -4443,17 +4448,6 @@ + TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + 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_LIBS="" +- LD_FLAGS="" +- LD_SEARCH_FLAGS="" +- ;; + NEXTSTEP-*) + SHLIB_CFLAGS="" + SHLIB_LD="cc -nostdlib -r" +@@ -5100,6 +5094,7 @@ + # stub support. + #-------------------------------------------------------------------- + # Replace ${VERSION} with contents of ${TCL_VERSION} ++${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0 + eval "STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}" + # Replace DBGX with TCL_DBGX + eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\"" diff --git a/lang/tcl82/pkg-plist b/lang/tcl82/pkg-plist index 82b88b8ae1d0..8eb81b29bd43 100644 --- a/lang/tcl82/pkg-plist +++ b/lang/tcl82/pkg-plist @@ -5,15 +5,22 @@ include/tcl8.1/generic/regex.h include/tcl8.1/generic/regguts.h include/tcl8.1/generic/tcl.h include/tcl8.1/generic/tclCompile.h +include/tcl8.1/generic/tclDecls.h include/tcl8.1/generic/tclInitScript.h include/tcl8.1/generic/tclInt.h +include/tcl8.1/generic/tclIntDecls.h +include/tcl8.1/generic/tclIntPlatDecls.h include/tcl8.1/generic/tclMath.h +include/tcl8.1/generic/tclPlatDecls.h include/tcl8.1/generic/tclPort.h include/tcl8.1/generic/tclRegexp.h include/tcl8.1/tcl.h +include/tcl8.1/tclDecls.h include/tcl8.1/unix/tclUnixPort.h lib/libtcl81.a +lib/libtcl81.so lib/libtcl81.so.1 +lib/libtclstub81.a @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R lib/tcl8.1/auto.tcl @@ -49,6 +56,7 @@ lib/tcl8.1/encoding/cp936.enc lib/tcl8.1/encoding/cp949.enc lib/tcl8.1/encoding/cp950.enc lib/tcl8.1/encoding/dingbats.enc +lib/tcl8.1/encoding/euc-cn.enc lib/tcl8.1/encoding/euc-jp.enc lib/tcl8.1/encoding/euc-kr.enc lib/tcl8.1/encoding/gb12345.enc @@ -69,6 +77,7 @@ lib/tcl8.1/encoding/iso8859-9.enc lib/tcl8.1/encoding/jis0201.enc lib/tcl8.1/encoding/jis0208.enc lib/tcl8.1/encoding/jis0212.enc +lib/tcl8.1/encoding/koi8-r.enc lib/tcl8.1/encoding/ksc5601.enc lib/tcl8.1/encoding/macCentEuro.enc lib/tcl8.1/encoding/macCroatian.enc diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile index df299de4ca3f..3b52c0662c51 100644 --- a/lang/tcl83/Makefile +++ b/lang/tcl83/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: tcl8.1 -# Version required: 8.1.a2 +# Version required: 8.1 # Date created: 19 August 1997 # Whom: jkh # -# $Id: Makefile,v 1.17 1999/04/22 00:17:07 scrappy Exp $ +# $Id: Makefile,v 1.18 1999/05/04 20:49:59 fenner Exp $ # -DISTNAME= tcl8.1b1 -PKGNAME= tcl-8.1.b1 +DISTNAME= tcl8.1 +PKGNAME= tcl-8.1 CATEGORIES= lang tcl81 MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/ @@ -17,7 +17,6 @@ Y2K= http://www.scriptics.com/Y2K.html FILE_DEPENDS= ${PORTSDIR}/lang/tcl80 -NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared @@ -26,35 +25,38 @@ PKGINSTALL= ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh MAN1= tclsh.1 -MAN3= AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 Async.3 \ - BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 CmdCmplt.3 \ - Concat.3 CrtChannel.3 CrtChnlHdlr.3 CrtCloseHdlr.3 CrtCommand.3 \ - CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 CrtObjCmd.3 CrtSlave.3 \ - CrtTimerHdlr.3 CrtTrace.3 DString.3 DetachPids.3 DoOneEvent.3 \ - DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 Exit.3 ExprLong.3 \ - ExprLongObj.3 FindExec.3 GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.3 \ - Hash.3 IntObj.3 Interp.3 LinkVar.3 ListObj.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 \ - ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 +MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \ + Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \ + CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 CrtCloseHdlr.3 \ + CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 CrtObjCmd.3 \ + CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 DetachPids.3 \ + DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 Exit.3 \ + ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetIndex.3 GetInt.3 \ + GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 IntObj.3 Interp.3 \ + LinkVar.3 ListObj.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_InitStubs.3 Tcl_Main.3 Thread.3 ToUpper.3 TraceVar.3 \ + Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \ - catch.n cd.n clock.n close.n concat.n continue.n encoding.n eof.n \ - error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.n fcopy.n \ - file.n fileevent.n filename.n flush.n for.n foreach.n format.n gets.n \ - glob.n global.n history.n http.n if.n incr.n info.n interp.n join.n \ - lappend.n library.n lindex.n linsert.n list.n llength.n load.n \ - lrange.n lreplace.n lsearch.n lsort.n msgcat.n namespace.n open.n \ - package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n read.n regexp.n \ - registry.n regsub.n rename.n resource.n return.n safe.n scan.n seek.n \ - set.n socket.n source.n split.n string.n subst.n switch.n tclvars.n \ - tell.n time.n trace.n unknown.n unset.n update.n uplevel.n upvar.n \ - variable.n vwait.n while.n + catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \ + eof.n error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.n \ + fcopy.n file.n fileevent.n filename.n flush.n for.n foreach.n \ + format.n gets.n glob.n global.n history.n http.n if.n incr.n info.n \ + interp.n join.n lappend.n library.n lindex.n linsert.n list.n \ + llength.n load.n lrange.n lreplace.n lsearch.n lsort.n msgcat.n \ + namespace.n open.n package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n \ + read.n regexp.n registry.n regsub.n rename.n resource.n return.n \ + safe.n scan.n seek.n set.n socket.n source.n split.n string.n subst.n \ + switch.n tclvars.n tell.n time.n trace.n unknown.n unset.n update.n \ + uplevel.n upvar.n variable.n vwait.n while.n # MLINKS generated via awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks -MLINKS= AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ +MLINKS= Access.3 Tcl_Access.3 \ + Access.3 Tcl_Stat.3 \ + AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ AddErrInfo.3 Tcl_AddErrorInfo.3 \ AddErrInfo.3 Tcl_SetErrorCode.3 \ AddErrInfo.3 Tcl_PosixError.3 \ @@ -180,6 +182,8 @@ MLINKS= AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ ExprLongObj.3 Tcl_ExprObj.3 \ FindExec.3 Tcl_FindExecutable.3 \ FindExec.3 Tcl_GetNameOfExecutable.3 \ + GetCwd.3 Tcl_GetCwd.3 \ + GetCwd.3 Tcl_Chdir.3 \ GetIndex.3 Tcl_GetIndexFromObj.3 \ GetInt.3 Tcl_GetInt.3 \ GetInt.3 Tcl_GetDouble.3 \ @@ -187,6 +191,7 @@ MLINKS= AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ GetOpnFl.3 Tcl_GetOpenFile.3 \ GetStdChan.3 Tcl_GetStdChannel.3 \ GetStdChan.3 Tcl_SetStdChannel.3 \ + GetVersion.3 Tcl_GetVersion.3 \ Hash.3 Tcl_InitHashTable.3 \ Hash.3 Tcl_DeleteHashTable.3 \ Hash.3 Tcl_CreateHashEntry.3 \ @@ -361,6 +366,9 @@ MANCOMPRESSED= yes .include +post-extract: + ${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \ + ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3 post-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .if exists(${PKGINSTALL}) diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo index 4b6578f01d73..85a27d9f66cc 100644 --- a/lang/tcl83/distinfo +++ b/lang/tcl83/distinfo @@ -1 +1 @@ -MD5 (tcl8.1b1.tar.gz) = 608c36993dfa52f06499f5c2004c7633 +MD5 (tcl8.1.tar.gz) = 78d3e8057950528b840f51fe6a51d205 diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa index 8cbda8008feb..b158373c4290 100644 --- a/lang/tcl83/files/patch-aa +++ b/lang/tcl83/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Dec 11 18:36:13 1998 -+++ Makefile.in Sat Jan 2 14:47:02 1999 +--- Makefile.in.orig Fri Apr 30 08:23:33 1999 ++++ Makefile.in Tue May 11 01:48:45 1999 @@ -55,7 +55,9 @@ BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin @@ -20,7 +20,7 @@ # To disable ANSI-C procedure prototypes reverse the comment characters -@@ -152,7 +154,7 @@ +@@ -161,7 +163,7 @@ # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. @@ -29,16 +29,16 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -@@ -357,15 +359,21 @@ +@@ -391,15 +393,21 @@ - SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) + SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS) --all: ${TCL_LIB_FILE} tclsh -+all: ${TCL_LIB_FILE} libtcl81.a tclsh +-all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh ++all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) libtcl81.a tclsh # The following target is configured by autoconf to generate either # a shared library or non-shared library for Tcl. - ${TCL_LIB_FILE}: ${OBJS} + ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f ${TCL_LIB_FILE} @MAKE_LIB@ + ln -sf ${TCL_LIB_FILE} libtcl81.so @@ -49,19 +49,19 @@ + ar cr libtcl81.a ${OBJS} + $(RANLIB) libtcl81.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 - # extensions. used for the Tcl Plugin. -- dl -@@ -459,7 +467,7 @@ - # some ranlibs write to current directory, and this might not always be + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} + rm -f ${STUB_LIB_FILE} + @MAKE_STUB_LIB@ +@@ -499,7 +507,7 @@ # possible (e.g. if installing as root). --install-binaries: $(TCL_LIB_FILE) tclsh -+install-binaries: $(TCL_LIB_FILE) libtcl81.a tclsh + install-binaries: $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ +- tclsh ++ libtcl81.a tclsh @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -471,16 +479,22 @@ +@@ -511,8 +519,13 @@ done; @echo "Installing $(TCL_LIB_FILE)" @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) @@ -72,12 +72,21 @@ + @$(INSTALL_DATA) libtcl81.a $(LIB_INSTALL_DIR)/libtcl81.a + @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl81.a) + @chmod 555 $(LIB_INSTALL_DIR)/libtcl81.a + @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ + echo "Installing $(TCL_EXP_FILE)"; \ + $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ +@@ -521,7 +534,8 @@ @echo "Installing tclsh" @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) @echo "Installing tclConfig.sh" - @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh + @mkdir -p $(SCRIPT_INSTALL_DIR) + @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh + @if test "$(TCL_STUB_LIB_FILE)" != "" ; then \ + echo "Installing $(TCL_STUB_LIB_FILE)"; \ + $(INSTALL_DATA) $(STUB_LIB_FILE) \ +@@ -529,8 +543,8 @@ + fi install-libraries: - @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ @@ -87,25 +96,26 @@ do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ -@@ -498,8 +512,15 @@ +@@ -548,11 +562,16 @@ else true; \ fi; \ done; -- @echo "Installing tcl.h" -- @$(INSTALL_DATA) $(GENERIC_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h +- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \ + @echo "Installing libraries, tcl.h and other headers" + @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ echo "Installing $$i"; \ + do \ + echo "Installing $$i"; \ +- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ + $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; + done; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h ++ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h + @echo "Installing $(TOP_DIR)unix/tclUnixPort.h" + @$(INSTALL_DATA) $(TOP_DIR)/unix/tclUnixPort.h $(UNIX_INCLUDE_INSTALL_DIR) @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ do \ echo "Installing $$i"; \ -@@ -531,30 +552,34 @@ +@@ -584,30 +603,35 @@ @cd $(TOP_DIR)/doc; for i in *.1; \ do \ echo "Installing doc/$$i"; \ @@ -147,6 +157,7 @@ + @echo "**********" + @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh" + @echo "tcl.h in $(INCLUDE_INSTALL_DIR)/tcl.h" ++ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h" + @echo "There are NOT default place, but good place to avoid" + @echo "conflicting with another version of Tcl/Tks." diff --git a/lang/tcl83/files/patch-ab b/lang/tcl83/files/patch-ab index 76921d7569df..551b0c24760a 100644 --- a/lang/tcl83/files/patch-ab +++ b/lang/tcl83/files/patch-ab @@ -1,6 +1,15 @@ ---- configure.orig Fri Dec 11 18:36:14 1998 -+++ configure Sat Jan 2 15:04:24 1999 -@@ -4330,14 +4330,19 @@ +--- configure.orig Fri Apr 30 08:23:33 1999 ++++ configure Tue May 11 01:25:32 1999 +@@ -4384,7 +4384,7 @@ + LD_FLAGS="-Wl,-Bexport" + LD_SEARCH_FLAGS="" + ;; +- NetBSD-*|FreeBSD-12.*|OpenBSD-*) ++ NetBSD-*|FreeBSD-*|OpenBSD-*) + # Not available on all versions: check for include file. + ac_safe=`echo "dlfcn.h" | tr './\055' '___'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +@@ -4413,14 +4413,19 @@ echo "$ac_t""yes" 1>&6 SHLIB_CFLAGS="-fpic" @@ -13,12 +22,38 @@ LD_SEARCH_FLAGS="" - TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' + if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then -+ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1' ++ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' + SHLIB_LD="ld -shared -x -soname \$@" + else -+ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0' ++ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' + SHLIB_LD="ld -Bshareable -x" + fi else echo "$ac_t""no" 1>&6 +@@ -4443,17 +4448,6 @@ + TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + 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_LIBS="" +- LD_FLAGS="" +- LD_SEARCH_FLAGS="" +- ;; + NEXTSTEP-*) + SHLIB_CFLAGS="" + SHLIB_LD="cc -nostdlib -r" +@@ -5100,6 +5094,7 @@ + # stub support. + #-------------------------------------------------------------------- + # Replace ${VERSION} with contents of ${TCL_VERSION} ++${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0 + eval "STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}" + # Replace DBGX with TCL_DBGX + eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\"" diff --git a/lang/tcl83/pkg-plist b/lang/tcl83/pkg-plist index 82b88b8ae1d0..8eb81b29bd43 100644 --- a/lang/tcl83/pkg-plist +++ b/lang/tcl83/pkg-plist @@ -5,15 +5,22 @@ include/tcl8.1/generic/regex.h include/tcl8.1/generic/regguts.h include/tcl8.1/generic/tcl.h include/tcl8.1/generic/tclCompile.h +include/tcl8.1/generic/tclDecls.h include/tcl8.1/generic/tclInitScript.h include/tcl8.1/generic/tclInt.h +include/tcl8.1/generic/tclIntDecls.h +include/tcl8.1/generic/tclIntPlatDecls.h include/tcl8.1/generic/tclMath.h +include/tcl8.1/generic/tclPlatDecls.h include/tcl8.1/generic/tclPort.h include/tcl8.1/generic/tclRegexp.h include/tcl8.1/tcl.h +include/tcl8.1/tclDecls.h include/tcl8.1/unix/tclUnixPort.h lib/libtcl81.a +lib/libtcl81.so lib/libtcl81.so.1 +lib/libtclstub81.a @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R lib/tcl8.1/auto.tcl @@ -49,6 +56,7 @@ lib/tcl8.1/encoding/cp936.enc lib/tcl8.1/encoding/cp949.enc lib/tcl8.1/encoding/cp950.enc lib/tcl8.1/encoding/dingbats.enc +lib/tcl8.1/encoding/euc-cn.enc lib/tcl8.1/encoding/euc-jp.enc lib/tcl8.1/encoding/euc-kr.enc lib/tcl8.1/encoding/gb12345.enc @@ -69,6 +77,7 @@ lib/tcl8.1/encoding/iso8859-9.enc lib/tcl8.1/encoding/jis0201.enc lib/tcl8.1/encoding/jis0208.enc lib/tcl8.1/encoding/jis0212.enc +lib/tcl8.1/encoding/koi8-r.enc lib/tcl8.1/encoding/ksc5601.enc lib/tcl8.1/encoding/macCentEuro.enc lib/tcl8.1/encoding/macCroatian.enc diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index df299de4ca3f..3b52c0662c51 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: tcl8.1 -# Version required: 8.1.a2 +# Version required: 8.1 # Date created: 19 August 1997 # Whom: jkh # -# $Id: Makefile,v 1.17 1999/04/22 00:17:07 scrappy Exp $ +# $Id: Makefile,v 1.18 1999/05/04 20:49:59 fenner Exp $ # -DISTNAME= tcl8.1b1 -PKGNAME= tcl-8.1.b1 +DISTNAME= tcl8.1 +PKGNAME= tcl-8.1 CATEGORIES= lang tcl81 MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/ @@ -17,7 +17,6 @@ Y2K= http://www.scriptics.com/Y2K.html FILE_DEPENDS= ${PORTSDIR}/lang/tcl80 -NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared @@ -26,35 +25,38 @@ PKGINSTALL= ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh MAN1= tclsh.1 -MAN3= AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 Async.3 \ - BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 CmdCmplt.3 \ - Concat.3 CrtChannel.3 CrtChnlHdlr.3 CrtCloseHdlr.3 CrtCommand.3 \ - CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 CrtObjCmd.3 CrtSlave.3 \ - CrtTimerHdlr.3 CrtTrace.3 DString.3 DetachPids.3 DoOneEvent.3 \ - DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 Exit.3 ExprLong.3 \ - ExprLongObj.3 FindExec.3 GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.3 \ - Hash.3 IntObj.3 Interp.3 LinkVar.3 ListObj.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 \ - ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 +MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \ + Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \ + CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 CrtCloseHdlr.3 \ + CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 CrtObjCmd.3 \ + CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 DetachPids.3 \ + DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 Exit.3 \ + ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetIndex.3 GetInt.3 \ + GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 IntObj.3 Interp.3 \ + LinkVar.3 ListObj.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_InitStubs.3 Tcl_Main.3 Thread.3 ToUpper.3 TraceVar.3 \ + Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \ - catch.n cd.n clock.n close.n concat.n continue.n encoding.n eof.n \ - error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.n fcopy.n \ - file.n fileevent.n filename.n flush.n for.n foreach.n format.n gets.n \ - glob.n global.n history.n http.n if.n incr.n info.n interp.n join.n \ - lappend.n library.n lindex.n linsert.n list.n llength.n load.n \ - lrange.n lreplace.n lsearch.n lsort.n msgcat.n namespace.n open.n \ - package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n read.n regexp.n \ - registry.n regsub.n rename.n resource.n return.n safe.n scan.n seek.n \ - set.n socket.n source.n split.n string.n subst.n switch.n tclvars.n \ - tell.n time.n trace.n unknown.n unset.n update.n uplevel.n upvar.n \ - variable.n vwait.n while.n + catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \ + eof.n error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.n \ + fcopy.n file.n fileevent.n filename.n flush.n for.n foreach.n \ + format.n gets.n glob.n global.n history.n http.n if.n incr.n info.n \ + interp.n join.n lappend.n library.n lindex.n linsert.n list.n \ + llength.n load.n lrange.n lreplace.n lsearch.n lsort.n msgcat.n \ + namespace.n open.n package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n \ + read.n regexp.n registry.n regsub.n rename.n resource.n return.n \ + safe.n scan.n seek.n set.n socket.n source.n split.n string.n subst.n \ + switch.n tclvars.n tell.n time.n trace.n unknown.n unset.n update.n \ + uplevel.n upvar.n variable.n vwait.n while.n # MLINKS generated via awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks -MLINKS= AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ +MLINKS= Access.3 Tcl_Access.3 \ + Access.3 Tcl_Stat.3 \ + AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ AddErrInfo.3 Tcl_AddErrorInfo.3 \ AddErrInfo.3 Tcl_SetErrorCode.3 \ AddErrInfo.3 Tcl_PosixError.3 \ @@ -180,6 +182,8 @@ MLINKS= AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ ExprLongObj.3 Tcl_ExprObj.3 \ FindExec.3 Tcl_FindExecutable.3 \ FindExec.3 Tcl_GetNameOfExecutable.3 \ + GetCwd.3 Tcl_GetCwd.3 \ + GetCwd.3 Tcl_Chdir.3 \ GetIndex.3 Tcl_GetIndexFromObj.3 \ GetInt.3 Tcl_GetInt.3 \ GetInt.3 Tcl_GetDouble.3 \ @@ -187,6 +191,7 @@ MLINKS= AddErrInfo.3 Tcl_AddObjErrorInfo.3 \ GetOpnFl.3 Tcl_GetOpenFile.3 \ GetStdChan.3 Tcl_GetStdChannel.3 \ GetStdChan.3 Tcl_SetStdChannel.3 \ + GetVersion.3 Tcl_GetVersion.3 \ Hash.3 Tcl_InitHashTable.3 \ Hash.3 Tcl_DeleteHashTable.3 \ Hash.3 Tcl_CreateHashEntry.3 \ @@ -361,6 +366,9 @@ MANCOMPRESSED= yes .include +post-extract: + ${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \ + ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3 post-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .if exists(${PKGINSTALL}) diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo index 4b6578f01d73..85a27d9f66cc 100644 --- a/lang/tcl84/distinfo +++ b/lang/tcl84/distinfo @@ -1 +1 @@ -MD5 (tcl8.1b1.tar.gz) = 608c36993dfa52f06499f5c2004c7633 +MD5 (tcl8.1.tar.gz) = 78d3e8057950528b840f51fe6a51d205 diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa index 8cbda8008feb..b158373c4290 100644 --- a/lang/tcl84/files/patch-aa +++ b/lang/tcl84/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Dec 11 18:36:13 1998 -+++ Makefile.in Sat Jan 2 14:47:02 1999 +--- Makefile.in.orig Fri Apr 30 08:23:33 1999 ++++ Makefile.in Tue May 11 01:48:45 1999 @@ -55,7 +55,9 @@ BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin @@ -20,7 +20,7 @@ # To disable ANSI-C procedure prototypes reverse the comment characters -@@ -152,7 +154,7 @@ +@@ -161,7 +163,7 @@ # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. @@ -29,16 +29,16 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -@@ -357,15 +359,21 @@ +@@ -391,15 +393,21 @@ - SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) + SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS) --all: ${TCL_LIB_FILE} tclsh -+all: ${TCL_LIB_FILE} libtcl81.a tclsh +-all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh ++all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) libtcl81.a tclsh # The following target is configured by autoconf to generate either # a shared library or non-shared library for Tcl. - ${TCL_LIB_FILE}: ${OBJS} + ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f ${TCL_LIB_FILE} @MAKE_LIB@ + ln -sf ${TCL_LIB_FILE} libtcl81.so @@ -49,19 +49,19 @@ + ar cr libtcl81.a ${OBJS} + $(RANLIB) libtcl81.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 - # extensions. used for the Tcl Plugin. -- dl -@@ -459,7 +467,7 @@ - # some ranlibs write to current directory, and this might not always be + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} + rm -f ${STUB_LIB_FILE} + @MAKE_STUB_LIB@ +@@ -499,7 +507,7 @@ # possible (e.g. if installing as root). --install-binaries: $(TCL_LIB_FILE) tclsh -+install-binaries: $(TCL_LIB_FILE) libtcl81.a tclsh + install-binaries: $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ +- tclsh ++ libtcl81.a tclsh @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -471,16 +479,22 @@ +@@ -511,8 +519,13 @@ done; @echo "Installing $(TCL_LIB_FILE)" @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) @@ -72,12 +72,21 @@ + @$(INSTALL_DATA) libtcl81.a $(LIB_INSTALL_DIR)/libtcl81.a + @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl81.a) + @chmod 555 $(LIB_INSTALL_DIR)/libtcl81.a + @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ + echo "Installing $(TCL_EXP_FILE)"; \ + $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ +@@ -521,7 +534,8 @@ @echo "Installing tclsh" @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) @echo "Installing tclConfig.sh" - @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh + @mkdir -p $(SCRIPT_INSTALL_DIR) + @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh + @if test "$(TCL_STUB_LIB_FILE)" != "" ; then \ + echo "Installing $(TCL_STUB_LIB_FILE)"; \ + $(INSTALL_DATA) $(STUB_LIB_FILE) \ +@@ -529,8 +543,8 @@ + fi install-libraries: - @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ @@ -87,25 +96,26 @@ do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ -@@ -498,8 +512,15 @@ +@@ -548,11 +562,16 @@ else true; \ fi; \ done; -- @echo "Installing tcl.h" -- @$(INSTALL_DATA) $(GENERIC_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h +- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \ + @echo "Installing libraries, tcl.h and other headers" + @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ echo "Installing $$i"; \ + do \ + echo "Installing $$i"; \ +- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ + $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; + done; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h ++ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h + @echo "Installing $(TOP_DIR)unix/tclUnixPort.h" + @$(INSTALL_DATA) $(TOP_DIR)/unix/tclUnixPort.h $(UNIX_INCLUDE_INSTALL_DIR) @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ do \ echo "Installing $$i"; \ -@@ -531,30 +552,34 @@ +@@ -584,30 +603,35 @@ @cd $(TOP_DIR)/doc; for i in *.1; \ do \ echo "Installing doc/$$i"; \ @@ -147,6 +157,7 @@ + @echo "**********" + @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh" + @echo "tcl.h in $(INCLUDE_INSTALL_DIR)/tcl.h" ++ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h" + @echo "There are NOT default place, but good place to avoid" + @echo "conflicting with another version of Tcl/Tks." diff --git a/lang/tcl84/files/patch-ab b/lang/tcl84/files/patch-ab index 76921d7569df..551b0c24760a 100644 --- a/lang/tcl84/files/patch-ab +++ b/lang/tcl84/files/patch-ab @@ -1,6 +1,15 @@ ---- configure.orig Fri Dec 11 18:36:14 1998 -+++ configure Sat Jan 2 15:04:24 1999 -@@ -4330,14 +4330,19 @@ +--- configure.orig Fri Apr 30 08:23:33 1999 ++++ configure Tue May 11 01:25:32 1999 +@@ -4384,7 +4384,7 @@ + LD_FLAGS="-Wl,-Bexport" + LD_SEARCH_FLAGS="" + ;; +- NetBSD-*|FreeBSD-12.*|OpenBSD-*) ++ NetBSD-*|FreeBSD-*|OpenBSD-*) + # Not available on all versions: check for include file. + ac_safe=`echo "dlfcn.h" | tr './\055' '___'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +@@ -4413,14 +4413,19 @@ echo "$ac_t""yes" 1>&6 SHLIB_CFLAGS="-fpic" @@ -13,12 +22,38 @@ LD_SEARCH_FLAGS="" - TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' + if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then -+ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1' ++ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' + SHLIB_LD="ld -shared -x -soname \$@" + else -+ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0' ++ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' + SHLIB_LD="ld -Bshareable -x" + fi else echo "$ac_t""no" 1>&6 +@@ -4443,17 +4448,6 @@ + TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + 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_LIBS="" +- LD_FLAGS="" +- LD_SEARCH_FLAGS="" +- ;; + NEXTSTEP-*) + SHLIB_CFLAGS="" + SHLIB_LD="cc -nostdlib -r" +@@ -5100,6 +5094,7 @@ + # stub support. + #-------------------------------------------------------------------- + # Replace ${VERSION} with contents of ${TCL_VERSION} ++${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0 + eval "STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}" + # Replace DBGX with TCL_DBGX + eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\"" diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist index 82b88b8ae1d0..8eb81b29bd43 100644 --- a/lang/tcl84/pkg-plist +++ b/lang/tcl84/pkg-plist @@ -5,15 +5,22 @@ include/tcl8.1/generic/regex.h include/tcl8.1/generic/regguts.h include/tcl8.1/generic/tcl.h include/tcl8.1/generic/tclCompile.h +include/tcl8.1/generic/tclDecls.h include/tcl8.1/generic/tclInitScript.h include/tcl8.1/generic/tclInt.h +include/tcl8.1/generic/tclIntDecls.h +include/tcl8.1/generic/tclIntPlatDecls.h include/tcl8.1/generic/tclMath.h +include/tcl8.1/generic/tclPlatDecls.h include/tcl8.1/generic/tclPort.h include/tcl8.1/generic/tclRegexp.h include/tcl8.1/tcl.h +include/tcl8.1/tclDecls.h include/tcl8.1/unix/tclUnixPort.h lib/libtcl81.a +lib/libtcl81.so lib/libtcl81.so.1 +lib/libtclstub81.a @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R lib/tcl8.1/auto.tcl @@ -49,6 +56,7 @@ lib/tcl8.1/encoding/cp936.enc lib/tcl8.1/encoding/cp949.enc lib/tcl8.1/encoding/cp950.enc lib/tcl8.1/encoding/dingbats.enc +lib/tcl8.1/encoding/euc-cn.enc lib/tcl8.1/encoding/euc-jp.enc lib/tcl8.1/encoding/euc-kr.enc lib/tcl8.1/encoding/gb12345.enc @@ -69,6 +77,7 @@ lib/tcl8.1/encoding/iso8859-9.enc lib/tcl8.1/encoding/jis0201.enc lib/tcl8.1/encoding/jis0208.enc lib/tcl8.1/encoding/jis0212.enc +lib/tcl8.1/encoding/koi8-r.enc lib/tcl8.1/encoding/ksc5601.enc lib/tcl8.1/encoding/macCentEuro.enc lib/tcl8.1/encoding/macCroatian.enc -- cgit v1.2.3