I dreamed it would happen. I asked about. I finally did it

myself (for the lack of  children, whom I could've prohibited to
do it). Sorry.

Upgrade this port to:
	. build against TCL-8.3 by default (controllable by TCL_VER)
	. build with or without TK (controllable by NO_X)
	. take over maintainership -- regretfully, Justin was
	  rather idle recently
	. build the helpfiles once -- during the build stage --
	  not during the install stage

On a side  note, I more and  more resent the fact,  that our TCL
8.3 is built with the  -stubs. It just introduces more variables
without  noticeable benefit.  On FreeBSD  shared libraries  work
well...

I  tested this  with TCL-8.3  (with  and without  TK), and  with
TCL-8.2 (without TK only). Please, test this more.

4 files changed, 53 insertions, 9 deletions

diff --git a/lang/tclX/files/patch-ab b/lang/tclX/files/patch-ab
index 0c7cac0..9c0dfb7 100644
--- a/lang/tclX/files/patch-ab
+++ b/lang/tclX/files/patch-ab
@@ -9,10 +9,12 @@
  
  libraries: tcl.tndx tcl.tlib tclx.tcl buildidx.tcl
  
-@@ -163,6 +163,7 @@
+@@ -162,7 +162,8 @@
+ 	PATH=${TCL_UNIX_DIR}:${PATH}; export PATH; \
  	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}
+-	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS}
++	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} @NEED_TCL_STUB@
 +	ln -sf ${TCLX_SHLIB_NAME} `echo ${TCLX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`
  
  hello:	hello.c
@@ -35,6 +37,11 @@
  	    ${HELP_DIR} Tcl.brf
  	${RUNTCL} -c "buildhelp ${HELP_DIR} TclX.brf ${TCLX_DOC_DIR}/TclX.n"
  
+@@ -322,3 +323,3 @@
+ 
+-install-misc: buildhelp
++install-misc:
+ 	${INSTCOPY} ${TCLX_GENERIC_DIR}/tclExtend.h \
 @@ -338,9 +339,11 @@
  	    ${INSTCOPY} ${TCLX_STLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB}; \
  	    ${RANLIB} ${INSTALL_ROOT}${TCLX_INST_LIB}/${TCLX_STLIB_NAME}; \
@@ -48,3 +55,7 @@
  	    ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\
  	fi
  
+@@ -385,2 +388,2 @@
+ tclXAppInit.o: ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c
+-	${CC} -c ${CC_SWITCHES} ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c
++	${CC} -c ${CC_SWITCHES} -UUSE_TCL_STUBS ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c
diff --git a/lang/tclX/files/patch-ac b/lang/tclX/files/patch-ac
index 32ddf41..c70c6c1 100644
--- a/lang/tclX/files/patch-ac
+++ b/lang/tclX/files/patch-ac
@@ -1,4 +1,4 @@
---- ../tk/unix/Makefile.in.orig	Sun Feb  6 18:54:01 2000
+--- ../tk/unix/Makefile.in	Sun Feb  6 18:54:01 2000
 +++ ../tk/unix/Makefile.in	Thu Jul 13 15:35:36 2000
 @@ -81,7 +81,7 @@
  #
@@ -9,14 +9,13 @@
  
  libraries: RUNTIME
  
-@@ -112,6 +112,7 @@
+@@ -112,4 +112,4 @@
  	${TCL_SHLIB_LD} -o ${TKX_SHLIB_NAME} ${SOBJS} \
- 	    ${TK_BUILD_STUB_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \
- 	    ${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS}
+-	    ${TK_BUILD_STUB_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \
+-	    ${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS}
++	    ${TK_SHLIB_LD_LIBS} ${TCLX_BUILD_LIB_SPEC}
 +	ln -sf ${TKX_SHLIB_NAME} `echo ${TKX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`
  
- hello:	hello.c
- 	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
 @@ -199,7 +200,7 @@
  buildhelp:
  	rm -rf ${HELP_DIR} help help.tmp
@@ -26,6 +25,9 @@
  	    ${HELP_DIR} Tk.brf
  
  #------------------------------------------------------------------------------
+@@ -215 +215 @@
+-install-misc: buildhelp
++install-misc:
 @@ -227,9 +228,11 @@
  	    ${INSTCOPY} ${TKX_STLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB}; \
  	    ${RANLIB} ${INSTALL_ROOT}${TKX_INST_LIB}/${TKX_STLIB_NAME}; \
@@ -39,3 +41,8 @@
  	    ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TKX_EXEC_RUNTIME} ;\
  	fi
  	${INSTCOPY} tclhelp ${INSTALL_ROOT}${TKX_INST_BIN}
+@@ -274,2 +276,3 @@
+ tkXAppInit.o: ${TKX_UNIX_SRC_DIR}/tkXAppInit.c
+-	${CC} -c ${CC_SWITCHES} ${TKX_UNIX_SRC_DIR}/tkXAppInit.c
++	${CC} -c ${CC_SWITCHES} -UUSE_TCL_STUBS -UUSE_TK_STUBS \
++		${TKX_UNIX_SRC_DIR}/tkXAppInit.c
diff --git a/lang/tclX/files/patch-ae b/lang/tclX/files/patch-ae
index 793ff38..9c42120 100644
--- a/lang/tclX/files/patch-ae
+++ b/lang/tclX/files/patch-ae
@@ -33,11 +33,21 @@
  
  #
  # Determine suffix to use for the object files for the shared library.
-@@ -4831,6 +4832,7 @@
+@@ -4793,2 +4794,8 @@
+ EOF
++
++if /usr/bin/ldd ${prefix}/bin/tclsh$TCL_VERSION | fgrep -qv libtcl; then
++	TCL_EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS\ -DUSE_TCL_STUBS
++	NEED_TCL_STUB=$TCL_STUB_LIB_SPEC
++fi
++
+ cat >> $CONFIG_STATUS <<EOF
+@@ -4831,6 +4832,8 @@
  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%@NEED_TCL_STUB@%$NEED_TCL_STUB%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
diff --git a/lang/tclX/files/patch-tkxshell b/lang/tclX/files/patch-tkxshell
new file mode 100644
index 0000000..d9fa531
--- /dev/null
+++ b/lang/tclX/files/patch-tkxshell
@@ -0,0 +1,16 @@
+--- ../tk/generic/tkXshell.c	Sun Feb  6 19:54:00 2000
++++ ../tk/generic/tkXshell.c	Fri Mar 16 14:02:59 2001
+@@ -87,2 +87,4 @@
++#if TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION < 3
+ extern void		TkpDisplayWarning _ANSI_ARGS_((char *msg,
+ 			    char *title));
++#endif
+@@ -407,7 +407,7 @@
+     Tk_MainLoop();
+-    Tcl_DeleteInterp(interp);
+ #ifdef TKX_SHELL
+     TclX_ShellExit(interp, 0);
+ #else
++    Tcl_DeleteInterp(interp);
+     Tcl_Exit(0);
+ #endif