5 files changed, 56 insertions, 69 deletions

diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 6a8af97dc58d..83cd6396f46a 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tk
-PORTVERSION=	8.4a4
-PORTREVISION=	1
+PORTVERSION=	8.4.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -47,9 +46,9 @@ MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.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 SetClass.3 SetClassProcs.3 SetGrid.3 \
-	SetOptions.3 SetVisual.3 StrictMotif.3 TextLayout.3 Tk_Init.3 \
-	Tk_Main.3 TkInitStubs.3 WindowId.3
+	RestrictEv.3 SetAppName.3 SetCaret.3 SetClass.3 SetClassProcs.3 \
+	SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 TextLayout.3 \
+	Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3
 
 MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
 	chooseColor.n chooseDirectory.n clipboard.n colors.n console.n \
@@ -171,7 +170,6 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	GetBitmap.3 Tk_SizeOfBitmap.3 \
 	GetBitmap.3 Tk_FreeBitmapFromObj.3 \
 	GetBitmap.3 Tk_FreeBitmap.3 \
-	GetBitmap.3 Tk_GetBitmapFromData.3 \
 	GetCapStyl.3 Tk_GetCapStyle.3 \
 	GetCapStyl.3 Tk_NameOfCapStyle.3 \
 	GetClrmap.3 Tk_GetColormap.3 \
@@ -255,10 +253,12 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	NameOfImg.3 Tk_NameOfImage.3 \
 	OwnSelect.3 Tk_OwnSelection.3 \
 	ParseArgv.3 Tk_ParseArgv.3 \
+	QWinEvent.3 Tk_CollapseMotionEvents.3 \
 	QWinEvent.3 Tk_QueueWindowEvent.3 \
 	Restack.3 Tk_RestackWindow.3 \
 	RestrictEv.3 Tk_RestrictEvents.3 \
 	SetAppName.3 Tk_SetAppName.3 \
+	SetCaret.3 Tk_SetCaretPos.3 \
 	SetClass.3 Tk_SetClass.3 \
 	SetClass.3 Tk_Class.3 \
 	SetClassProcs.3 Tk_SetClassProcs.3 \
@@ -273,6 +273,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 	SetOptions.3 Tk_GetOptionValue.3 \
 	SetOptions.3 Tk_GetOptionInfo.3 \
 	SetOptions.3 Tk_FreeConfigOptions.3 \
+	SetOptions.3 Tk_Offset.3 \
 	SetVisual.3 Tk_SetWindowVisual.3 \
 	StrictMotif.3 Tk_StrictMotif.3 \
 	TextLayout.3 Tk_ComputeTextLayout.3 \
diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo
index f928ee6cda5e..07e07cdd6477 100644
--- a/x11-toolkits/tk84/distinfo
+++ b/x11-toolkits/tk84/distinfo
@@ -1 +1 @@
-MD5 (tk8.4a4-src.tar.gz) = e93a39346109d3129741e915ba0f42ec
+MD5 (tk8.4.0-src.tar.gz) = f94480f34d47f262d5eced60a1dab814
diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa
index 7fe4d892b4e6..a5bc31edd04e 100644
--- a/x11-toolkits/tk84/files/patch-aa
+++ b/x11-toolkits/tk84/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Wed Mar  6 09:51:50 2002
-+++ configure	Thu May  9 10:43:59 2002
-@@ -2482,22 +2482,23 @@
+--- configure.orig	Tue Sep 10 21:13:52 2002
++++ configure	Mon Sep 30 20:45:39 2002
+@@ -2669,12 +2669,13 @@
  	FreeBSD-*)
  	    # FreeBSD 3.* and greater have ELF.
  	    SHLIB_CFLAGS="-fPIC"
@@ -13,9 +13,10 @@
  	    DL_LIBS=""
 -	    LDFLAGS="-export-dynamic"
 +	    LDFLAGS=""
