aboutsummaryrefslogtreecommitdiffstats
path: root/lang/tcl84
diff options
context:
space:
mode:
Diffstat (limited to 'lang/tcl84')
-rw-r--r--lang/tcl84/Makefile8
-rw-r--r--lang/tcl84/distinfo4
-rw-r--r--lang/tcl84/files/patch-aa69
-rw-r--r--lang/tcl84/pkg-plist7
4 files changed, 40 insertions, 48 deletions
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index fbc1e8a01944..b6635192b184 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= tcl
-PORTVERSION= 8.3.0
+PORTVERSION= 8.3.1
CATEGORIES= lang tcl83
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_3
@@ -43,9 +43,9 @@ MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.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 \
- ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3
+ SetErrno.3 SetRecLmt.3 SetResult.3 SetVar.3 Sleep.3 SourceRCFile.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
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 dde.n encoding.n \
diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo
index 986bdae3c3a5..675074eea191 100644
--- a/lang/tcl84/distinfo
+++ b/lang/tcl84/distinfo
@@ -1,2 +1,2 @@
-MD5 (tcl8.3.0.tar.gz) = 0fc2ee5c79692fe13316d85939fda62b
-MD5 (tcl8.3.0plus.patch.gz) = 09c7889cf432fce84935c6a006a68a05
+MD5 (tcl8.3.1.tar.gz) = 1834811e47421892584830c22e3ff002
+MD5 (tcl8.3.1plus.patch.gz) = 10a932acd141eeac7d2cbc71b6a49f26
diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa
index 9a44e63c391f..f7e0dc92f180 100644
--- a/lang/tcl84/files/patch-aa
+++ b/lang/tcl84/files/patch-aa
@@ -1,46 +1,35 @@
---- Makefile.in.orig Thu Feb 10 06:09:57 2000
-+++ Makefile.in Mon Apr 24 09:58:51 2000
-@@ -48,7 +48,9 @@
- SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
+--- Makefile.in.orig Wed May 10 16:38:48 2000
++++ Makefile.in Wed May 10 16:46:00 2000
+@@ -53,7 +53,9 @@
+ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
# Directory in which to install the include file tcl.h:
--INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION)
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
# Top-level directory in which to install manual entries:
- MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
-@@ -82,7 +84,7 @@
- #CFLAGS = $(CFLAGS_DEBUG)
- #CFLAGS = $(CFLAGS_OPTIMIZE)
- #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
--CFLAGS = @CFLAGS@
-+CFLAGS? = @CFLAGS@
+ MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
+@@ -87,7 +89,7 @@
+ #CFLAGS = $(CFLAGS_DEBUG)
+ #CFLAGS = $(CFLAGS_OPTIMIZE)
+ #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+-CFLAGS = @CFLAGS@
++CFLAGS ?= @CFLAGS@
# To disable ANSI-C procedure prototypes reverse the comment characters
# on the following lines:
-@@ -156,7 +158,7 @@
- # "install" around; better to use the install-sh script that comes
- # with the distribution, which is slower but guaranteed to work.
-
--INSTALL = @srcdir@/install-sh -c
-+INSTALL = install -c
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_DATA = ${INSTALL} -m 644
-
-@@ -383,7 +385,7 @@
+@@ -394,7 +396,7 @@
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) libtcl${SHORT_TCL_VER}.a tclsh
+-binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh Tcltest${SHLIB_SUFFIX}
++binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl${SHORT_TCL_VER}.a tclsh Tcltest${SHLIB_SUFFIX}
libraries:
-@@ -394,8 +396,13 @@
- ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
- rm -f ${TCL_LIB_FILE}
+@@ -407,6 +409,11 @@
@MAKE_LIB@
$(RANLIB) ${TCL_LIB_FILE}
@@ -52,11 +41,14 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f ${STUB_LIB_FILE}
@MAKE_STUB_LIB@
-@@ -506,8 +514,13 @@
+@@ -520,11 +527,16 @@
fi
@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
+ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
+ @echo "Installing Tcltest${SHLIB_SUFFIX} to $(SCRIPT_INSTALL_DIR)/tcltest1.0"
+ @$(INSTALL_DATA) Tcltest${SHLIB_SUFFIX} \
+ $(SCRIPT_INSTALL_DIR)/tcltest1.0/Tcltest${SHLIB_SUFFIX}
@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
+ @echo "Installing libtcl${SHORT_TCL_VER}.a"
@@ -66,7 +58,7 @@
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-@@ -515,8 +528,9 @@
+@@ -532,8 +544,9 @@
fi
@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@@ -78,18 +70,17 @@
@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
echo "Installing $(TCL_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(STUB_LIB_FILE) \
-@@ -524,8 +538,8 @@
+@@ -541,7 +554,8 @@
fi
install-libraries: libraries
-- @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
-- $(SCRIPT_INSTALL_DIR); \
-+ @for i in $(INSTALL_ROOT)$(prefix)/lib $(GENERIC_INCLUDE_INSTALL_DIR) \
-+ $(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
+- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
++ @for i in $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
++ $(SCRIPT_INSTALL_DIR); \
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
-@@ -547,10 +561,16 @@
+@@ -563,10 +577,16 @@
chmod +x $(SRC_DIR)/install-sh; \
fi
@echo "Installing header files";
@@ -108,7 +99,7 @@
@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 \
-@@ -591,7 +611,6 @@
+@@ -607,7 +627,6 @@
chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking top-level (.1) docs";
@@ -116,7 +107,7 @@
@echo "Installing C API (.3) docs";
@cd $(TOP_DIR)/doc; for i in *.3; \
do \
-@@ -601,7 +620,6 @@
+@@ -617,7 +636,6 @@
chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking C API (.3) docs";
@@ -124,7 +115,7 @@
@echo "Installing command (.n) docs";
@cd $(TOP_DIR)/doc; for i in *.n; \
do \
-@@ -611,7 +629,14 @@
+@@ -627,7 +645,14 @@
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking command (.n) docs";
diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist
index 0209069c4d86..60d28389294d 100644
--- a/lang/tcl84/pkg-plist
+++ b/lang/tcl84/pkg-plist
@@ -101,8 +101,8 @@ lib/tcl%%TCL_VER%%/encoding/symbol.enc
lib/tcl%%TCL_VER%%/history.tcl
lib/tcl%%TCL_VER%%/http1.0/http.tcl
lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
-lib/tcl%%TCL_VER%%/http2.1/http.tcl
-lib/tcl%%TCL_VER%%/http2.1/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/http2.3/http.tcl
+lib/tcl%%TCL_VER%%/http2.3/pkgIndex.tcl
lib/tcl%%TCL_VER%%/init.tcl
lib/tcl%%TCL_VER%%/ldAix
lib/tcl%%TCL_VER%%/ldAout.tcl
@@ -116,13 +116,14 @@ 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%%/tcltest1.0/Tcltest.so
lib/tcl%%TCL_VER%%/tcltest1.0/pkgIndex.tcl
lib/tcl%%TCL_VER%%/tcltest1.0/tcltest.tcl
lib/tcl%%TCL_VER%%/word.tcl
@dirrm lib/tcl%%TCL_VER%%/tcltest1.0
@dirrm lib/tcl%%TCL_VER%%/opt0.4
@dirrm lib/tcl%%TCL_VER%%/msgcat1.0
-@dirrm lib/tcl%%TCL_VER%%/http2.1
+@dirrm lib/tcl%%TCL_VER%%/http2.3
@dirrm lib/tcl%%TCL_VER%%/http1.0
@dirrm lib/tcl%%TCL_VER%%/encoding
@dirrm lib/tcl%%TCL_VER%%