Upgrade repository copy of tk 8.0 to version 8.1

5 files changed, 168 insertions, 164 deletions

diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index cdf9ea574ae5..b62815b355ad 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	tk8.0
-# Version required:	tk8.0
+# Version required:	8.1a1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.6 1997/11/26 22:49:14 pst Exp $
+# $Id: Makefile,v 1.7 1997/12/01 16:50:58 pst Exp $
 #
 
-DISTNAME=	tk8.0p2
-PKGNAME=	tk-8.0.2
-CATEGORIES=	x11 tk80
+DISTNAME=	tk8.1a1
+PKGNAME=	tk-8.1.a1
+CATEGORIES=	x11 tk81
 MASTER_SITES=	ftp://ftp.sunlabs.com/pub/tcl/
 
-MAINTAINER=	jkh@Freebsd.ORG
+MAINTAINER=	jseger@FreeBSD.ORG
 
-LIB_DEPENDS=	tcl80\\.1\\.2:${PORTSDIR}/lang/tcl80
+LIB_DEPENDS=	tcl81\\.1\\.0:${PORTSDIR}/lang/tcl81
 
-WRKSRC=		${WRKDIR}/tk8.0/unix
+WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
diff --git a/x11-toolkits/tk82/distinfo b/x11-toolkits/tk82/distinfo
index 0d97a37fdeaa..f3c9702a5866 100644
--- a/x11-toolkits/tk82/distinfo
+++ b/x11-toolkits/tk82/distinfo
@@ -1 +1 @@
-MD5 (tk8.0p2.tar.gz) = e7711ce7e584bf1c0388cdbb86ffe7cc
+MD5 (tk8.1a1.tar.gz) = ca075a232cb89e0e3cab56fb5b9d943a
diff --git a/x11-toolkits/tk82/files/patch-aa b/x11-toolkits/tk82/files/patch-aa
index c39f29c64f77..20acaaba2844 100644
--- a/x11-toolkits/tk82/files/patch-aa
+++ b/x11-toolkits/tk82/files/patch-aa
@@ -1,11 +1,11 @@
---- configure.orig	Fri Aug 15 22:17:52 1997
-+++ configure	Wed Oct  1 10:50:54 1997
+--- 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
    TCL_BIN_DIR=$withval
  else
--  TCL_BIN_DIR=`cd ../../tcl8.0/unix; pwd`
-+  TCL_BIN_DIR=${prefix}/lib/tcl8.0
+-  TCL_BIN_DIR=`cd ../../tcl8.1a1/unix; pwd`
++  TCL_BIN_DIR=${prefix}/lib/tcl8.1
  fi
  
  if test ! -d $TCL_BIN_DIR; then
@@ -27,7 +27,7 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -2271,6 +2273,7 @@
+@@ -2222,6 +2224,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 feae30fefebc..eba83e4fb7df 100644
--- a/x11-toolkits/tk82/files/patch-ab
+++ b/x11-toolkits/tk82/files/patch-ab
@@ -16,7 +16,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 -ltcl80 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
++LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
  
  # To change the compiler switches, for example to change from -O
  # to -g, change the following line:
@@ -38,10 +38,10 @@
  	@MAKE_LIB@
  	$(RANLIB) @TK_LIB_FILE@
  
-+libtk80.a: ${OBJS}
-+	rm -f libtk80.a
-+	ar cr libtk80.a ${OBJS}
-+	$(RANLIB) libtk80.a
++libtk81.a: ${OBJS}
++	rm -f libtk81.a
++	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
@@ -51,7 +51,7 @@
  # possible (e.g. if installing as root).
  
 -install-binaries: $(TK_LIB_FILE) wish
-+install-binaries: $(TK_LIB_FILE) libtk80.a wish
++install-binaries: $(TK_LIB_FILE) libtk81.a wish
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
@@ -59,10 +59,10 @@
  	@$(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)
