Upgrade to tcl-8.2.2

4 files changed, 15 insertions, 24 deletions

diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index ee4d27fbc1d5..b95e9cd45fd1 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for:	tcl8.2.0
-# Version required:	8.2.0
+# New ports collection makefile for:	tcl8.2.2
+# Version required:	8.2.2
 # Date created:		19 August 1997
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcl8.2.0
-PKGNAME=	tcl-8.2.0
+DISTNAME=	tcl8.2.2
+PKGNAME=	tcl-8.2.2
 CATEGORIES=	lang tcl82
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
 
diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo
index 6550a1b09da9..0becb14a2b05 100644
--- a/lang/tcl83/distinfo
+++ b/lang/tcl83/distinfo
@@ -1 +1 @@
-MD5 (tcl8.2.0.tar.gz) = acaa5113663ed3fc10b8ae5baf9e904d
+MD5 (tcl8.2.2.tar.gz) = 4b16a1d5f91ae5744d17385a7bf13820
diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa
index 05f24146fb78..347b053cfc41 100644
--- a/lang/tcl83/files/patch-aa
+++ b/lang/tcl83/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Aug 13 18:02:47 1999
-+++ Makefile.in	Sun Sep  5 10:44:32 1999
+--- Makefile.in.orig	Wed Nov  3 21:37:24 1999
++++ Makefile.in	Sun Nov 21 15:31:00 1999
 @@ -48,7 +48,9 @@
  SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
  
@@ -11,16 +11,7 @@
  
  # Top-level directory in which to install manual entries:
  MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
-@@ -65,7 +67,7 @@
- MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann
- 
- # Directory in which to install the include file tcl.h:
--INCLUDE_INSTALL_DIR = @includedir@
-+#INCLUDE_INSTALL_DIR = @includedir@
- 
- # Package search path.
- TCL_PACKAGE_PATH	= @TCL_PACKAGE_PATH@
-@@ -85,7 +87,7 @@
+@@ -82,7 +84,7 @@
  #CFLAGS = 		$(CFLAGS_DEBUG)
  #CFLAGS = 		$(CFLAGS_OPTIMIZE)
  #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -29,7 +20,7 @@
  
  # To disable ANSI-C procedure prototypes reverse the comment characters
  # on the following lines:
-@@ -159,7 +161,7 @@
+@@ -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.
  
@@ -38,7 +29,7 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -386,7 +388,7 @@
+@@ -383,7 +385,7 @@
  
  all: binaries libraries doc
  
@@ -47,7 +38,7 @@
  
  libraries:
  
-@@ -397,8 +399,14 @@
+@@ -394,8 +396,14 @@
  ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
@@ -89,7 +80,7 @@
 @@ -522,8 +536,8 @@
  	    fi
  
- install-libraries:
+ 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) \
diff --git a/lang/tcl83/files/patch-ab b/lang/tcl83/files/patch-ab
index d3d9bb55b69f..6cda56a21351 100644
--- a/lang/tcl83/files/patch-ab
+++ b/lang/tcl83/files/patch-ab
@@ -1,5 +1,5 @@
---- configure.orig	Fri Aug 13 18:02:47 1999
-+++ configure	Sat Sep  4 13:15:50 1999
+--- configure.orig	Wed Nov  3 21:37:24 1999
++++ configure	Sun Nov 21 15:34:05 1999
 @@ -4648,7 +4648,7 @@
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
@@ -13,7 +13,7 @@
  	    LDFLAGS="-Wl,-Bexport"
  	    LD_SEARCH_FLAGS=""
  	    ;;
--	NetBSD-*|FreeBSD-[12].*|OpenBSD-*)
+-	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
 +	NetBSD-*|FreeBSD-*|OpenBSD-*)
  	    # Not available on all versions:  check for include file.
  	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`