Upgrade to version 8.1.a2.

5 files changed, 22 insertions, 23 deletions

diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index b62815b355ad..f0096cfd46bb 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	tk8.0
-# Version required:	8.1a1
+# Version required:	8.1a2
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.7 1997/12/01 16:50:58 pst Exp $
+# $Id: Makefile,v 1.8 1998/02/16 15:59:56 jseger Exp $
 #
 
-DISTNAME=	tk8.1a1
-PKGNAME=	tk-8.1.a1
+DISTNAME=	tk8.1a2
+PKGNAME=	tk-8.1.a2
 CATEGORIES=	x11 tk81
 MASTER_SITES=	ftp://ftp.sunlabs.com/pub/tcl/
 
diff --git a/x11-toolkits/tk82/distinfo b/x11-toolkits/tk82/distinfo
index f3c9702a5866..eda0f4eb09ff 100644
--- a/x11-toolkits/tk82/distinfo
+++ b/x11-toolkits/tk82/distinfo
@@ -1 +1 @@
-MD5 (tk8.1a1.tar.gz) = ca075a232cb89e0e3cab56fb5b9d943a
+MD5 (tk8.1a2.tar.gz) = eb6fd94eabb8d2f3a2bd64c40a75bf6f
diff --git a/x11-toolkits/tk82/files/patch-aa b/x11-toolkits/tk82/files/patch-aa
index 20acaaba2844..920a23fade54 100644
--- a/x11-toolkits/tk82/files/patch-aa
+++ b/x11-toolkits/tk82/files/patch-aa
@@ -1,10 +1,10 @@
---- configure.orig	Fri Jan 23 11:48:42 1998
-+++ configure	Thu Feb 12 19:46:09 1998
-@@ -662,14 +662,14 @@
- if test -n "$withval"; then
+--- configure.orig	Mon Feb 23 21:11:35 1998
++++ configure	Sun Mar  1 19:43:04 1998
+@@ -871,14 +871,14 @@
+   withval="$with_tcl"
    TCL_BIN_DIR=$withval
  else
--  TCL_BIN_DIR=`cd ../../tcl8.1a1/unix; pwd`
+-  TCL_BIN_DIR=`cd ../../tcl8.1a2/unix; pwd`
 +  TCL_BIN_DIR=${prefix}/lib/tcl8.1
  fi
  
@@ -18,7 +18,7 @@
  fi
  
  #--------------------------------------------------------------------
-@@ -688,6 +688,8 @@
+@@ -897,6 +897,8 @@
  DL_LIBS=$TCL_DL_LIBS
  LD_FLAGS=$TCL_LD_FLAGS
  
@@ -27,7 +27,7 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -2222,6 +2224,7 @@
+@@ -2571,6 +2573,7 @@
  s%@SHLIB_VERSION@%$SHLIB_VERSION%g
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
  s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
diff --git a/x11-toolkits/tk82/files/patch-ab b/x11-toolkits/tk82/files/patch-ab
index eba83e4fb7df..b408a73c7d34 100644
--- a/x11-toolkits/tk82/files/patch-ab
+++ b/x11-toolkits/tk82/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Aug 15 22:17:51 1997
-+++ Makefile.in	Wed Oct  1 10:07:16 1997
+--- Makefile.in.orig	Mon Feb 23 21:11:34 1998
++++ Makefile.in	Sun Mar  1 19:51:58 1998
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -11,7 +11,7 @@
  
  # Top-level directory for manual entries:
  MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-@@ -94,11 +96,11 @@
+@@ -95,11 +97,11 @@
  
  # Libraries to use when linking.  This definition is determined by the
  # configure script.
@@ -25,7 +25,7 @@
  
  # To turn off the security checks that disallow incoming sends when
  # the X server appears to be insecure, reverse the comments on the
-@@ -134,7 +136,7 @@
+@@ -141,7 +143,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -34,7 +34,7 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -290,6 +292,11 @@
+@@ -301,6 +303,11 @@
  	@MAKE_LIB@
  	$(RANLIB) @TK_LIB_FILE@
  
@@ -46,7 +46,7 @@
  # Make target which outputs the list of the .o contained in the Tk lib
  # usefull to build a single big shared library containing Tcl/Tk and other
  # extensions.  used for the Tcl Plugin.  -- dl
-@@ -340,7 +347,7 @@
+@@ -355,7 +362,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -55,7 +55,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -354,13 +361,19 @@
+@@ -369,13 +376,19 @@
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -76,7 +76,7 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -370,8 +383,18 @@
+@@ -385,8 +398,18 @@
  		else true; \
  		fi; \
  	    done;
@@ -94,10 +94,10 @@
 +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
 +	    done;
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
- 	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
+ 	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -430,28 +453,28 @@
+@@ -445,28 +468,28 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/x11-toolkits/tk82/pkg-plist b/x11-toolkits/tk82/pkg-plist
index 3ec371cca989..e16c5da8bde3 100644
--- a/x11-toolkits/tk82/pkg-plist
+++ b/x11-toolkits/tk82/pkg-plist
@@ -109,7 +109,6 @@ lib/tk8.1/msgbox.tcl
 lib/tk8.1/obsolete.tcl
 lib/tk8.1/optMenu.tcl
 lib/tk8.1/palette.tcl
-lib/tk8.1/prolog.ps
 lib/tk8.1/safetk.tcl
 lib/tk8.1/scale.tcl
 lib/tk8.1/scrlbar.tcl