1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Update to tcl8.4b2

koi8-u.enc now in distribution
This commit is contained in:
Dirk Meyer 2002-09-09 12:12:37 +00:00
parent ef7fc9de4d
commit 78eac1eef3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=65914
5 changed files with 59 additions and 61 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= tcl
PORTVERSION= 8.4a4
PORTREVISION= 1
PORTVERSION= 8.4b2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
@ -64,7 +63,7 @@ MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.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 generated via awk '/ln/ {print "\t" $3,$4,"\\"}' unix/mkLinks
MLINKS= Access.3 Tcl_Access.3 \
Access.3 Tcl_Stat.3 \
AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
@ -129,6 +128,7 @@ MLINKS= Access.3 Tcl_Access.3 \
CrtChannel.3 Tcl_ChannelInputProc.3 \
CrtChannel.3 Tcl_ChannelOutputProc.3 \
CrtChannel.3 Tcl_ChannelSeekProc.3 \
CrtChannel.3 Tcl_ChannelWideSeekProc.3 \
CrtChannel.3 Tcl_ChannelSetOptionProc.3 \
CrtChannel.3 Tcl_ChannelGetOptionProc.3 \
CrtChannel.3 Tcl_ChannelWatchProc.3 \
@ -164,6 +164,8 @@ MLINKS= Access.3 Tcl_Access.3 \
CrtObjCmd.3 Tcl_SetCommandInfo.3 \
CrtObjCmd.3 Tcl_SetCommandInfoFromToken.3 \
CrtObjCmd.3 Tcl_GetCommandName.3 \
CrtObjCmd.3 Tcl_GetCommandFullName.3 \
CrtObjCmd.3 Tcl_GetCommandFromObj.3 \
CrtSlave.3 Tcl_IsSafe.3 \
CrtSlave.3 Tcl_MakeSafe.3 \
CrtSlave.3 Tcl_CreateSlave.3 \
@ -488,6 +490,7 @@ MLINKS= Access.3 Tcl_Access.3 \
StringObj.3 Tcl_SetUnicodeObj.3 \
StringObj.3 Tcl_GetStringFromObj.3 \
StringObj.3 Tcl_GetString.3 \
StringObj.3 Tcl_GetUnicodeFromObj.3 \
StringObj.3 Tcl_GetUnicode.3 \
StringObj.3 Tcl_GetUniChar.3 \
StringObj.3 Tcl_GetCharLength.3 \
@ -517,6 +520,9 @@ MLINKS= Access.3 Tcl_Access.3 \
ToUpper.3 Tcl_UtfToUpper.3 \
ToUpper.3 Tcl_UtfToLower.3 \
ToUpper.3 Tcl_UtfToTitle.3 \
TraceCmd.3 Tcl_CommandTraceInfo.3 \
TraceCmd.3 Tcl_TraceCommand.3 \
TraceCmd.3 Tcl_UntraceCommand.3 \
TraceVar.3 Tcl_TraceVar.3 \
TraceVar.3 Tcl_TraceVar2.3 \
TraceVar.3 Tcl_UntraceVar.3 \
@ -556,7 +562,6 @@ MLINKS= Access.3 Tcl_Access.3 \
Utf.3 Tcl_UtfAtIndex.3 \
Utf.3 Tcl_UtfBackslash.3 \
WrongNumArgs.3 Tcl_WrongNumArgs.3 \
http.n Http.n \
library.n auto_execok.n \
library.n auto_import.n \
library.n auto_load.n \
@ -581,8 +586,6 @@ post-install:
.if exists(${PKGINSTALL})
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
.endif
${INSTALL_DATA} ${FILESDIR}/koi8-u.enc \
${PREFIX}/lib/tcl${TCL_VER}/encoding/
test:
cd ${WRKSRC} && ${MAKE} test

View File

@ -1 +1 @@
MD5 (tcl8.4a4-src.tar.gz) = 50e4634c9167d3071e98cf88d6f345d5
MD5 (tcl8.4b2-src.tar.gz) = 605876e2197ed5d576ea67005d2bc12b

View File