-+	@echo "Installing libtk80.a"
-+	@$(INSTALL_DATA) libtk80.a $(LIB_INSTALL_DIR)/libtk80.a
-+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk80.a)
-+	@chmod 555 $(LIB_INSTALL_DIR)/libtk80.a
++	@echo "Installing libtk81.a"
++	@$(INSTALL_DATA) libtk81.a $(LIB_INSTALL_DIR)/libtk81.a
++	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk81.a)
++	@chmod 555 $(LIB_INSTALL_DIR)/libtk81.a
  	@echo "Installing wish"
  	@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
  	@echo "Installing tkConfig.sh"
diff --git a/x11-toolkits/tk82/pkg-plist b/x11-toolkits/tk82/pkg-plist
index 81920bf1749c..3ec371cca989 100644
--- a/x11-toolkits/tk82/pkg-plist
+++ b/x11-toolkits/tk82/pkg-plist
@@ -1,33 +1,127 @@
-bin/wish8.0
-include/tk8.0/tk.h
-include/tk8.0/unix/tkUnixDefault.h
-include/tk8.0/unix/tkUnixInt.h
-include/tk8.0/unix/tkUnixPort.h
-include/tk8.0/generic/default.h
-include/tk8.0/generic/ks_names.h
-include/tk8.0/generic/tk.h
-include/tk8.0/generic/tk3d.h
-include/tk8.0/generic/tkButton.h
-include/tk8.0/generic/tkCanvas.h
-include/tk8.0/generic/tkColor.h
-include/tk8.0/generic/tkFileFilter.h
-include/tk8.0/generic/tkFont.h
-include/tk8.0/generic/tkInitScript.h
-include/tk8.0/generic/tkInt.h
-include/tk8.0/generic/tkMenu.h
-include/tk8.0/generic/tkMenubutton.h
-include/tk8.0/generic/tkPort.h
-include/tk8.0/generic/tkScale.h
-include/tk8.0/generic/tkScrollbar.h
-include/tk8.0/generic/tkSelect.h
-include/tk8.0/generic/tkText.h
+bin/wish8.1
+include/tk8.1/generic/default.h
+include/tk8.1/generic/ks_names.h
+include/tk8.1/generic/tk.h
+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/tkFileFilter.h
+include/tk8.1/generic/tkFont.h
+include/tk8.1/generic/tkInitScript.h
+include/tk8.1/generic/tkInt.h
+include/tk8.1/generic/tkMenu.h
+include/tk8.1/generic/tkMenubutton.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/unix/tkUnixDefault.h
+include/tk8.1/unix/tkUnixInt.h
+include/tk8.1/unix/tkUnixPort.h
+lib/libtk81.a
+lib/libtk81.so.1.0
+@exec /sbin/ldconfig -m %B
+lib/tk8.1/bgerror.tcl
+lib/tk8.1/button.tcl
+lib/tk8.1/clrpick.tcl
+lib/tk8.1/comdlg.tcl
+lib/tk8.1/console.tcl
+lib/tk8.1/demos/README
+lib/tk8.1/demos/arrow.tcl
+lib/tk8.1/demos/bind.tcl
+lib/tk8.1/demos/bitmap.tcl
+lib/tk8.1/demos/browse
+lib/tk8.1/demos/button.tcl
+lib/tk8.1/demos/check.tcl
+lib/tk8.1/demos/clrpick.tcl
+lib/tk8.1/demos/colors.tcl
+lib/tk8.1/demos/cscroll.tcl
+lib/tk8.1/demos/ctext.tcl
+lib/tk8.1/demos/dialog1.tcl
+lib/tk8.1/demos/dialog2.tcl
+lib/tk8.1/demos/entry1.tcl
+lib/tk8.1/demos/entry2.tcl
+lib/tk8.1/demos/filebox.tcl
+lib/tk8.1/demos/floor.tcl
+lib/tk8.1/demos/form.tcl
+lib/tk8.1/demos/hello
+lib/tk8.1/demos/hscale.tcl
+lib/tk8.1/demos/icon.tcl
+lib/tk8.1/demos/image1.tcl
+lib/tk8.1/demos/image2.tcl
+lib/tk8.1/demos/images/earth.gif
+lib/tk8.1/demos/images/earthris.gif
+lib/tk8.1/demos/images/face.bmp
+lib/tk8.1/demos/images/flagdown.bmp
+lib/tk8.1/demos/images/flagup.bmp
+lib/tk8.1/demos/images/gray25.bmp
+lib/tk8.1/demos/images/letters.bmp
+lib/tk8.1/demos/images/noletter.bmp
+lib/tk8.1/demos/images/pattern.bmp
+lib/tk8.1/demos/images/tcllogo.gif
+lib/tk8.1/demos/images/teapot.ppm
+lib/tk8.1/demos/items.tcl
+lib/tk8.1/demos/ixset
+lib/tk8.1/demos/label.tcl
+lib/tk8.1/demos/license.terms
+lib/tk8.1/demos/menu.tcl
+lib/tk8.1/demos/menubu.tcl
+lib/tk8.1/demos/msgbox.tcl
+lib/tk8.1/demos/plot.tcl
+lib/tk8.1/demos/puzzle.tcl
+lib/tk8.1/demos/radio.tcl
+lib/tk8.1/demos/rmt
+lib/tk8.1/demos/rolodex
+lib/tk8.1/demos/ruler.tcl
+lib/tk8.1/demos/sayings.tcl
+lib/tk8.1/demos/search.tcl
+lib/tk8.1/demos/square
+lib/tk8.1/demos/states.tcl
+lib/tk8.1/demos/style.tcl
+lib/tk8.1/demos/tclIndex
+lib/tk8.1/demos/tcolor
+lib/tk8.1/demos/text.tcl
+lib/tk8.1/demos/timer
+lib/tk8.1/demos/twind.tcl
+lib/tk8.1/demos/vscale.tcl
+lib/tk8.1/demos/widget
+lib/tk8.1/dialog.tcl
+lib/tk8.1/entry.tcl
+lib/tk8.1/focus.tcl
+lib/tk8.1/images/README
+lib/tk8.1/images/logo.eps
+lib/tk8.1/images/logo100.gif
+lib/tk8.1/images/logo64.gif
+lib/tk8.1/images/logoLarge.gif
+lib/tk8.1/images/logoMed.gif
+lib/tk8.1/images/pwrdLogo.eps
+lib/tk8.1/images/pwrdLogo100.gif
+lib/tk8.1/images/pwrdLogo150.gif
+lib/tk8.1/images/pwrdLogo175.gif
+lib/tk8.1/images/pwrdLogo200.gif
+lib/tk8.1/images/pwrdLogo75.gif
+lib/tk8.1/listbox.tcl
+lib/tk8.1/menu.tcl
+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
+lib/tk8.1/tclIndex
+lib/tk8.1/tearoff.tcl
+lib/tk8.1/text.tcl
+lib/tk8.1/tk.tcl
+lib/tk8.1/tkAppInit.c
+lib/tk8.1/tkConfig.sh
+lib/tk8.1/tkfbox.tcl
+lib/tk8.1/xmfbox.tcl
 man/man1/wish.1.gz
