summaryrefslogtreecommitdiff
path: root/lang/tclX/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/tclX/files')
-rw-r--r--lang/tclX/files/patch-ab56
-rw-r--r--lang/tclX/files/patch-ac45
-rw-r--r--lang/tclX/files/patch-ad72
-rw-r--r--lang/tclX/files/patch-ae61
-rw-r--r--lang/tclX/files/patch-af63
-rw-r--r--lang/tclX/files/patch-tkxshell16
6 files changed, 0 insertions, 313 deletions
diff --git a/lang/tclX/files/patch-ab b/lang/tclX/files/patch-ab
deleted file mode 100644
index 886e9ac2b1a6..000000000000
--- a/lang/tclX/files/patch-ab
+++ /dev/null
@@ -1,56 +0,0 @@
---- ../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: binaries libraries doc
-
--binaries: tcl checkup RUNTIME tclXtest
-+binaries: tcl checkup RUNTIME
-
- libraries: tcl.tndx tcl.tlib tclx.tcl buildidx.tcl
-
-@@ -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} @NEED_TCL_STUB@ -lm
-+ ln -sf ${TCLX_SHLIB_NAME} `echo ${TCLX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`
-
- hello: hello.c
- ${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
-@@ -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
-
- tcl.tlib: ${TLIB_SRCS} autoload.tcl
- -rm -f tcl.tlib tcl.tndx
-@@ -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 "@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/'`) ;\
- ${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
deleted file mode 100644
index 0867456df65e..000000000000
--- a/lang/tclX/files/patch-ac
+++ /dev/null
@@ -1,45 +0,0 @@
---- ../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
diff --git a/lang/tclX/files/patch-ad b/lang/tclX/files/patch-ad
deleted file mode 100644
index 69011c45858b..000000000000
--- a/lang/tclX/files/patch-ad
+++ /dev/null
@@ -1,72 +0,0 @@
---- 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_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@
-+CFLAGS += @TCL_CFLAGS_WARNING@ @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@
-
--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
deleted file mode 100644
index 77a2d2654139..000000000000
--- a/lang/tclX/files/patch-ae
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure.orig Sun Feb 6 18:54:02 2000
-+++ configure Thu Jul 13 14:29:54 2000
-@@ -2088,8 +2088,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 @@
-
- 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=libtclx83.a
-+TCLX_SHLIB_NAME=libtclx83.so.1
-
- 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=libtkx83.a
-+TKX_SHLIB_NAME=libtkx83.so.1
-
- #
- # Determine suffix to use for the object files for the shared library.
-@@ -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
-@@ -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
deleted file mode 100644
index 1e38676af12c..000000000000
--- a/lang/tclX/files/patch-af
+++ /dev/null
@@ -1,63 +0,0 @@
---- 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/files/patch-tkxshell b/lang/tclX/files/patch-tkxshell
deleted file mode 100644
index d9fa531b86f3..000000000000
--- a/lang/tclX/files/patch-tkxshell
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../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