Upgrade to tcl and tk 8.1.

Move NO_LATEST_LINK from tcl81 and tk81 to tcl80 and tk80.

Submitted by:	YAZAKI Hiroyuki <yazaki@nn.iij4u.or.jp>

16 files changed, 179 insertions, 133 deletions

diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index d29b9f6e9516..11c16957f47b 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.18 1999/04/30 16:11:48 cwt Exp $
+# $Id: Makefile,v 1.19 1999/05/04 19:33:48 fenner Exp $
 #
 
 DISTNAME=	tk8.0.5
@@ -15,6 +15,7 @@ MAINTAINER=	cwt@Freebsd.ORG
 
 LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
 
+NO_LATEST_LINK=	yes
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/tk8.0.5/unix
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index b42fbd864757..872bcf1aa13a 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	tk8.1
-# Version required:	8.1a2
+# Version required:	8.1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1999/05/04 20:50:08 fenner Exp $
+# $Id: Makefile,v 1.24 1999/05/04 21:03:55 fenner Exp $
 #
 
-DISTNAME=	tk8.1b1
-PKGNAME=	tk-8.1.b1
+DISTNAME=	tk8.1
+PKGNAME=	tk-8.1
 CATEGORIES=	x11-toolkits tk81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
@@ -17,7 +17,6 @@ LIB_DEPENDS=	tcl81.1:${PORTSDIR}/lang/tcl81
 FILE_DEPENDS=	${PORTSDIR}/x11-toolkits/tk80
 
 USE_XLIB=	yes
-NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -38,9 +37,9 @@ MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
 	MapWindow.3 MeasureChar.3 MoveToplev.3 Name.3 NameOfImg.3 OwnSelect.3 \
 	ParseArgv.3 QWinEvent.3 Restack.3 RestrictEv.3 SetAppName.3 \
 	SetClass.3 SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 \
-	TextLayout.3 Tk_Init.3 Tk_Main.3 WindowId.3
+	TextLayout.3 Tk_Init.3 Tk_InitStubs.3 Tk_Main.3 WindowId.3
 MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
-	chooseColor.n clipboard.n dde.n destroy.n dialog.n entry.n event.n \
+	chooseColor.n clipboard.n destroy.n dialog.n entry.n event.n \
 	focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n \
 	image.n label.n listbox.n loadTk.n lower.n menu.n menubar.n \
 	menubutton.n message.n messageBox.n option.n optionMenu.n options.n \
@@ -293,6 +292,9 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
+post-extract:   
+	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
+	      ${WRKDIR}/${DISTNAME}/doc/Tk_InitStubs.3
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
diff --git a/x11-toolkits/tk82/distinfo b/x11-toolkits/tk82/distinfo
index c57202986b5e..6a4643902080 100644
--- a/x11-toolkits/tk82/distinfo
+++ b/x11-toolkits/tk82/distinfo
@@ -1 +1 @@
-MD5 (tk8.1b1.tar.gz) = 13164e3d3c5918315988615523f43e56
+MD5 (tk8.1.tar.gz) = 4447b2e0ad596c139df928aabe83e551
diff --git a/x11-toolkits/tk82/files/patch-aa b/x11-toolkits/tk82/files/patch-aa
index f858d13c6249..66ed07aecf62 100644
--- a/x11-toolkits/tk82/files/patch-aa
+++ b/x11-toolkits/tk82/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Fri Dec 11 17:38:40 1998
-+++ configure	Sun Jan 24 16:12:10 1999
-@@ -854,14 +854,14 @@
+--- configure.orig	Fri Apr 30 08:27:45 1999
++++ configure	Mon May 10 00:20:26 1999
+@@ -956,14 +956,14 @@
    withval="$with_tcl"
    TCL_BIN_DIR=$withval
  else
@@ -18,7 +18,7 @@
  fi
  
  #--------------------------------------------------------------------
-@@ -902,6 +902,8 @@
+@@ -1004,6 +1004,8 @@
  CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
  EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
  
@@ -27,18 +27,18 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -2302,7 +2304,7 @@
+@@ -2450,7 +2452,7 @@
  if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
      TK_SHARED_BUILD=1
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
 -    TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
 +    TK_LIB_FILE=${TK_LIB_FILE}
-     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_BUILD_STUB_LIB_SPEC} \${LIBS}"
      RANLIB=":"
