head	1.8;
access;
symbols
	RELEASE_5_1_0:1.7
	RELEASE_4_8_0:1.7
	RELEASE_5_0_0:1.7
	RELEASE_4_7_0:1.7
	RELEASE_4_6_2:1.7
	RELEASE_4_6_1:1.7
	RELEASE_4_6_0:1.7
	RELEASE_5_0_DP1:1.7
	RELEASE_4_5_0:1.7
	RELEASE_4_4_0:1.6
	RELEASE_4_3_0:1.6
	RELEASE_4_2_0:1.5
	RELEASE_4_1_1:1.5
	RELEASE_4_1_0:1.5
	RELEASE_3_5_0:1.4
	RELEASE_4_0_0:1.4
	RELEASE_3_4_0:1.4
	RELEASE_3_3_0:1.4
	RELEASE_3_2_0:1.3
	RELEASE_3_1_0:1.3
	RELEASE_2_2_8:1.3
	RELEASE_3_0_0:1.3
	RELEASE_2_2_7:1.2
	RELEASE_2_2_6:1.1
	RELEASE_2_2_5:1.1;
locks; strict;
comment	@# @;


1.8
date	2003.06.02.20.19.28;	author mi;	state dead;
branches;
next	1.7;

1.7
date	2001.10.24.03.18.59;	author mi;	state Exp;
branches;
next	1.6;

1.6
date	2001.03.16.20.11.53;	author mi;	state Exp;
branches;
next	1.5;

1.5
date	2000.07.13.20.54.36;	author ade;	state Exp;
branches;
next	1.4;

1.4
date	99.09.02.21.59.32;	author jseger;	state Exp;
branches;
next	1.3;

1.3
date	98.10.11.19.51.43;	author smace;	state Exp;
branches;
next	1.2;

1.2
date	98.05.21.01.36.26;	author jseger;	state Exp;
branches;
next	1.1;

1.1
date	97.10.09.08.19.15;	author tg;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Finaly delete lang/tclX82 (installing TclX-8.3) and point devel/tcl-neo
to use lang/tclX (currently installing TclX-8.3.5).
@
text
@--- ../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 @@@@
 #
 all: binaries libraries doc
 
-binaries: wishx tktest
+binaries: wishx
 
 libraries: RUNTIME
 
@@@@ -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_SHLIB_LD_LIBS} ${TCLX_BUILD_LIB_SPEC}
+	ln -sf ${TKX_SHLIB_NAME} `echo ${TKX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`
 
@@@@ -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 "@@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/'`) ;\
 	    ${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
@


1.7
log
@TclX seems abandoned by its original authors, but the maintainers
of TclPro made TclX-8.3 available last year. There is not a whole
lot of changes, and most of them deal with the Windows parts of the
thing, but here is the upgrade 8.3 anyway. Please, test...

I think, it is time to repocopy tclX82 into tclX and get rid of
tclX75, tclX80, and tclX82...
@
text
@@


1.6
log
@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.
@
text
@a27 3
@@@@ -215 +215 @@@@
-install-misc: buildhelp
+install-misc:
@


1.5
log
@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>
@
text
@d1 1
a1 1
--- ../tk/unix/Makefile.in.orig	Sun Feb  6 18:54:01 2000
d12 1
a12 1
@@@@ -112,6 +112,7 @@@@
d14 3
a16 2
 	    ${TK_BUILD_STUB_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \
 	    ${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS}
a18 2
 hello:	hello.c
 	${CC} ${LD_SWITCHES} -o $@@ hello.c ${STATIC_LIBS}
d28 3
d44 5
@


1.4
log
@Unbreak and upgrade tclX80 to 8.0.4

PR:		ports/13544
Submitted by:	Ade Lovett <ade@@lovett.com>
@
text
@d1 3
a3 5
--- ../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.
d5 1
a5 2
-all: wishx RUNTIME tktest
+all: wishx RUNTIME
d7 4
a10 1
 static: wishx.static tktest.static
d14 2
a15 2
 	    ${TK_BUILD_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \
 	    ${TCL_BUILD_LIB_SPEC} ${TCL_SHLIB_LD_LIBS}
d20 10
a29 1
@@@@ -223,9 +224,11 @@@@
d35 1
a35 1
 	if test "@@BUILD_SHARED@@" = "YES"; then \
@


1.3
log
@Convert to ELF.
PR:		8017
Approved by:	jseger
@
text
@d1 2
a2 2
--- ../tk/unix/Makefile.in.orig	Sat Nov 29 17:19:07 1997
+++ ../tk/unix/Makefile.in	Mon Sep 28 14:14:16 1998
@


1.2
log
@Import of tclX8.0.2

PR:             6540
Submitted by:   dob@@bazzle.com
@
text
@d1 2
a2 2
--- ../tk/unix/Makefile.in.ORIG	Sun May  3 18:54:47 1998
+++ ../tk/unix/Makefile.in	Sun May  3 18:55:31 1998
d12 21
@


1.1
log
@Un-break this port. We need it for xtem (PR 3759).
@
text
@d1 3
a3 3
--- ../tk/unix/Makefile.in.orig	Sun Jun 16 07:39:17 1996
+++ ../tk/unix/Makefile.in	Thu Oct  9 09:57:43 1997
@@@@ -67,8 +67,7 @@@@
d7 4
a10 3
-all: libtkx.a SHLIB_@@BUILD_SHARED@@ wishx RUNTIME tktest runtest \
-     ${bldbasedir}/tk/tests
+all: libtkx.a SHLIB_@@BUILD_SHARED@@ wishx RUNTIME
a11 2
 wishx: tkXAppInit.o libtkx.a ${LIBTK} ${LIBTCLX}
 	${CC} ${LD_SWITCHES} tkXAppInit.o ${LDLIBS} -o wishx || \
@