-man/man3/FontId.3.gz
-man/man3/GetFont.3.gz
-man/man3/MeasureChar.3.gz
-man/man3/GetGC.3.gz
-man/man3/TextLayout.3.gz
-man/man3/Name.3.gz
 man/man3/3DBorder.3.gz
 man/man3/BindTable.3.gz
 man/man3/CanvPsY.3.gz
@@ -35,7 +129,6 @@ man/man3/CanvTkwin.3.gz
 man/man3/CanvTxtInfo.3.gz
 man/man3/Clipboard.3.gz
 man/man3/ClrSelect.3.gz
-man/man3/GetImage.3.gz
 man/man3/ConfigWidg.3.gz
 man/man3/ConfigWind.3.gz
 man/man3/CoordToWin.3.gz
@@ -50,6 +143,7 @@ man/man3/DeleteImg.3.gz
 man/man3/DrawFocHlt.3.gz
 man/man3/EventHndlr.3.gz
 man/man3/FindPhoto.3.gz
+man/man3/FontId.3.gz
 man/man3/FreeXId.3.gz
 man/man3/GeomReq.3.gz
 man/man3/GetAnchor.3.gz
@@ -58,6 +152,9 @@ man/man3/GetCapStyl.3.gz
 man/man3/GetClrmap.3.gz
 man/man3/GetColor.3.gz
 man/man3/GetCursor.3.gz
