Update tcl/tk to 8.3.3

- Changes in installion of includes, so it keep compaible
  to previous patchlevel
- took maintainership

8 files changed, 44 insertions, 42 deletions

diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index c47fc395e2c3..3de1c8d72a81 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.3.2
+PORTVERSION=	8.3.3
 CATEGORIES=	lang tcl83
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_3
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	jseger@FreeBSD.org
+MAINTAINER=	dirk.meyer@dinoex.sub.org
 
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo
index 1acf7e85a99e..7c826f9c8133 100644
--- a/lang/tcl83/distinfo
+++ b/lang/tcl83/distinfo
@@ -1 +1 @@
-MD5 (tcl8.3.2.tar.gz) = 971d9e22fecc486d3520841aac1ec588
+MD5 (tcl8.3.3.tar.gz) = e94397490adb2c1c2b1990052b1a92b2
diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa
index c3d335611b6c..1f1185f8f215 100644
--- a/lang/tcl83/files/patch-aa
+++ b/lang/tcl83/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Aug  8 12:17:11 2000
-+++ Makefile.in	Sat Feb 24 16:17:52 2001
+--- Makefile.in.orig	Fri Apr  6 20:51:46 2001
++++ Makefile.in	Fri Apr 13 21:12:54 2001
 @@ -53,7 +53,9 @@
  SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
  
@@ -44,7 +44,7 @@
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
-@@ -523,8 +531,13 @@
+@@ -525,8 +533,13 @@
  	    fi
  	@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@@ -58,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) \
