diff options
Diffstat (limited to 'lang/tcl86/files')
-rw-r--r-- | lang/tcl86/files/patch-generic-tclPort.h | 11 | ||||
-rw-r--r-- | lang/tcl86/files/patch-generic-tclPosixStr.c | 22 | ||||
-rw-r--r-- | lang/tcl86/files/patch-tests-fCmd.test | 20 | ||||
-rw-r--r-- | lang/tcl86/files/patch-unix-Makefile.in | 145 | ||||
-rw-r--r-- | lang/tcl86/files/patch-unix-configure | 37 | ||||
-rw-r--r-- | lang/tcl86/files/patch-unix-tclUnixPort.h | 12 |
6 files changed, 0 insertions, 247 deletions
diff --git a/lang/tcl86/files/patch-generic-tclPort.h b/lang/tcl86/files/patch-generic-tclPort.h deleted file mode 100644 index 5b8d1d292e5e..000000000000 --- a/lang/tcl86/files/patch-generic-tclPort.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../generic/tclPort.h.orig Tue Jan 30 11:39:50 2007 -+++ ../generic/tclPort.h Tue Jan 30 11:41:05 2007 -@@ -24,7 +24,7 @@ - #if defined(__WIN32__) - # include "../win/tclWinPort.h" - #else --# include "tclUnixPort.h" -+# include "../unix/tclUnixPort.h" - #endif - - #if !defined(LLONG_MIN) diff --git a/lang/tcl86/files/patch-generic-tclPosixStr.c b/lang/tcl86/files/patch-generic-tclPosixStr.c deleted file mode 100644 index f178ef6c38fd..000000000000 --- a/lang/tcl86/files/patch-generic-tclPosixStr.c +++ /dev/null @@ -1,22 +0,0 @@ ---- ../generic/tclPosixStr.c.orig Wed Jan 17 13:12:17 2007 -+++ ../generic/tclPosixStr.c Wed Jan 17 13:03:19 2007 -@@ -1039,6 +1039,9 @@ - #ifdef SIGXFSZ - case SIGXFSZ: return "SIGXFSZ"; - #endif -+#ifdef SIGINFO -+ case SIGINFO: return "SIGINFO"; -+#endif - } - return "unknown signal"; - } -@@ -1169,6 +1172,9 @@ - #endif - #ifdef SIGXFSZ - case SIGXFSZ: return "exceeded file size limit"; -+#endif -+#ifdef SIGINFO -+ case SIGINFO: return "information/status request"; - #endif - } - return "unknown signal"; diff --git a/lang/tcl86/files/patch-tests-fCmd.test b/lang/tcl86/files/patch-tests-fCmd.test deleted file mode 100644 index 792df4022c8c..000000000000 --- a/lang/tcl86/files/patch-tests-fCmd.test +++ /dev/null @@ -1,20 +0,0 @@ ---- ../tests/fCmd.test.orig Mon Nov 13 20:46:35 2006 -+++ ../tests/fCmd.test Sun Apr 29 21:31:35 2007 -@@ -572,7 +572,7 @@ - set msg - } {1 {error copying "td2" to "~/td1/td2": permission denied}} - test fCmd-6.26 {CopyRenameOneFile: doesn't use original name} \ -- {unix notRoot} { -+ -constraints {unixOnly notRoot} -match regexp -body { - cleanup - file mkdir ~/td1/td2 - set td2name [file join [file dirname ~] [file tail ~] td1 td2] -@@ -581,7 +581,7 @@ - file attributes $td2name -permissions 0755 - file delete -force ~/td1 - set msg --} "1 {error copying \"~/td1\" to \"td1\": \"[file join $::env(HOME) td1 td2]\": permission denied}" -+} -result "1 {error copying \"~/td1\" to \"td1\": \".*[file join $::env(HOME) td1 td2]\": permission denied}" - test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} \ - {unix notRoot xdev} { - cleanup /tmp diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in deleted file mode 100644 index c5840deb2c98..000000000000 --- a/lang/tcl86/files/patch-unix-Makefile.in +++ /dev/null @@ -1,145 +0,0 @@ ---- Makefile.in.orig Thu Apr 26 19:33:51 2007 -+++ Makefile.in Sun Apr 29 22:33:58 2007 -@@ -54,6 +54,8 @@ - - # Directory in which to install the include file tcl.h: - INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) -+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix - - # Path to the private tcl header dir: - PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -97,7 +99,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ - - # Flags to pass to the linker - LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -540,7 +542,8 @@ - - all: binaries libraries doc - --binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh -+binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ -+ libtcl${SHORT_TCL_VER}.a tclsh - - libraries: - -@@ -551,6 +554,15 @@ - ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} - rm -f $@ - @MAKE_LIB@ -+ @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so -+ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ -+ $(RANLIB) ${LIB_FILE}; \ -+ fi -+ -+libtcl${SHORT_TCL_VER}.a: ${OBJS} -+ rm -f libtcl${SHORT_TCL_VER}.a -+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS} -+ $(RANLIB) libtcl${SHORT_TCL_VER}.a - - ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} - rm -f $@ -@@ -699,7 +711,7 @@ - dltest.marker: ${STUB_LIB_FILE} - cd dltest ; $(MAKE) - --INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@ -+INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@ - - install: $(INSTALL_TARGETS) - -@@ -728,6 +740,13 @@ - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" - @@INSTALL_LIB@ - @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE) -+ @ln -sf $(LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so -+ @echo "Installing libtcl${SHORT_TCL_VER}.a" -+ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \ -+ $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a -+ - @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ - echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -735,8 +754,9 @@ - fi - @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" - @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) -- @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/" -- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh -+ @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/" -+ @mkdir -p $(SCRIPT_INSTALL_DIR) -+ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh - @if test "$(STUB_LIB_FILE)" != "" ; then \ - echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ - @INSTALL_STUB_LIB@ ; \ -@@ -744,7 +764,8 @@ - @EXTRA_INSTALL_BINARIES@ - - install-libraries: libraries $(INSTALL_TZDATA) install-msgs -- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \ -+ @for i in $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ -+ $(SCRIPT_INSTALL_DIR); \ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -@@ -766,13 +787,17 @@ - chmod +x $(SRC_DIR)/../unix/install-sh; \ - fi - @echo "Installing header files"; -- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ -- $(GENERIC_DIR)/tclPlatDecls.h \ -- $(GENERIC_DIR)/tclTomMath.h \ -- $(GENERIC_DIR)/tclTomMathDecls.h ; \ -+ @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; -+ @for i in $(UNIX_DIR)/*.h ; \ - do \ -- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ - done; -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclPlatDecls.h $(INCLUDE_INSTALL_DIR)/tclPlatDecls.h - @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; - @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ - do \ -@@ -839,18 +864,27 @@ - done; - @echo "Installing and cross-linking top-level (.1) docs"; - @for i in $(TOP_DIR)/doc/*.1; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \ -+ ${BSD_INSTALL_MAN} $$i $(MAN1_INSTALL_DIR); \ - done - - @echo "Installing and cross-linking C API (.3) docs"; - @for i in $(TOP_DIR)/doc/*.3; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \ -+ ${BSD_INSTALL_MAN} $$i $(MAN3_INSTALL_DIR); \ - done - - @echo "Installing and cross-linking command (.n) docs"; - @for i in $(TOP_DIR)/doc/*.n; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \ -+ ${BSD_INSTALL_MAN} $$i $(MANN_INSTALL_DIR); \ - done -+ -+ @echo "**********" -+ @echo "IMPORTANT:" -+ @echo "**********" -+ @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh" -+ @echo "tcl.h in $(INCLUDE_INSTALL_DIR)/tcl.h" -+ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h" -+ @echo "There are NOT default place, but good place to avoid" -+ @echo "conflicting with another version of Tcl/Tks." - - # Optional target to install private headers - install-private-headers: libraries diff --git a/lang/tcl86/files/patch-unix-configure b/lang/tcl86/files/patch-unix-configure deleted file mode 100644 index 2ee97ec6e969..000000000000 --- a/lang/tcl86/files/patch-unix-configure +++ /dev/null @@ -1,37 +0,0 @@ ---- configure.orig 2007-09-24 17:46:44.000000000 +0200 -+++ configure 2007-09-27 20:24:15.000000000 +0200 -@@ -6615,7 +6615,7 @@ - LDFLAGS_ARCH="" - TCL_EXPORT_FILE_SUFFIX="" - UNSHARED_LIB_SUFFIX="" -- TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' -+ TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` - ECHO_VERSION='`echo ${VERSION}`' - TCL_LIB_VERSIONS_OK=ok - CFLAGS_DEBUG=-g -@@ -7490,20 +7490,20 @@ - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" -- LDFLAGS="$LDFLAGS -export-dynamic" -+ LDFLAGS="" - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - if test "${TCL_THREADS}" = "1" ; then - # The -pthread needs to go in the CFLAGS, not LIBS - LIBS=`echo $LIBS | sed s/-pthread//` -- CFLAGS="$CFLAGS -pthread" -- LDFLAGS="$LDFLAGS -pthread" -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS" - fi - case $system in -- FreeBSD-3.*) -+ FreeBSD-*) - # FreeBSD-3 doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' - TCL_LIB_VERSIONS_OK=nodots - ;; - esac diff --git a/lang/tcl86/files/patch-unix-tclUnixPort.h b/lang/tcl86/files/patch-unix-tclUnixPort.h deleted file mode 100644 index 7a4f70a917d2..000000000000 --- a/lang/tcl86/files/patch-unix-tclUnixPort.h +++ /dev/null @@ -1,12 +0,0 @@ ---- tclUnixPort.h.orig Wed Jan 17 13:14:18 2007 -+++ tclUnixPort.h Wed Jan 17 13:08:39 2007 -@@ -628,6 +628,9 @@ - EXTERN struct tm * TclpLocaltime(CONST time_t *); - EXTERN struct tm * TclpGmtime(CONST time_t *); - EXTERN char * TclpInetNtoa(struct in_addr); -+#ifdef inet_ntoa -+# undef inet_ntoa -+#endif - /* #define localtime(x) TclpLocaltime(x) - * #define gmtime(x) TclpGmtime(x) */ - # undef inet_ntoa |