aboutsummaryrefslogtreecommitdiff
path: root/lang/tcl84
diff options
context:
space:
mode:
Diffstat (limited to 'lang/tcl84')
-rw-r--r--lang/tcl84/Makefile7
-rw-r--r--lang/tcl84/distinfo2
-rw-r--r--lang/tcl84/files/patch-aa48
-rw-r--r--lang/tcl84/files/patch-configure13
-rw-r--r--lang/tcl84/files/patch-tcl.m413
-rw-r--r--lang/tcl84/pkg-plist13
6 files changed, 55 insertions, 41 deletions
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 3117d1288a9f..cce3eff48321 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= tcl
-PORTVERSION= 8.3.3
-PORTREVISION= 4
+PORTVERSION= 8.3.4
CATEGORIES= lang tcl83
-MASTER_SITES= ${MASTER_SITE_TCLTK}
-MASTER_SITE_SUBDIR= tcl8_3
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= tcl
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo
index 7c826f9c8133..f914cacee8b8 100644
--- a/lang/tcl84/distinfo
+++ b/lang/tcl84/distinfo
@@ -1 +1 @@
-MD5 (tcl8.3.3.tar.gz) = e94397490adb2c1c2b1990052b1a92b2
+MD5 (tcl8.3.4.tar.gz) = 8777250e03d6be9be7551bfc6e99d252
diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa
index 1f1185f8f215..0ff89d9eade2 100644
--- a/lang/tcl84/files/patch-aa
+++ b/lang/tcl84/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig Fri Apr 6 20:51:46 2001
-+++ Makefile.in Fri Apr 13 21:12:54 2001
+--- Makefile.in.orig Sat Oct 20 02:24:15 2001
++++ Makefile.in Sat Oct 20 11:21:50 2001
@@ -53,7 +53,9 @@
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
@@ -15,26 +15,29 @@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
--CFLAGS = @CFLAGS@
-+CFLAGS ?= @CFLAGS@
+-CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@
++CFLAGS ?= @CFLAGS@ @CFLAGS_DEFAULT@
- # To disable ANSI-C procedure prototypes reverse the comment characters
- # on the following lines:
-@@ -397,7 +399,7 @@
+ # Flags to pass to the linker
+ LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
+@@ -407,7 +409,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) libtcl${SHORT_TCL_VER}.a tclsh
++binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \
++ libtcl${SHORT_TCL_VER}.a tclsh
libraries:
-@@ -408,8 +410,14 @@
+@@ -418,10 +421,16 @@
${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
rm -f ${TCL_LIB_FILE}
@MAKE_LIB@
+ @ln -sf $(TCL_LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
- $(RANLIB) ${TCL_LIB_FILE}
+ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
+ $(RANLIB) ${TCL_LIB_FILE}; \
+ fi
+libtcl${SHORT_TCL_VER}.a: ${OBJS}
+ rm -f libtcl${SHORT_TCL_VER}.a
@@ -44,21 +47,24 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f ${STUB_LIB_FILE}
@MAKE_STUB_LIB@
-@@ -525,8 +533,13 @@
+@@ -539,10 +548,16 @@
fi
@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
- @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
+ @$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
+ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
- @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
+ @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)
+ @echo "Installing libtcl${SHORT_TCL_VER}.a"
-+ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
++ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \
++ $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a)
+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-@@ -534,8 +547,9 @@
+@@ -550,8 +565,9 @@
fi
@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@@ -69,8 +75,8 @@
+ @$(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_DATA) $(STUB_LIB_FILE) \
-@@ -543,7 +557,8 @@
+ $(INSTALL_LIBRARY) $(STUB_LIB_FILE) \
+@@ -559,7 +575,8 @@
fi
install-libraries: libraries
@@ -80,7 +86,7 @@
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
-@@ -565,11 +580,16 @@
+@@ -581,11 +598,16 @@
chmod +x $(SRC_DIR)/install-sh; \
fi
@echo "Installing header files";
@@ -100,7 +106,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 \
-@@ -627,7 +647,6 @@
+@@ -643,7 +665,6 @@
chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking top-level (.1) docs";
@@ -108,7 +114,7 @@
@echo "Installing C API (.3) docs";
@cd $(TOP_DIR)/doc; for i in *.3; \
do \
-@@ -637,7 +656,6 @@
+@@ -653,7 +674,6 @@
chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking C API (.3) docs";
@@ -116,7 +122,7 @@
@echo "Installing command (.n) docs";
@cd $(TOP_DIR)/doc; for i in *.n; \
do \
-@@ -647,7 +665,14 @@
+@@ -663,7 +683,14 @@
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking command (.n) docs";
diff --git a/lang/tcl84/files/patch-configure b/lang/tcl84/files/patch-configure
index f067b9b47e74..f44c39d0f4e1 100644
--- a/lang/tcl84/files/patch-configure
+++ b/lang/tcl84/files/patch-configure
@@ -1,15 +1,16 @@
---- configure.orig Fri Apr 6 20:51:46 2001
-+++ configure Tue Aug 14 09:25:13 2001
-@@ -5175,8 +5175,11 @@
+--- configure.orig Sat Oct 20 02:24:15 2001
++++ configure Sat Oct 20 10:45:39 2001
+@@ -5391,11 +5391,11 @@
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
- LDFLAGS="-export-dynamic"
+ LDFLAGS=""
LD_SEARCH_FLAGS=""
-+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ # FreeBSD 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'
-+ TCL_LIB_VERSIONS_OK=nodots
+ TCL_LIB_VERSIONS_OK=nodots
;;
Rhapsody-*|Darwin-*)
- SHLIB_CFLAGS="-fno-common"
diff --git a/lang/tcl84/files/patch-tcl.m4 b/lang/tcl84/files/patch-tcl.m4
index b081b46ad2b5..d546861e60d5 100644
--- a/lang/tcl84/files/patch-tcl.m4
+++ b/lang/tcl84/files/patch-tcl.m4
@@ -1,15 +1,16 @@
---- tcl.m4.orig Fri Apr 6 20:51:46 2001
-+++ tcl.m4 Tue Aug 14 09:24:56 2001
-@@ -890,8 +890,11 @@
+--- tcl.m4.orig Sat Oct 20 02:24:15 2001
++++ tcl.m4 Sat Oct 20 10:47:49 2001
+@@ -957,11 +957,11 @@
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
- LDFLAGS="-export-dynamic"
+ LDFLAGS=""
LD_SEARCH_FLAGS=""
-+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ # FreeBSD 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'
-+ TCL_LIB_VERSIONS_OK=nodots
+ TCL_LIB_VERSIONS_OK=nodots
;;
Rhapsody-*|Darwin-*)
- SHLIB_CFLAGS="-fno-common"
diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist
index 2f13a90f30c5..5b5811f50738 100644
--- a/lang/tcl84/pkg-plist
+++ b/lang/tcl84/pkg-plist
@@ -56,6 +56,7 @@ 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
@@ -74,6 +75,11 @@ lib/tcl%%TCL_VER%%/encoding/iso8859-6.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-7.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-8.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-9.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-10.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-13.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-14.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-15.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-16.enc
lib/tcl%%TCL_VER%%/encoding/jis0201.enc
lib/tcl%%TCL_VER%%/encoding/jis0208.enc
lib/tcl%%TCL_VER%%/encoding/jis0212.enc
@@ -94,11 +100,12 @@ lib/tcl%%TCL_VER%%/encoding/macTurkish.enc
lib/tcl%%TCL_VER%%/encoding/macUkraine.enc
lib/tcl%%TCL_VER%%/encoding/shiftjis.enc
lib/tcl%%TCL_VER%%/encoding/symbol.enc
+lib/tcl%%TCL_VER%%/encoding/tis-620.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.3/http.tcl
-lib/tcl%%TCL_VER%%/http2.3/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/http2.4/http.tcl
+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
@@ -118,7 +125,7 @@ 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.1
-@dirrm lib/tcl%%TCL_VER%%/http2.3
+@dirrm lib/tcl%%TCL_VER%%/http2.4
@dirrm lib/tcl%%TCL_VER%%/http1.0
@dirrm lib/tcl%%TCL_VER%%/encoding
@dirrm lib/tcl%%TCL_VER%%