Upgrade to tk-8.3.1 w/plus

3 files changed, 36 insertions, 37 deletions

diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index c4839e2b1dae..2e572e15cc98 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tk
-PORTVERSION= 	8.3.0
+PORTVERSION= 	8.3.1
 CATEGORIES=	x11-toolkits tk83
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/devel/ \
 		http://www.neosoft.com/tcl/ftparchive/sorted/packages-8.0/devel/
@@ -29,15 +29,16 @@ PLIST_SUB=	TK_VER=8.3 SHORT_TK_VER=83
 MANCOMPRESSED=	no
 
 MAN1=	wish.1
-MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
-	Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 CoordToWin.3 \
-	CrtErrHdlr.3 CrtGenHdlr.3 CrtImgType.3 CrtItemType.3 CrtPhImgFmt.3 \
-	CrtSelHdlr.3 CrtWindow.3 DeleteImg.3 DrawFocHlt.3 EventHndlr.3 \
-	FindPhoto.3 FontId.3 FreeXId.3 GeomReq.3 GetAnchor.3 GetBitmap.3 \
-	GetCapStyl.3 GetClrmap.3 GetColor.3 GetCursor.3 GetDash.3 GetFont.3 \
-	GetGC.3 GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \
-	GetPixmap.3 GetRelief.3 GetRootCrd.3 GetScroll.3 GetSelect.3 GetUid.3 \
-	GetVRoot.3 GetVisual.3 HandleEvent.3 IdToWindow.3 ImgChanged.3 \
+MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
+	CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \
+	CoordToWin.3 CrtErrHdlr.3 CrtGenHdlr.3 CrtImgType.3 CrtItemType.3 \
+	CrtPhImgFmt.3 CrtSelHdlr.3 CrtWindow.3 DeleteImg.3 DrawFocHlt.3 \
+	EventHndlr.3 FindPhoto.3 FontId.3 FreeXId.3 GeomReq.3 GetAnchor.3 \
+	GetBitmap.3 GetCapStyl.3 GetClrmap.3 GetColor.3 GetCursor.3 GetDash.3 \
+	GetFont.3 GetGC.3 GetHINSTANCE.3 GetHWND.3 GetImage.3 GetJoinStl.3 \
+	GetJustify.3 GetOption.3 GetPixels.3 GetPixmap.3 GetRelief.3 \
+	GetRootCrd.3 GetScroll.3 GetSelect.3 GetUid.3 GetVRoot.3 GetVisual.3 \
+	Grab.3 HWNDToWindow.3 HandleEvent.3 IdToWindow.3 ImgChanged.3 \
 	InternAtom.3 MainLoop.3 MainWin.3 MaintGeom.3 ManageGeom.3 \
 	MapWindow.3 MeasureChar.3 MoveToplev.3 Name.3 NameOfImg.3 OwnSelect.3 \
 	ParseArgv.3 QWinEvent.3 Restack.3 RestrictEv.3 SetAppName.3 \
@@ -68,6 +69,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	3DBorder.3 Tk_3DBorderGC.3 \
 	3DBorder.3 Tk_Free3DBorderFromObj.3 \
 	3DBorder.3 Tk_Free3DBorder.3 \
+	AddOption.3 Tk_AddOption.3 \
 	BindTable.3 Tk_CreateBindingTable.3 \
 	BindTable.3 Tk_DeleteBindingTable.3 \
 	BindTable.3 Tk_CreateBinding.3 \
@@ -185,6 +187,8 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	GetFont.3 Tk_FreeFont.3 \
 	GetGC.3 Tk_GetGC.3 \
 	GetGC.3 Tk_FreeGC.3 \
+	GetHINSTANCE.3 Tk_GetHINSTANCE.3 \
+	GetHWND.3 Tk_GetHWND.3 \
 	GetImage.3 Tk_GetImage.3 \
 	GetImage.3 Tk_RedrawImage.3 \
 	GetImage.3 Tk_SizeOfImage.3 \
@@ -206,11 +210,15 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	GetRelief.3 Tk_NameOfRelief.3 \
 	GetRootCrd.3 Tk_GetRootCoords.3 \
 	GetScroll.3 Tk_GetScrollInfo.3 \
+	GetScroll.3 Tk_GetScrollInfoObj.3 \
 	GetSelect.3 Tk_GetSelection.3 \
 	GetUid.3 Tk_GetUid.3 \
 	GetUid.3 Tk_Uid.3 \
 	GetVRoot.3 Tk_GetVRootGeometry.3 \
 	GetVisual.3 Tk_GetVisual.3 \
