summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjwise <jwise@pkgsrc.org>2000-09-01 17:10:37 +0000
committerjwise <jwise@pkgsrc.org>2000-09-01 17:10:37 +0000
commit2ddebc73b12221084dc80f50e9c371546789f6e4 (patch)
tree571f4f357745f36d5fe588921c31ca83ec58db2e /x11
parentc66e7f6c6ddc6fb5bb954bf59de023f201ccc064 (diff)
downloadpkgsrc-2ddebc73b12221084dc80f50e9c371546789f6e4.tar.gz
Remove this package. It has been supplanted by pkgsrc/x11/tk.
Diffstat (limited to 'x11')
-rw-r--r--x11/tk80/Makefile27
-rw-r--r--x11/tk80/files/md53
-rw-r--r--x11/tk80/files/patch-sum6
-rw-r--r--x11/tk80/patches/patch-aa48
-rw-r--r--x11/tk80/patches/patch-ab509
-rw-r--r--x11/tk80/patches/patch-ac714
-rw-r--r--x11/tk80/patches/patch-ad1074
-rw-r--r--x11/tk80/pkg/COMMENT1
-rw-r--r--x11/tk80/pkg/DESCR9
-rw-r--r--x11/tk80/pkg/PLIST467
10 files changed, 0 insertions, 2858 deletions
diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile
deleted file mode 100644
index 2180755a581..00000000000
--- a/x11/tk80/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2000/07/28 21:02:55 jlam Exp $
-# FreeBSD Id: Makefile,v 1.4 1997/10/01 09:20:31 tg Exp
-#
-
-DISTNAME= tk8.0.5
-PKGNAME= tk-8.0.5
-CATEGORIES= x11
-MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
-
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.scriptics.com/
-
-DEPENDS+= tcl-8.0.5:../../lang/tcl80
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/unix
-GNU_CONFIGURE= yes
-
-USE_X11= yes
-
-# let libtool look after shared libraries
-USE_LIBTOOL= yes
-CONFIGURE_ARGS= --disable-shared
-
-test:
- cd ${WRKSRC}; ${SETENV} LIBTOOL=${LIBTOOL} PREFIX=${PREFIX} ${MAKE} test
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk80/files/md5 b/x11/tk80/files/md5
deleted file mode 100644
index 4a16bc8a79f..00000000000
--- a/x11/tk80/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.4 1999/04/01 13:38:46 agc Exp $
-
-MD5 (tk8.0.5.tar.gz) = 3ae92b86c01ec99a1872697294839e64
diff --git a/x11/tk80/files/patch-sum b/x11/tk80/files/patch-sum
deleted file mode 100644
index 9b05fc4585b..00000000000
--- a/x11/tk80/files/patch-sum
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:31 agc Exp $
-
-MD5 (patch-aa) = 6320017049ea836f0a16c45493467575
-MD5 (patch-ab) = f8f283d43def0e7506c7f5d4166f86b5
-MD5 (patch-ac) = 07db919c2461d803074dd03d3cb2bf37
-MD5 (patch-ad) = b012c128065fa75a2a853758f7496119
diff --git a/x11/tk80/patches/patch-aa b/x11/tk80/patches/patch-aa
deleted file mode 100644
index 24fdb7dcaeb..00000000000
--- a/x11/tk80/patches/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.7 1999/04/03 16:17:01 tron Exp $
-
---- configure.orig Tue Mar 9 06:53:50 1999
-+++ configure Thu Apr 1 13:19:46 1999
-@@ -874,15 +874,12 @@
- withval="$with_tcl"
- TCL_BIN_DIR=$withval
- else
-- TCL_BIN_DIR=`cd ../../tcl8.0$TK_PATCH_LEVEL/unix; pwd`
-+ TCL_BIN_DIR=${prefix}/lib/tcl8.0
- fi
-
- if test ! -d $TCL_BIN_DIR; then
- { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; }
- fi
--if test ! -f $TCL_BIN_DIR/Makefile; then
-- { echo "configure: error: There's no Makefile in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
--fi
-
- #--------------------------------------------------------------------
- # Read in configuration information generated by Tcl for shared
-@@ -922,6 +919,8 @@
- CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
- EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
-
-+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
-+
- LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
-
- # If Tcl and Tk are installed in different places, adjust the library
-@@ -2400,6 +2399,9 @@
- DBGX='${TK_DBGX}'
- eval "TK_LIB_FILE=${TK_LIB_FILE}"
-
-+# Force the issue
-+TK_SHARED_BUILD=1
-+
- # Note: in the following variable, it's important to use the absolute
- # path name of the Tcl directory rather than "..": this is because
- # AIX remembers this path and will attempt to use it at run-time to look
-@@ -2598,6 +2600,7 @@
- s%@SHLIB_VERSION@%$SHLIB_VERSION%g
- s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
- s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
-+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
- s%@TCL_DBGX@%$TCL_DBGX%g
- s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g
- s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
diff --git a/x11/tk80/patches/patch-ab b/x11/tk80/patches/patch-ab
deleted file mode 100644
index 974c8302d55..00000000000
--- a/x11/tk80/patches/patch-ab
+++ /dev/null
@@ -1,509 +0,0 @@
-$NetBSD: patch-ab,v 1.10 1999/04/03 00:32:43 tron Exp $
-
-Adjust for libtool operation.
-
---- Makefile.in.orig Tue Mar 9 07:53:50 1999
-+++ Makefile.in Sat Apr 3 02:17:21 1999
-@@ -56,7 +56,9 @@
- BIN_DIR = $(exec_prefix)/bin
-
- # Directory in which to install the include file tk.h:
--INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tk$(VERSION)
-+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)$(prefix)/man
-@@ -112,7 +114,7 @@
-
- # Libraries to use when linking. This definition is determined by the
- # configure script.
--LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
-+LIBS = -L${.CURDIR}/.libs -L${prefix}/lib -ltcl80 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
-
- # To turn off the security checks that disallow incoming sends when
- # the X server appears to be insecure, reverse the comments on the
-@@ -148,8 +150,8 @@
- # "install" around; better to use the install-sh script that comes
- # with the distribution, which is slower but guaranteed to work.
-
--INSTALL = @srcdir@/install-sh -c
--INSTALL_PROGRAM = ${INSTALL}
-+INSTALL = install -c
-+INSTALL_PROGRAM = ${INSTALL} -m 755 -s
- INSTALL_DATA = ${INSTALL} -m 644
-
-
-@@ -307,9 +309,7 @@
- # The following target is configured by autoconf to generate either
- # a shared library or non-shared library for Tk.
- ${TK_LIB_FILE}: ${OBJS}
-- rm -f ${TK_LIB_FILE}
-- @MAKE_LIB@
-- $(RANLIB) ${TK_LIB_FILE}
-+ ${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:0
-
- # Make target which outputs the list of the .o contained in the Tk lib
- # usefull to build a single big shared library containing Tcl/Tk and other
-@@ -320,18 +320,21 @@
- # case
- objs: ${OBJS}
-
-+RPATH= -Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib
-
- wish: $(WISH_OBJS) $(TK_LIB_FILE)
-- $(CC) @LD_FLAGS@ $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ $(LIBS) \
-+ ${LIBTOOL} --mode=link $(CC) @LD_FLAGS@ $(RPATH) $(WISH_OBJS) \
-+ ${TK_LIB_FILE:.a=.la} $(LIBS) \
- $(TK_CC_SEARCH_FLAGS) -o wish
-
- tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
-- ${CC} @LD_FLAGS@ $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ $(LIBS) \
-+ ${LIBTOOL} --mode=link ${CC} @LD_FLAGS@ $(RPATH) $(TKTEST_OBJS) \
-+ ${TK_LIB_FILE:.a=.la} $(LIBS) \
- $(TK_CC_SEARCH_FLAGS) -o tktest
-
- xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
-- ${CC} @LD_FLAGS@ test.o tkTest.o tkSquare.o \
-- @TK_BUILD_LIB_SPEC@ $(LIBS) \
-+ ${LIBTOOL} --mode=link ${CC} @LD_FLAGS@ $(RPATH) test.o tkTest.o tkSquare.o \
-+ ${TK_LIB_FILE:.a=.la} $(LIBS) \
- @TK_LD_SEARCH_FLAGS@ -lXt -o xttest
-
- # Note, in the target below TCL_LIBRARY needs to be set or else
-@@ -376,16 +379,17 @@
- fi; \
- done;
- @echo "Installing $(TK_LIB_FILE)"
-- @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-- @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
-+ @${LIBTOOL} --mode=install $(INSTALL_DATA) ${TK_LIB_FILE:.a=.la} $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
- @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
- @echo "Installing wish"
-- @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
-+ @${LIBTOOL} --mode=install $(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
- @echo "Installing tkConfig.sh"
-- @$(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
-
- install-libraries:
- @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
-+ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
- $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
- do \
- if [ ! -d $$i ] ; then \
-@@ -395,8 +399,19 @@
- else true; \
- fi; \
- done;
-- @echo "Installing tk.h"
-- @$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
-+ @echo "Installing headers"
-+ @for i in $(GENERIC_DIR)/*.h ; \
-+ do \
-+ echo "Installing $$i"; \
-+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
-+ done;
-+ @for i in $(UNIX_DIR)/*.h ; \
-+ do \
-+ echo "Installing $$i"; \
-+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
-+ done;
-+ @rm -f $(INCLUDE_INSTALL_DIR)/tk.h
-+ @ln -s $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
- for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
- do \
- echo "Installing $$i"; \
-@@ -455,7 +470,7 @@
- @cd $(SRC_DIR)/doc; for i in *.1; \
- do \
- echo "Installing doc/$$i"; \
-- rm -f $(MAN1_INSTALL_DIR)/$$i; \
-+ rm -f $(MAN1_INSTALL_DIR)/$$i $(MAN1_INSTALL_DIR)/$$i.gz; \
- sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
- $$i > $(MAN1_INSTALL_DIR)/$$i; \
- chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
-@@ -464,7 +479,7 @@
- @cd $(SRC_DIR)/doc; for i in *.3; \
- do \
- echo "Installing doc/$$i"; \
-- rm -f $(MAN3_INSTALL_DIR)/$$i; \
-+ rm -f $(MAN3_INSTALL_DIR)/$$i $(MAN3_INSTALL_DIR)/$$i.gz; \
- sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
- $$i > $(MAN3_INSTALL_DIR)/$$i; \
- chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
-@@ -473,7 +488,7 @@
- @cd $(SRC_DIR)/doc; for i in *.n; \
- do \
- echo "Installing doc/$$i"; \
-- rm -f $(MANN_INSTALL_DIR)/$$i; \
-+ rm -f $(MANN_INSTALL_DIR)/$$i $(MANN_INSTALL_DIR)/$$i.gz; \
- sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
- $$i > $(MANN_INSTALL_DIR)/$$i; \
- chmod 444 $(MANN_INSTALL_DIR)/$$i; \
-@@ -499,275 +514,267 @@
- # because this doesn't work on some strange compilers (e.g. UnixWare).
-
- tkTestInit.o: $(UNIX_DIR)/tkAppInit.c
-- @if test -f tkAppInit.o ; then \
-- rm -f tkAppInit.sav; \
-- mv tkAppInit.o tkAppInit.sav; \
-- fi;
-- $(CC) -c $(CC_SWITCHES) -DTK_TEST $(UNIX_DIR)/tkAppInit.c
-- rm -f tkTestInit.o
-- mv tkAppInit.o tkTestInit.o
-- @if test -f tkAppInit.sav ; then \
-- mv tkAppInit.sav tkAppInit.o; \
-- fi;
-+ ln -fs ${UNIX_DIR}/tkAppInit.c tkTestInit.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) -DTK_TEST $(UNIX_DIR)/tkTestInit.c
-
- tk3d.o: $(GENERIC_DIR)/tk3d.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tk3d.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tk3d.c
-
- tkAppInit.o: $(UNIX_DIR)/tkAppInit.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkAppInit.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkAppInit.c
-
- tkArgv.o: $(GENERIC_DIR)/tkArgv.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkArgv.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkArgv.c
-
- tkAtom.o: $(GENERIC_DIR)/tkAtom.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkAtom.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkAtom.c
-
- tkBind.o: $(GENERIC_DIR)/tkBind.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkBind.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkBind.c
-
- tkBitmap.o: $(GENERIC_DIR)/tkBitmap.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkBitmap.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkBitmap.c
-
- tkClipboard.o: $(GENERIC_DIR)/tkClipboard.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkClipboard.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkClipboard.c
-
- tkCmds.o: $(GENERIC_DIR)/tkCmds.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCmds.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCmds.c
-
- tkColor.o: $(GENERIC_DIR)/tkColor.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkColor.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkColor.c
-
- tkConfig.o: $(GENERIC_DIR)/tkConfig.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkConfig.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkConfig.c
-
- tkCursor.o: $(GENERIC_DIR)/tkCursor.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCursor.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCursor.c
-
- tkError.o: $(GENERIC_DIR)/tkError.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkError.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkError.c
-
- tkEvent.o: $(GENERIC_DIR)/tkEvent.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkEvent.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkEvent.c
-
- tkFocus.o: $(GENERIC_DIR)/tkFocus.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFocus.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFocus.c
-
- tkFont.o: $(GENERIC_DIR)/tkFont.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFont.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFont.c
-
- tkGet.o: $(GENERIC_DIR)/tkGet.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGet.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGet.c
-
- tkGC.o: $(GENERIC_DIR)/tkGC.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGC.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGC.c
-
- tkGeometry.o: $(GENERIC_DIR)/tkGeometry.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGeometry.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGeometry.c
-
- tkGrab.o: $(GENERIC_DIR)/tkGrab.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGrab.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGrab.c
-
- tkGrid.o: $(GENERIC_DIR)/tkGrid.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGrid.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGrid.c
-
- tkMain.o: $(GENERIC_DIR)/tkMain.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMain.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMain.c
-
- tkOption.o: $(GENERIC_DIR)/tkOption.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkOption.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkOption.c
-
- tkPack.o: $(GENERIC_DIR)/tkPack.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkPack.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkPack.c
-
- tkPlace.o: $(GENERIC_DIR)/tkPlace.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkPlace.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkPlace.c
-
- tkSelect.o: $(GENERIC_DIR)/tkSelect.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkSelect.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkSelect.c
-
- tkUtil.o: $(GENERIC_DIR)/tkUtil.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkUtil.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkUtil.c
-
- tkVisual.o: $(GENERIC_DIR)/tkVisual.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c
-
- tkWindow.o: $(GENERIC_DIR)/tkWindow.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkWindow.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkWindow.c
-
- tkButton.o: $(GENERIC_DIR)/tkButton.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c
-
- tkEntry.o: $(GENERIC_DIR)/tkEntry.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkEntry.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkEntry.c
-
- tkFrame.o: $(GENERIC_DIR)/tkFrame.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFrame.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFrame.c
-
- tkListbox.o: $(GENERIC_DIR)/tkListbox.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkListbox.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkListbox.c
-
- tkMenu.o: $(GENERIC_DIR)/tkMenu.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMenu.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMenu.c
-
- tkMenubutton.o: $(GENERIC_DIR)/tkMenubutton.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMenubutton.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMenubutton.c
-
- tkMenuDraw.o: $(GENERIC_DIR)/tkMenuDraw.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMenuDraw.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMenuDraw.c
-
- tkMessage.o: $(GENERIC_DIR)/tkMessage.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMessage.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMessage.c
-
- tkScale.o: $(GENERIC_DIR)/tkScale.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkScale.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkScale.c
-
- tkScrollbar.o: $(GENERIC_DIR)/tkScrollbar.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkScrollbar.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkScrollbar.c
-
- tkSquare.o: $(GENERIC_DIR)/tkSquare.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkSquare.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkSquare.c
-
- tkCanvas.o: $(GENERIC_DIR)/tkCanvas.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvas.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvas.c
-
- tkCanvArc.o: $(GENERIC_DIR)/tkCanvArc.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvArc.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvArc.c
-
- tkCanvBmap.o: $(GENERIC_DIR)/tkCanvBmap.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvBmap.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvBmap.c
-
- tkCanvImg.o: $(GENERIC_DIR)/tkCanvImg.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvImg.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvImg.c
-
- tkCanvLine.o: $(GENERIC_DIR)/tkCanvLine.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvLine.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvLine.c
-
- tkCanvPoly.o: $(GENERIC_DIR)/tkCanvPoly.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvPoly.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvPoly.c
-
- tkCanvPs.o: $(GENERIC_DIR)/tkCanvPs.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvPs.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvPs.c
-
- tkCanvText.o: $(GENERIC_DIR)/tkCanvText.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvText.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvText.c
-
- tkCanvUtil.o: $(GENERIC_DIR)/tkCanvUtil.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvUtil.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvUtil.c
-
- tkCanvWind.o: $(GENERIC_DIR)/tkCanvWind.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvWind.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvWind.c
-
- tkRectOval.o: $(GENERIC_DIR)/tkRectOval.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkRectOval.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkRectOval.c
-
- tkTrig.o: $(GENERIC_DIR)/tkTrig.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTrig.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTrig.c
-
- tkImage.o: $(GENERIC_DIR)/tkImage.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImage.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImage.c
-
- tkImgBmap.o: $(GENERIC_DIR)/tkImgBmap.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgBmap.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgBmap.c
-
- tkImgGIF.o: $(GENERIC_DIR)/tkImgGIF.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgGIF.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgGIF.c
-
- tkImgPPM.o: $(GENERIC_DIR)/tkImgPPM.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgPPM.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgPPM.c
-
- tkImgPhoto.o: $(GENERIC_DIR)/tkImgPhoto.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgPhoto.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgPhoto.c
-
- tkTest.o: $(GENERIC_DIR)/tkTest.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTest.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTest.c
-
- tkText.o: $(GENERIC_DIR)/tkText.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkText.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkText.c
-
- tkTextBTree.o: $(GENERIC_DIR)/tkTextBTree.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextBTree.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextBTree.c
-
- tkTextDisp.o: $(GENERIC_DIR)/tkTextDisp.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextDisp.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextDisp.c
-
- tkTextImage.o: $(GENERIC_DIR)/tkTextImage.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextImage.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextImage.c
-
- tkTextIndex.o: $(GENERIC_DIR)/tkTextIndex.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextIndex.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextIndex.c
-
- tkTextMark.o: $(GENERIC_DIR)/tkTextMark.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextMark.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextMark.c
-
- tkTextTag.o: $(GENERIC_DIR)/tkTextTag.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextTag.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextTag.c
-
- tkTextWind.o: $(GENERIC_DIR)/tkTextWind.c
-- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextWind.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextWind.c
-
- tkUnix.o: $(UNIX_DIR)/tkUnix.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnix.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnix.c
-
- tkUnix3d.o: $(UNIX_DIR)/tkUnix3d.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnix3d.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnix3d.c
-
- tkUnixButton.o: $(UNIX_DIR)/tkUnixButton.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixButton.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixButton.c
-
- tkUnixColor.o: $(UNIX_DIR)/tkUnixColor.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixColor.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixColor.c
-
- tkUnixCursor.o: $(UNIX_DIR)/tkUnixCursor.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixCursor.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixCursor.c
-
- tkUnixDialog.o: $(UNIX_DIR)/tkUnixDialog.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixDialog.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixDialog.c
-
- tkUnixDraw.o: $(UNIX_DIR)/tkUnixDraw.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixDraw.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixDraw.c
-
- tkUnixEmbed.o: $(UNIX_DIR)/tkUnixEmbed.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixEmbed.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixEmbed.c
-
- tkUnixEvent.o: $(UNIX_DIR)/tkUnixEvent.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixEvent.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixEvent.c
-
- tkUnixFocus.o: $(UNIX_DIR)/tkUnixFocus.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixFocus.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixFocus.c
-
- tkUnixFont.o: $(UNIX_DIR)/tkUnixFont.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixFont.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixFont.c
-
- tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c $(GENERIC_DIR)/tkInitScript.h tkConfig.sh
-- $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
- $(UNIX_DIR)/tkUnixInit.c
-
- tkUnixMenu.o: $(UNIX_DIR)/tkUnixMenu.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixMenu.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixMenu.c
-
- tkUnixMenubu.o: $(UNIX_DIR)/tkUnixMenubu.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixMenubu.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixMenubu.c
-
- tkUnixScale.o: $(UNIX_DIR)/tkUnixScale.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixScale.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixScale.c
-
- tkUnixScrlbr.o: $(UNIX_DIR)/tkUnixScrlbr.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixScrlbr.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixScrlbr.c
-
- tkUnixSelect.o: $(UNIX_DIR)/tkUnixSelect.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixSelect.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixSelect.c
-
- tkUnixSend.o: $(UNIX_DIR)/tkUnixSend.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixSend.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixSend.c
-
- tkUnixWm.o: $(UNIX_DIR)/tkUnixWm.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixWm.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixWm.c
-
- tkUnixXId.o: $(UNIX_DIR)/tkUnixXId.c
-- $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixXId.c
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixXId.c
-
- .c.o:
-- $(CC) -c $(CC_SWITCHES) $<
-+ ${LIBTOOL} --mode=compile $(CC) -c $(CC_SWITCHES) $<
-
- #
- # Target to check for proper usage of UCHAR macro.
diff --git a/x11/tk80/patches/patch-ac b/x11/tk80/patches/patch-ac
deleted file mode 100644
index 2ea50c750c0..00000000000
--- a/x11/tk80/patches/patch-ac
+++ /dev/null
@@ -1,714 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1998/08/07 11:18:17 agc Exp $
-
---- ../generic/tkText.c.orig Tue Oct 14 19:45:15 1997
-+++ ../generic/tkText.c Sat Feb 14 00:59:29 1998
-@@ -866,6 +866,7 @@
- || (textPtr->selTagPtr->spacing2String != NULL)
- || (textPtr->selTagPtr->spacing3String != NULL)
- || (textPtr->selTagPtr->tabString != NULL)
-+ || (textPtr->selTagPtr->elideString != NULL)
- || (textPtr->selTagPtr->underlineString != NULL)
- || (textPtr->selTagPtr->wrapMode != NULL)) {
- textPtr->selTagPtr->affectsDisplay = 1;
-@@ -1413,7 +1414,7 @@
- }
- }
- }
-- if (segPtr->typePtr == &tkTextCharType) {
-+ if (segPtr->typePtr == &tkTextCharType && !TkTextIsElided(textPtr, &textPtr->selIndex)) {
- memcpy((VOID *) buffer, (VOID *) (segPtr->body.chars
- + offsetInSeg), (size_t) chunkSize);
- buffer += chunkSize;
-@@ -1554,7 +1555,7 @@
- int argc; /* Number of arguments. */
- char **argv; /* Argument strings. */
- {
-- int backwards, exact, c, i, argsLeft, noCase, leftToScan;
-+ int backwards, exact, searchElide, c, i, argsLeft, noCase, leftToScan;
- size_t length;
- int numLines, startingLine, startingChar, lineNum, firstChar, lastChar;
- int code, matchLength, matchChar, passes, stopLine, searchWholeText;
-@@ -1565,6 +1566,7 @@
- Tcl_DString line, patDString;
- TkTextSegment *segPtr;
- TkTextLine *linePtr;
-+ TkTextIndex curIndex;
- Tcl_RegExp regexp = NULL; /* Initialization needed only to
- * prevent compiler warning. */
-
-@@ -1573,6 +1575,8 @@
- */
-
- exact = 1;
-+ searchElide = 0;
-+ curIndex.tree = textPtr->tree;
- backwards = 0;
- noCase = 0;
- varName = NULL;
-@@ -1586,7 +1590,7 @@
- badSwitch:
- Tcl_AppendResult(interp, "bad switch \"", arg,
- "\": must be -forward, -backward, -exact, -regexp, ",
-- "-nocase, -count, or --", (char *) NULL);
-+ "-nocase, -count, -elide, or --", (char *) NULL);
- return TCL_ERROR;
- }
- c = arg[1];
-@@ -1607,6 +1611,8 @@
- noCase = 1;
- } else if ((c == 'r') && (strncmp(argv[i], "-regexp", length) == 0)) {
- exact = 0;
-+ } else if ((c == 'e') && (strncmp(argv[i], "-elide", length) == 0)) {
-+ searchElide = 1;
- } else if ((c == '-') && (strncmp(argv[i], "--", length) == 0)) {
- i++;
- break;
-@@ -1702,9 +1708,10 @@
- */
-
- linePtr = TkBTreeFindLine(textPtr->tree, lineNum);
-+ curIndex.linePtr = linePtr; curIndex.charIndex = 0;
- for (segPtr = linePtr->segPtr; segPtr != NULL;
-- segPtr = segPtr->nextPtr) {
-- if (segPtr->typePtr != &tkTextCharType) {
-+ curIndex.charIndex += segPtr->size, segPtr = segPtr->nextPtr) {
-+ if (segPtr->typePtr != &tkTextCharType || (!searchElide && TkTextIsElided(textPtr, &curIndex))) {
- continue;
- }
- Tcl_DStringAppend(&line, segPtr->body.chars, segPtr->size);
---- ../generic/tkText.h.orig Thu Nov 28 00:30:39 1996
-+++ ../generic/tkText.h Sat Feb 14 00:59:29 1998
-@@ -370,6 +370,10 @@
- * Must be tkTextCharUid, tkTextNoneUid,
- * tkTextWordUid, or NULL to use wrapMode
- * for whole widget. */
-+ char *elideString; /* -elide option string (malloc-ed).
-+ * NULL means option not specified. */
-+ int elide; /* Non-zero means text is elided.
-+ * Only valid if elideString is non-NULL. */
- int affectsDisplay; /* Non-zero means that this tag affects the
- * way information is displayed on the screen
- * (so need to redisplay if tag changes). */
-@@ -800,6 +804,8 @@
- ClientData clientData));
- extern TkTextIndex * TkTextMakeIndex _ANSI_ARGS_((TkTextBTree tree,
- int lineIndex, int charIndex,
-+ TkTextIndex *indexPtr));
-+extern int TkTextIsElided _ANSI_ARGS_((TkText *textPtr,
- TkTextIndex *indexPtr));
- extern int TkTextMarkCmd _ANSI_ARGS_((TkText *textPtr,
- Tcl_Interp *interp, int argc, char **argv));
---- ../generic/tkTextBTree.c.orig Fri May 16 02:13:26 1997
-+++ ../generic/tkTextBTree.c Sat Feb 14 00:59:30 1998
-@@ -2427,6 +2427,132 @@
- }
- return tagInfo.tagPtrs;
- }
-+
-+
-+/*
-+ special case to just return information about elided attribute
-+ specialized from TkBTreeGetTags(indexPtr, numTagsPtr) and GetStyle(textPtr, indexPtr)
-+ just need to keep track of invisibility settings for each priority, pick highest one active at end
-+*/
-+int
-+TkTextIsElided(textPtr, indexPtr)
-+ TkText *textPtr; /* Overall information about text widget. */
-+ TkTextIndex *indexPtr; /* The character in the text for which
-+ * display information is wanted. */
-+{
-+#define LOTSA_TAGS 1000
-+ int elide = 0; /* if nobody says otherwise, it's visible */
-+
-+ int deftagCnts[LOTSA_TAGS];
-+ int *tagCnts = deftagCnts;
-+ TkTextTag *deftagPtrs[LOTSA_TAGS];
-+ TkTextTag **tagPtrs = deftagPtrs;
-+ int numTags = textPtr->numTags;
-+ register Node *nodePtr;
-+ register TkTextLine *siblingLinePtr;
-+ register TkTextSegment *segPtr;
-+ register TkTextTag *tagPtr;
-+ register int i, index;
-+
-+ /* almost always avoid malloc, so stay out of system calls */
-+ if (LOTSA_TAGS < numTags) {
-+ tagCnts = (int *)ckalloc((unsigned)sizeof(int) * numTags);
-+ tagPtrs = (TkTextTag **)ckalloc((unsigned)sizeof(TkTextTag *) * numTags);
-+ }
-+
-+ for (i=0; i<numTags; i++) tagCnts[i]=0;
-+
-+
-+ /*
-+ * Record tag toggles within the line of indexPtr but preceding
-+ * indexPtr.
-+ */
-+
-+ for (index = 0, segPtr = indexPtr->linePtr->segPtr;
-+ (index + segPtr->size) <= indexPtr->charIndex;
-+ index += segPtr->size, segPtr = segPtr->nextPtr) {
-+ if ((segPtr->typePtr == &tkTextToggleOnType)
-+ || (segPtr->typePtr == &tkTextToggleOffType)) {
-+ tagPtr = segPtr->body.toggle.tagPtr;
-+ if (tagPtr->elideString != NULL) {
-+ tagPtrs[tagPtr->priority] = tagPtr;
-+ tagCnts[tagPtr->priority]++;
-+ }
-+ }
-+ }
-+
-+ /*
-+ * Record toggles for tags in lines that are predecessors of
-+ * indexPtr->linePtr but under the same level-0 node.
-+ */
-+
-+ for (siblingLinePtr = indexPtr->linePtr->parentPtr->children.linePtr;
-+ siblingLinePtr != indexPtr->linePtr;
-+ siblingLinePtr = siblingLinePtr->nextPtr) {
-+ for (segPtr = siblingLinePtr->segPtr; segPtr != NULL;
-+ segPtr = segPtr->nextPtr) {
-+ if ((segPtr->typePtr == &tkTextToggleOnType)
-+ || (segPtr->typePtr == &tkTextToggleOffType)) {
-+ tagPtr = segPtr->body.toggle.tagPtr;
-+ if (tagPtr->elideString != NULL) {
-+ tagPtrs[tagPtr->priority] = tagPtr;
-+ tagCnts[tagPtr->priority]++;
-+ }
-+ }
-+ }
-+ }
-+
-+ /*
-+ * For each node in the ancestry of this line, record tag toggles
-+ * for all siblings that precede that node.
-+ */
-+
-+ for (nodePtr = indexPtr->linePtr->parentPtr; nodePtr->parentPtr != NULL;
-+ nodePtr = nodePtr->parentPtr) {
-+ register Node *siblingPtr;
-+ register Summary *summaryPtr;
-+
-+ for (siblingPtr = nodePtr->parentPtr->children.nodePtr;
-+ siblingPtr != nodePtr; siblingPtr = siblingPtr->nextPtr) {
-+ for (summaryPtr = siblingPtr->summaryPtr; summaryPtr != NULL;
-+ summaryPtr = summaryPtr->nextPtr) {
-+ if (summaryPtr->toggleCount & 1) {
-+ tagPtr = summaryPtr->tagPtr;
-+ if (tagPtr->elideString != NULL) {
-+ tagPtrs[tagPtr->priority] = tagPtr;
-+ tagCnts[tagPtr->priority] += summaryPtr->toggleCount;
-+ }
-+ }
-+ }
-+ }
-+ }
-+
-+
-+ /*
-+ * Now traverse from highest priority to lowest,
-+ * take elided value from first odd count (= on)
-+ */
-+
-+ for (i = numTags-1; i >=0; i--) {
-+ if (tagCnts[i] & 1) {
-+#ifndef ALWAYS_SHOW_SELECTION
-+ /* who would make the selection elided? */
-+ if ((tagPtr == textPtr->selTagPtr) && !(textPtr->flags & GOT_FOCUS)) {
-+ continue;
-+ }
-+#endif
-+ elide = tagPtrs[i]->elide;
-+ break;
-+ }
-+ }
-+
-+ if (LOTSA_TAGS < numTags) {
-+ ckfree((char *) tagCnts);
-+ ckfree((char *) tagPtrs);
-+ }
-+
-+ return elide;
-+}
-
- /*
- *----------------------------------------------------------------------
---- ../generic/tkTextDisp.c.orig Wed Aug 13 20:20:00 1997
-+++ ../generic/tkTextDisp.c Sat Feb 14 00:59:30 1998
-@@ -55,6 +55,7 @@
- * be NULL). */
- int underline; /* Non-zero means draw underline underneath
- * text. */
-+ int elide; /* Non-zero means draw text */
- Tk_Uid wrapMode; /* How to handle wrap-around for this tag.
- * One of tkTextCharUid, tkTextNoneUid,
- * or tkTextWordUid. */
-@@ -311,6 +312,21 @@
- int x));
- static void CharUndisplayProc _ANSI_ARGS_((TkText *textPtr,
- TkTextDispChunk *chunkPtr));
-+
-+/*
-+ Definitions of elided procs.
-+ Compiler can't inline these since we use pointers to these functions.
-+ ElideDisplayProc, ElideUndisplayProc special-cased for speed,
-+ as potentially many elided DLine chunks if large, tag toggle-filled
-+ elided region.
-+*/
-+static void ElideBboxProc _ANSI_ARGS_((TkTextDispChunk *chunkPtr,
-+ int index, int y, int lineHeight, int baseline,
-+ int *xPtr, int *yPtr, int *widthPtr,
-+ int *heightPtr));
-+static int ElideMeasureProc _ANSI_ARGS_((TkTextDispChunk *chunkPtr,
-+ int x));
-+
- static void DisplayDLine _ANSI_ARGS_((TkText *textPtr,
- DLine *dlPtr, DLine *prevPtr, Pixmap pixmap));
- static void DisplayLineBackground _ANSI_ARGS_((TkText *textPtr,
-@@ -479,7 +495,7 @@
-
- int borderPrio, borderWidthPrio, reliefPrio, bgStipplePrio;
- int fgPrio, fontPrio, fgStipplePrio;
-- int underlinePrio, justifyPrio, offsetPrio;
-+ int underlinePrio, elidePrio, justifyPrio, offsetPrio;
- int lMargin1Prio, lMargin2Prio, rMarginPrio;
- int spacing1Prio, spacing2Prio, spacing3Prio;
- int overstrikePrio, tabPrio, wrapPrio;
-@@ -494,7 +510,7 @@
- tagPtrs = TkBTreeGetTags(indexPtr, &numTags);
- borderPrio = borderWidthPrio = reliefPrio = bgStipplePrio = -1;
- fgPrio = fontPrio = fgStipplePrio = -1;
-- underlinePrio = justifyPrio = offsetPrio = -1;
-+ underlinePrio = elidePrio = justifyPrio = offsetPrio = -1;
- lMargin1Prio = lMargin2Prio = rMarginPrio = -1;
- spacing1Prio = spacing2Prio = spacing3Prio = -1;
- overstrikePrio = tabPrio = wrapPrio = -1;
-@@ -612,6 +628,11 @@
- styleValues.underline = tagPtr->underline;
- underlinePrio = tagPtr->priority;
- }
-+ if ((tagPtr->elideString != NULL)
-+ && (tagPtr->priority > elidePrio)) {
-+ styleValues.elide = tagPtr->elide;
-+ elidePrio = tagPtr->priority;
-+ }
- if ((tagPtr->wrapMode != NULL)
- && (tagPtr->priority > wrapPrio)) {
- styleValues.wrapMode = tagPtr->wrapMode;
-@@ -768,7 +789,7 @@
- * lines with numChars > 0. Used to
- * drop 0-sized chunks from the end
- * of the line. */
-- int offset, ascent, descent, code;
-+ int offset, ascent, descent, code, elide, elidesize;
- StyleValues *sValuePtr;
-
- /*
-@@ -786,6 +807,34 @@
- dlPtr->nextPtr = NULL;
- dlPtr->flags = NEW_LAYOUT;
-
-+
-+ /*
-+ * special case entirely elide line as there may be 1000s or more
-+ */
-+ elide = TkTextIsElided(textPtr, indexPtr); /* save a malloc */
-+ if (elide && indexPtr->charIndex==0) {
-+ maxChars = 0;
-+ for (segPtr = indexPtr->linePtr->segPtr; elide && segPtr!=NULL; segPtr = segPtr->nextPtr) {
-+ if ((elidesize = segPtr->size) > 0) {
-+ maxChars += elidesize;
-+
-+ /* if have tag toggle, chance that invisibility state changed, so bail out */
-+ } else if (segPtr->typePtr == &tkTextToggleOffType || segPtr->typePtr == &tkTextToggleOnType) {
-+ if (segPtr->body.toggle.tagPtr->elideString!=NULL) {
-+ elide = (segPtr->typePtr == &tkTextToggleOffType) ^ (segPtr->body.toggle.tagPtr->elide==1);
-+ }
-+ }
-+ }
-+
-+ if (elide) {
-+ dlPtr->count = maxChars;
-+ dlPtr->spaceAbove = dlPtr->spaceBelow = dlPtr->length = 0;
-+ return dlPtr;
-+ }
-+ }
-+
-+
-+
- /*
- * Each iteration of the loop below creates one TkTextDispChunk for
- * the new display line. The line will always have at least one
-@@ -797,6 +846,7 @@
- lastChunkPtr = NULL;
- chunkPtr = NULL;
- noCharsYet = 1;
-+ elide = 0;
- breakChunkPtr = NULL;
- breakCharOffset = 0;
- justify = TK_JUSTIFY_LEFT;
-@@ -821,6 +871,31 @@
- }
-
- while (segPtr != NULL) {
-+
-+ /* every line still gets at least one chunk due to expectations in rest of code,
-+ but able to skip elided portions of line quickly */
-+ /* if current chunk elided and last chunk was too, coalese */
-+ if (elide && lastChunkPtr!=NULL && lastChunkPtr->displayProc == NULL/*ElideDisplayProc*/) {
-+ if ((elidesize = segPtr->size - offset) > 0) {
-+ curIndex.charIndex += elidesize;
-+ lastChunkPtr->numChars += elidesize;
-+ breakCharOffset = lastChunkPtr->breakIndex = lastChunkPtr->numChars;
-+
-+ /* if have tag toggle, chance that invisibility state changed */
-+ } else if (segPtr->typePtr == &tkTextToggleOffType || segPtr->typePtr == &tkTextToggleOnType) {
-+ if (segPtr->body.toggle.tagPtr->elideString!=NULL) {
-+ elide = (segPtr->typePtr == &tkTextToggleOffType) ^ (segPtr->body.toggle.tagPtr->elide==1);
-+ }
-+ }
-+
-+ offset = 0;
-+ segPtr = segPtr->nextPtr;
-+ if (segPtr == NULL && chunkPtr != NULL) ckfree((char *) chunkPtr);
-+
-+ continue;
-+ }
-+
-+
- if (segPtr->typePtr->layoutProc == NULL) {
- segPtr = segPtr->nextPtr;
- offset = 0;
-@@ -831,6 +906,7 @@
- chunkPtr->nextPtr = NULL;
- }
- chunkPtr->stylePtr = GetStyle(textPtr, &curIndex);
-+ elide = chunkPtr->stylePtr->sValuePtr->elide;
-
- /*
- * Save style information such as justification and indentation,
-@@ -864,7 +940,7 @@
-
- gotTab = 0;
- maxChars = segPtr->size - offset;
-- if (justify == TK_JUSTIFY_LEFT) {
-+ if (!elide && justify == TK_JUSTIFY_LEFT) {
- if (segPtr->typePtr == &tkTextCharType) {
- char *p;
-
-@@ -877,8 +953,21 @@
- }
- }
- }
--
- chunkPtr->x = x;
-+ if (elide && maxChars) {
-+ /* don't free style here, as other code expects to be able to do that */
-+ /*breakCharOffset =*/ chunkPtr->breakIndex = chunkPtr->numChars = maxChars;
-+ chunkPtr->width = 0;
-+ chunkPtr->minAscent = chunkPtr->minDescent = chunkPtr->minHeight = 0;
-+
-+ /* would just like to point to canonical empty chunk */
-+ chunkPtr->displayProc = (Tk_ChunkDisplayProc *) NULL;
-+ chunkPtr->undisplayProc = (Tk_ChunkUndisplayProc *) NULL;
-+ chunkPtr->measureProc = ElideMeasureProc;
-+ chunkPtr->bboxProc = ElideBboxProc;
-+
-+ code = 1;
-+ } else
- code = (*segPtr->typePtr->layoutProc)(textPtr, &curIndex, segPtr,
- offset, maxX-tabSize, maxChars, noCharsYet, wrapMode,
- chunkPtr);
-@@ -950,6 +1039,7 @@
- offset = 0;
- segPtr = segPtr->nextPtr;
- }
-+
- chunkPtr = NULL;
- }
- if (noCharsYet) {
-@@ -998,6 +1088,7 @@
- wholeLine = 0;
- }
-
-+
- /*
- * Make tab adjustments for the last tab stop, if there is one.
- */
-@@ -1321,6 +1412,7 @@
- index.linePtr = TkBTreeFindLine(textPtr->tree, lineNum);
- index.charIndex = 0;
- lowestPtr = NULL;
-+
- do {
- dlPtr = LayoutDLine(textPtr, &index);
- dlPtr->nextPtr = lowestPtr;
-@@ -1554,6 +1646,8 @@
- Display *display;
- int height, x;
-
-+ if (dlPtr->chunkPtr == NULL) return;
-+
- /*
- * First, clear the area of the line to the background color for the
- * text widget.
-@@ -1620,12 +1714,16 @@
- * something is off to the right).
- */
-
-+ if (chunkPtr->displayProc != NULL)
- (*chunkPtr->displayProc)(chunkPtr, -chunkPtr->width,
- dlPtr->spaceAbove,
- dlPtr->height - dlPtr->spaceAbove - dlPtr->spaceBelow,
- dlPtr->baseline - dlPtr->spaceAbove, display, pixmap,
- dlPtr->y + dlPtr->spaceAbove);
- } else {
-+ /* don't call if elide. This tax ok since not very many visible DLine's in
-+ an area, but potentially many elide ones */
-+ if (chunkPtr->displayProc != NULL)
- (*chunkPtr->displayProc)(chunkPtr, x, dlPtr->spaceAbove,
- dlPtr->height - dlPtr->spaceAbove - dlPtr->spaceBelow,
- dlPtr->baseline - dlPtr->spaceAbove, display, pixmap,
-@@ -1714,6 +1812,7 @@
- StyleValues *sValuePtr;
- Display *display;
-
-+
- /*
- * Pass 1: scan through dlPtr from left to right. For each range of
- * chunks with the same style, draw the main background for the style
-@@ -1787,7 +1886,7 @@
- rightX = maxX;
- }
- chunkPtr2 = NULL;
-- if (prevPtr != NULL) {
-+ if (prevPtr != NULL && prevPtr->chunkPtr != NULL) {
- /*
- * Find the chunk in the previous line that covers leftX.
- */
-@@ -1908,7 +2007,8 @@
- rightX = maxX;
- }
- chunkPtr2 = NULL;
-- if (dlPtr->nextPtr != NULL) {
-+/* for (dlPtr2 = dlPtr; dlPtr2->nextPtr != NULL && dlPtr2->nextPtr->chunkPtr == NULL; dlPtr2 = dlPtr2->nextPtr) {}*/
-+ if (dlPtr->nextPtr != NULL && dlPtr->nextPtr->chunkPtr != NULL) {
- /*
- * Find the chunk in the previous line that covers leftX.
- */
-@@ -2299,6 +2399,7 @@
- for (prevPtr = NULL, dlPtr = textPtr->dInfoPtr->dLinePtr;
- (dlPtr != NULL) && (dlPtr->y < dInfoPtr->maxY);
- prevPtr = dlPtr, dlPtr = dlPtr->nextPtr) {
-+ if (dlPtr->chunkPtr == NULL) continue;
- if (dlPtr->oldY != dlPtr->y) {
- if (tkTextDebug) {
- char string[TK_POS_CHARS];
-@@ -2315,6 +2416,7 @@
- dlPtr->oldY = dlPtr->y;
- dlPtr->flags &= ~NEW_LAYOUT;
- }
-+ /*prevPtr = dlPtr;*/
- }
- Tk_FreePixmap(Tk_Display(textPtr->tkwin), pixmap);
- }
-@@ -3369,6 +3471,7 @@
- dlPtr = LayoutDLine(textPtr, &index);
- dlPtr->nextPtr = lowestPtr;
- lowestPtr = dlPtr;
-+ if (dlPtr->length == 0 && dlPtr->height == 0) { offset--; break; } /* elide */
- TkTextIndexForwChars(&index, dlPtr->count, &index);
- charsToCount -= dlPtr->count;
- } while ((charsToCount > 0)
-@@ -3381,7 +3484,7 @@
- break;
- }
- }
--
-+
- /*
- * Discard the display lines, then either return or prepare
- * for the next display line to lay out.
-@@ -3410,12 +3513,14 @@
- TkBTreeNumLines(textPtr->tree));
- for (i = 0; i < offset; i++) {
- dlPtr = LayoutDLine(textPtr, &textPtr->topIndex);
-+ if (dlPtr->length == 0 && dlPtr->height == 0) offset++;
- dlPtr->nextPtr = NULL;
- TkTextIndexForwChars(&textPtr->topIndex, dlPtr->count, &new);
- FreeDLines(textPtr, dlPtr, (DLine *) NULL, 0);
- if (new.linePtr == lastLinePtr) {
- break;
- }
-+
- textPtr->topIndex = new;
- }
- }
-@@ -3949,7 +4054,7 @@
- * index of the character nearest to (x,y). */
- {
- TextDInfo *dInfoPtr = textPtr->dInfoPtr;
-- register DLine *dlPtr;
-+ register DLine *dlPtr, *validdlPtr;
- register TkTextDispChunk *chunkPtr;
-
- /*
-@@ -3982,8 +4087,9 @@
- * Find the display line containing the desired y-coordinate.
- */
-
-- for (dlPtr = dInfoPtr->dLinePtr; y >= (dlPtr->y + dlPtr->height);
-+ for (dlPtr = validdlPtr = dInfoPtr->dLinePtr; y >= (dlPtr->y + dlPtr->height);
- dlPtr = dlPtr->nextPtr) {
-+ if (dlPtr->chunkPtr !=NULL) validdlPtr = dlPtr;
- if (dlPtr->nextPtr == NULL) {
- /*
- * Y-coordinate is off the bottom of the displayed text.
-@@ -3994,6 +4100,8 @@
- break;
- }
- }
-+ if (dlPtr->chunkPtr == NULL) dlPtr = validdlPtr;
-+
-
- /*
- * Scan through the line's chunks to find the one that contains
-@@ -4005,12 +4113,12 @@
- *indexPtr = dlPtr->index;
- x = x - dInfoPtr->x + dInfoPtr->curPixelOffset;
- for (chunkPtr = dlPtr->chunkPtr; x >= (chunkPtr->x + chunkPtr->width);
-- indexPtr->charIndex += chunkPtr->numChars,
-- chunkPtr = chunkPtr->nextPtr) {
-+ indexPtr->charIndex += chunkPtr->numChars,
-+ chunkPtr = chunkPtr->nextPtr) {
- if (chunkPtr->nextPtr == NULL) {
- indexPtr->charIndex += chunkPtr->numChars - 1;
- return;
-- }
-+ }
- }
-
- /*
-@@ -4166,6 +4274,7 @@
- {
- TextDInfo *dInfoPtr = textPtr->dInfoPtr;
- DLine *dlPtr;
-+ int dlx;
-
- /*
- * Make sure that all of the screen layout information is up to date.
-@@ -4184,8 +4293,9 @@
- return -1;
- }
-
-- *xPtr = dInfoPtr->x - dInfoPtr->curPixelOffset + dlPtr->chunkPtr->x;
-- *widthPtr = dlPtr->length - dlPtr->chunkPtr->x;
-+ dlx = (dlPtr->chunkPtr != NULL? dlPtr->chunkPtr->x: 0);
-+ *xPtr = dInfoPtr->x - dInfoPtr->curPixelOffset + dlx;
-+ *widthPtr = dlPtr->length - dlx;
- *yPtr = dlPtr->y;
- if ((dlPtr->y + dlPtr->height) > dInfoPtr->maxY) {
- *heightPtr = dInfoPtr->maxY - dlPtr->y;
-@@ -4196,6 +4306,41 @@
- return 0;
- }
-
-+static void
-+ElideBboxProc(chunkPtr, index, y, lineHeight, baseline, xPtr, yPtr,
-+ widthPtr, heightPtr)
-+ TkTextDispChunk *chunkPtr; /* Chunk containing desired char. */
-+ int index; /* Index of desired character within
-+ * the chunk. */
-+ int y; /* Topmost pixel in area allocated
-+ * for this line. */
-+ int lineHeight; /* Height of line, in pixels. */
-+ int baseline; /* Location of line's baseline, in
-+ * pixels measured down from y. */
-+ int *xPtr, *yPtr; /* Gets filled in with coords of
-+ * character's upper-left pixel.
-+ * X-coord is in same coordinate
-+ * system as chunkPtr->x. */
-+ int *widthPtr; /* Gets filled in with width of
-+ * character, in pixels. */
-+ int *heightPtr; /* Gets filled in with height of
-+ * character, in pixels. */
-+{
-+ *xPtr = chunkPtr->x;
-+ *yPtr = y;
-+ *widthPtr = *heightPtr = 0;
-+}
-+
-+
-+static int
-+ElideMeasureProc(chunkPtr, x)
-+ TkTextDispChunk *chunkPtr; /* Chunk containing desired coord. */
-+ int x; /* X-coordinate, in same coordinate
-+ * system as chunkPtr->x. */
-+{
-+ return 0 /*chunkPtr->numChars - 1*/;
-+}
-+
- /*
- *--------------------------------------------------------------
- *
-@@ -4421,7 +4566,7 @@
- * Draw the text, underline, and overstrike for this chunk.
- */
-
-- if (ciPtr->numChars > offsetChars) {
-+ if (!sValuePtr->elide && ciPtr->numChars > offsetChars) {
- int numChars = ciPtr->numChars - offsetChars;
- char *string = ciPtr->chars + offsetChars;
-
---- ../generic/tkTextTag.c.orig Wed Feb 19 01:40:12 1997
-+++ ../generic/tkTextTag.c Sat Feb 14 00:59:30 1998
-@@ -63,6 +63,9 @@
- {TK_CONFIG_STRING, "-underline", (char *) NULL, (char *) NULL,
- (char *) NULL, Tk_Offset(TkTextTag, underlineString),
- TK_CONFIG_NULL_OK},
-+ {TK_CONFIG_STRING, "-elide", (char *) NULL, (char *) NULL,
-+ (char *) NULL, Tk_Offset(TkTextTag, elideString),
-+ TK_CONFIG_NULL_OK},
- {TK_CONFIG_UID, "-wrap", (char *) NULL, (char *) NULL,
- (char *) NULL, Tk_Offset(TkTextTag, wrapMode),
- TK_CONFIG_NULL_OK},
-@@ -378,6 +381,12 @@
- return TCL_ERROR;
- }
- }
-+ if (tagPtr->elideString != NULL) {
-+ if (Tcl_GetBoolean(interp, tagPtr->elideString,
-+ &tagPtr->elide) != TCL_OK) {
-+ return TCL_ERROR;
-+ }
-+ }
- if ((tagPtr->wrapMode != NULL)
- && (tagPtr->wrapMode != tkTextCharUid)
- && (tagPtr->wrapMode != tkTextNoneUid)
-@@ -419,6 +428,7 @@
- || (tagPtr->spacing3String != NULL)
- || (tagPtr->tabString != NULL)
- || (tagPtr->underlineString != NULL)
-+ || (tagPtr->elideString != NULL)
- || (tagPtr->wrapMode != NULL)) {
- tagPtr->affectsDisplay = 1;
- }
-@@ -811,6 +821,8 @@
- tagPtr->tabArrayPtr = NULL;
- tagPtr->underlineString = NULL;
- tagPtr->underline = 0;
-+ tagPtr->elideString = NULL;
-+ tagPtr->elide = 0;
- tagPtr->wrapMode = NULL;
- tagPtr->affectsDisplay = 0;
- textPtr->numTags++;
-@@ -934,6 +946,9 @@
- }
- if (tagPtr->underlineString != NULL) {
- ckfree(tagPtr->underlineString);
-+ }
-+ if (tagPtr->elideString != NULL) {
-+ ckfree(tagPtr->elideString);
- }
- ckfree((char *) tagPtr);
- }
diff --git a/x11/tk80/patches/patch-ad b/x11/tk80/patches/patch-ad
deleted file mode 100644
index 17d903cf020..00000000000
--- a/x11/tk80/patches/patch-ad
+++ /dev/null
@@ -1,1074 +0,0 @@
-$NetBSD: patch-ad,v 1.5 1999/04/01 13:38:46 agc Exp $
-
-Use symbolic links
-
---- mkLinks.orig Tue Mar 9 06:53:53 1999
-+++ mkLinks Thu Apr 1 13:29:13 1999
-@@ -30,854 +30,854 @@
-
- if test -r 3DBorder.3; then
- rm -f Tk_Get3DBorder.3
-- ln 3DBorder.3 Tk_Get3DBorder.3
-+ ln -s 3DBorder.3 Tk_Get3DBorder.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_Draw3DRectangle.3
-- ln 3DBorder.3 Tk_Draw3DRectangle.3
-+ ln -s 3DBorder.3 Tk_Draw3DRectangle.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_Fill3DRectangle.3
-- ln 3DBorder.3 Tk_Fill3DRectangle.3
-+ ln -s 3DBorder.3 Tk_Fill3DRectangle.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_Draw3DPolygon.3
-- ln 3DBorder.3 Tk_Draw3DPolygon.3
-+ ln -s 3DBorder.3 Tk_Draw3DPolygon.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_Fill3DPolygon.3
-- ln 3DBorder.3 Tk_Fill3DPolygon.3
-+ ln -s 3DBorder.3 Tk_Fill3DPolygon.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_3DVerticalBevel.3
-- ln 3DBorder.3 Tk_3DVerticalBevel.3
-+ ln -s 3DBorder.3 Tk_3DVerticalBevel.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_3DHorizontalBevel.3
-- ln 3DBorder.3 Tk_3DHorizontalBevel.3
-+ ln -s 3DBorder.3 Tk_3DHorizontalBevel.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_SetBackgroundFromBorder.3
-- ln 3DBorder.3 Tk_SetBackgroundFromBorder.3
-+ ln -s 3DBorder.3 Tk_SetBackgroundFromBorder.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_NameOf3DBorder.3
-- ln 3DBorder.3 Tk_NameOf3DBorder.3
-+ ln -s 3DBorder.3 Tk_NameOf3DBorder.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_3DBorderColor.3
-- ln 3DBorder.3 Tk_3DBorderColor.3
-+ ln -s 3DBorder.3 Tk_3DBorderColor.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_3DBorderGC.3
-- ln 3DBorder.3 Tk_3DBorderGC.3
-+ ln -s 3DBorder.3 Tk_3DBorderGC.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_Free3DBorder.3
-- ln 3DBorder.3 Tk_Free3DBorder.3
-+ ln -s 3DBorder.3 Tk_Free3DBorder.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_CreateBindingTable.3
-- ln BindTable.3 Tk_CreateBindingTable.3
-+ ln -s BindTable.3 Tk_CreateBindingTable.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_DeleteBindingTable.3
-- ln BindTable.3 Tk_DeleteBindingTable.3
-+ ln -s BindTable.3 Tk_DeleteBindingTable.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_CreateBinding.3
-- ln BindTable.3 Tk_CreateBinding.3
-+ ln -s BindTable.3 Tk_CreateBinding.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_DeleteBinding.3
-- ln BindTable.3 Tk_DeleteBinding.3
-+ ln -s BindTable.3 Tk_DeleteBinding.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_GetBinding.3
-- ln BindTable.3 Tk_GetBinding.3
-+ ln -s BindTable.3 Tk_GetBinding.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_GetAllBindings.3
-- ln BindTable.3 Tk_GetAllBindings.3
-+ ln -s BindTable.3 Tk_GetAllBindings.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_DeleteAllBindings.3
-- ln BindTable.3 Tk_DeleteAllBindings.3
-+ ln -s BindTable.3 Tk_DeleteAllBindings.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_BindEvent.3
-- ln BindTable.3 Tk_BindEvent.3
-+ ln -s BindTable.3 Tk_BindEvent.3
- fi
- if test -r CanvPsY.3; then
- rm -f Tk_CanvasPsY.3
-- ln CanvPsY.3 Tk_CanvasPsY.3
-+ ln -s CanvPsY.3 Tk_CanvasPsY.3
- fi
- if test -r CanvPsY.3; then
- rm -f Tk_CanvasPsBitmap.3
-- ln CanvPsY.3 Tk_CanvasPsBitmap.3
-+ ln -s CanvPsY.3 Tk_CanvasPsBitmap.3
- fi
- if test -r CanvPsY.3; then
- rm -f Tk_CanvasPsColor.3
-- ln CanvPsY.3 Tk_CanvasPsColor.3
-+ ln -s CanvPsY.3 Tk_CanvasPsColor.3
- fi
- if test -r CanvPsY.3; then
- rm -f Tk_CanvasPsFont.3
-- ln CanvPsY.3 Tk_CanvasPsFont.3
-+ ln -s CanvPsY.3 Tk_CanvasPsFont.3
- fi
- if test -r CanvPsY.3; then
- rm -f Tk_CanvasPsPath.3
-- ln CanvPsY.3 Tk_CanvasPsPath.3
-+ ln -s CanvPsY.3 Tk_CanvasPsPath.3
- fi
- if test -r CanvPsY.3; then
- rm -f Tk_CanvasPsStipple.3
-- ln CanvPsY.3 Tk_CanvasPsStipple.3
-+ ln -s CanvPsY.3 Tk_CanvasPsStipple.3
- fi
- if test -r CanvTkwin.3; then
- rm -f Tk_CanvasTkwin.3
-- ln CanvTkwin.3 Tk_CanvasTkwin.3
-+ ln -s CanvTkwin.3 Tk_CanvasTkwin.3
- fi
- if test -r CanvTkwin.3; then
- rm -f Tk_CanvasGetCoord.3
-- ln CanvTkwin.3 Tk_CanvasGetCoord.3
-+ ln -s CanvTkwin.3 Tk_CanvasGetCoord.3
- fi
- if test -r CanvTkwin.3; then
- rm -f Tk_CanvasDrawableCoords.3
-- ln CanvTkwin.3 Tk_CanvasDrawableCoords.3
-+ ln -s CanvTkwin.3 Tk_CanvasDrawableCoords.3
- fi
- if test -r CanvTkwin.3; then
- rm -f Tk_CanvasSetStippleOrigin.3
-- ln CanvTkwin.3 Tk_CanvasSetStippleOrigin.3
-+ ln -s CanvTkwin.3 Tk_CanvasSetStippleOrigin.3
- fi
- if test -r CanvTkwin.3; then
- rm -f Tk_CanvasWindowCoords.3
-- ln CanvTkwin.3 Tk_CanvasWindowCoords.3
-+ ln -s CanvTkwin.3 Tk_CanvasWindowCoords.3
- fi
- if test -r CanvTkwin.3; then
- rm -f Tk_CanvasEventuallyRedraw.3
-- ln CanvTkwin.3 Tk_CanvasEventuallyRedraw.3
-+ ln -s CanvTkwin.3 Tk_CanvasEventuallyRedraw.3
- fi
- if test -r CanvTkwin.3; then
- rm -f Tk_CanvasTagsOption.3
-- ln CanvTkwin.3 Tk_CanvasTagsOption.3
-+ ln -s CanvTkwin.3 Tk_CanvasTagsOption.3
- fi
- if test -r CanvTxtInfo.3; then
- rm -f Tk_CanvasTextInfo.3
-- ln CanvTxtInfo.3 Tk_CanvasTextInfo.3
-+ ln -s CanvTxtInfo.3 Tk_CanvasTextInfo.3
- fi
- if test -r Clipboard.3; then
- rm -f Tk_ClipboardClear.3
-- ln Clipboard.3 Tk_ClipboardClear.3
-+ ln -s Clipboard.3 Tk_ClipboardClear.3
- fi
- if test -r Clipboard.3; then
- rm -f Tk_ClipboardAppend.3
-- ln Clipboard.3 Tk_ClipboardAppend.3
-+ ln -s Clipboard.3 Tk_ClipboardAppend.3
- fi
- if test -r ClrSelect.3; then
- rm -f Tk_ClearSelection.3
-- ln ClrSelect.3 Tk_ClearSelection.3
-+ ln -s ClrSelect.3 Tk_ClearSelection.3
- fi
- if test -r ConfigWidg.3; then
- rm -f Tk_ConfigureWidget.3
-- ln ConfigWidg.3 Tk_ConfigureWidget.3
-+ ln -s ConfigWidg.3 Tk_ConfigureWidget.3
- fi
- if test -r ConfigWidg.3; then
- rm -f Tk_Offset.3
-- ln ConfigWidg.3 Tk_Offset.3
-+ ln -s ConfigWidg.3 Tk_Offset.3
- fi
- if test -r ConfigWidg.3; then
- rm -f Tk_ConfigureInfo.3
-- ln ConfigWidg.3 Tk_ConfigureInfo.3
-+ ln -s ConfigWidg.3 Tk_ConfigureInfo.3
- fi
- if test -r ConfigWidg.3; then
- rm -f Tk_ConfigureValue.3
-- ln ConfigWidg.3 Tk_ConfigureValue.3
-+ ln -s ConfigWidg.3 Tk_ConfigureValue.3
- fi
- if test -r ConfigWidg.3; then
- rm -f Tk_FreeOptions.3
-- ln ConfigWidg.3 Tk_FreeOptions.3
-+ ln -s ConfigWidg.3 Tk_FreeOptions.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_ConfigureWindow.3
-- ln ConfigWind.3 Tk_ConfigureWindow.3
-+ ln -s ConfigWind.3 Tk_ConfigureWindow.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_MoveWindow.3
-- ln ConfigWind.3 Tk_MoveWindow.3
-+ ln -s ConfigWind.3 Tk_MoveWindow.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_ResizeWindow.3
-- ln ConfigWind.3 Tk_ResizeWindow.3
-+ ln -s ConfigWind.3 Tk_ResizeWindow.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_MoveResizeWindow.3
-- ln ConfigWind.3 Tk_MoveResizeWindow.3
-+ ln -s ConfigWind.3 Tk_MoveResizeWindow.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_SetWindowBorderWidth.3
-- ln ConfigWind.3 Tk_SetWindowBorderWidth.3
-+ ln -s ConfigWind.3 Tk_SetWindowBorderWidth.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_ChangeWindowAttributes.3
-- ln ConfigWind.3 Tk_ChangeWindowAttributes.3
-+ ln -s ConfigWind.3 Tk_ChangeWindowAttributes.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_SetWindowBackground.3
-- ln ConfigWind.3 Tk_SetWindowBackground.3
-+ ln -s ConfigWind.3 Tk_SetWindowBackground.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_SetWindowBackgroundPixmap.3
-- ln ConfigWind.3 Tk_SetWindowBackgroundPixmap.3
-+ ln -s ConfigWind.3 Tk_SetWindowBackgroundPixmap.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_SetWindowBorder.3
-- ln ConfigWind.3 Tk_SetWindowBorder.3
-+ ln -s ConfigWind.3 Tk_SetWindowBorder.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_SetWindowBorderPixmap.3
-- ln ConfigWind.3 Tk_SetWindowBorderPixmap.3
-+ ln -s ConfigWind.3 Tk_SetWindowBorderPixmap.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_SetWindowColormap.3
-- ln ConfigWind.3 Tk_SetWindowColormap.3
-+ ln -s ConfigWind.3 Tk_SetWindowColormap.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_DefineCursor.3
-- ln ConfigWind.3 Tk_DefineCursor.3
-+ ln -s ConfigWind.3 Tk_DefineCursor.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_UndefineCursor.3
-- ln ConfigWind.3 Tk_UndefineCursor.3
-+ ln -s ConfigWind.3 Tk_UndefineCursor.3
- fi
- if test -r CoordToWin.3; then
- rm -f Tk_CoordsToWindow.3
-- ln CoordToWin.3 Tk_CoordsToWindow.3
-+ ln -s CoordToWin.3 Tk_CoordsToWindow.3
- fi
- if test -r CrtErrHdlr.3; then
- rm -f Tk_CreateErrorHandler.3
-- ln CrtErrHdlr.3 Tk_CreateErrorHandler.3
-+ ln -s CrtErrHdlr.3 Tk_CreateErrorHandler.3
- fi
- if test -r CrtErrHdlr.3; then
- rm -f Tk_DeleteErrorHandler.3
-- ln CrtErrHdlr.3 Tk_DeleteErrorHandler.3
-+ ln -s CrtErrHdlr.3 Tk_DeleteErrorHandler.3
- fi
- if test -r CrtGenHdlr.3; then
- rm -f Tk_CreateGenericHandler.3
-- ln CrtGenHdlr.3 Tk_CreateGenericHandler.3
-+ ln -s CrtGenHdlr.3 Tk_CreateGenericHandler.3
- fi
- if test -r CrtGenHdlr.3; then
- rm -f Tk_DeleteGenericHandler.3
-- ln CrtGenHdlr.3 Tk_DeleteGenericHandler.3
-+ ln -s CrtGenHdlr.3 Tk_DeleteGenericHandler.3
- fi
- if test -r CrtImgType.3; then
- rm -f Tk_CreateImageType.3
-- ln CrtImgType.3 Tk_CreateImageType.3
-+ ln -s CrtImgType.3 Tk_CreateImageType.3
- fi
- if test -r CrtImgType.3; then
- rm -f Tk_GetImageMasterData.3
-- ln CrtImgType.3 Tk_GetImageMasterData.3
-+ ln -s CrtImgType.3 Tk_GetImageMasterData.3
- fi
- if test -r CrtItemType.3; then
- rm -f Tk_CreateItemType.3
-- ln CrtItemType.3 Tk_CreateItemType.3
-+ ln -s CrtItemType.3 Tk_CreateItemType.3
- fi
- if test -r CrtItemType.3; then
- rm -f Tk_GetItemTypes.3
-- ln CrtItemType.3 Tk_GetItemTypes.3
-+ ln -s CrtItemType.3 Tk_GetItemTypes.3
- fi
- if test -r CrtPhImgFmt.3; then
- rm -f Tk_CreatePhotoImageFormat.3
-- ln CrtPhImgFmt.3 Tk_CreatePhotoImageFormat.3
-+ ln -s CrtPhImgFmt.3 Tk_CreatePhotoImageFormat.3
- fi
- if test -r CrtSelHdlr.3; then
- rm -f Tk_CreateSelHandler.3
-- ln CrtSelHdlr.3 Tk_CreateSelHandler.3
-+ ln -s CrtSelHdlr.3 Tk_CreateSelHandler.3
- fi
- if test -r CrtSelHdlr.3; then
- rm -f Tk_DeleteSelHandler.3
-- ln CrtSelHdlr.3 Tk_DeleteSelHandler.3
-+ ln -s CrtSelHdlr.3 Tk_DeleteSelHandler.3
- fi
- if test -r CrtWindow.3; then
- rm -f Tk_CreateWindow.3
-- ln CrtWindow.3 Tk_CreateWindow.3
-+ ln -s CrtWindow.3 Tk_CreateWindow.3
- fi
- if test -r CrtWindow.3; then
- rm -f Tk_CreateWindowFromPath.3
-- ln CrtWindow.3 Tk_CreateWindowFromPath.3
-+ ln -s CrtWindow.3 Tk_CreateWindowFromPath.3
- fi
- if test -r CrtWindow.3; then
- rm -f Tk_DestroyWindow.3
-- ln CrtWindow.3 Tk_DestroyWindow.3
-+ ln -s CrtWindow.3 Tk_DestroyWindow.3
- fi
- if test -r CrtWindow.3; then
- rm -f Tk_MakeWindowExist.3
-- ln CrtWindow.3 Tk_MakeWindowExist.3
-+ ln -s CrtWindow.3 Tk_MakeWindowExist.3
- fi
- if test -r DeleteImg.3; then
- rm -f Tk_DeleteImage.3
-- ln DeleteImg.3 Tk_DeleteImage.3
-+ ln -s DeleteImg.3 Tk_DeleteImage.3
- fi
- if test -r DrawFocHlt.3; then
- rm -f Tk_DrawFocusHighlight.3
-- ln DrawFocHlt.3 Tk_DrawFocusHighlight.3
-+ ln -s DrawFocHlt.3 Tk_DrawFocusHighlight.3
- fi
- if test -r EventHndlr.3; then
- rm -f Tk_CreateEventHandler.3
-- ln EventHndlr.3 Tk_CreateEventHandler.3
-+ ln -s EventHndlr.3 Tk_CreateEventHandler.3
- fi
- if test -r EventHndlr.3; then
- rm -f Tk_DeleteEventHandler.3
-- ln EventHndlr.3 Tk_DeleteEventHandler.3
-+ ln -s EventHndlr.3 Tk_DeleteEventHandler.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_FindPhoto.3
-- ln FindPhoto.3 Tk_FindPhoto.3
-+ ln -s FindPhoto.3 Tk_FindPhoto.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoPutBlock.3
-- ln FindPhoto.3 Tk_PhotoPutBlock.3
-+ ln -s FindPhoto.3 Tk_PhotoPutBlock.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoPutZoomedBlock.3
-- ln FindPhoto.3 Tk_PhotoPutZoomedBlock.3
-+ ln -s FindPhoto.3 Tk_PhotoPutZoomedBlock.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoGetImage.3
-- ln FindPhoto.3 Tk_PhotoGetImage.3
-+ ln -s FindPhoto.3 Tk_PhotoGetImage.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoBlank.3
-- ln FindPhoto.3 Tk_PhotoBlank.3
-+ ln -s FindPhoto.3 Tk_PhotoBlank.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoExpand.3
-- ln FindPhoto.3 Tk_PhotoExpand.3
-+ ln -s FindPhoto.3 Tk_PhotoExpand.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoGetSize.3
-- ln FindPhoto.3 Tk_PhotoGetSize.3
-+ ln -s FindPhoto.3 Tk_PhotoGetSize.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoSetSize.3
-- ln FindPhoto.3 Tk_PhotoSetSize.3
-+ ln -s FindPhoto.3 Tk_PhotoSetSize.3
- fi
- if test -r FontId.3; then
- rm -f Tk_FontId.3
-- ln FontId.3 Tk_FontId.3
-+ ln -s FontId.3 Tk_FontId.3
- fi
- if test -r FontId.3; then
- rm -f Tk_FontMetrics.3
-- ln FontId.3 Tk_FontMetrics.3
-+ ln -s FontId.3 Tk_FontMetrics.3
- fi
- if test -r FontId.3; then
- rm -f Tk_PostscriptFontName.3
-- ln FontId.3 Tk_PostscriptFontName.3
-+ ln -s FontId.3 Tk_PostscriptFontName.3
- fi
- if test -r FreeXId.3; then
- rm -f Tk_FreeXId.3
-- ln FreeXId.3 Tk_FreeXId.3
-+ ln -s FreeXId.3 Tk_FreeXId.3
- fi
- if test -r GeomReq.3; then
- rm -f Tk_GeometryRequest.3
-- ln GeomReq.3 Tk_GeometryRequest.3
-+ ln -s GeomReq.3 Tk_GeometryRequest.3
- fi
- if test -r GeomReq.3; then
- rm -f Tk_SetInternalBorder.3
-- ln GeomReq.3 Tk_SetInternalBorder.3
-+ ln -s GeomReq.3 Tk_SetInternalBorder.3
- fi
- if test -r GetAnchor.3; then
- rm -f Tk_GetAnchor.3
-- ln GetAnchor.3 Tk_GetAnchor.3
-+ ln -s GetAnchor.3 Tk_GetAnchor.3
- fi
- if test -r GetAnchor.3; then
- rm -f Tk_NameOfAnchor.3
-- ln GetAnchor.3 Tk_NameOfAnchor.3
-+ ln -s GetAnchor.3 Tk_NameOfAnchor.3
- fi
- if test -r GetBitmap.3; then
- rm -f Tk_GetBitmap.3
-- ln GetBitmap.3 Tk_GetBitmap.3
-+ ln -s GetBitmap.3 Tk_GetBitmap.3
- fi
- if test -r GetBitmap.3; then
- rm -f Tk_DefineBitmap.3
-- ln GetBitmap.3 Tk_DefineBitmap.3
-+ ln -s GetBitmap.3 Tk_DefineBitmap.3
- fi
- if test -r GetBitmap.3; then
- rm -f Tk_NameOfBitmap.3
-- ln GetBitmap.3 Tk_NameOfBitmap.3
-+ ln -s GetBitmap.3 Tk_NameOfBitmap.3
- fi
- if test -r GetBitmap.3; then
- rm -f Tk_SizeOfBitmap.3
-- ln GetBitmap.3 Tk_SizeOfBitmap.3
-+ ln -s GetBitmap.3 Tk_SizeOfBitmap.3
- fi
- if test -r GetBitmap.3; then
- rm -f Tk_FreeBitmap.3
-- ln GetBitmap.3 Tk_FreeBitmap.3
-+ ln -s GetBitmap.3 Tk_FreeBitmap.3
- fi
- if test -r GetBitmap.3; then
- rm -f Tk_GetBitmapFromData.3
-- ln GetBitmap.3 Tk_GetBitmapFromData.3
-+ ln -s GetBitmap.3 Tk_GetBitmapFromData.3
- fi
- if test -r GetCapStyl.3; then
- rm -f Tk_GetCapStyle.3
-- ln GetCapStyl.3 Tk_GetCapStyle.3
-+ ln -s GetCapStyl.3 Tk_GetCapStyle.3
- fi
- if test -r GetCapStyl.3; then
- rm -f Tk_NameOfCapStyle.3
-- ln GetCapStyl.3 Tk_NameOfCapStyle.3
-+ ln -s GetCapStyl.3 Tk_NameOfCapStyle.3
- fi
- if test -r GetClrmap.3; then
- rm -f Tk_GetColormap.3
-- ln GetClrmap.3 Tk_GetColormap.3
-+ ln -s GetClrmap.3 Tk_GetColormap.3
- fi
- if test -r GetClrmap.3; then
- rm -f Tk_FreeColormap.3
-- ln GetClrmap.3 Tk_FreeColormap.3
-+ ln -s GetClrmap.3 Tk_FreeColormap.3
- fi
- if test -r GetColor.3; then
- rm -f Tk_GetColor.3
-- ln GetColor.3 Tk_GetColor.3
-+ ln -s GetColor.3 Tk_GetColor.3
- fi
- if test -r GetColor.3; then
- rm -f Tk_GetColorByValue.3
-- ln GetColor.3 Tk_GetColorByValue.3
-+ ln -s GetColor.3 Tk_GetColorByValue.3
- fi
- if test -r GetColor.3; then
- rm -f Tk_NameOfColor.3
-- ln GetColor.3 Tk_NameOfColor.3
-+ ln -s GetColor.3 Tk_NameOfColor.3
- fi
- if test -r GetColor.3; then
- rm -f Tk_FreeColor.3
-- ln GetColor.3 Tk_FreeColor.3
-+ ln -s GetColor.3 Tk_FreeColor.3
- fi
- if test -r GetCursor.3; then
- rm -f Tk_GetCursor.3
-- ln GetCursor.3 Tk_GetCursor.3
-+ ln -s GetCursor.3 Tk_GetCursor.3
- fi
- if test -r GetCursor.3; then
- rm -f Tk_GetCursorFromData.3
-- ln GetCursor.3 Tk_GetCursorFromData.3
-+ ln -s GetCursor.3 Tk_GetCursorFromData.3
- fi
- if test -r GetCursor.3; then
- rm -f Tk_NameOfCursor.3
-- ln GetCursor.3 Tk_NameOfCursor.3
-+ ln -s GetCursor.3 Tk_NameOfCursor.3
- fi
- if test -r GetCursor.3; then
- rm -f Tk_FreeCursor.3
-- ln GetCursor.3 Tk_FreeCursor.3
-+ ln -s GetCursor.3 Tk_FreeCursor.3
- fi
- if test -r GetFont.3; then
- rm -f Tk_GetFont.3
-- ln GetFont.3 Tk_GetFont.3
-+ ln -s GetFont.3 Tk_GetFont.3
- fi
- if test -r GetFont.3; then
- rm -f Tk_NameOfFont.3
-- ln GetFont.3 Tk_NameOfFont.3
-+ ln -s GetFont.3 Tk_NameOfFont.3
- fi
- if test -r GetFont.3; then
- rm -f Tk_FreeFont.3
-- ln GetFont.3 Tk_FreeFont.3
-+ ln -s GetFont.3 Tk_FreeFont.3
- fi
- if test -r GetGC.3; then
- rm -f Tk_GetGC.3
-- ln GetGC.3 Tk_GetGC.3
-+ ln -s GetGC.3 Tk_GetGC.3
- fi
- if test -r GetGC.3; then
- rm -f Tk_FreeGC.3
-- ln GetGC.3 Tk_FreeGC.3
-+ ln -s GetGC.3 Tk_FreeGC.3
- fi
- if test -r GetImage.3; then
- rm -f Tk_GetImage.3
-- ln GetImage.3 Tk_GetImage.3
-+ ln -s GetImage.3 Tk_GetImage.3
- fi
- if test -r GetImage.3; then
- rm -f Tk_RedrawImage.3
-- ln GetImage.3 Tk_RedrawImage.3
-+ ln -s GetImage.3 Tk_RedrawImage.3
- fi
- if test -r GetImage.3; then
- rm -f Tk_SizeOfImage.3
-- ln GetImage.3 Tk_SizeOfImage.3
-+ ln -s GetImage.3 Tk_SizeOfImage.3
- fi
- if test -r GetImage.3; then
- rm -f Tk_FreeImage.3
-- ln GetImage.3 Tk_FreeImage.3
-+ ln -s GetImage.3 Tk_FreeImage.3
- fi
- if test -r GetJoinStl.3; then
- rm -f Tk_GetJoinStyle.3
-- ln GetJoinStl.3 Tk_GetJoinStyle.3
-+ ln -s GetJoinStl.3 Tk_GetJoinStyle.3
- fi
- if test -r GetJoinStl.3; then
- rm -f Tk_NameOfJoinStyle.3
-- ln GetJoinStl.3 Tk_NameOfJoinStyle.3
-+ ln -s GetJoinStl.3 Tk_NameOfJoinStyle.3
- fi
- if test -r GetJustify.3; then
- rm -f Tk_GetJustify.3
-- ln GetJustify.3 Tk_GetJustify.3
-+ ln -s GetJustify.3 Tk_GetJustify.3
- fi
- if test -r GetJustify.3; then
- rm -f Tk_NameOfJustify.3
-- ln GetJustify.3 Tk_NameOfJustify.3
-+ ln -s GetJustify.3 Tk_NameOfJustify.3
- fi
- if test -r GetOption.3; then
- rm -f Tk_GetOption.3
-- ln GetOption.3 Tk_GetOption.3
-+ ln -s GetOption.3 Tk_GetOption.3
- fi
- if test -r GetPixels.3; then
- rm -f Tk_GetPixels.3
-- ln GetPixels.3 Tk_GetPixels.3
-+ ln -s GetPixels.3 Tk_GetPixels.3
- fi
- if test -r GetPixels.3; then
- rm -f Tk_GetScreenMM.3
-- ln GetPixels.3 Tk_GetScreenMM.3
-+ ln -s GetPixels.3 Tk_GetScreenMM.3
- fi
- if test -r GetPixmap.3; then
- rm -f Tk_GetPixmap.3
-- ln GetPixmap.3 Tk_GetPixmap.3
-+ ln -s GetPixmap.3 Tk_GetPixmap.3
- fi
- if test -r GetPixmap.3; then
- rm -f Tk_FreePixmap.3
-- ln GetPixmap.3 Tk_FreePixmap.3
-+ ln -s GetPixmap.3 Tk_FreePixmap.3
- fi
- if test -r GetRelief.3; then
- rm -f Tk_GetRelief.3
-- ln GetRelief.3 Tk_GetRelief.3
-+ ln -s GetRelief.3 Tk_GetRelief.3
- fi
- if test -r GetRelief.3; then
- rm -f Tk_NameOfRelief.3
-- ln GetRelief.3 Tk_NameOfRelief.3
-+ ln -s GetRelief.3 Tk_NameOfRelief.3
- fi
- if test -r GetRootCrd.3; then
- rm -f Tk_GetRootCoords.3
-- ln GetRootCrd.3 Tk_GetRootCoords.3
-+ ln -s GetRootCrd.3 Tk_GetRootCoords.3
- fi
- if test -r GetScroll.3; then
- rm -f Tk_GetScrollInfo.3
-- ln GetScroll.3 Tk_GetScrollInfo.3
-+ ln -s GetScroll.3 Tk_GetScrollInfo.3
- fi
- if test -r GetSelect.3; then
- rm -f Tk_GetSelection.3
-- ln GetSelect.3 Tk_GetSelection.3
-+ ln -s GetSelect.3 Tk_GetSelection.3
- fi
- if test -r GetUid.3; then
- rm -f Tk_GetUid.3
-- ln GetUid.3 Tk_GetUid.3
-+ ln -s GetUid.3 Tk_GetUid.3
- fi
- if test -r GetUid.3; then
- rm -f Tk_Uid.3
-- ln GetUid.3 Tk_Uid.3
-+ ln -s GetUid.3 Tk_Uid.3
- fi
- if test -r GetVRoot.3; then
- rm -f Tk_GetVRootGeometry.3
-- ln GetVRoot.3 Tk_GetVRootGeometry.3
-+ ln -s GetVRoot.3 Tk_GetVRootGeometry.3
- fi
- if test -r GetVisual.3; then
- rm -f Tk_GetVisual.3
-- ln GetVisual.3 Tk_GetVisual.3
-+ ln -s GetVisual.3 Tk_GetVisual.3
- fi
- if test -r HandleEvent.3; then
- rm -f Tk_HandleEvent.3
-- ln HandleEvent.3 Tk_HandleEvent.3
-+ ln -s HandleEvent.3 Tk_HandleEvent.3
- fi
- if test -r IdToWindow.3; then
- rm -f Tk_IdToWindow.3
-- ln IdToWindow.3 Tk_IdToWindow.3
-+ ln -s IdToWindow.3 Tk_IdToWindow.3
- fi
- if test -r ImgChanged.3; then
- rm -f Tk_ImageChanged.3
-- ln ImgChanged.3 Tk_ImageChanged.3
-+ ln -s ImgChanged.3 Tk_ImageChanged.3
- fi
- if test -r InternAtom.3; then
- rm -f Tk_InternAtom.3
-- ln InternAtom.3 Tk_InternAtom.3
-+ ln -s InternAtom.3 Tk_InternAtom.3
- fi
- if test -r InternAtom.3; then
- rm -f Tk_GetAtomName.3
-- ln InternAtom.3 Tk_GetAtomName.3
-+ ln -s InternAtom.3 Tk_GetAtomName.3
- fi
- if test -r MainLoop.3; then
- rm -f Tk_MainLoop.3
-- ln MainLoop.3 Tk_MainLoop.3
-+ ln -s MainLoop.3 Tk_MainLoop.3
- fi
- if test -r MainWin.3; then
- rm -f Tk_MainWindow.3
-- ln MainWin.3 Tk_MainWindow.3
-+ ln -s MainWin.3 Tk_MainWindow.3
- fi
- if test -r MaintGeom.3; then
- rm -f Tk_MaintainGeometry.3
-- ln MaintGeom.3 Tk_MaintainGeometry.3
-+ ln -s MaintGeom.3 Tk_MaintainGeometry.3
- fi
- if test -r MaintGeom.3; then
- rm -f Tk_UnmaintainGeometry.3
-- ln MaintGeom.3 Tk_UnmaintainGeometry.3
-+ ln -s MaintGeom.3 Tk_UnmaintainGeometry.3
- fi
- if test -r ManageGeom.3; then
- rm -f Tk_ManageGeometry.3
-- ln ManageGeom.3 Tk_ManageGeometry.3
-+ ln -s ManageGeom.3 Tk_ManageGeometry.3
- fi
- if test -r MapWindow.3; then
- rm -f Tk_MapWindow.3
-- ln MapWindow.3 Tk_MapWindow.3
-+ ln -s MapWindow.3 Tk_MapWindow.3
- fi
- if test -r MapWindow.3; then
- rm -f Tk_UnmapWindow.3
-- ln MapWindow.3 Tk_UnmapWindow.3
-+ ln -s MapWindow.3 Tk_UnmapWindow.3
- fi
- if test -r MeasureChar.3; then
- rm -f Tk_MeasureChars.3
-- ln MeasureChar.3 Tk_MeasureChars.3
-+ ln -s MeasureChar.3 Tk_MeasureChars.3
- fi
- if test -r MeasureChar.3; then
- rm -f Tk_TextWidth.3
-- ln MeasureChar.3 Tk_TextWidth.3
-+ ln -s MeasureChar.3 Tk_TextWidth.3
- fi
- if test -r MeasureChar.3; then
- rm -f Tk_DrawChars.3
-- ln MeasureChar.3 Tk_DrawChars.3
-+ ln -s MeasureChar.3 Tk_DrawChars.3
- fi
- if test -r MeasureChar.3; then
- rm -f Tk_UnderlineChars.3
-- ln MeasureChar.3 Tk_UnderlineChars.3
-+ ln -s MeasureChar.3 Tk_UnderlineChars.3
- fi
- if test -r MoveToplev.3; then
- rm -f Tk_MoveToplevelWindow.3
-- ln MoveToplev.3 Tk_MoveToplevelWindow.3
-+ ln -s MoveToplev.3 Tk_MoveToplevelWindow.3
- fi
- if test -r Name.3; then
- rm -f Tk_Name.3
-- ln Name.3 Tk_Name.3
-+ ln -s Name.3 Tk_Name.3
- fi
- if test -r Name.3; then
- rm -f Tk_PathName.3
-- ln Name.3 Tk_PathName.3
-+ ln -s Name.3 Tk_PathName.3
- fi
- if test -r Name.3; then
- rm -f Tk_NameToWindow.3
-- ln Name.3 Tk_NameToWindow.3
-+ ln -s Name.3 Tk_NameToWindow.3
- fi
- if test -r NameOfImg.3; then
- rm -f Tk_NameOfImage.3
-- ln NameOfImg.3 Tk_NameOfImage.3
-+ ln -s NameOfImg.3 Tk_NameOfImage.3
- fi
- if test -r OwnSelect.3; then
- rm -f Tk_OwnSelection.3
-- ln OwnSelect.3 Tk_OwnSelection.3
-+ ln -s OwnSelect.3 Tk_OwnSelection.3
- fi
- if test -r ParseArgv.3; then
- rm -f Tk_ParseArgv.3
-- ln ParseArgv.3 Tk_ParseArgv.3
-+ ln -s ParseArgv.3 Tk_ParseArgv.3
- fi
- if test -r QWinEvent.3; then
- rm -f Tk_QueueWindowEvent.3
-- ln QWinEvent.3 Tk_QueueWindowEvent.3
-+ ln -s QWinEvent.3 Tk_QueueWindowEvent.3
- fi
- if test -r Restack.3; then
- rm -f Tk_RestackWindow.3
-- ln Restack.3 Tk_RestackWindow.3
-+ ln -s Restack.3 Tk_RestackWindow.3
- fi
- if test -r RestrictEv.3; then
- rm -f Tk_RestrictEvents.3
-- ln RestrictEv.3 Tk_RestrictEvents.3
-+ ln -s RestrictEv.3 Tk_RestrictEvents.3
- fi
- if test -r SetAppName.3; then
- rm -f Tk_SetAppName.3
-- ln SetAppName.3 Tk_SetAppName.3
-+ ln -s SetAppName.3 Tk_SetAppName.3
- fi
- if test -r SetClass.3; then
- rm -f Tk_SetClass.3
-- ln SetClass.3 Tk_SetClass.3
-+ ln -s SetClass.3 Tk_SetClass.3
- fi
- if test -r SetClass.3; then
- rm -f Tk_Class.3
-- ln SetClass.3 Tk_Class.3
-+ ln -s SetClass.3 Tk_Class.3
- fi
- if test -r SetGrid.3; then
- rm -f Tk_SetGrid.3
-- ln SetGrid.3 Tk_SetGrid.3
-+ ln -s SetGrid.3 Tk_SetGrid.3
- fi
- if test -r SetGrid.3; then
- rm -f Tk_UnsetGrid.3
-- ln SetGrid.3 Tk_UnsetGrid.3
-+ ln -s SetGrid.3 Tk_UnsetGrid.3
- fi
- if test -r SetVisual.3; then
- rm -f Tk_SetWindowVisual.3
-- ln SetVisual.3 Tk_SetWindowVisual.3
-+ ln -s SetVisual.3 Tk_SetWindowVisual.3
- fi
- if test -r StrictMotif.3; then
- rm -f Tk_StrictMotif.3
-- ln StrictMotif.3 Tk_StrictMotif.3
-+ ln -s StrictMotif.3 Tk_StrictMotif.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_ComputeTextLayout.3
-- ln TextLayout.3 Tk_ComputeTextLayout.3
-+ ln -s TextLayout.3 Tk_ComputeTextLayout.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_FreeTextLayout.3
-- ln TextLayout.3 Tk_FreeTextLayout.3
-+ ln -s TextLayout.3 Tk_FreeTextLayout.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_DrawTextLayout.3
-- ln TextLayout.3 Tk_DrawTextLayout.3
-+ ln -s TextLayout.3 Tk_DrawTextLayout.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_UnderlineTextLayout.3
-- ln TextLayout.3 Tk_UnderlineTextLayout.3
-+ ln -s TextLayout.3 Tk_UnderlineTextLayout.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_PointToChar.3
-- ln TextLayout.3 Tk_PointToChar.3
-+ ln -s TextLayout.3 Tk_PointToChar.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_CharBbox.3
-- ln TextLayout.3 Tk_CharBbox.3
-+ ln -s TextLayout.3 Tk_CharBbox.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_DistanceToTextLayout.3
-- ln TextLayout.3 Tk_DistanceToTextLayout.3
-+ ln -s TextLayout.3 Tk_DistanceToTextLayout.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_IntersectTextLayout.3
-- ln TextLayout.3 Tk_IntersectTextLayout.3
-+ ln -s TextLayout.3 Tk_IntersectTextLayout.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_TextLayoutToPostscript.3
-- ln TextLayout.3 Tk_TextLayoutToPostscript.3
-+ ln -s TextLayout.3 Tk_TextLayoutToPostscript.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_WindowId.3
-- ln WindowId.3 Tk_WindowId.3
-+ ln -s WindowId.3 Tk_WindowId.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Parent.3
-- ln WindowId.3 Tk_Parent.3
-+ ln -s WindowId.3 Tk_Parent.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Display.3
-- ln WindowId.3 Tk_Display.3
-+ ln -s WindowId.3 Tk_Display.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_DisplayName.3
-- ln WindowId.3 Tk_DisplayName.3
-+ ln -s WindowId.3 Tk_DisplayName.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_ScreenNumber.3
-- ln WindowId.3 Tk_ScreenNumber.3
-+ ln -s WindowId.3 Tk_ScreenNumber.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Screen.3
-- ln WindowId.3 Tk_Screen.3
-+ ln -s WindowId.3 Tk_Screen.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_X.3
-- ln WindowId.3 Tk_X.3
-+ ln -s WindowId.3 Tk_X.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Y.3
-- ln WindowId.3 Tk_Y.3
-+ ln -s WindowId.3 Tk_Y.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Width.3
-- ln WindowId.3 Tk_Width.3
-+ ln -s WindowId.3 Tk_Width.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Height.3
-- ln WindowId.3 Tk_Height.3
-+ ln -s WindowId.3 Tk_Height.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Changes.3
-- ln WindowId.3 Tk_Changes.3
-+ ln -s WindowId.3 Tk_Changes.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Attributes.3
-- ln WindowId.3 Tk_Attributes.3
-+ ln -s WindowId.3 Tk_Attributes.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_IsMapped.3
-- ln WindowId.3 Tk_IsMapped.3
-+ ln -s WindowId.3 Tk_IsMapped.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_IsTopLevel.3
-- ln WindowId.3 Tk_IsTopLevel.3
-+ ln -s WindowId.3 Tk_IsTopLevel.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_ReqWidth.3
-- ln WindowId.3 Tk_ReqWidth.3
-+ ln -s WindowId.3 Tk_ReqWidth.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_ReqHeight.3
-- ln WindowId.3 Tk_ReqHeight.3
-+ ln -s WindowId.3 Tk_ReqHeight.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_InternalBorderWidth.3
-- ln WindowId.3 Tk_InternalBorderWidth.3
-+ ln -s WindowId.3 Tk_InternalBorderWidth.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Visual.3
-- ln WindowId.3 Tk_Visual.3
-+ ln -s WindowId.3 Tk_Visual.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Depth.3
-- ln WindowId.3 Tk_Depth.3
-+ ln -s WindowId.3 Tk_Depth.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Colormap.3
-- ln WindowId.3 Tk_Colormap.3
-+ ln -s WindowId.3 Tk_Colormap.3
- fi
- if test -r chooseColor.n; then
- rm -f tk_chooseColor.n
-- ln chooseColor.n tk_chooseColor.n
-+ ln -s chooseColor.n tk_chooseColor.n
- fi
- if test -r dialog.n; then
- rm -f tk_dialog.n
-- ln dialog.n tk_dialog.n
-+ ln -s dialog.n tk_dialog.n
- fi
- if test -r focusNext.n; then
- rm -f tk_focusNext.n
-- ln focusNext.n tk_focusNext.n
-+ ln -s focusNext.n tk_focusNext.n
- fi
- if test -r focusNext.n; then
- rm -f tk_focusPrev.n
-- ln focusNext.n tk_focusPrev.n
-+ ln -s focusNext.n tk_focusPrev.n
- fi
- if test -r focusNext.n; then
- rm -f tk_focusFollowsMouse.n
-- ln focusNext.n tk_focusFollowsMouse.n
-+ ln -s focusNext.n tk_focusFollowsMouse.n
- fi
- if test -r getOpenFile.n; then
- rm -f tk_getOpenFile.n
-- ln getOpenFile.n tk_getOpenFile.n
-+ ln -s getOpenFile.n tk_getOpenFile.n
- fi
- if test -r getOpenFile.n; then
- rm -f tk_getSaveFile.n
-- ln getOpenFile.n tk_getSaveFile.n
-+ ln -s getOpenFile.n tk_getSaveFile.n
- fi
- if test -r menubar.n; then
- rm -f tk_menuBar.n
-- ln menubar.n tk_menuBar.n
-+ ln -s menubar.n tk_menuBar.n
- fi
- if test -r menubar.n; then
- rm -f tk_bindForTraversal.n
-- ln menubar.n tk_bindForTraversal.n
-+ ln -s menubar.n tk_bindForTraversal.n
- fi
- if test -r messageBox.n; then
- rm -f tk_messageBox.n
-- ln messageBox.n tk_messageBox.n
-+ ln -s messageBox.n tk_messageBox.n
- fi
- if test -r optionMenu.n; then
- rm -f tk_optionMenu.n
-- ln optionMenu.n tk_optionMenu.n
-+ ln -s optionMenu.n tk_optionMenu.n
- fi
- if test -r pack-old.n; then
- rm -f pack.n
-- ln pack-old.n pack.n
-+ ln -s pack-old.n pack.n
- fi
- if test -r palette.n; then
- rm -f tk_setPalette.n
-- ln palette.n tk_setPalette.n
-+ ln -s palette.n tk_setPalette.n
- fi
- if test -r palette.n; then
- rm -f tk_bisque.n
-- ln palette.n tk_bisque.n
-+ ln -s palette.n tk_bisque.n
- fi
- if test -r popup.n; then
- rm -f tk_popup.n
-- ln popup.n tk_popup.n
-+ ln -s popup.n tk_popup.n
- fi
- exit 0
diff --git a/x11/tk80/pkg/COMMENT b/x11/tk80/pkg/COMMENT
deleted file mode 100644
index ff5ce674d03..00000000000
--- a/x11/tk80/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Graphical toolkit for TCL
diff --git a/x11/tk80/pkg/DESCR b/x11/tk80/pkg/DESCR
deleted file mode 100644
index afdf6fe9e2f..00000000000
--- a/x11/tk80/pkg/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-This package contains the binary release of Tk version 8.0, a GUI
-toolkit for Tcl.
-
-The best way to get started with Tcl is to read ``Tcl and the Tk
-Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
-
-A full set of manual pages is also provided with this package.
-
-NOTE: This kit requires a Tcl8.0 binary kit.
diff --git a/x11/tk80/pkg/PLIST b/x11/tk80/pkg/PLIST
deleted file mode 100644
index 3818050a29d..00000000000
--- a/x11/tk80/pkg/PLIST
+++ /dev/null
@@ -1,467 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2000/07/28 21:02:56 jlam Exp $
-bin/wish8.0
-include/tk8.0/tk.h
-include/tk8.0/unix/tkUnixDefault.h
-include/tk8.0/unix/tkUnixInt.h
-include/tk8.0/unix/tkUnixPort.h
-include/tk8.0/generic/default.h
-include/tk8.0/generic/ks_names.h
-include/tk8.0/generic/tk.h
-include/tk8.0/generic/tk3d.h
-include/tk8.0/generic/tkButton.h
-include/tk8.0/generic/tkCanvas.h
-include/tk8.0/generic/tkColor.h
-include/tk8.0/generic/tkFileFilter.h
-include/tk8.0/generic/tkFont.h
-include/tk8.0/generic/tkInitScript.h
-include/tk8.0/generic/tkInt.h
-include/tk8.0/generic/tkMenu.h
-include/tk8.0/generic/tkMenubutton.h
-include/tk8.0/generic/tkPort.h
-include/tk8.0/generic/tkScale.h
-include/tk8.0/generic/tkScrollbar.h
-include/tk8.0/generic/tkSelect.h
-include/tk8.0/generic/tkText.h
-man/man1/wish.1
-man/man3/FontId.3
-man/man3/GetFont.3
-man/man3/MeasureChar.3
-man/man3/GetGC.3
-man/man3/TextLayout.3
-man/man3/Name.3
-man/man3/3DBorder.3
-man/man3/BindTable.3
-man/man3/CanvPsY.3
-man/man3/CanvTkwin.3
-man/man3/CanvTxtInfo.3
-man/man3/Clipboard.3
-man/man3/ClrSelect.3
-man/man3/GetImage.3
-man/man3/ConfigWidg.3
-man/man3/ConfigWind.3
-man/man3/CoordToWin.3
-man/man3/CrtErrHdlr.3
-man/man3/CrtGenHdlr.3
-man/man3/CrtImgType.3
-man/man3/CrtItemType.3
-man/man3/CrtPhImgFmt.3
-man/man3/CrtSelHdlr.3
-man/man3/CrtWindow.3
-man/man3/DeleteImg.3
-man/man3/DrawFocHlt.3
-man/man3/EventHndlr.3
-man/man3/FindPhoto.3
-man/man3/FreeXId.3
-man/man3/GeomReq.3
-man/man3/GetAnchor.3
-man/man3/GetBitmap.3
-man/man3/GetCapStyl.3
-man/man3/GetClrmap.3
-man/man3/GetColor.3
-man/man3/GetCursor.3
-man/man3/GetJoinStl.3
-man/man3/GetJustify.3
-man/man3/GetOption.3
-man/man3/GetPixels.3
-man/man3/GetPixmap.3
-man/man3/GetRelief.3
-man/man3/GetRootCrd.3
-man/man3/GetScroll.3
-man/man3/GetSelect.3
-man/man3/GetUid.3
-man/man3/GetVRoot.3
-man/man3/GetVisual.3
-man/man3/HandleEvent.3
-man/man3/IdToWindow.3
-man/man3/ImgChanged.3
-man/man3/InternAtom.3
-man/man3/MainLoop.3
-man/man3/MainWin.3
-man/man3/MaintGeom.3
-man/man3/ManageGeom.3
-man/man3/MapWindow.3
-man/man3/MoveToplev.3
-man/man3/NameOfImg.3
-man/man3/OwnSelect.3
-man/man3/ParseArgv.3
-man/man3/QWinEvent.3
-man/man3/Restack.3
-man/man3/RestrictEv.3
-man/man3/SetAppName.3
-man/man3/SetClass.3
-man/man3/SetGrid.3
-man/man3/SetVisual.3
-man/man3/StrictMotif.3
-man/man3/Tk_Init.3
-man/man3/Tk_Main.3
-man/man3/WindowId.3
-man/man3/Tk_X.3
-man/man3/Tk_3DBorderColor.3
-man/man3/Tk_3DBorderGC.3
-man/man3/Tk_3DHorizontalBevel.3
-man/man3/Tk_3DVerticalBevel.3
-man/man3/Tk_Attributes.3
-man/man3/Tk_BindEvent.3
-man/man3/Tk_CanvasDrawableCoords.3
-man/man3/Tk_CanvasEventuallyRedraw.3
-man/man3/Tk_CanvasGetCoord.3
-man/man3/Tk_CanvasPsBitmap.3
-man/man3/Tk_CanvasPsColor.3
-man/man3/Tk_CanvasPsFont.3
-man/man3/Tk_CanvasPsPath.3
-man/man3/Tk_CanvasPsStipple.3
-man/man3/Tk_CanvasPsY.3
-man/man3/Tk_CanvasSetStippleOrigin.3
-man/man3/Tk_Changes.3
-man/man3/Tk_CanvasTagsOption.3
-man/man3/Tk_CanvasTextInfo.3
-man/man3/Tk_CanvasTkwin.3
-man/man3/Tk_CanvasWindowCoords.3
-man/man3/Tk_ChangeWindowAttributes.3
-man/man3/Tk_CharBbox.3
-man/man3/Tk_Class.3
-man/man3/Tk_ClearSelection.3
-man/man3/Tk_ClipboardAppend.3
-man/man3/Tk_ClipboardClear.3
-man/man3/Tk_Colormap.3
-man/man3/Tk_ComputeTextLayout.3
-man/man3/Tk_ConfigureInfo.3
-man/man3/Tk_ConfigureValue.3
-man/man3/Tk_ConfigureWidget.3
-man/man3/Tk_ConfigureWindow.3
-man/man3/Tk_CoordsToWindow.3
-man/man3/Tk_Depth.3
-man/man3/Tk_CreateBinding.3
-man/man3/Tk_CreateBindingTable.3
-man/man3/Tk_CreateErrorHandler.3
-man/man3/Tk_CreateEventHandler.3
-man/man3/Tk_CreateGenericHandler.3
-man/man3/Tk_CreateImageType.3
-man/man3/Tk_CreateItemType.3
-man/man3/Tk_CreatePhotoImageFormat.3
-man/man3/Tk_CreateSelHandler.3
-man/man3/Tk_CreateWindow.3
-man/man3/Tk_CreateWindowFromPath.3
-man/man3/Tk_DefineBitmap.3
-man/man3/Tk_DefineCursor.3
-man/man3/Tk_DeleteAllBindings.3
-man/man3/Tk_DeleteBinding.3
-man/man3/Tk_DeleteBindingTable.3
-man/man3/Tk_DeleteErrorHandler.3
-man/man3/Tk_DeleteEventHandler.3
-man/man3/Tk_DeleteGenericHandler.3
-man/man3/Tk_DeleteImage.3
-man/man3/Tk_DeleteSelHandler.3
-man/man3/Tk_DestroyWindow.3
-man/man3/Tk_Display.3
-man/man3/Tk_DisplayName.3
-man/man3/Tk_DistanceToTextLayout.3
-man/man3/Tk_Draw3DPolygon.3
-man/man3/Tk_Draw3DRectangle.3
-man/man3/Tk_DrawChars.3
-man/man3/Tk_DrawFocusHighlight.3
-man/man3/Tk_DrawTextLayout.3
-man/man3/Tk_Fill3DPolygon.3
-man/man3/Tk_Fill3DRectangle.3
-man/man3/Tk_FindPhoto.3
-man/man3/Tk_FontId.3
-man/man3/Tk_FontMetrics.3
-man/man3/Tk_Free3DBorder.3
-man/man3/Tk_FreeBitmap.3
-man/man3/Tk_FreeColor.3
-man/man3/Tk_FreeColormap.3
-man/man3/Tk_FreeCursor.3
-man/man3/Tk_FreeFont.3
-man/man3/Tk_FreeGC.3
-man/man3/Tk_FreeImage.3
-man/man3/Tk_FreeOptions.3
-man/man3/Tk_FreePixmap.3
-man/man3/Tk_FreeTextLayout.3
-man/man3/Tk_FreeXId.3
-man/man3/Tk_GeometryRequest.3
-man/man3/Tk_Get3DBorder.3
-man/man3/Tk_GetAllBindings.3
-man/man3/Tk_GetAnchor.3
-man/man3/Tk_GetAtomName.3
-man/man3/Tk_GetBinding.3
-man/man3/Tk_GetBitmap.3
-man/man3/Tk_GetBitmapFromData.3
-man/man3/Tk_GetCapStyle.3
-man/man3/Tk_GetColor.3
-man/man3/Tk_GetColorByValue.3
-man/man3/Tk_GetColormap.3
-man/man3/Tk_GetCursor.3
-man/man3/Tk_GetCursorFromData.3
-man/man3/Tk_GetFont.3
-man/man3/Tk_GetGC.3
-man/man3/Tk_GetImage.3
-man/man3/Tk_GetImageMasterData.3
-man/man3/Tk_GetItemTypes.3
-man/man3/Tk_GetJoinStyle.3
-man/man3/Tk_GetJustify.3
-man/man3/Tk_GetOption.3
-man/man3/Tk_GetPixels.3
-man/man3/Tk_GetPixmap.3
-man/man3/Tk_GetRelief.3
-man/man3/Tk_GetRootCoords.3
-man/man3/Tk_GetScreenMM.3
-man/man3/Tk_GetScrollInfo.3
-man/man3/Tk_GetSelection.3
-man/man3/Tk_GetUid.3
-man/man3/Tk_GetVRootGeometry.3
-man/man3/Tk_GetVisual.3
-man/man3/Tk_HandleEvent.3
-man/man3/Tk_Height.3
-man/man3/Tk_IdToWindow.3
-man/man3/Tk_ImageChanged.3
-man/man3/Tk_InternAtom.3
-man/man3/Tk_InternalBorderWidth.3
-man/man3/Tk_IntersectTextLayout.3
-man/man3/Tk_IsMapped.3
-man/man3/Tk_IsTopLevel.3
-man/man3/Tk_MainLoop.3
-man/man3/Tk_MainWindow.3
-man/man3/Tk_MaintainGeometry.3
-man/man3/Tk_MakeWindowExist.3
-man/man3/Tk_ManageGeometry.3
-man/man3/Tk_MapWindow.3
-man/man3/Tk_MeasureChars.3
-man/man3/Tk_MoveResizeWindow.3
-man/man3/Tk_MoveToplevelWindow.3
-man/man3/Tk_MoveWindow.3
-man/man3/Tk_Name.3
-man/man3/Tk_NameOf3DBorder.3
-man/man3/Tk_NameOfAnchor.3
-man/man3/Tk_NameOfBitmap.3
-man/man3/Tk_NameOfCapStyle.3
-man/man3/Tk_NameOfColor.3
-man/man3/Tk_NameOfCursor.3
-man/man3/Tk_NameOfFont.3
-man/man3/Tk_NameOfImage.3
-man/man3/Tk_NameOfJoinStyle.3
-man/man3/Tk_NameOfJustify.3
-man/man3/Tk_NameOfRelief.3
-man/man3/Tk_NameToWindow.3
-man/man3/Tk_Offset.3
-man/man3/Tk_OwnSelection.3
-man/man3/Tk_Parent.3
-man/man3/Tk_ParseArgv.3
-man/man3/Tk_PathName.3
-man/man3/Tk_PhotoBlank.3
-man/man3/Tk_PhotoExpand.3
-man/man3/Tk_PhotoGetImage.3
-man/man3/Tk_PhotoGetSize.3
-man/man3/Tk_PhotoPutBlock.3
-man/man3/Tk_PhotoPutZoomedBlock.3
-man/man3/Tk_PhotoSetSize.3
-man/man3/Tk_PointToChar.3
-man/man3/Tk_PostscriptFontName.3
-man/man3/Tk_QueueWindowEvent.3
-man/man3/Tk_RedrawImage.3
-man/man3/Tk_Screen.3
-man/man3/Tk_ReqHeight.3
-man/man3/Tk_ReqWidth.3
-man/man3/Tk_ResizeWindow.3
-man/man3/Tk_RestackWindow.3
-man/man3/Tk_RestrictEvents.3
-man/man3/Tk_ScreenNumber.3
-man/man3/Tk_SetAppName.3
-man/man3/Tk_SetBackgroundFromBorder.3
-man/man3/Tk_SetClass.3
-man/man3/Tk_SetGrid.3
-man/man3/Tk_SetInternalBorder.3
-man/man3/Tk_SetWindowBackground.3
-man/man3/Tk_SetWindowBackgroundPixmap.3
-man/man3/Tk_SetWindowBorder.3
-man/man3/Tk_SetWindowBorderPixmap.3
-man/man3/Tk_SetWindowBorderWidth.3
-man/man3/Tk_SizeOfBitmap.3
-man/man3/Tk_SetWindowColormap.3
-man/man3/Tk_SetWindowVisual.3
-man/man3/Tk_SizeOfImage.3
-man/man3/Tk_StrictMotif.3
-man/man3/Tk_TextLayoutToPostscript.3
-man/man3/Tk_TextWidth.3
-man/man3/Tk_Uid.3
-man/man3/Tk_UndefineCursor.3
-man/man3/Tk_UnderlineChars.3
-man/man3/Tk_UnderlineTextLayout.3
-man/man3/Tk_UnmaintainGeometry.3
-man/man3/Tk_UnmapWindow.3
-man/man3/Tk_UnsetGrid.3
-man/man3/Tk_Visual.3
-man/man3/Tk_Width.3
-man/man3/Tk_WindowId.3
-man/man3/Tk_Y.3
-man/mann/chooseColor.n
-man/mann/getOpenFile.n
-man/mann/event.n
-man/mann/font.n
-man/mann/messageBox.n
-man/mann/bell.n
-man/mann/bind.n
-man/mann/bindtags.n
-man/mann/bitmap.n
-man/mann/button.n
-man/mann/canvas.n
-man/mann/checkbutton.n
-man/mann/clipboard.n
-man/mann/destroy.n
-man/mann/dialog.n
-man/mann/entry.n
-man/mann/focus.n
-man/mann/focusNext.n
-man/mann/frame.n
-man/mann/grab.n
-man/mann/grid.n
-man/mann/image.n
-man/mann/label.n
-man/mann/listbox.n
-man/mann/loadTk.n
-man/mann/lower.n
-man/mann/menu.n
-man/mann/menubar.n
-man/mann/menubutton.n
-man/mann/message.n
-man/mann/option.n
-man/mann/optionMenu.n
-man/mann/options.n
-man/mann/pack-old.n
-man/mann/pack.n
-man/mann/palette.n
-man/mann/photo.n
-man/mann/place.n
-man/mann/popup.n
-man/mann/radiobutton.n
-man/mann/raise.n
-man/mann/scale.n
-man/mann/scrollbar.n
-man/mann/selection.n
-man/mann/send.n
-man/mann/text.n
-man/mann/tk.n
-man/mann/tkerror.n
-man/mann/tkvars.n
-man/mann/tkwait.n
-man/mann/toplevel.n
-man/mann/winfo.n
-man/mann/wm.n
-man/mann/tk_bindForTraversal.n
-man/mann/tk_bisque.n
-man/mann/tk_chooseColor.n
-man/mann/tk_dialog.n
-man/mann/tk_focusFollowsMouse.n
-man/mann/tk_focusNext.n
-man/mann/tk_focusPrev.n
-man/mann/tk_getOpenFile.n
-man/mann/tk_getSaveFile.n
-man/mann/tk_menuBar.n
-man/mann/tk_messageBox.n
-man/mann/tk_optionMenu.n
-man/mann/tk_popup.n
-man/mann/tk_setPalette.n
-lib/tk8.0/demos/images/earth.gif
-lib/tk8.0/demos/images/earthris.gif
-lib/tk8.0/demos/images/face.bmp
-lib/tk8.0/demos/images/flagdown.bmp
-lib/tk8.0/demos/images/flagup.bmp
-lib/tk8.0/demos/images/gray25.bmp
-lib/tk8.0/demos/images/letters.bmp
-lib/tk8.0/demos/images/noletter.bmp
-lib/tk8.0/demos/images/pattern.bmp
-lib/tk8.0/demos/images/tcllogo.gif
-lib/tk8.0/demos/images/teapot.ppm
-lib/tk8.0/demos/README
-lib/tk8.0/demos/arrow.tcl
-lib/tk8.0/demos/bind.tcl
-lib/tk8.0/demos/bitmap.tcl
-lib/tk8.0/demos/browse
-lib/tk8.0/demos/button.tcl
-lib/tk8.0/demos/check.tcl
-lib/tk8.0/demos/clrpick.tcl
-lib/tk8.0/demos/colors.tcl
-lib/tk8.0/demos/cscroll.tcl
-lib/tk8.0/demos/ctext.tcl
-lib/tk8.0/demos/dialog1.tcl
-lib/tk8.0/demos/dialog2.tcl
-lib/tk8.0/demos/entry1.tcl
-lib/tk8.0/demos/entry2.tcl
-lib/tk8.0/demos/filebox.tcl
-lib/tk8.0/demos/floor.tcl
-lib/tk8.0/demos/form.tcl
-lib/tk8.0/demos/hello
-lib/tk8.0/demos/hscale.tcl
-lib/tk8.0/demos/icon.tcl
-lib/tk8.0/demos/image1.tcl
-lib/tk8.0/demos/image2.tcl
-lib/tk8.0/demos/items.tcl
-lib/tk8.0/demos/ixset
-lib/tk8.0/demos/label.tcl
-lib/tk8.0/demos/license.terms
-lib/tk8.0/demos/menu.tcl
-lib/tk8.0/demos/msgbox.tcl
-lib/tk8.0/demos/plot.tcl
-lib/tk8.0/demos/puzzle.tcl
-lib/tk8.0/demos/radio.tcl
-lib/tk8.0/demos/rmt
-lib/tk8.0/demos/rolodex
-lib/tk8.0/demos/ruler.tcl
-lib/tk8.0/demos/sayings.tcl
-lib/tk8.0/demos/search.tcl
-lib/tk8.0/demos/square
-lib/tk8.0/demos/states.tcl
-lib/tk8.0/demos/style.tcl
-lib/tk8.0/demos/tclIndex
-lib/tk8.0/demos/tcolor
-lib/tk8.0/demos/text.tcl
-lib/tk8.0/demos/timer
-lib/tk8.0/demos/twind.tcl
-lib/tk8.0/demos/vscale.tcl
-lib/tk8.0/demos/widget
-lib/tk8.0/demos/menubu.tcl
-lib/tk8.0/bgerror.tcl
-lib/tk8.0/button.tcl
-lib/tk8.0/clrpick.tcl
-lib/tk8.0/comdlg.tcl
-lib/tk8.0/console.tcl
-lib/tk8.0/dialog.tcl
-lib/tk8.0/entry.tcl
-lib/tk8.0/focus.tcl
-lib/tk8.0/listbox.tcl
-lib/tk8.0/menu.tcl
-lib/tk8.0/msgbox.tcl
-lib/tk8.0/obsolete.tcl
-lib/tk8.0/optMenu.tcl
-lib/tk8.0/palette.tcl
-lib/tk8.0/scale.tcl
-lib/tk8.0/scrlbar.tcl
-lib/tk8.0/tearoff.tcl
-lib/tk8.0/text.tcl
-lib/tk8.0/tk.tcl
-lib/tk8.0/tkfbox.tcl
-lib/tk8.0/xmfbox.tcl
-lib/tk8.0/tclIndex
-lib/tk8.0/prolog.ps
-lib/tk8.0/tkAppInit.c
-lib/tk8.0/images/README
-lib/tk8.0/images/logo100.gif
-lib/tk8.0/images/logo64.gif
-lib/tk8.0/images/logoLarge.gif
-lib/tk8.0/images/logoMed.gif
-lib/tk8.0/images/pwrdLogo100.gif
-lib/tk8.0/images/pwrdLogo150.gif
-lib/tk8.0/images/pwrdLogo175.gif
-lib/tk8.0/images/pwrdLogo200.gif
-lib/tk8.0/images/pwrdLogo75.gif
-lib/tk8.0/safetk.tcl
-lib/tk8.0/tkConfig.sh
-lib/libtk80.a
-lib/libtk80.la
-lib/libtk80.so.1.0
-@dirrm lib/tk8.0/demos/images
-@dirrm lib/tk8.0/demos
-@dirrm lib/tk8.0/images
-@dirrm lib/tk8.0
-@dirrm include/tk8.0/unix
-@dirrm include/tk8.0/generic
-@dirrm include/tk8.0
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-02 16:49:47 +0000