- else
-@@ -2513,6 +2515,7 @@
- s%@SHLIB_VERSION@%$SHLIB_VERSION%g
+ 
+@@ -2729,6 +2731,7 @@
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
+ s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g
  s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
 +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
  s%@TCL_DBGX@%$TCL_DBGX%g
diff --git a/x11-toolkits/tk82/files/patch-ab b/x11-toolkits/tk82/files/patch-ab
index 51b05794bf3a..d907e5809b46 100644
--- a/x11-toolkits/tk82/files/patch-ab
+++ b/x11-toolkits/tk82/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Dec 11 17:38:40 1998
-+++ Makefile.in	Sun Jan 24 16:16:06 1999
+--- Makefile.in.orig	Fri Apr 30 08:27:45 1999
++++ Makefile.in	Mon May 10 01:18:32 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -20,16 +20,7 @@
  
  # A "-I" switch that can be used when compiling to make all of the
  # X11 include files accessible (the configure script will try to
-@@ -113,7 +115,7 @@
- 
- # Libraries to use when linking.  This definition is determined by the
- # configure script.
--LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
-+LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
- 
- # To turn off the security checks that disallow incoming sends when
- # the X server appears to be insecure, reverse the comments on the
-@@ -155,7 +157,7 @@
+@@ -152,7 +154,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,16 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -320,8 +322,14 @@
+@@ -188,7 +190,7 @@
+ # Libraries to use when linking.  This definition is determined by the
+ # configure script.
+ LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+-WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
++WISH_LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+ 
+ # The symbol below provides support for dynamic loading and shared
+ # libraries.  See configure.in for a description of what it means.
+@@ -348,8 +350,14 @@
  ${TK_LIB_FILE}: ${OBJS}
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
@@ -50,19 +50,20 @@
 +	ar cr libtk81.a ${OBJS}
 +	$(RANLIB) libtk81.a
 +
- # 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
-@@ -376,7 +384,7 @@
+ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ 	rm -f ${STUB_LIB_FILE}
+ 	@MAKE_STUB_LIB@
+@@ -410,7 +418,8 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
--install-binaries: $(TK_LIB_FILE) wish
-+install-binaries: $(TK_LIB_FILE) libtk81.a wish
+-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
++		libtk81.a wish
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -388,15 +396,22 @@
+@@ -422,12 +431,18 @@
  	    done;
  	@echo "Installing $(TK_LIB_FILE)"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -79,6 +80,10 @@
 -	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
 +	@mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
 +	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
+ 	@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
+ 	    echo "Installing $(TK_EXP_FILE)"; \
+ 	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
+@@ -441,6 +456,7 @@
  
  install-libraries:
  	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -86,12 +91,11 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -406,8 +421,18 @@