@ -1,6 +1,6 @@
--- Makefile.in.orig Wed Mar 6 09:51:35 2002
+++ Makefile.in Wed Mar 13 07:11:30 2002
@@ -53,7 +53,9 @@
--- Makefile.in.orig Sat Aug 17 21:04:03 2002
+++ Makefile.in Mon Sep 9 14:00:35 2002
@@ -56,7 +56,9 @@
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
# Directory in which to install the include file tcl.h:
@ -11,7 +11,7 @@
# Top-level directory in which to install manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
@@ -87,7 +89,7 @@
@@ -90,7 +92,7 @@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@ -20,42 +20,37 @@
# Flags to pass to the linker
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
@@ -408,7 +410,8 @@
@@ -436,7 +438,8 @@
all: binaries libraries doc
-binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
+binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \
-binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
+binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \
+ libtcl${SHORT_TCL_VER}.a tclsh
libraries:
@@ -419,10 +422,16 @@
${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
rm -f ${TCL_LIB_FILE}
@@ -447,6 +450,15 @@
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
rm -f $@
@MAKE_LIB@
+ @ln -sf $(TCL_LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
$(RANLIB) ${TCL_LIB_FILE}; \
fi
+ @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
+ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
+ $(RANLIB) ${LIB_FILE}; \
+ fi
+
+libtcl${SHORT_TCL_VER}.a: ${OBJS}
+ rm -f libtcl${SHORT_TCL_VER}.a
+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
+ $(RANLIB) libtcl${SHORT_TCL_VER}.a
+
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f ${STUB_LIB_FILE}
@MAKE_STUB_LIB@
@@ -556,10 +565,16 @@
fi
@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
@$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
+ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
@if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)); \
fi
@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
rm -f $@
@@ -606,6 +618,12 @@
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@INSTALL_LIB@
@chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
+ @ln -sf $(LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
+ @echo "Installing libtcl${SHORT_TCL_VER}.a"
+ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \
+ $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
@ -64,7 +59,7 @@
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
@@ -567,8 +582,9 @@
@@ -613,15 +631,17 @@
fi
@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@ -73,11 +68,10 @@
+ @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
+ @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) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_LIBRARY) $(STUB_LIB_FILE) \
@@ -576,7 +592,8 @@
fi
@if test "$(STUB_LIB_FILE)" != "" ; then \
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
@INSTALL_STUB_LIB@ ; \
fi
install-libraries: libraries
- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
@ -86,7 +80,7 @@
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
@@ -598,11 +615,17 @@
@@ -643,11 +663,17 @@
chmod +x $(SRC_DIR)/install-sh; \
fi
@echo "Installing header files";
@ -107,27 +101,27 @@
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
do \
@@ -660,7 +683,6 @@
@@ -705,7 +731,6 @@
chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking top-level (.1) docs";
- @$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
- @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN1_INSTALL_DIR)
@echo "Installing C API (.3) docs";
@cd $(TOP_DIR)/doc; for i in *.3; \
do \
@@ -670,7 +692,6 @@
@@ -715,7 +740,6 @@
chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking C API (.3) docs";
- @$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
- @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR)
@echo "Installing command (.n) docs";
@cd $(TOP_DIR)/doc; for i in *.n; \
do \
@@ -680,7 +701,14 @@
@@ -725,7 +749,14 @@
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking command (.n) docs";
- @$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
- @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR)
+ @echo "**********"
+ @echo "IMPORTANT:"
+ @echo "**********"

View File

@ -1,6 +1,6 @@
--- configure.orig Wed Mar 6 09:51:35 2002
+++ configure Thu Mar 7 07:24:23 2002
@@ -5251,7 +5251,7 @@
--- configure.orig Sat Aug 17 21:04:03 2002
+++ configure Mon Sep 9 12:59:14 2002
@@ -5482,7 +5482,7 @@
EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
@ -9,22 +9,23 @@
ECHO_VERSION='`echo ${VERSION}`'
TCL_LIB_VERSIONS_OK=ok
CFLAGS_DEBUG=-g
@@ -5878,22 +5878,23 @@
@@ -6143,12 +6143,13 @@
FreeBSD-*)
# FreeBSD 3.* and greater have ELF.
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="ld -Bshareable -x"
+ TCL_SHLIB_LD_EXTRAS="-soname \$@"
+ SHLIB_LD="ld -shared -x"
+ TCL_SHLIB_LD_EXTRAS="-soname \$@"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
- LDFLAGS="-export-dynamic"
+ LDFLAGS=""
LD_SEARCH_FLAGS=""
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
if test "${TCL_THREADS}" = "1" ; then
EXTRA_CFLAGS="-pthread"
@@ -6156,10 +6157,10 @@
LDFLAGS="$LDFLAGS -pthread"
fi
case $system in
@ -33,7 +34,7 @@
# FreeBSD-3 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
;;
esac

View File

@ -110,8 +110,8 @@ lib/tcl%%TCL_VER%%/http2.4/pkgIndex.tcl
lib/tcl%%TCL_VER%%/init.tcl
lib/tcl%%TCL_VER%%/ldAix
lib/tcl%%TCL_VER%%/ldAout.tcl
lib/tcl%%TCL_VER%%/msgcat1.2/msgcat.tcl
lib/tcl%%TCL_VER%%/msgcat1.2/pkgIndex.tcl
lib/tcl%%TCL_VER%%/msgcat1.3/msgcat.tcl
lib/tcl%%TCL_VER%%/msgcat1.3/pkgIndex.tcl
lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
lib/tcl%%TCL_VER%%/package.tcl
@ -120,12 +120,12 @@ lib/tcl%%TCL_VER%%/safe.tcl
lib/tcl%%TCL_VER%%/tclAppInit.c
lib/tcl%%TCL_VER%%/tclConfig.sh
lib/tcl%%TCL_VER%%/tclIndex
lib/tcl%%TCL_VER%%/tcltest2.0/pkgIndex.tcl
lib/tcl%%TCL_VER%%/tcltest2.0/tcltest.tcl
lib/tcl%%TCL_VER%%/tcltest2.1/pkgIndex.tcl
lib/tcl%%TCL_VER%%/tcltest2.1/tcltest.tcl
lib/tcl%%TCL_VER%%/word.tcl
@dirrm lib/tcl%%TCL_VER%%/tcltest2.0
@dirrm lib/tcl%%TCL_VER%%/tcltest2.1
@dirrm lib/tcl%%TCL_VER%%/opt0.4
@dirrm lib/tcl%%TCL_VER%%/msgcat1.2
@dirrm lib/tcl%%TCL_VER%%/msgcat1.3
@dirrm lib/tcl%%TCL_VER%%/http2.4
@dirrm lib/tcl%%TCL_VER%%/http1.0
@dirrm lib/tcl%%TCL_VER%%/encoding