diff options
Diffstat (limited to 'x11-toolkits/tk83/files')
| -rw-r--r-- | x11-toolkits/tk83/files/patch-aa | 47 | ||||
| -rw-r--r-- | x11-toolkits/tk83/files/patch-ab | 143 | ||||
| -rw-r--r-- | x11-toolkits/tk83/files/patch-tk.tcl | 10 | ||||
| -rw-r--r-- | x11-toolkits/tk83/files/patch-tkCursor.c | 25 | ||||
| -rw-r--r-- | x11-toolkits/tk83/files/patch-tkImgGIF.c | 11 | ||||
| -rw-r--r-- | x11-toolkits/tk83/files/pkgIndex.tcl | 3 |
6 files changed, 0 insertions, 239 deletions
diff --git a/x11-toolkits/tk83/files/patch-aa b/x11-toolkits/tk83/files/patch-aa deleted file mode 100644 index c6f57702fff9..000000000000 --- a/x11-toolkits/tk83/files/patch-aa +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.orig 2002-10-23 19:45:50.000000000 +0200 -+++ configure 2009-10-26 16:36:07.000000000 +0100 -@@ -1763,7 +1763,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print }' /etc/.relid'` -+ system=MP-RAS-`awk '{print }' '/etc/.relid'` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -2496,12 +2496,12 @@ - FreeBSD-*) - # FreeBSD 3.* and greater have ELF. - SHLIB_CFLAGS="-fPIC" -- SHLIB_LD="ld -Bshareable -x" -+ SHLIB_LD="ld -shared -x -soname \$@" - SHLIB_LD_LIBS='${LIBS}' - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" -- LDFLAGS="-export-dynamic" -+ LDFLAGS="" - LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - if test "${TCL_THREADS}" = "1" ; then - # The -pthread needs to go in the CFLAGS, not LIBS -@@ -2510,10 +2510,10 @@ - LDFLAGS="$LDFLAGS -pthread" - fi - case $system in -- FreeBSD-3.*) -+ FreeBSD-*) - # FreeBSD-3 doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' - TCL_LIB_VERSIONS_OK=nodots - ;; - esac -@@ -3074,6 +3074,7 @@ - fi - fi - -+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION} - - LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' - diff --git a/x11-toolkits/tk83/files/patch-ab b/x11-toolkits/tk83/files/patch-ab deleted file mode 100644 index a44f52617111..000000000000 --- a/x11-toolkits/tk83/files/patch-ab +++ /dev/null @@ -1,143 +0,0 @@ ---- Makefile.in.orig Wed Oct 23 19:45:50 2002 -+++ Makefile.in Mon Mar 12 18:00:56 2007 -@@ -58,6 +58,8 @@ - - # Directory in which to install the include file tk.h: - INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) -+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix - - # Top-level directory for manual entries: - MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) -@@ -100,7 +102,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -+CFLAGS ?= @CFLAGS@ - - # Flags to pass to the linker - LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -203,7 +205,7 @@ - # Libraries to use when linking. This definition is determined by the - # configure script. - LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ --WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -+WISH_LIBS = -L${PREFIX}/lib -ltcl${SHORT_TK_VER} @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc - - # The symbol below provides support for dynamic loading and shared - # libraries. See configure.in for a description of what it means. -@@ -352,6 +354,8 @@ - default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h \ - tkPort.h tkScrollbar.h tkText.h - -+INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h -+ - DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget - - all: binaries libraries doc -@@ -371,8 +375,14 @@ - ${TK_LIB_FILE}: ${OBJS} - rm -f ${TK_LIB_FILE} - @MAKE_LIB@ -+ ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so - $(RANLIB) ${TK_LIB_FILE} - -+libtk${SHORT_TK_VER}.a: ${OBJS} -+ rm -f libtk${SHORT_TK_VER}.a -+ ar cr libtk${SHORT_TK_VER}.a ${OBJS} -+ $(RANLIB) libtk${SHORT_TK_VER}.a -+ - ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} - rm -f ${STUB_LIB_FILE} - @MAKE_STUB_LIB@ -@@ -454,13 +464,13 @@ - gdb ./wish --command=gdb.run - rm gdb.run - --install: all install-binaries install-libraries install-demos install-doc -+install: all install-binaries install-libraries install-demos - - # Note: before running ranlib below, must cd to target directory because - # some ranlibs write to current directory, and this might not always be - # possible (e.g. if installing as root). - --install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish -+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk${SHORT_TK_VER}.a wish - @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ - do \ - if [ ! -d $$i ] ; then \ -@@ -478,12 +488,18 @@ - fi - @echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so - @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) - @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @echo "Installing libtk${SHORT_TK_VER}.a" -+ @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk${SHORT_TK_VER}.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a - @echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)" - @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) - @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/" -- @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh -+ @mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION) -+ @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh - @if test "$(TK_BUILD_EXP_FILE)" != ""; then \ - echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ -@@ -497,6 +513,7 @@ - - install-libraries: - @for i in $(INCLUDE_INSTALL_DIR) \ -+ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ - $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \ - do \ - if [ ! -d $$i ] ; then \ -@@ -510,10 +527,18 @@ - chmod +x $(UNIX_DIR)/install-sh; \ - fi - @echo "Installing header files"; -- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \ -- $(GENERIC_DIR)/tkDecls.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 $(UNIX_INCLUDE_INSTALL_DIR); \ -+ done; -+ @for i in $(INSTALL_HDRS) ; \ - do \ -- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ j=`basename $$i` ; \ -+ ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \ - done; - @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; - @for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ -@@ -580,7 +605,6 @@ - chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking top-level (.1) docs"; -- @$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) - @echo "Installing C API (.3) docs"; - @cd $(SRC_DIR)/doc; for i in *.3; \ - do \ -@@ -590,7 +614,6 @@ - chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking top-level (.3) docs"; -- @$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) - @echo "Installing command (.n) docs"; - @cd $(SRC_DIR)/doc; for i in *.n; \ - do \ -@@ -600,7 +623,6 @@ - chmod 444 $(MANN_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking command (.n) docs"; -- @$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) - - Makefile: $(UNIX_DIR)/Makefile.in - $(SHELL) config.status diff --git a/x11-toolkits/tk83/files/patch-tk.tcl b/x11-toolkits/tk83/files/patch-tk.tcl deleted file mode 100644 index 0a6ca86ff659..000000000000 --- a/x11-toolkits/tk83/files/patch-tk.tcl +++ /dev/null @@ -1,10 +0,0 @@ ---- ../library/tk.tcl.orig Fri Jun 7 02:54:55 2002 -+++ ../library/tk.tcl -@@ -304,6 +304,7 @@ - if {[info exists tcl_platform(os)]} { - switch $tcl_platform(os) { - "IRIX" - -+ "FreeBSD" - - "Linux" { event add <<PrevWindow>> <ISO_Left_Tab> } - "HP-UX" { - # This seems to be correct on *some* HP systems. diff --git a/x11-toolkits/tk83/files/patch-tkCursor.c b/x11-toolkits/tk83/files/patch-tkCursor.c deleted file mode 100644 index 864d5fad1d8c..000000000000 --- a/x11-toolkits/tk83/files/patch-tkCursor.c +++ /dev/null @@ -1,25 +0,0 @@ ---- ../generic/tkCursor.c 2001/08/15 15:44:36 1.7 -+++ ../generic/tkCursor.c 2001/10/23 08:40:47 1.8 -@@ -276,13 +276,12 @@ - cursorPtr->objRefCount = 0; - cursorPtr->otherTable = &dispPtr->cursorNameTable; - cursorPtr->hashPtr = nameHashPtr; -- cursorPtr->nextPtr = NULL; -+ cursorPtr->nextPtr = existingCursorPtr; - cursorPtr->idHashPtr = Tcl_CreateHashEntry(&dispPtr->cursorIdTable, - (char *) cursorPtr->cursor, &new); - if (!new) { - panic("cursor already registered in Tk_GetCursor"); - } -- cursorPtr->nextPtr = existingCursorPtr; - Tcl_SetHashValue(nameHashPtr, cursorPtr); - Tcl_SetHashValue(cursorPtr->idHashPtr, cursorPtr); - -@@ -384,6 +383,7 @@ - cursorPtr->objRefCount = 0; - cursorPtr->idHashPtr = Tcl_CreateHashEntry(&dispPtr->cursorIdTable, - (char *) cursorPtr->cursor, &new); -+ cursorPtr->nextPtr = NULL; - - if (!new) { - panic("cursor already registered in Tk_GetCursorFromData"); diff --git a/x11-toolkits/tk83/files/patch-tkImgGIF.c b/x11-toolkits/tk83/files/patch-tkImgGIF.c deleted file mode 100644 index c70dcae78556..000000000000 --- a/x11-toolkits/tk83/files/patch-tkImgGIF.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ../generic/tkImgGIF.c 2002-03-26 03:29:01.000000000 +0100 -+++ ../generic/tkImgGIF.new.c 2007-10-04 20:40:09.000000000 +0200 -@@ -960,7 +960,7 @@ - /* If interlacing, the next ypos is not just +1 */ - if (interlace) { - ypos += interlaceStep[pass]; -- while (ypos >= height) { -+ while (ypos >= rows) { - pass++; - if (pass > 3) { - return TCL_OK; diff --git a/x11-toolkits/tk83/files/pkgIndex.tcl b/x11-toolkits/tk83/files/pkgIndex.tcl deleted file mode 100644 index 47743949502f..000000000000 --- a/x11-toolkits/tk83/files/pkgIndex.tcl +++ /dev/null @@ -1,3 +0,0 @@ -# Tcl package index file, version 1.0 - -package ifneeded Tk 8.3 [list load "[file join [file dirname $dir] libtk83.so.1]" Tk] |
