From 79fb1155cb12bab0890aff8f5cd03b04ee167b64 Mon Sep 17 00:00:00 2001
From: Mikhail Teterin <mi@FreeBSD.org>
Date: Fri, 16 Mar 2001 20:11:53 +0000
Subject: 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.
---
 lang/tclX82/files/patch-ac | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'lang/tclX82/files/patch-ac')

diff --git a/lang/tclX82/files/patch-ac b/lang/tclX82/files/patch-ac
index 32ddf413e4b9..c70c6c116fc9 100644
--- a/lang/tclX82/files/patch-ac
+++ b/lang/tclX82/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
-- 
cgit v1.2.3