+man/man3/GetFont.3.gz
+man/man3/GetGC.3.gz
+man/man3/GetImage.3.gz
 man/man3/GetJoinStl.3.gz
 man/man3/GetJustify.3.gz
 man/man3/GetOption.3.gz
@@ -79,7 +176,9 @@ man/man3/MainWin.3.gz
 man/man3/MaintGeom.3.gz
 man/man3/ManageGeom.3.gz
 man/man3/MapWindow.3.gz
+man/man3/MeasureChar.3.gz
 man/man3/MoveToplev.3.gz
+man/man3/Name.3.gz
 man/man3/NameOfImg.3.gz
 man/man3/OwnSelect.3.gz
 man/man3/ParseArgv.3.gz
@@ -89,16 +188,13 @@ man/man3/RestrictEv.3.gz
 man/man3/SetAppName.3.gz
 man/man3/SetClass.3.gz
 man/man3/SetGrid.3.gz
+man/man3/SetOptions.3.gz
 man/man3/SetVisual.3.gz
 man/man3/StrictMotif.3.gz
+man/man3/TextLayout.3.gz
 man/man3/Tk_Init.3.gz
 man/man3/Tk_Main.3.gz
 man/man3/WindowId.3.gz
-man/mann/chooseColor.n.gz
-man/mann/getOpenFile.n.gz
-man/mann/event.n.gz
-man/mann/font.n.gz
-man/mann/messageBox.n.gz
 man/mann/bell.n.gz
 man/mann/bind.n.gz
 man/mann/bindtags.n.gz
@@ -106,13 +202,18 @@ man/mann/bitmap.n.gz
 man/mann/button.n.gz
 man/mann/canvas.n.gz
 man/mann/checkbutton.n.gz
+man/mann/chooseColor.n.gz
 man/mann/clipboard.n.gz
+man/mann/dde.n.gz
 man/mann/destroy.n.gz
 man/mann/dialog.n.gz
 man/mann/entry.n.gz
+man/mann/event.n.gz
 man/mann/focus.n.gz
 man/mann/focusNext.n.gz
+man/mann/font.n.gz
 man/mann/frame.n.gz
+man/mann/getOpenFile.n.gz
 man/mann/grab.n.gz
 man/mann/grid.n.gz
 man/mann/image.n.gz
@@ -124,6 +225,7 @@ man/mann/menu.n.gz
 man/mann/menubar.n.gz
 man/mann/menubutton.n.gz
 man/mann/message.n.gz
+man/mann/messageBox.n.gz
 man/mann/option.n.gz
 man/mann/optionMenu.n.gz
 man/mann/options.n.gz
@@ -147,108 +249,10 @@ man/mann/tkwait.n.gz
 man/mann/toplevel.n.gz
 man/mann/winfo.n.gz
 man/mann/wm.n.gz