- 	    LD_SEARCH_FLAGS=""
+ 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  	    if test "${TCL_THREADS}" = "1" ; then
- 		EXTRA_CFLAGS="-pthread"
+@@ -2684,10 +2685,10 @@
  	    	LDFLAGS="$LDFLAGS -pthread"
  	    fi
  	    case $system in
@@ -24,32 +25,15 @@
  	    	# FreeBSD-3 doesn't handle version numbers with dots.
  	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 -	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+	        SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1'
++		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1'
  	    	TCL_LIB_VERSIONS_OK=nodots
  		;;
  	    esac
-@@ -3030,6 +3031,7 @@
- 	echo "$ac_t""no" 1>&6
-     fi
+@@ -2913,6 +2914,7 @@
+ #define _POSIX_PTHREAD_SEMANTICS 1
+ EOF
  
 +TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
  
- LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
- 
-@@ -4733,7 +4735,7 @@
- if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
-     TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
-     TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
--    MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) \${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
-+    MAKE_LIB="\${SHLIB_LD} \${TCL_SHLIB_LD_EXTRAS} -o \$@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) \${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
-     RANLIB=":"
- 
-     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
-@@ -5046,6 +5048,7 @@
- s%@STLIB_LD@%$STLIB_LD%g
- s%@SHLIB_LD@%$SHLIB_LD%g
- s%@SHLIB_LD_LIBS@%$SHLIB_LD_LIBS%g
-+s%@TCL_SHLIB_LD_EXTRAS@%$TCL_SHLIB_LD_EXTRAS%g
- s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g
- s%@SHLIB_VERSION@%$SHLIB_VERSION%g
- s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
+ 	    SHLIB_CFLAGS="-KPIC"
+ 	    LDFLAGS=""
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab
index e066ba11773c..88e7be0d3f58 100644
--- a/x11-toolkits/tk84/files/patch-ab
+++ b/x11-toolkits/tk84/files/patch-ab
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Wed Mar  6 09:51:50 2002
-+++ Makefile.in	Thu May  9 10:44:55 2002
-@@ -58,7 +58,9 @@
+--- Makefile.in.orig	Tue Sep 10 21:13:52 2002
++++ Makefile.in	Mon Sep 30 21:11:16 2002
+@@ -61,7 +61,9 @@
  SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)
  
  # Directory in which to install the include file tk.h:
@@ -11,7 +11,7 @@
  
  # Top-level directory for manual entries:
  MAN_INSTALL_DIR		= $(INSTALL_ROOT)$(mandir)
-@@ -101,7 +103,7 @@
+@@ -113,7 +115,7 @@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -20,15 +20,16 @@
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -213,6 +215,7 @@
+@@ -232,7 +234,7 @@
  STLIB_LD		= @STLIB_LD@
  SHLIB_LD		= @SHLIB_LD@
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
-+TCL_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
+-TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
++TK_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
  
  # Additional search flags needed to find the various shared libraries
  # at run-time.  The first symbol is for use when creating a binary
-@@ -356,6 +359,8 @@
+@@ -381,6 +383,8 @@
  	default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h  \
  	tkPort.h tkScrollbar.h tkText.h
  
@@ -37,51 +38,48 @@
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
  
  all: binaries libraries doc
-@@ -375,8 +380,14 @@
- ${TK_LIB_FILE}: ${OBJS}
- 	rm -f ${TK_LIB_FILE}
+@@ -400,6 +404,12 @@
+ ${LIB_FILE}: ${OBJS}
+ 	rm -f $@
  	@MAKE_LIB@
 +	ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so
- 	$(RANLIB) ${TK_LIB_FILE}
- 
++
 +libtk${SHORT_TK_VER}.a: ${OBJS}
 +	rm -f libtk${SHORT_TK_VER}.a
 +	ar cr libtk${SHORT_TK_VER}.a ${OBJS}
 +	$(RANLIB) libtk${SHORT_TK_VER}.a