+	Grab.3 Tk_Grab.3 \
+	Grab.3 Tk_Ungrab.3 \
+	HWNDToWindow.3 Tk_HWNDToWindow.3 \
 	HandleEvent.3 Tk_HandleEvent.3 \
 	IdToWindow.3 Tk_IdToWindow.3 \
 	ImgChanged.3 Tk_ImageChanged.3 \
@@ -218,6 +226,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	InternAtom.3 Tk_GetAtomName.3 \
 	MainLoop.3 Tk_MainLoop.3 \
 	MainWin.3 Tk_MainWindow.3 \
+	MainWin.3 Tk_GetNumMainWindows.3 \
 	MaintGeom.3 Tk_MaintainGeometry.3 \
 	MaintGeom.3 Tk_UnmaintainGeometry.3 \
 	ManageGeom.3 Tk_ManageGeometry.3 \
diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo
index 1e5c49e52f24..004fe838d5d8 100644
--- a/x11-toolkits/tk84/distinfo
+++ b/x11-toolkits/tk84/distinfo
@@ -1 +1 @@
-MD5 (tk8.3.0plus.tar.gz) = 86ba6dba8407ffd3567eaf7911e81c11
+MD5 (tk8.3.1plus.tar.gz) = bf38b4aed84fc993559a59130ae8cad5
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab
index 6bcb8c6b4af7..d8114a482761 100644
--- a/x11-toolkits/tk84/files/patch-ab
+++ b/x11-toolkits/tk84/files/patch-ab
@@ -1,26 +1,16 @@
---- Makefile.in.orig	Sun Feb 20 06:39:43 2000
-+++ Makefile.in	Mon May  1 10:37:26 2000
-@@ -56,7 +56,9 @@
- BIN_DIR =		$(exec_prefix)/bin
+--- Makefile.in.orig	Sat May  6 06:40:23 2000
++++ Makefile.in	Wed May 10 17:32:06 2000
+@@ -58,6 +58,8 @@
  
  # Directory in which to install the include file tk.h:
--INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include/tk$(VERSION)
+-INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
++INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)/tk$(VERSION)
 +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
 +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
  
  # Top-level directory for manual entries:
- MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-@@ -154,7 +156,7 @@
- # "install" around;  better to use the install-sh script that comes
- # with the distribution, which is slower but guaranteed to work.
- 
--INSTALL = @srcdir@/install-sh -c
-+INSTALL = install -c
- INSTALL_PROGRAM =	${INSTALL}
- INSTALL_DATA =		${INSTALL} -m 644
- 
-@@ -195,7 +197,7 @@
+ MAN_INSTALL_DIR		= $(INSTALL_ROOT)$(mandir)
+@@ -205,7 +207,7 @@
  # Libraries to use when linking.  This definition is determined by the
  # configure script.
  LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
@@ -29,7 +19,7 @@
  
  # The symbol below provides support for dynamic loading and shared
  # libraries.  See configure.in for a description of what it means.
-@@ -371,8 +373,14 @@
+@@ -378,8 +380,14 @@
  ${TK_LIB_FILE}: ${OBJS}
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
@@ -44,7 +34,7 @@
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
-@@ -442,7 +450,7 @@
+@@ -455,7 +463,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -53,7 +43,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -460,14 +468,20 @@
+@@ -473,14 +481,20 @@
  	    fi
  	@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -75,15 +65,15 @@
  	@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
-@@ -481,6 +495,7 @@
+@@ -494,6 +508,7 @@
  
  install-libraries:
- 	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
+ 	@for i in $(INCLUDE_INSTALL_DIR) \
 +		$(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -494,10 +509,16 @@
+@@ -507,10 +522,16 @@
  	    chmod +x $(UNIX_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
@@ -102,7 +92,7 @@
  	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
  	@for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
  	        $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
-@@ -563,7 +584,6 @@
+@@ -576,7 +597,6 @@
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking top-level (.1) docs";
@@ -110,7 +100,7 @@
  	@echo "Installing C API (.3) docs";
  	@cd $(SRC_DIR)/doc; for i in *.3; \
  	    do \
-@@ -573,7 +593,6 @@
+@@ -586,7 +606,6 @@
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking C API (.3) docs";
@@ -118,7 +108,7 @@
  	@echo "Installing command (.n) docs";
  	@cd $(SRC_DIR)/doc; for i in *.n; \
  	    do \
-@@ -583,7 +602,6 @@
+@@ -596,7 +615,6 @@
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking command (.n) docs";