-lib/tk8.0/demos/images/earth.gif
-lib/tk8.0/demos/images/earthris.gif
-lib/tk8.0/demos/images/face.bmp
-lib/tk8.0/demos/images/flagdown.bmp
-lib/tk8.0/demos/images/flagup.bmp
-lib/tk8.0/demos/images/gray25.bmp
-lib/tk8.0/demos/images/letters.bmp
-lib/tk8.0/demos/images/noletter.bmp
-lib/tk8.0/demos/images/pattern.bmp
-lib/tk8.0/demos/images/tcllogo.gif
-lib/tk8.0/demos/images/teapot.ppm
-lib/tk8.0/demos/README
-lib/tk8.0/demos/arrow.tcl
-lib/tk8.0/demos/bind.tcl
-lib/tk8.0/demos/bitmap.tcl
-lib/tk8.0/demos/browse
-lib/tk8.0/demos/button.tcl
-lib/tk8.0/demos/check.tcl
-lib/tk8.0/demos/clrpick.tcl
-lib/tk8.0/demos/colors.tcl
-lib/tk8.0/demos/cscroll.tcl
-lib/tk8.0/demos/ctext.tcl
-lib/tk8.0/demos/dialog1.tcl
-lib/tk8.0/demos/dialog2.tcl
-lib/tk8.0/demos/entry1.tcl
-lib/tk8.0/demos/entry2.tcl
-lib/tk8.0/demos/filebox.tcl
-lib/tk8.0/demos/floor.tcl
-lib/tk8.0/demos/form.tcl
-lib/tk8.0/demos/hello
-lib/tk8.0/demos/hscale.tcl
-lib/tk8.0/demos/icon.tcl
-lib/tk8.0/demos/image1.tcl
-lib/tk8.0/demos/image2.tcl
-lib/tk8.0/demos/items.tcl
-lib/tk8.0/demos/ixset
-lib/tk8.0/demos/label.tcl
-lib/tk8.0/demos/license.terms
-lib/tk8.0/demos/menu.tcl
-lib/tk8.0/demos/msgbox.tcl
-lib/tk8.0/demos/plot.tcl
-lib/tk8.0/demos/puzzle.tcl
-lib/tk8.0/demos/radio.tcl
-lib/tk8.0/demos/rmt
-lib/tk8.0/demos/rolodex
-lib/tk8.0/demos/ruler.tcl
-lib/tk8.0/demos/sayings.tcl
-lib/tk8.0/demos/search.tcl
-lib/tk8.0/demos/square
-lib/tk8.0/demos/states.tcl
-lib/tk8.0/demos/style.tcl
-lib/tk8.0/demos/tclIndex
-lib/tk8.0/demos/tcolor
-lib/tk8.0/demos/text.tcl
-lib/tk8.0/demos/timer
-lib/tk8.0/demos/twind.tcl
-lib/tk8.0/demos/vscale.tcl
-lib/tk8.0/demos/widget
-lib/tk8.0/demos/menubu.tcl
-lib/tk8.0/bgerror.tcl
-lib/tk8.0/button.tcl
-lib/tk8.0/clrpick.tcl
-lib/tk8.0/comdlg.tcl
-lib/tk8.0/console.tcl
-lib/tk8.0/dialog.tcl
-lib/tk8.0/entry.tcl
-lib/tk8.0/focus.tcl
-lib/tk8.0/listbox.tcl
-lib/tk8.0/menu.tcl
-lib/tk8.0/msgbox.tcl
-lib/tk8.0/obsolete.tcl
-lib/tk8.0/optMenu.tcl
-lib/tk8.0/palette.tcl
-lib/tk8.0/scale.tcl
-lib/tk8.0/scrlbar.tcl
-lib/tk8.0/tearoff.tcl
-lib/tk8.0/text.tcl
-lib/tk8.0/tk.tcl
-lib/tk8.0/tkfbox.tcl
-lib/tk8.0/xmfbox.tcl
-lib/tk8.0/tclIndex
-lib/tk8.0/prolog.ps
-lib/tk8.0/tkAppInit.c
-lib/tk8.0/images/README
-lib/tk8.0/images/logo100.gif
-lib/tk8.0/images/logo64.gif
-lib/tk8.0/images/logoLarge.gif
-lib/tk8.0/images/logoMed.gif
-lib/tk8.0/images/pwrdLogo100.gif
-lib/tk8.0/images/pwrdLogo150.gif
-lib/tk8.0/images/pwrdLogo175.gif
-lib/tk8.0/images/pwrdLogo200.gif
-lib/tk8.0/images/pwrdLogo75.gif
-lib/tk8.0/safetk.tcl
-lib/tk8.0/tkConfig.sh
-lib/libtk80.a
-lib/libtk80.so.1.2
-@exec /sbin/ldconfig -m %B
-@dirrm lib/tk8.0/demos/images
-@dirrm lib/tk8.0/demos
-@dirrm lib/tk8.0/images
-@dirrm lib/tk8.0
-@dirrm include/tk8.0/unix
-@dirrm include/tk8.0/generic
-@dirrm include/tk8.0
+@dirrm lib/tk8.1/demos/images
+@dirrm lib/tk8.1/demos
+@dirrm lib/tk8.1/images
+@dirrm lib/tk8.1
+@dirrm include/tk8.1/unix
+@dirrm include/tk8.1/generic
+@dirrm include/tk8.1