-+
+ 
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
- 	rm -f ${STUB_LIB_FILE}
- 	@MAKE_STUB_LIB@
-@@ -485,7 +496,7 @@
+ 	rm -f $@
+@@ -497,7 +507,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) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
-+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk${SHORT_TK_VER}.a wish
- 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
++	libtk${SHORT_TK_VER}.a wish
+ 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -503,12 +514,18 @@
- 	    fi
- 	@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
- 	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
+@@ -523,10 +534,15 @@
+ 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+ 	@@INSTALL_LIB@
+ 	@chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
 +	@ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
- 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
- 	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
 +	@echo "Installing libtk${SHORT_TK_VER}.a"
 +	@$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
-+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk${SHORT_TK_VER}.a)
 +	@chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
  	@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
  	@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
- 	@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
+-	@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
 -	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
++	@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/tk$(VERSION)"
 +	@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) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
-@@ -522,6 +539,7 @@
+@@ -539,6 +555,7 @@
  
  install-libraries:
  	@for i in $(INCLUDE_INSTALL_DIR) \
@@ -89,7 +87,7 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \
  		$(SCRIPT_INSTALL_DIR)/msgs; \
  	    do \
-@@ -536,10 +554,18 @@
+@@ -553,10 +570,18 @@
  	    chmod +x $(UNIX_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
@@ -111,27 +109,27 @@
  	    done;
  	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
  	@for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
-@@ -613,7 +639,6 @@
+@@ -633,7 +658,6 @@
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking top-level (.1) docs";
--	@$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
+-	@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN1_INSTALL_DIR)
  	@echo "Installing C API (.3) docs";
  	@cd $(SRC_DIR)/doc; for i in *.3; \
  	    do \
-@@ -623,7 +648,6 @@
+@@ -643,7 +667,6 @@
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking top-level (.3) docs";
--	@$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
+-	@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR)
  	@echo "Installing command (.n) docs";
  	@cd $(SRC_DIR)/doc; for i in *.n; \
  	    do \
-@@ -633,7 +657,6 @@
+@@ -653,7 +676,6 @@
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking command (.n) docs";
--	@$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
+-	@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR)
  
  Makefile: $(UNIX_DIR)/Makefile.in
  	$(SHELL) config.status
diff --git a/x11-toolkits/tk84/pkg-plist b/x11-toolkits/tk84/pkg-plist
index ae31031f75c8..62aa1e7aaffd 100644
--- a/x11-toolkits/tk84/pkg-plist
+++ b/x11-toolkits/tk84/pkg-plist
@@ -22,6 +22,7 @@ include/tk%%TK_VER%%/generic/tkScale.h
 include/tk%%TK_VER%%/generic/tkScrollbar.h
 include/tk%%TK_VER%%/generic/tkSelect.h
 include/tk%%TK_VER%%/generic/tkText.h
+include/tk%%TK_VER%%/generic/tkUndo.h
 include/tk%%TK_VER%%/tk.h
 include/tk%%TK_VER%%/tkDecls.h
 include/tk%%TK_VER%%/tkInt.h
@@ -123,13 +124,16 @@ lib/tk%%TK_VER%%/msgs/cs.msg
 lib/tk%%TK_VER%%/msgs/de.msg
 lib/tk%%TK_VER%%/msgs/el.msg
 lib/tk%%TK_VER%%/msgs/en.msg
+lib/tk%%TK_VER%%/msgs/en_gb.msg
 lib/tk%%TK_VER%%/msgs/es.msg
 lib/tk%%TK_VER%%/msgs/fr.msg
 lib/tk%%TK_VER%%/msgs/it.msg
 lib/tk%%TK_VER%%/msgs/nl.msg
+lib/tk%%TK_VER%%/msgs/ru.msg
 lib/tk%%TK_VER%%/listbox.tcl
 lib/tk%%TK_VER%%/menu.tcl
 lib/tk%%TK_VER%%/msgbox.tcl
+lib/tk%%TK_VER%%/mkpsenc.tcl
 lib/tk%%TK_VER%%/obsolete.tcl
 lib/tk%%TK_VER%%/optMenu.tcl
 lib/tk%%TK_VER%%/palette.tcl