+@@ -450,11 +466,19 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing tk.h"
--	@$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
+-	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
 +	@echo "Installing headers"
 +	@for i in $(GENERIC_DIR)/*.h ; \
 +	    do \
@@ -99,15 +103,17 @@
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
 +	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
-+	    do \
-+	    echo "Installing $$i"; \
+ 	    do \
+ 	    echo "Installing $$i"; \
+-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
-+	    done;
+ 	    done;
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
++	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -466,30 +491,27 @@
+@@ -513,30 +537,27 @@
  	@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 18dc742aa134..d66214bbe293 100644
--- a/x11-toolkits/tk82/pkg-plist
+++ b/x11-toolkits/tk82/pkg-plist
@@ -6,24 +6,31 @@ include/tk8.1/generic/tk3d.h
 include/tk8.1/generic/tkButton.h
 include/tk8.1/generic/tkCanvas.h
 include/tk8.1/generic/tkColor.h
+include/tk8.1/generic/tkDecls.h
 include/tk8.1/generic/tkFileFilter.h
 include/tk8.1/generic/tkFont.h
 include/tk8.1/generic/tkInitScript.h
 include/tk8.1/generic/tkInt.h
+include/tk8.1/generic/tkIntDecls.h
+include/tk8.1/generic/tkIntPlatDecls.h
+include/tk8.1/generic/tkIntXlibDecls.h
 include/tk8.1/generic/tkMenu.h
 include/tk8.1/generic/tkMenubutton.h
+include/tk8.1/generic/tkPlatDecls.h
 include/tk8.1/generic/tkPort.h
 include/tk8.1/generic/tkScale.h
 include/tk8.1/generic/tkScrollbar.h
 include/tk8.1/generic/tkSelect.h
 include/tk8.1/generic/tkText.h
 include/tk8.1/tk.h
+include/tk8.1/tkDecls.h
 include/tk8.1/unix/tkUnixDefault.h
 include/tk8.1/unix/tkUnixInt.h
 include/tk8.1/unix/tkUnixPort.h
 lib/libtk81.a
 lib/libtk81.so
 lib/libtk81.so.1
+lib/libtkstub81.a
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/tk8.1/bgerror.tcl
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index b42fbd864757..872bcf1aa13a 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	tk8.1
-# Version required:	8.1a2
+# Version required:	8.1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1999/05/04 20:50:08 fenner Exp $
+# $Id: Makefile,v 1.24 1999/05/04 21:03:55 fenner Exp $
 #
 
-DISTNAME=	tk8.1b1
-PKGNAME=	tk-8.1.b1
+DISTNAME=	tk8.1
+PKGNAME=	tk-8.1
 CATEGORIES=	x11-toolkits tk81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
@@ -17,7 +17,6 @@ LIB_DEPENDS=	tcl81.1:${PORTSDIR}/lang/tcl81
 FILE_DEPENDS=	${PORTSDIR}/x11-toolkits/tk80
 
 USE_XLIB=	yes
-NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -38,9 +37,9 @@ MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
 	MapWindow.3 MeasureChar.3 MoveToplev.3 Name.3 NameOfImg.3 OwnSelect.3 \
 	ParseArgv.3 QWinEvent.3 Restack.3 RestrictEv.3 SetAppName.3 \
 	SetClass.3 SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 \
-	TextLayout.3 Tk_Init.3 Tk_Main.3 WindowId.3
+	TextLayout.3 Tk_Init.3 Tk_InitStubs.3 Tk_Main.3 WindowId.3
 MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
-	chooseColor.n clipboard.n dde.n destroy.n dialog.n entry.n event.n \
+	chooseColor.n clipboard.n destroy.n dialog.n entry.n event.n \
 	focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n \
 	image.n label.n listbox.n loadTk.n lower.n menu.n menubar.n \
 	menubutton.n message.n messageBox.n option.n optionMenu.n options.n \
@@ -293,6 +292,9 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
+post-extract:   
+	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
+	      ${WRKDIR}/${DISTNAME}/doc/Tk_InitStubs.3
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
diff --git a/x11-toolkits/tk83/distinfo b/x11-toolkits/tk83/distinfo
index c57202986b5e..6a4643902080 100644
--- a/x11-toolkits/tk83/distinfo
+++ b/x11-toolkits/tk83/distinfo
@@ -1 +1 @@
-MD5 (tk8.1b1.tar.gz) = 13164e3d3c5918315988615523f43e56
+MD5 (tk8.1.tar.gz) = 4447b2e0ad596c139df928aabe83e551
diff --git a/x11-toolkits/tk83/files/patch-aa b/x11-toolkits/tk83/files/patch-aa
index f858d13c6249..66ed07aecf62 100644
--- a/x11-toolkits/tk83/files/patch-aa
+++ b/x11-toolkits/tk83/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Fri Dec 11 17:38:40 1998
-+++ configure	Sun Jan 24 16:12:10 1999
-@@ -854,14 +854,14 @@
+--- configure.orig	Fri Apr 30 08:27:45 1999
++++ configure	Mon May 10 00:20:26 1999
+@@ -956,14 +956,14 @@
    withval="$with_tcl"
    TCL_BIN_DIR=$withval
  else
@@ -18,7 +18,7 @@
  fi
  
  #--------------------------------------------------------------------
-@@ -902,6 +902,8 @@
+@@ -1004,6 +1004,8 @@
  CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
  EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
  
@@ -27,18 +27,18 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -2302,7 +2304,7 @@
+@@ -2450,7 +2452,7 @@
  if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
      TK_SHARED_BUILD=1
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
 -    TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
 +    TK_LIB_FILE=${TK_LIB_FILE}
-     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_BUILD_STUB_LIB_SPEC} \${LIBS}"
      RANLIB=":"
- else
-@@ -2513,6 +2515,7 @@
- s%@SHLIB_VERSION@%$SHLIB_VERSION%g
+ 
+@@ -2729,6 +2731,7 @@
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
+ s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g
  s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
 +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
  s%@TCL_DBGX@%$TCL_DBGX%g
diff --git a/x11-toolkits/tk83/files/patch-ab b/x11-toolkits/tk83/files/patch-ab
index 51b05794bf3a..d907e5809b46 100644
--- a/x11-toolkits/tk83/files/patch-ab
+++ b/x11-toolkits/tk83/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Dec 11 17:38:40 1998
-+++ Makefile.in	Sun Jan 24 16:16:06 1999
+--- Makefile.in.orig	Fri Apr 30 08:27:45 1999
++++ Makefile.in	Mon May 10 01:18:32 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -20,16 +20,7 @@
  
  # A "-I" switch that can be used when compiling to make all of the
  # X11 include files accessible (the configure script will try to
-@@ -113,7 +115,7 @@
- 
- # Libraries to use when linking.  This definition is determined by the
- # configure script.
--LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
-+LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
- 
- # To turn off the security checks that disallow incoming sends when
- # the X server appears to be insecure, reverse the comments on the
-@@ -155,7 +157,7 @@
+@@ -152,7 +154,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,16 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -320,8 +322,14 @@
+@@ -188,7 +190,7 @@
+ # Libraries to use when linking.  This definition is determined by the
+ # configure script.
+ LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+-WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
++WISH_LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+ 
+ # The symbol below provides support for dynamic loading and shared
+ # libraries.  See configure.in for a description of what it means.
+@@ -348,8 +350,14 @@
  ${TK_LIB_FILE}: ${OBJS}
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
@@ -50,19 +50,20 @@
 +	ar cr libtk81.a ${OBJS}
 +	$(RANLIB) libtk81.a
 +
- # 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
-@@ -376,7 +384,7 @@
+ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ 	rm -f ${STUB_LIB_FILE}
+ 	@MAKE_STUB_LIB@
+@@ -410,7 +418,8 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
--install-binaries: $(TK_LIB_FILE) wish
-+install-binaries: $(TK_LIB_FILE) libtk81.a wish
+-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
++		libtk81.a wish
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -388,15 +396,22 @@
+@@ -422,12 +431,18 @@
  	    done;
  	@echo "Installing $(TK_LIB_FILE)"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -79,6 +80,10 @@
 -	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
 +	@mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
 +	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
+ 	@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
+ 	    echo "Installing $(TK_EXP_FILE)"; \
+ 	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
+@@ -441,6 +456,7 @@
  
  install-libraries:
  	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -86,12 +91,11 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -406,8 +421,18 @@
+@@ -450,11 +466,19 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing tk.h"
--	@$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
+-	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
 +	@echo "Installing headers"
 +	@for i in $(GENERIC_DIR)/*.h ; \
 +	    do \
@@ -99,15 +103,17 @@
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
 +	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
-+	    do \
-+	    echo "Installing $$i"; \
+ 	    do \
+ 	    echo "Installing $$i"; \
+-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
-+	    done;
+ 	    done;
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
++	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -466,30 +491,27 @@
+@@ -513,30 +537,27 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/x11-toolkits/tk83/pkg-plist b/x11-toolkits/tk83/pkg-plist
index 18dc742aa134..d66214bbe293 100644
--- a/x11-toolkits/tk83/pkg-plist
+++ b/x11-toolkits/tk83/pkg-plist
@@ -6,24 +6,31 @@ include/tk8.1/generic/tk3d.h
 include/tk8.1/generic/tkButton.h
 include/tk8.1/generic/tkCanvas.h
 include/tk8.1/generic/tkColor.h
+include/tk8.1/generic/tkDecls.h
 include/tk8.1/generic/tkFileFilter.h
 include/tk8.1/generic/tkFont.h
 include/tk8.1/generic/tkInitScript.h
 include/tk8.1/generic/tkInt.h
+include/tk8.1/generic/tkIntDecls.h
+include/tk8.1/generic/tkIntPlatDecls.h
+include/tk8.1/generic/tkIntXlibDecls.h
 include/tk8.1/generic/tkMenu.h
 include/tk8.1/generic/tkMenubutton.h
+include/tk8.1/generic/tkPlatDecls.h
 include/tk8.1/generic/tkPort.h
 include/tk8.1/generic/tkScale.h
 include/tk8.1/generic/tkScrollbar.h
 include/tk8.1/generic/tkSelect.h
 include/tk8.1/generic/tkText.h
 include/tk8.1/tk.h
+include/tk8.1/tkDecls.h
 include/tk8.1/unix/tkUnixDefault.h
 include/tk8.1/unix/tkUnixInt.h
 include/tk8.1/unix/tkUnixPort.h
 lib/libtk81.a
 lib/libtk81.so
 lib/libtk81.so.1
+lib/libtkstub81.a
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/tk8.1/bgerror.tcl
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index b42fbd864757..872bcf1aa13a 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	tk8.1
-# Version required:	8.1a2
+# Version required:	8.1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1999/05/04 20:50:08 fenner Exp $
+# $Id: Makefile,v 1.24 1999/05/04 21:03:55 fenner Exp $
 #
 
-DISTNAME=	tk8.1b1
-PKGNAME=	tk-8.1.b1
+DISTNAME=	tk8.1
+PKGNAME=	tk-8.1
 CATEGORIES=	x11-toolkits tk81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
@@ -17,7 +17,6 @@ LIB_DEPENDS=	tcl81.1:${PORTSDIR}/lang/tcl81
 FILE_DEPENDS=	${PORTSDIR}/x11-toolkits/tk80
 
 USE_XLIB=	yes
-NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -38,9 +37,9 @@ MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
 	MapWindow.3 MeasureChar.3 MoveToplev.3 Name.3 NameOfImg.3 OwnSelect.3 \
 	ParseArgv.3 QWinEvent.3 Restack.3 RestrictEv.3 SetAppName.3 \
 	SetClass.3 SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 \
-	TextLayout.3 Tk_Init.3 Tk_Main.3 WindowId.3
+	TextLayout.3 Tk_Init.3 Tk_InitStubs.3 Tk_Main.3 WindowId.3
 MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
-	chooseColor.n clipboard.n dde.n destroy.n dialog.n entry.n event.n \
+	chooseColor.n clipboard.n destroy.n dialog.n entry.n event.n \
 	focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n \
 	image.n label.n listbox.n loadTk.n lower.n menu.n menubar.n \
 	menubutton.n message.n messageBox.n option.n optionMenu.n options.n \
@@ -293,6 +292,9 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
+post-extract:   
+	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
+	      ${WRKDIR}/${DISTNAME}/doc/Tk_InitStubs.3
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo
index c57202986b5e..6a4643902080 100644
--- a/x11-toolkits/tk84/distinfo
+++ b/x11-toolkits/tk84/distinfo
@@ -1 +1 @@
-MD5 (tk8.1b1.tar.gz) = 13164e3d3c5918315988615523f43e56
+MD5 (tk8.1.tar.gz) = 4447b2e0ad596c139df928aabe83e551
diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa
index f858d13c6249..66ed07aecf62 100644
--- a/x11-toolkits/tk84/files/patch-aa
+++ b/x11-toolkits/tk84/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Fri Dec 11 17:38:40 1998
-+++ configure	Sun Jan 24 16:12:10 1999
-@@ -854,14 +854,14 @@
+--- configure.orig	Fri Apr 30 08:27:45 1999
++++ configure	Mon May 10 00:20:26 1999
+@@ -956,14 +956,14 @@
    withval="$with_tcl"
    TCL_BIN_DIR=$withval
  else
@@ -18,7 +18,7 @@
  fi
  
  #--------------------------------------------------------------------
-@@ -902,6 +902,8 @@
+@@ -1004,6 +1004,8 @@
  CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
  EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
  
@@ -27,18 +27,18 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -2302,7 +2304,7 @@
+@@ -2450,7 +2452,7 @@
  if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
      TK_SHARED_BUILD=1
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
 -    TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
 +    TK_LIB_FILE=${TK_LIB_FILE}
-     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_BUILD_STUB_LIB_SPEC} \${LIBS}"
      RANLIB=":"
- else
-@@ -2513,6 +2515,7 @@
- s%@SHLIB_VERSION@%$SHLIB_VERSION%g
+ 
+@@ -2729,6 +2731,7 @@
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
+ s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g
  s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
 +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
  s%@TCL_DBGX@%$TCL_DBGX%g
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab
index 51b05794bf3a..d907e5809b46 100644
--- a/x11-toolkits/tk84/files/patch-ab
+++ b/x11-toolkits/tk84/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Dec 11 17:38:40 1998
-+++ Makefile.in	Sun Jan 24 16:16:06 1999
+--- Makefile.in.orig	Fri Apr 30 08:27:45 1999
++++ Makefile.in	Mon May 10 01:18:32 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -20,16 +20,7 @@
  
  # A "-I" switch that can be used when compiling to make all of the
  # X11 include files accessible (the configure script will try to
-@@ -113,7 +115,7 @@
- 
- # Libraries to use when linking.  This definition is determined by the
- # configure script.
--LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
-+LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
- 
- # To turn off the security checks that disallow incoming sends when
- # the X server appears to be insecure, reverse the comments on the
-@@ -155,7 +157,7 @@
+@@ -152,7 +154,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,16 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -320,8 +322,14 @@
+@@ -188,7 +190,7 @@
+ # Libraries to use when linking.  This definition is determined by the
+ # configure script.
+ LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+-WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
++WISH_LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+ 
+ # The symbol below provides support for dynamic loading and shared
+ # libraries.  See configure.in for a description of what it means.
+@@ -348,8 +350,14 @@
  ${TK_LIB_FILE}: ${OBJS}
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
@@ -50,19 +50,20 @@
 +	ar cr libtk81.a ${OBJS}
 +	$(RANLIB) libtk81.a
 +
- # 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
-@@ -376,7 +384,7 @@
+ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ 	rm -f ${STUB_LIB_FILE}
+ 	@MAKE_STUB_LIB@
+@@ -410,7 +418,8 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
--install-binaries: $(TK_LIB_FILE) wish
-+install-binaries: $(TK_LIB_FILE) libtk81.a wish
+-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
++		libtk81.a wish
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -388,15 +396,22 @@
+@@ -422,12 +431,18 @@
  	    done;
  	@echo "Installing $(TK_LIB_FILE)"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -79,6 +80,10 @@
 -	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
 +	@mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
 +	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
+ 	@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
+ 	    echo "Installing $(TK_EXP_FILE)"; \
+ 	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
+@@ -441,6 +456,7 @@
  
  install-libraries:
  	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -86,12 +91,11 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -406,8 +421,18 @@
+@@ -450,11 +466,19 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing tk.h"
--	@$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
+-	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
 +	@echo "Installing headers"
 +	@for i in $(GENERIC_DIR)/*.h ; \
 +	    do \
@@ -99,15 +103,17 @@
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
 +	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
-+	    do \
-+	    echo "Installing $$i"; \
+ 	    do \
+ 	    echo "Installing $$i"; \
+-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
-+	    done;
+ 	    done;
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
++	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -466,30 +491,27 @@
+@@ -513,30 +537,27 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/x11-toolkits/tk84/pkg-plist b/x11-toolkits/tk84/pkg-plist
index 18dc742aa134..d66214bbe293 100644
--- a/x11-toolkits/tk84/pkg-plist
+++ b/x11-toolkits/tk84/pkg-plist
@@ -6,24 +6,31 @@ include/tk8.1/generic/tk3d.h
 include/tk8.1/generic/tkButton.h
 include/tk8.1/generic/tkCanvas.h
 include/tk8.1/generic/tkColor.h
+include/tk8.1/generic/tkDecls.h
 include/tk8.1/generic/tkFileFilter.h
 include/tk8.1/generic/tkFont.h
 include/tk8.1/generic/tkInitScript.h
 include/tk8.1/generic/tkInt.h
+include/tk8.1/generic/tkIntDecls.h
+include/tk8.1/generic/tkIntPlatDecls.h
+include/tk8.1/generic/tkIntXlibDecls.h
 include/tk8.1/generic/tkMenu.h
 include/tk8.1/generic/tkMenubutton.h
+include/tk8.1/generic/tkPlatDecls.h
 include/tk8.1/generic/tkPort.h
 include/tk8.1/generic/tkScale.h
 include/tk8.1/generic/tkScrollbar.h
 include/tk8.1/generic/tkSelect.h
 include/tk8.1/generic/tkText.h
 include/tk8.1/tk.h
+include/tk8.1/tkDecls.h
 include/tk8.1/unix/tkUnixDefault.h
 include/tk8.1/unix/tkUnixInt.h
 include/tk8.1/unix/tkUnixPort.h
 lib/libtk81.a
 lib/libtk81.so
 lib/libtk81.so.1
+lib/libtkstub81.a
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/tk8.1/bgerror.tcl