-@@ -532,8 +545,9 @@
+@@ -534,8 +547,9 @@
  	    fi
  	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@@ -70,7 +70,7 @@
  	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(TCL_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
-@@ -541,7 +555,8 @@
+@@ -543,7 +557,8 @@
  	    fi
  
  install-libraries: libraries
@@ -80,26 +80,27 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -563,10 +578,16 @@
+@@ -565,11 +580,16 @@
  	    chmod +x $(SRC_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
--	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \
+-	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
+-		$(GENERIC_DIR)/tclPlatDecls.h ; \
 +	@for i in $(GENERIC_DIR)/*.h ; \
-+	    do \
-+	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
-+	    done;
-+	@for i in $(UNIX_DIR)/*.h ; \
  	    do \
 -	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
-+	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
++	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
  	    done;
++	@for i in $(UNIX_DIR)/*.h ; \
++  	    do \
++	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
++ 	    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 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 \
-@@ -607,7 +628,6 @@
+@@ -627,7 +647,6 @@
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking top-level (.1) docs";
@@ -107,7 +108,7 @@
  	@echo "Installing C API (.3) docs";
  	@cd $(TOP_DIR)/doc; for i in *.3; \
  	    do \
-@@ -617,7 +637,6 @@
+@@ -637,7 +656,6 @@
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking C API (.3) docs";
@@ -115,7 +116,7 @@
  	@echo "Installing command (.n) docs";
  	@cd $(TOP_DIR)/doc; for i in *.n; \
  	    do \
-@@ -627,7 +646,14 @@
+@@ -647,7 +665,14 @@
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking command (.n) docs";
diff --git a/lang/tcl83/pkg-plist b/lang/tcl83/pkg-plist
index eef7e02c70e3..f944a28db7d5 100644
--- a/lang/tcl83/pkg-plist
+++ b/lang/tcl83/pkg-plist
@@ -101,8 +101,8 @@ 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
-lib/tcl%%TCL_VER%%/msgcat1.0/msgcat.tcl
-lib/tcl%%TCL_VER%%/msgcat1.0/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/msgcat1.1/msgcat.tcl
+lib/tcl%%TCL_VER%%/msgcat1.1/pkgIndex.tcl
 lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
 lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
 lib/tcl%%TCL_VER%%/package.tcl
@@ -116,7 +116,7 @@ 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%%/msgcat1.1
 @dirrm lib/tcl%%TCL_VER%%/http2.3
 @dirrm lib/tcl%%TCL_VER%%/http1.0
 @dirrm lib/tcl%%TCL_VER%%/encoding
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index c47fc395e2c3..3de1c8d72a81 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.3.2
+PORTVERSION=	8.3.3
 CATEGORIES=	lang tcl83
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_3
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	jseger@FreeBSD.org
+MAINTAINER=	dirk.meyer@dinoex.sub.org
 
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo
index 1acf7e85a99e..7c826f9c8133 100644
--- a/lang/tcl84/distinfo
+++ b/lang/tcl84/distinfo
@@ -1 +1 @@
-MD5 (tcl8.3.2.tar.gz) = 971d9e22fecc486d3520841aac1ec588
+MD5 (tcl8.3.3.tar.gz) = e94397490adb2c1c2b1990052b1a92b2
diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa
index c3d335611b6c..1f1185f8f215 100644
--- a/lang/tcl84/files/patch-aa
+++ b/lang/tcl84/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Aug  8 12:17:11 2000
-+++ Makefile.in	Sat Feb 24 16:17:52 2001
+--- Makefile.in.orig	Fri Apr  6 20:51:46 2001
++++ Makefile.in	Fri Apr 13 21:12:54 2001
 @@ -53,7 +53,9 @@
  SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
  
@@ -44,7 +44,7 @@
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
-@@ -523,8 +531,13 @@
+@@ -525,8 +533,13 @@
  	    fi
  	@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@@ -58,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) \
-@@ -532,8 +545,9 @@
+@@ -534,8 +547,9 @@
  	    fi
  	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@@ -70,7 +70,7 @@
  	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(TCL_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
-@@ -541,7 +555,8 @@
+@@ -543,7 +557,8 @@
  	    fi
  
  install-libraries: libraries
@@ -80,26 +80,27 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -563,10 +578,16 @@
+@@ -565,11 +580,16 @@
  	    chmod +x $(SRC_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
--	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \
+-	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
+-		$(GENERIC_DIR)/tclPlatDecls.h ; \
 +	@for i in $(GENERIC_DIR)/*.h ; \
-+	    do \
-+	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
-+	    done;
-+	@for i in $(UNIX_DIR)/*.h ; \
  	    do \
 -	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
-+	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
++	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
  	    done;
++	@for i in $(UNIX_DIR)/*.h ; \
++  	    do \
++	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
++ 	    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 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 \
-@@ -607,7 +628,6 @@
+@@ -627,7 +647,6 @@
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking top-level (.1) docs";
@@ -107,7 +108,7 @@
  	@echo "Installing C API (.3) docs";
  	@cd $(TOP_DIR)/doc; for i in *.3; \
  	    do \
-@@ -617,7 +637,6 @@
+@@ -637,7 +656,6 @@
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking C API (.3) docs";
@@ -115,7 +116,7 @@
  	@echo "Installing command (.n) docs";
  	@cd $(TOP_DIR)/doc; for i in *.n; \
  	    do \
-@@ -627,7 +646,14 @@
+@@ -647,7 +665,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 eef7e02c70e3..f944a28db7d5 100644
--- a/lang/tcl84/pkg-plist
+++ b/lang/tcl84/pkg-plist
@@ -101,8 +101,8 @@ 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
-lib/tcl%%TCL_VER%%/msgcat1.0/msgcat.tcl
-lib/tcl%%TCL_VER%%/msgcat1.0/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/msgcat1.1/msgcat.tcl
+lib/tcl%%TCL_VER%%/msgcat1.1/pkgIndex.tcl
 lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
 lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
 lib/tcl%%TCL_VER%%/package.tcl
@@ -116,7 +116,7 @@ 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%%/msgcat1.1
 @dirrm lib/tcl%%TCL_VER%%/http2.3
 @dirrm lib/tcl%%TCL_VER%%/http1.0
 @dirrm lib/tcl%%TCL_VER%%/encoding