Import of tclX82 after repo-copy from tclX80, one more step on

the road to obliterating tcl/tk 8.0 from the tree.

Note 1: the patches have been extensively re-worked from the
        original submission, to make this port PREFIX-safe,
        and also to deal with multiple patchfiles updating the
        same source file.

Note 2: I've left the MAINTAINER as jseger.  Justin, you may
        want to cast your TCL-expert eye over this one, it seems
        to do the right thing.

PR:		16970
Submitted by:	Mikhail Teterin <mi@aldan.algebra.com>

8 files changed, 237 insertions, 80 deletions

diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 55d52f9d6198..22cf36e5caf1 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -6,20 +6,22 @@
 #
 
 PORTNAME=	tclX
-PORTVERSION=	8.0.4
-CATEGORIES=	lang tcl80 tk80
+PORTVERSION=	8.2.0
+CATEGORIES=	lang tcl82 tk82
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
-DISTNAME=	tclX8.0.4
+DISTNAME=	tclX8.2.0
 
 MAINTAINER=	jseger@FreeBSD.org
 
-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --enable-shared --with-tk
-PLIST_SUB=	TCLX_LONG_VER=8.0.4 TCLX_SHORT_VER=804
+CONFIGURE_ARGS= --enable-shared \
+		--with-tcl="${LOCALBASE}/lib/tcl8.2" \
+		--with-tk="${LOCALBASE}/lib/tk8.2"
+PLIST_SUB=	TCLX_LONG_VER=8.2 TCLX_SHORT_VER=82
 
 MAN3=   CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3 \
 	TclCommandWriting.3 \
@@ -27,7 +29,7 @@ MAN3=   CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3 \
 	TclX_KeyedListSet.3 TclX_Main.3 TclX_NewKeyedListObj.3 \
 	Tcl_HandleAlloc.3 Tcl_HandleFree.3 Tcl_HandleTblInit.3 \
 	Tcl_HandleTblRelease.3 Tcl_HandleTblUseCount.3 Tcl_HandleWalk.3 \
-	Tcl_HandleXlate.3  Tclx_Init.3  Tclxcmd_Init.3 TkX_Main.3 Tkx_Init.3 
+	Tcl_HandleXlate.3  Tclx_Init.3  Tclxcmd_Init.3 TkX_Main.3 Tkx_Init.3
 
 MANN=   Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
 	Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n
@@ -35,12 +37,12 @@ MANN=   Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
 .include <bsd.port.pre.mk>
 
 post-install:
-	$(INSTALL_MAN) $(WRKSRC)/../doc/CmdWrite.3 $(PREFIX)/man/man3
-	$(INSTALL_MAN) $(WRKSRC)/../doc/Handles.3 $(PREFIX)/man/man3
-	$(INSTALL_MAN) $(WRKSRC)/../doc/Keylist.3 $(PREFIX)/man/man3
-	$(INSTALL_MAN) $(WRKSRC)/../doc/ObjCmdWrite.3 $(PREFIX)/man/man3
-	$(INSTALL_MAN) $(WRKSRC)/../doc/TclXInit.3 $(PREFIX)/man/man3
-	$(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann
-	$(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann
+	${INSTALL_MAN} ${WRKSRC}/../doc/CmdWrite.3 ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/../doc/Handles.3 ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/../doc/Keylist.3 ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/../doc/ObjCmdWrite.3 ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/../doc/TclXInit.3 ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/../doc/Memory.n ${PREFIX}/man/mann
+	${INSTALL_MAN} ${WRKSRC}/../doc/TclX.n ${PREFIX}/man/mann
 
 .include <bsd.port.post.mk>
diff --git a/lang/tclX/distinfo b/lang/tclX/distinfo
index f595634a0ae9..5f4897102217 100644
--- a/lang/tclX/distinfo
+++ b/lang/tclX/distinfo
@@ -1 +1 @@
-MD5 (tclX8.0.4.tar.gz) = ca3b5a6e89d1402e50bbb25afa35cb85
+MD5 (tclX8.2.0.tar.gz) = dc2b6dbafebc765154570b143c585670
diff --git a/lang/tclX/files/patch-ab b/lang/tclX/files/patch-ab
index 8106565f0e9e..0c7cac0ee64e 100644
--- a/lang/tclX/files/patch-ab
+++ b/lang/tclX/files/patch-ab
@@ -1,15 +1,15 @@
---- ../tcl/unix/Makefile.in.orig	Sun Dec  6 21:47:24 1998
-+++ ../tcl/unix/Makefile.in	Fri Aug 27 10:34:27 1999
-@@ -124,7 +124,7 @@
- # If a link fails, purge the executable, as some systems leave invalid
- # executables around.
+--- ../tcl/unix/Makefile.in.orig	Sun Feb  6 18:53:59 2000
++++ ../tcl/unix/Makefile.in	Thu Jul 13 15:35:23 2000
+@@ -131,7 +131,7 @@
  #
--all: tcl checkup RUNTIME tclXtest
-+all: tcl checkup RUNTIME
+ all: binaries libraries doc
  
- static:	tcl.static tclXtest.static
+-binaries: tcl checkup RUNTIME tclXtest
++binaries: tcl checkup RUNTIME
  
-@@ -152,6 +152,7 @@
+ libraries: tcl.tndx tcl.tlib tclx.tcl buildidx.tcl
+ 
+@@ -163,6 +163,7 @@
  	TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \
  	LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
  	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS}
@@ -17,22 +17,31 @@
  
  hello:	hello.c
  	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
-@@ -173,7 +174,7 @@
+@@ -184,7 +185,7 @@
  # unless we don't have them.
  #
  RUNTIME: tcl.tlib tcl.tndx tclx.tcl buildidx.tcl autoload.tcl help.tmp \
 -         dltest.tmp checkup
-+	 checkup
++         checkup
  
  tcl.tlib: ${TLIB_SRCS} autoload.tcl
  	-rm -f tcl.tlib tcl.tndx
-@@ -318,9 +319,11 @@
+@@ -306,7 +307,7 @@
+ buildhelp: tcl tcl.tndx
+ 	rm -rf ${HELP_DIR} help help.tmp
+ 	mkdir ${HELP_DIR}
+-	${BLDMANHELP} ${TCL_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tclmanpages \
++	${BLDMANHELP} ${TCLX_TOOLS_SRC_DIR}/tclmanpages \
+ 	    ${HELP_DIR} Tcl.brf
+ 	${RUNTCL} -c "buildhelp ${HELP_DIR} TclX.brf ${TCLX_DOC_DIR}/TclX.n"
+ 
+@@ -338,9 +339,11 @@
  	    ${INSTCOPY} ${TCLX_STLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB}; \
  	    ${RANLIB} ${INSTALL_ROOT}${TCLX_INST_LIB}/${TCLX_STLIB_NAME}; \
  	fi
 -	${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB}
 +	${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
- 	if test "@BUILD_SHARED@" = "YES"; then \
+ 	if test "@SHARED_BUILD@" = "1"; then \
  	    ${INSTCOPY} ${TCLX_SHLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
 +	    (cd ${INSTALL_ROOT}${TCLX_INST_LIB} && \
 +		ln -sf ${TCLX_SHLIB_NAME} `echo ${TCLX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`) ;\
diff --git a/lang/tclX/files/patch-ac b/lang/tclX/files/patch-ac
index 629c9d5ee7c8..32ddf413e4b9 100644
--- a/lang/tclX/files/patch-ac
+++ b/lang/tclX/files/patch-ac
@@ -1,29 +1,38 @@
---- ../tk/unix/Makefile.in.orig	Sun Dec  6 21:47:30 1998
-+++ ../tk/unix/Makefile.in	Fri Aug 27 10:37:45 1999
-@@ -85,7 +85,7 @@
- # If a link fails, purge the executable, as some systems leave invalid
- # executables around.
+--- ../tk/unix/Makefile.in.orig	Sun Feb  6 18:54:01 2000
++++ ../tk/unix/Makefile.in	Thu Jul 13 15:35:36 2000
+@@ -81,7 +81,7 @@
  #
--all: wishx RUNTIME tktest
-+all: wishx RUNTIME
+ all: binaries libraries doc
  
- static: wishx.static tktest.static
+-binaries: wishx tktest
++binaries: wishx
+ 
+ libraries: RUNTIME
  
 @@ -112,6 +112,7 @@
  	${TCL_SHLIB_LD} -o ${TKX_SHLIB_NAME} ${SOBJS} \
- 	    ${TK_BUILD_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \
- 	    ${TCL_BUILD_LIB_SPEC} ${TCL_SHLIB_LD_LIBS}
+ 	    ${TK_BUILD_STUB_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \
+ 	    ${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS}
 +	ln -sf ${TKX_SHLIB_NAME} `echo ${TKX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`
  
  hello:	hello.c
  	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
-@@ -223,9 +224,11 @@
+@@ -199,7 +200,7 @@
+ buildhelp:
+ 	rm -rf ${HELP_DIR} help help.tmp
+ 	mkdir ${HELP_DIR}
+-	${BLDMANHELP} ${TK_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tkmanpages \
++	${BLDMANHELP} ${TCLX_TOOLS_SRC_DIR}/tkmanpages \
+ 	    ${HELP_DIR} Tk.brf
+ 
+ #------------------------------------------------------------------------------
+@@ -227,9 +228,11 @@
  	    ${INSTCOPY} ${TKX_STLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB}; \
  	    ${RANLIB} ${INSTALL_ROOT}${TKX_INST_LIB}/${TKX_STLIB_NAME}; \
  	fi
 -	${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_LIB}
 +	${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_RUNTIME}
- 	if test "@BUILD_SHARED@" = "YES"; then \
+ 	if test "@SHARED_BUILD@" = "1"; then \
  	    ${INSTCOPY} ${TKX_SHLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB} ;\
 +	    (cd ${INSTALL_ROOT}${TKX_INST_LIB} && \
 +		ln -sf ${TKX_SHLIB_NAME} `echo ${TKX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`) ;\
diff --git a/lang/tclX/files/patch-ad b/lang/tclX/files/patch-ad
index c0374cd9637c..40fda9da67b1 100644
--- a/lang/tclX/files/patch-ad
+++ b/lang/tclX/files/patch-ad
@@ -1,20 +1,72 @@
---- Common.mk.in.orig	Sun Dec  6 21:47:30 1998
-+++ Common.mk.in	Fri Aug 27 09:29:10 1999
-@@ -97,7 +97,7 @@
+--- Common.mk.in.orig	Sun Feb  6 18:54:02 2000
++++ Common.mk.in	Thu Jul 13 13:54:11 2000
+@@ -36,8 +36,7 @@
+ #------------------------------------------------------------------------------
+ # Programs and options used by build
+ #
+-CC           = @CC@
+-CFLAGS       = @CFLAGS@ @TCL_EXTRA_CFLAGS@
++CFLAGS      += @TCL_EXTRA_CFLAGS@
+ SYSCFLAGS    = @SYSCFLAGS@
+ RANLIB       = @RANLIB@
+ AR           = ar
+@@ -115,6 +114,7 @@
+ #------------------------------------------------------------------------------
+ # Configuration information from tclConfig.sh.
+ #
++TCL_PREFIX	     = @TCL_PREFIX@
+ TCL_BIN_DIR          = @TCL_BIN_DIR@
+ TCL_SRC_DIR          = @TCL_SRC_DIR@
+ TCL_LIB_DIR          = @TCL_BIN_DIR@
+@@ -128,18 +128,19 @@
  TCL_SHLIB_LD         = @TCL_SHLIB_LD@
  TCL_SHLIB_LD_LIBS    = @TCL_SHLIB_LD_LIBS@
  TCL_DBGX             = @TCL_DBGX@
 -TCL_BUILD_LIB_SPEC   = @TCL_BUILD_LIB_SPEC@
 +TCL_BUILD_LIB_SPEC   = @TCL_LIB_SPEC@
  TCL_LIB_SPEC         = @TCL_LIB_SPEC@
+-TCL_BUILD_STUB_LIB_SPEC   = @TCL_BUILD_STUB_LIB_SPEC@
++TCL_BUILD_STUB_LIB_SPEC   = @TCL_STUB_LIB_SPEC@
+ TCL_STUB_LIB_SPEC         = @TCL_STUB_LIB_SPEC@
  TCL_LD_SEARCH_FLAGS  = @TCL_LD_SEARCH_FLAGS@
  
-@@ -107,7 +107,7 @@
+-TCL_GENERIC_DIR      = ${TCL_SRC_DIR}/generic
+-TCL_UNIX_DIR	     = ${TCL_SRC_DIR}/unix
++TCL_GENERIC_DIR      = ${TCL_PREFIX}/include/tcl${TCL_VERSION}/generic
++TCL_UNIX_DIR	     = ${TCL_PREFIX}/include/tcl${TCL_VERSION}/unix
+ 
+ #------------------------------------------------------------------------------
+ # Configuration information from tkConfig.sh.
+ #
++TK_PREFIX	     = @TK_PREFIX@
+ TK_BIN_DIR           = @TK_BIN_DIR@
+ TK_SRC_DIR           = @TK_SRC_DIR@
+ TK_LIB_DIR           = @TK_BIN_DIR@
+@@ -150,23 +151,18 @@
  TK_XINCLUDES         = @TK_XINCLUDES@
  TK_XLIBSW            = @TK_XLIBSW@
  TK_DBGX              = @TK_DBGX@
 -TK_BUILD_LIB_SPEC    = @TK_BUILD_LIB_SPEC@
 +TK_BUILD_LIB_SPEC    = @TK_LIB_SPEC@
  TK_LIB_SPEC          = @TK_LIB_SPEC@
+-TK_BUILD_STUB_LIB_SPEC    = @TK_BUILD_STUB_LIB_SPEC@
++TK_BUILD_STUB_LIB_SPEC    = @TK_STUB_LIB_SPEC@
+ TK_STUB_LIB_SPEC          = @TK_STUB_LIB_SPEC@
  TK_LD_SEARCH_FLAGS   = @TK_LD_SEARCH_FLAGS@
  
+-TK_GENERIC_DIR       = ${TK_SRC_DIR}/generic
+-TK_UNIX_DIR	     = ${TK_SRC_DIR}/unix
++TK_GENERIC_DIR       = ${TK_PREFIX}/include/tk${TK_VERSION}/generic
++TK_UNIX_DIR	     = ${TK_PREFIX}/include/tk${TK_VERSION}/unix
+ 
+ #------------------------------------------------------------------------------
+ # Location of directories in TclX source and build trees.
+ #
+-TCL_GENERIC_DIR    = ${TCL_SRC_DIR}/generic
+-TCL_UNIX_DIR       = ${TCL_SRC_DIR}/unix
+-TCL_LIBRARY_DIR    = ${TCL_SRC_DIR}/library
+-TK_GENERIC_DIR     = ${TK_SRC_DIR}/generic
+-TK_UNIX_DIR        = ${TK_SRC_DIR}/unix
+ 
+ TCLX_GENERIC_DIR   = ${srcbasedir}/tcl/generic
+ TCLX_UNIX_SRC_DIR  = ${srcbasedir}/tcl/unix
diff --git a/lang/tclX/files/patch-ae b/lang/tclX/files/patch-ae
index 8ef4f264172d..793ff3867bf6 100644
--- a/lang/tclX/files/patch-ae
+++ b/lang/tclX/files/patch-ae
@@ -1,35 +1,51 @@
---- configure.orig	Sun Dec  6 21:47:31 1998
-+++ configure	Fri Aug 27 10:11:48 1999
-@@ -1097,21 +1097,19 @@
- #
- # Generate the library names using the Tcl macros.
- #
--SHLIB_SUFFIX=${TCL_SHLIB_SUFFIX}
-+TCL_STLIB_NAME=libtcl80.a
-+TK_STLIB_NAME=libtk80.a
+--- configure.orig	Sun Feb  6 18:54:02 2000
++++ configure	Thu Jul 13 14:29:54 2000
+@@ -2009,8 +2009,11 @@
+ 	    ;;
+ 	FreeBSD-*)
+ 	    # FreeBSD 3.* and greater have ELF.
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    TCL_LIB_VERSIONS_OK=nodots
+-	    SHLIB_CFLAGS="-fpic"
++	    SHLIB_CFLAGS="-fPIC -DPIC"
+	    SHLIB_LD="ld -Bshareable -x"
+ 	    SHLIB_LD_LIBS=""
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+@@ -2496,15 +2499,13 @@
  
--VERSION=$TCL_VERSION
--eval "TCL_STLIB_NAME=libtcl${TCL_UNSHARED_LIB_SUFFIX}"
-+TCLX_STLIB_NAME=libtclx804.a
-+TKX_STLIB_NAME=libtkx804.a
+ DBGX=${TCLX_DBGX}
+ VERSION=$TCLX_VERSION
+-eval "TCLX_STLIB_NAME=libtclx${UNSHARED_LIB_SUFFIX}"
+-eval "TCLX_SHLIB_NAME=libtclx${SHARED_LIB_SUFFIX}"
+-eval "TCLX_SHLIB_NAME=${TCLX_SHLIB_NAME}"
++TCLX_STLIB_NAME=libtclx82.a
++TCLX_SHLIB_NAME=libtclx82.so.1
  
--VERSION=$TK_VERSION
--eval "TK_STLIB_NAME=libtk${TCL_UNSHARED_LIB_SUFFIX}"
--
--VERSION=$TCLX_VERSION$TCL_DBGX
--eval "TCLX_STLIB_NAME=libtclx${TCL_UNSHARED_LIB_SUFFIX}"
--eval "TCLX_SHLIB_NAME=libtclx${TCL_SHARED_LIB_SUFFIX}"
--
--VERSION=$TKX_VERSION$TCL_DBGX
--eval "TKX_STLIB_NAME=libtkx${TCL_UNSHARED_LIB_SUFFIX}"
--eval "TKX_SHLIB_NAME=libtkx${TCL_SHARED_LIB_SUFFIX}"
-+if [ "$PORTOBJFORMAT" = "elf" ]; then
-+    TCLX_SHLIB_NAME=libtclx804.so.1
-+    TKX_SHLIB_NAME=libtkx804.so.1
-+else
-+    TCLX_SHLIB_NAME=libtclx804.so.1.4
-+    TKX_SHLIB_NAME=libtkx804.so.1.4
-+fi
+ DBGX=${TKX_DBGX}
+ VERSION=$TKX_VERSION
+-eval "TKX_STLIB_NAME=libtkx${UNSHARED_LIB_SUFFIX}"
+-eval "TKX_SHLIB_NAME=libtkx${SHARED_LIB_SUFFIX}"
+-eval "TKX_SHLIB_NAME=${TKX_SHLIB_NAME}"
++TKX_STLIB_NAME=libtkx82.a
++TKX_SHLIB_NAME=libtkx82.so.1
  
  #
  # Determine suffix to use for the object files for the shared library.
+@@ -4831,6 +4832,7 @@
+ s%@TCLX_FULL_VERSION@%$TCLX_FULL_VERSION%g
+ s%@TKX_VERSION@%$TKX_VERSION%g
+ s%@TKX_FULL_VERSION@%$TKX_FULL_VERSION%g
++s%@TCL_PREFIX@%$TCL_PREFIX%g
+ s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
+ s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
+ s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g
+@@ -4851,6 +4853,7 @@
+ s%@TCL_STUB_LIB_SPEC@%$TCL_STUB_LIB_SPEC%g
+ s%@TCL_LIB_DIR@%$TCL_LIB_DIR%g
+ s%@TCL_LIBRARY_DIR@%$TCL_LIBRARY_DIR%g
++s%@TK_PREFIX@%$TK_PREFIX%g
+ s%@TK_BIN_DIR@%$TK_BIN_DIR%g
+ s%@TK_SRC_DIR@%$TK_SRC_DIR%g
+ s%@TK_LIB_FILE@%$TK_LIB_FILE%g
diff --git a/lang/tclX/files/patch-af b/lang/tclX/files/patch-af
new file mode 100644
index 000000000000..1e38676af12c
--- /dev/null
+++ b/lang/tclX/files/patch-af
@@ -0,0 +1,63 @@
+--- tools/bldmanhelp.tcl.orig	Sun Feb  6 19:54:02 2000
++++ tools/bldmanhelp.tcl	Thu Feb 24 17:03:26 2000
+@@ -13,6 +13,5 @@
+ #
+-#   bldmanhelp docdir maninfo helpdir
++#   bldmanhelp maninfo helpdir
+ #
+ # Where:
+-#    o docdir is the directory containing the manual pages.
+ #    o maninfo is the path to a file that when sources returns a list of
+@@ -64,5 +63,14 @@
+ 
+-    set stat [catch {
+-        open $manPage
+-    } fh]
++    set section [lindex [split $manPage .] end]
++    set manPage [file rootname $manPage]
++    set manPage [split [exec man -w $section $manPage] ":)"]
++    if {[llength $manPage] > 1} { # Get the source, not from cat
++	set manPage [string trim [lindex $manPage 1]]
++    }
++    
++    if {[string match *.gz $manPage]} {
++	set stat [catch {open "|gzip -d -c $manPage"} fh]
++    } else {
++	set stat [catch {open $manPage} fh]
++    }
+     if {$stat != 0} {
+@@ -70,3 +75,3 @@
+         set gotErrors 1
+-        puts stderr "can't open \"$manPage\" $fh"
++        puts stderr "can't open \"$manPage\" $fh. (cwd is [pwd])"
+         return
+@@ -114,3 +119,3 @@
+ 
+-proc GenInputFile {docDir manInfoTbl tmpFile} {
++proc GenInputFile {manInfoTbl tmpFile} {
+ 
+@@ -118,3 +123,2 @@
+    set cwd [pwd]
+-   cd $docDir
+ 
+@@ -132,4 +136,4 @@
+ 
+-if {[llength $argv] != 4} {
+-    puts stderr "wrong # args: bldmanhelp docdir maninfo helpdir brief"
++if {[llength $argv] != 3} {
++    puts stderr "wrong # args: bldmanhelp maninfo helpdir brief"
+     exit 1
+@@ -139,9 +143,8 @@
+ 
+-set docDir [lindex $argv 0]
+-set manInfoTbl [source [lindex $argv 1]]
+-set helpDir [lindex $argv 2]
+-set brief [lindex $argv 3]
++set manInfoTbl [source [lindex $argv 0]]
++set helpDir [lindex $argv 1]
++set brief [lindex $argv 2]
+ 
+ puts stdout "Begin preprocessing UCB manual files"
+-GenInputFile $docDir $manInfoTbl $tmpFile
++GenInputFile $manInfoTbl $tmpFile
+ 
diff --git a/lang/tclX/pkg-plist b/lang/tclX/pkg-plist
index fe1d756a1754..bcf9bf59b28a 100644
--- a/lang/tclX/pkg-plist
+++ b/lang/tclX/pkg-plist
@@ -3,11 +3,11 @@ bin/tclhelp
 bin/wishx
 include/tclExtend.h
 lib/libtclx%%TCLX_SHORT_VER%%.a
-lib/libtclx%%TCLX_SHORT_VER%%.so.1
 lib/libtclx%%TCLX_SHORT_VER%%.so
+lib/libtclx%%TCLX_SHORT_VER%%.so.1
 lib/libtkx%%TCLX_SHORT_VER%%.a
-lib/libtkx%%TCLX_SHORT_VER%%.so.1
 lib/libtkx%%TCLX_SHORT_VER%%.so
+lib/libtkx%%TCLX_SHORT_VER%%.so.1
 lib/tclX%%TCLX_LONG_VER%%/autoload.tcl
 lib/tclX%%TCLX_LONG_VER%%/buildidx.tcl
 lib/tclX%%TCLX_LONG_VER%%/help/Tcl.brf
@@ -18,6 +18,7 @@ lib/tclX%%TCLX_LONG_VER%%/help/tcl/control/case
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/control/catch
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/control/commandloop
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/control/continue
+lib/tclX%%TCLX_LONG_VER%%/help/tcl/control/dde
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/control/error
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/control/eval
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/control/exit
@@ -80,6 +81,8 @@ lib/tclX%%TCLX_LONG_VER%%/help/tcl/files/read
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/files/read_file
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/files/readdir
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/files/recursive_glob
+lib/tclX%%TCLX_LONG_VER%%/help/tcl/files/registry
+lib/tclX%%TCLX_LONG_VER%%/help/tcl/files/resource
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/files/seek
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/files/select
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/files/sync
@@ -88,9 +91,11 @@ lib/tclX%%TCLX_LONG_VER%%/help/tcl/files/write_file
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/filescan/scancontext
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/filescan/scanfile
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/filescan/scanmatch
-lib/tclX%%TCLX_LONG_VER%%/help/tcl/internation/catclose
-lib/tclX%%TCLX_LONG_VER%%/help/tcl/internation/catgets
-lib/tclX%%TCLX_LONG_VER%%/help/tcl/internation/catopen
+lib/tclX%%TCLX_LONG_VER%%/help/tcl/intl/catclose
+lib/tclX%%TCLX_LONG_VER%%/help/tcl/intl/catgets
+lib/tclX%%TCLX_LONG_VER%%/help/tcl/intl/catopen
+lib/tclX%%TCLX_LONG_VER%%/help/tcl/intl/encoding
+lib/tclX%%TCLX_LONG_VER%%/help/tcl/intl/msgcat
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/intro/keyedlists
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/intro/syntax
 lib/tclX%%TCLX_LONG_VER%%/help/tcl/intro/tclsh
@@ -216,6 +221,7 @@ lib/tkX%%TCLX_LONG_VER%%/help/tk/control/focus
 lib/tkX%%TCLX_LONG_VER%%/help/tk/control/font
 lib/tkX%%TCLX_LONG_VER%%/help/tk/control/grab
 lib/tkX%%TCLX_LONG_VER%%/help/tk/control/grid
+lib/tkX%%TCLX_LONG_VER%%/help/tk/control/loadTk
 lib/tkX%%TCLX_LONG_VER%%/help/tk/control/lower
 lib/tkX%%TCLX_LONG_VER%%/help/tk/control/option
 lib/tkX%%TCLX_LONG_VER%%/help/tk/control/pack
@@ -268,7 +274,7 @@ lib/tkX%%TCLX_LONG_VER%%/tkxConfig.sh
 @dirrm lib/tclX%%TCLX_LONG_VER%%/help/tcl/events
 @dirrm lib/tclX%%TCLX_LONG_VER%%/help/tcl/files
 @dirrm lib/tclX%%TCLX_LONG_VER%%/help/tcl/filescan
-@dirrm lib/tclX%%TCLX_LONG_VER%%/help/tcl/internation
+@dirrm lib/tclX%%TCLX_LONG_VER%%/help/tcl/intl
 @dirrm lib/tclX%%TCLX_LONG_VER%%/help/tcl/intro
 @dirrm lib/tclX%%TCLX_LONG_VER%%/help/tcl/keyedlists
 @dirrm lib/tclX%%TCLX_LONG_VER%%/help/tcl/libraries