cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove obsolete tcl and tk 8.0

Browse Source 
ok naddy@
This commit is contained in:
steven 2007-07-30 16:59:54 +00:00
parent 9ee2bdca3f
commit 125eedcb43
21 changed files with 2 additions and 2034 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lang/tcl/8.0/Makefile
View File

@ -1,48 +0,0 @@
# $OpenBSD: Makefile,v 1.17 2006/10/18 13:10:37 naddy Exp $
# $FreeBSD: Makefile,v 1.4 1997/12/01 16:50:49 pst Exp $
COMMENT= "Tool Command Language"
DISTNAME= tcl8.0.5
PKGNAME= tcl-8.0.5p0
SHARED_LIBS= tcl80 1.5
CATEGORIES= lang lang/tcl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
HOMEPAGE= http://dev.scriptics.com/software/tcltk/
MAINTAINER= Niklas Hallqvist <niklas@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m
MAKE_FLAGS= CFLAGS="${CFLAGS}"
FAKE_FLAGS= INSTALL="install -c" INSTALL_ROOT="${WRKINST}" \
BASE_INCLUDE_DIR='$$(prefix)/include/tcl$$(VERSION)' \
INCLUDE_INSTALL_DIR='$$(INSTALL_ROOT)$$(BASE_INCLUDE_DIR)' \
GENERIC_INCLUDE_INSTALL_DIR='$$(BASE_INCLUDE_DIR)/generic' \
UNIX_INCLUDE_INSTALL_DIR='$$(BASE_INCLUDE_DIR)/unix' \
MAN_INSTALL_DIR='$${INSTALL_ROOT}$$(TCL_LIBRARY)/man'
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}" \
LIBtcl80_VERSION=${LIBtcl80_VERSION}
WRKDIST= ${WRKDIR}/${DISTNAME}/unix
REGRESS_TARGET= test
TESTHOME=${WRKDIR}/testhome
REGRESS_FLAGS= HOME=${TESTHOME}
# Needs a full network connection to run
REGRESS_IS_INTERACTIVE=Yes
pre-regress:
mkdir -p ${TESTHOME}
post-install:
@strip ${PREFIX}/bin/tclsh8.0
.include <bsd.port.mk>

5
lang/tcl/8.0/distinfo
View File

@ -1,5 +0,0 @@
MD5 (tcl8.0.5.tar.gz) = QkeXXIAVEPs3i3Yjeyq6rw==
RMD160 (tcl8.0.5.tar.gz) = g5yt3s80FpZZ4ecGOQ9glHFRM5E=
SHA1 (tcl8.0.5.tar.gz) = sfbUvyUZaZVbb2zn34JFgegCjNE=
SHA256 (tcl8.0.5.tar.gz) = BAK+UakozBWRBJsC4yVlq8zk9MBvN7j+0PJXPuFrR54=
SIZE (tcl8.0.5.tar.gz) = 1519970

100
lang/tcl/8.0/patches/patch-Makefile_in
View File

@ -1,100 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.2 2006/10/18 13:10:37 naddy Exp $
--- Makefile.in.orig Tue Mar 9 07:51:26 1999
+++ Makefile.in Wed Oct 18 12:28:39 2006
@@ -34,6 +34,9 @@ exec_prefix = @exec_prefix@
# when installing files.
INSTALL_ROOT =
+# Path for the platform independent Tcl scripting generic header files:
+TCL_INCLUDE_GENERIC = $(prefix)/include/tcl$(VERSION)/generic
+
# Directory from which applications will reference the library of Tcl
# scripts (note: you can set the TCL_LIBRARY environment variable at
# run-time to override this value):
@@ -331,15 +334,19 @@ DL_SRCS = \
SRCS = $(GENERIC_SRCS) $(UNIX_SRCS)
-all: ${TCL_LIB_FILE} tclsh
+all: ${TCL_LIB_FILE} libtcl80.a tclsh
# The following target is configured by autoconf to generate either
# a shared library or non-shared library for Tcl.
${TCL_LIB_FILE}: ${OBJS}
rm -f ${TCL_LIB_FILE}
@MAKE_LIB@
- $(RANLIB) ${TCL_LIB_FILE}
+libtcl80.a: ${OBJS}
+ rm -f libtcl80.a
+ ar cr libtcl80.a ${OBJS}
+ $(RANLIB) libtcl80.a
+
# Make target which outputs the list of the .o contained in the Tcl lib
# usefull to build a single big shared library containing Tcl and other
# extensions. used for the Tcl Plugin. -- dl
@@ -433,7 +440,7 @@ install: install-binaries install-librar
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
-install-binaries: $(TCL_LIB_FILE) tclsh
+install-binaries: $(TCL_LIB_FILE) libtcl80.a tclsh
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
@@ -445,16 +452,19 @@ install-binaries: $(TCL_LIB_FILE) tclsh
done;
@echo "Installing $(TCL_LIB_FILE)"
@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
- @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
+ @echo "Installing libtcl80.a"
+ @$(INSTALL_DATA) libtcl80.a $(LIB_INSTALL_DIR)/libtcl80.a
+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl80.a
@echo "Installing tclsh"
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@echo "Installing tclConfig.sh"
- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
+ @mkdir -p $(SCRIPT_INSTALL_DIR)
+ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
install-libraries:
- @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
- $(SCRIPT_INSTALL_DIR); \
+ @for i in $(INSTALL_ROOT)$(prefix)/lib $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR) \
+ $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
@@ -472,8 +482,15 @@ install-libraries:
else true; \
fi; \
done;
- @echo "Installing tcl.h"
- @$(INSTALL_DATA) $(GENERIC_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
+ @echo "Installing libraries, tcl.h and other headers"
+ @for i in $(GENERIC_DIR)/*.h ; \
+ do \
+ echo "Installing $$i"; \
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR); \
+ done;
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
+ @echo "Installing $(TOP_DIR)unix/tclUnixPort.h"
+ @$(INSTALL_DATA) $(TOP_DIR)/unix/tclUnixPort.h $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR)
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
do \
echo "Installing $$i"; \
@@ -525,6 +542,13 @@ install-man:
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
+ @echo "**********"
+ @echo "IMPORTANT:"
+ @echo "**********"
+ @echo "tclConfig.sh in $(TCL_LIBRARY)/tclConfig.sh"
+ @echo "tcl.h in $(TCL_INCLUDE_GENERIC)/tcl.h"
+ @echo "These are NOT in the default place, but in a good place to avoid"
+ @echo "conflicting with another version of Tcl/Tk."
Makefile: $(UNIX_DIR)/Makefile.in
$(SHELL) config.status

34
lang/tcl/8.0/patches/patch-configure
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-configure,v 1.5 2006/10/18 13:10:37 naddy Exp $
--- configure.orig Tue Mar 9 07:51:26 1999
+++ configure Wed Oct 18 12:33:05 2006
@@ -4096,15 +4096,15 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- SHLIB_CFLAGS="-fpic"
- SHLIB_LD="ld -Bshareable -x"
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared ${SHLIB_CFLAGS}"
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
LD_FLAGS=""
LD_SEARCH_FLAGS=""
- TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${LIBtcl80_VERSION}'
else
echo "$ac_t""no" 1>&6
@@ -4656,10 +4656,9 @@ if test "$tcl_ok" = "yes" -a "${SHLIB_SU
TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
if test "x$DL_OBJS" = "xtclLoadAout.o"; then
- MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
+ MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}; \${RANLIB} \${TCL_LIB_FILE}"
else
MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
- RANLIB=":"
fi
else
TCL_SHARED_BUILD=0

6
lang/tcl/8.0/pkg/DESCR
View File

@ -1,6 +0,0 @@
This is Tcl8.0, an embeddable tool command language.
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.

2
lang/tcl/8.0/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/08 12:43:52 alek Exp $
@lib lib/libtcl80.so.${LIBtcl80_VERSION}

446
lang/tcl/8.0/pkg/PLIST
View File

@ -1,446 +0,0 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/18 12:52:55 espie Exp $
@option no-default-conflict
@conflict tcl->=8.0,<8.1
bin/tclsh8.0
include/tcl8.0/
include/tcl8.0/generic/
include/tcl8.0/generic/tcl.h
include/tcl8.0/generic/tclCompile.h
include/tcl8.0/generic/tclInitScript.h
include/tcl8.0/generic/tclInt.h
include/tcl8.0/generic/tclMath.h
include/tcl8.0/generic/tclPort.h
include/tcl8.0/generic/tclRegexp.h
include/tcl8.0/tcl.h
include/tcl8.0/unix/
include/tcl8.0/unix/tclUnixPort.h
lib/libtcl80.a
lib/tcl8.0/
lib/tcl8.0/history.tcl
lib/tcl8.0/http1.0/
lib/tcl8.0/http1.0/http.tcl
lib/tcl8.0/http1.0/pkgIndex.tcl
lib/tcl8.0/http2.0/
lib/tcl8.0/http2.0/http.tcl
lib/tcl8.0/http2.0/pkgIndex.tcl
lib/tcl8.0/init.tcl
lib/tcl8.0/ldAix
lib/tcl8.0/ldAout.tcl
@mandir lib/tcl8.0/man/
lib/tcl8.0/man/man1/
@man lib/tcl8.0/man/man1/tclsh.1
lib/tcl8.0/man/man3/
@man lib/tcl8.0/man/man3/AddErrInfo.3
@man lib/tcl8.0/man/man3/Alloc.3
@man lib/tcl8.0/man/man3/AllowExc.3
@man lib/tcl8.0/man/man3/AppInit.3
@man lib/tcl8.0/man/man3/AssocData.3
@man lib/tcl8.0/man/man3/Async.3
@man lib/tcl8.0/man/man3/BackgdErr.3
@man lib/tcl8.0/man/man3/Backslash.3
@man lib/tcl8.0/man/man3/BoolObj.3
@man lib/tcl8.0/man/man3/CallDel.3
@man lib/tcl8.0/man/man3/CmdCmplt.3
@man lib/tcl8.0/man/man3/Concat.3
@man lib/tcl8.0/man/man3/CrtChannel.3
@man lib/tcl8.0/man/man3/CrtChnlHdlr.3
@man lib/tcl8.0/man/man3/CrtCloseHdlr.3
@man lib/tcl8.0/man/man3/CrtCommand.3
@man lib/tcl8.0/man/man3/CrtFileHdlr.3
@man lib/tcl8.0/man/man3/CrtInterp.3
@man lib/tcl8.0/man/man3/CrtMathFnc.3
@man lib/tcl8.0/man/man3/CrtObjCmd.3
@man lib/tcl8.0/man/man3/CrtSlave.3
@man lib/tcl8.0/man/man3/CrtTimerHdlr.3
@man lib/tcl8.0/man/man3/CrtTrace.3
@man lib/tcl8.0/man/man3/DString.3
@man lib/tcl8.0/man/man3/DetachPids.3
@man lib/tcl8.0/man/man3/DoOneEvent.3
@man lib/tcl8.0/man/man3/DoWhenIdle.3
@man lib/tcl8.0/man/man3/DoubleObj.3
@man lib/tcl8.0/man/man3/Eval.3
@man lib/tcl8.0/man/man3/EvalObj.3
@man lib/tcl8.0/man/man3/Exit.3
@man lib/tcl8.0/man/man3/ExprLong.3
@man lib/tcl8.0/man/man3/ExprLongObj.3
@man lib/tcl8.0/man/man3/FindExec.3
@man lib/tcl8.0/man/man3/GetIndex.3
@man lib/tcl8.0/man/man3/GetInt.3
@man lib/tcl8.0/man/man3/GetOpnFl.3
@man lib/tcl8.0/man/man3/GetStdChan.3
@man lib/tcl8.0/man/man3/Hash.3
@man lib/tcl8.0/man/man3/IntObj.3
@man lib/tcl8.0/man/man3/Interp.3
@man lib/tcl8.0/man/man3/LinkVar.3
@man lib/tcl8.0/man/man3/ListObj.3
@man lib/tcl8.0/man/man3/Notifier.3
@man lib/tcl8.0/man/man3/ObjSetVar.3
@man lib/tcl8.0/man/man3/Object.3
@man lib/tcl8.0/man/man3/ObjectType.3
@man lib/tcl8.0/man/man3/OpenFileChnl.3
@man lib/tcl8.0/man/man3/OpenTcp.3
@man lib/tcl8.0/man/man3/PkgRequire.3
@man lib/tcl8.0/man/man3/Preserve.3
@man lib/tcl8.0/man/man3/PrintDbl.3
@man lib/tcl8.0/man/man3/RecEvalObj.3
@man lib/tcl8.0/man/man3/RecordEval.3
@man lib/tcl8.0/man/man3/RegExp.3
@man lib/tcl8.0/man/man3/SetErrno.3
@man lib/tcl8.0/man/man3/SetRecLmt.3
@man lib/tcl8.0/man/man3/SetResult.3
@man lib/tcl8.0/man/man3/SetVar.3
@man lib/tcl8.0/man/man3/Sleep.3
@man lib/tcl8.0/man/man3/SplitList.3
@man lib/tcl8.0/man/man3/SplitPath.3
@man lib/tcl8.0/man/man3/StaticPkg.3
@man lib/tcl8.0/man/man3/StrMatch.3
@man lib/tcl8.0/man/man3/StringObj.3
@man lib/tcl8.0/man/man3/TclConcatObj.3
@man lib/tcl8.0/man/man3/Tcl_AddErrorInfo.3
@man lib/tcl8.0/man/man3/Tcl_AddObjErrorInfo.3
@man lib/tcl8.0/man/man3/Tcl_Alloc.3
@man lib/tcl8.0/man/man3/Tcl_AllowExceptions.3
@man lib/tcl8.0/man/man3/Tcl_AppInit.3
@man lib/tcl8.0/man/man3/Tcl_AppendAllObjTypes.3
@man lib/tcl8.0/man/man3/Tcl_AppendElement.3
@man lib/tcl8.0/man/man3/Tcl_AppendResult.3
@man lib/tcl8.0/man/man3/Tcl_AppendStringsToObj.3
@man lib/tcl8.0/man/man3/Tcl_AppendToObj.3
@man lib/tcl8.0/man/man3/Tcl_AsyncCreate.3
@man lib/tcl8.0/man/man3/Tcl_AsyncDelete.3
@man lib/tcl8.0/man/man3/Tcl_AsyncInvoke.3
@man lib/tcl8.0/man/man3/Tcl_AsyncMark.3
@man lib/tcl8.0/man/man3/Tcl_BackgroundError.3
@man lib/tcl8.0/man/man3/Tcl_Backslash.3
@man lib/tcl8.0/man/man3/Tcl_BadChannelOption.3
@man lib/tcl8.0/man/man3/Tcl_CallWhenDeleted.3
@man lib/tcl8.0/man/man3/Tcl_CancelIdleCall.3
@man lib/tcl8.0/man/man3/Tcl_Close.3
@man lib/tcl8.0/man/man3/Tcl_CommandComplete.3
@man lib/tcl8.0/man/man3/Tcl_Concat.3
@man lib/tcl8.0/man/man3/Tcl_ConvertElement.3
@man lib/tcl8.0/man/man3/Tcl_ConvertToType.3
@man lib/tcl8.0/man/man3/Tcl_CreateAlias.3
@man lib/tcl8.0/man/man3/Tcl_CreateAliasObj.3
@man lib/tcl8.0/man/man3/Tcl_CreateChannel.3
@man lib/tcl8.0/man/man3/Tcl_CreateChannelHandler.3
@man lib/tcl8.0/man/man3/Tcl_CreateCloseHandler.3
@man lib/tcl8.0/man/man3/Tcl_CreateCommand.3
@man lib/tcl8.0/man/man3/Tcl_CreateEventSource.3
@man lib/tcl8.0/man/man3/Tcl_CreateExitHandler.3
@man lib/tcl8.0/man/man3/Tcl_CreateFileHandler.3
@man lib/tcl8.0/man/man3/Tcl_CreateHashEntry.3
@man lib/tcl8.0/man/man3/Tcl_CreateInterp.3
@man lib/tcl8.0/man/man3/Tcl_CreateMathFunc.3
@man lib/tcl8.0/man/man3/Tcl_CreateObjCommand.3
@man lib/tcl8.0/man/man3/Tcl_CreateSlave.3
@man lib/tcl8.0/man/man3/Tcl_CreateTimerHandler.3
@man lib/tcl8.0/man/man3/Tcl_CreateTrace.3
@man lib/tcl8.0/man/man3/Tcl_DStringAppend.3
@man lib/tcl8.0/man/man3/Tcl_DStringAppendElement.3
@man lib/tcl8.0/man/man3/Tcl_DStringEndSublist.3
@man lib/tcl8.0/man/man3/Tcl_DStringFree.3
@man lib/tcl8.0/man/man3/Tcl_DStringGetResult.3
@man lib/tcl8.0/man/man3/Tcl_DStringInit.3
@man lib/tcl8.0/man/man3/Tcl_DStringLength.3
@man lib/tcl8.0/man/man3/Tcl_DStringResult.3
@man lib/tcl8.0/man/man3/Tcl_DStringSetLength.3
@man lib/tcl8.0/man/man3/Tcl_DStringStartSublist.3
@man lib/tcl8.0/man/man3/Tcl_DStringValue.3
@man lib/tcl8.0/man/man3/Tcl_DecrRefCount.3
@man lib/tcl8.0/man/man3/Tcl_DeleteAssocData.3
@man lib/tcl8.0/man/man3/Tcl_DeleteChannelHandler.3
@man lib/tcl8.0/man/man3/Tcl_DeleteCloseHandler.3
@man lib/tcl8.0/man/man3/Tcl_DeleteCommand.3
@man lib/tcl8.0/man/man3/Tcl_DeleteCommandFromToken.3
@man lib/tcl8.0/man/man3/Tcl_DeleteEventSource.3
@man lib/tcl8.0/man/man3/Tcl_DeleteEvents.3
@man lib/tcl8.0/man/man3/Tcl_DeleteExitHandler.3
@man lib/tcl8.0/man/man3/Tcl_DeleteFileHandler.3
@man lib/tcl8.0/man/man3/Tcl_DeleteHashEntry.3
@man lib/tcl8.0/man/man3/Tcl_DeleteHashTable.3
@man lib/tcl8.0/man/man3/Tcl_DeleteInterp.3
@man lib/tcl8.0/man/man3/Tcl_DeleteTimerHandler.3
@man lib/tcl8.0/man/man3/Tcl_DeleteTrace.3
@man lib/tcl8.0/man/man3/Tcl_DetachPids.3
@man lib/tcl8.0/man/man3/Tcl_DoOneEvent.3
@man lib/tcl8.0/man/man3/Tcl_DoWhenIdle.3
@man lib/tcl8.0/man/man3/Tcl_DontCallWhenDeleted.3
@man lib/tcl8.0/man/man3/Tcl_DuplicateObj.3
@man lib/tcl8.0/man/man3/Tcl_Eof.3
@man lib/tcl8.0/man/man3/Tcl_Eval.3
@man lib/tcl8.0/man/man3/Tcl_EvalFile.3
@man lib/tcl8.0/man/man3/Tcl_EvalObj.3
@man lib/tcl8.0/man/man3/Tcl_EventuallyFree.3
@man lib/tcl8.0/man/man3/Tcl_Exit.3
@man lib/tcl8.0/man/man3/Tcl_ExposeCommand.3
@man lib/tcl8.0/man/man3/Tcl_ExprBoolean.3
@man lib/tcl8.0/man/man3/Tcl_ExprBooleanObj.3
@man lib/tcl8.0/man/man3/Tcl_ExprDouble.3
@man lib/tcl8.0/man/man3/Tcl_ExprDoubleObj.3
@man lib/tcl8.0/man/man3/Tcl_ExprLong.3
@man lib/tcl8.0/man/man3/Tcl_ExprLongObj.3
@man lib/tcl8.0/man/man3/Tcl_ExprObj.3
@man lib/tcl8.0/man/man3/Tcl_ExprString.3
@man lib/tcl8.0/man/man3/Tcl_Finalize.3
@man lib/tcl8.0/man/man3/Tcl_FindExecutable.3
@man lib/tcl8.0/man/man3/Tcl_FindHashEntry.3
@man lib/tcl8.0/man/man3/Tcl_FirstHashEntry.3
@man lib/tcl8.0/man/man3/Tcl_Flush.3
@man lib/tcl8.0/man/man3/Tcl_Free.3
@man lib/tcl8.0/man/man3/Tcl_GetAlias.3
@man lib/tcl8.0/man/man3/Tcl_GetAliasObj.3
@man lib/tcl8.0/man/man3/Tcl_GetAssocData.3
@man lib/tcl8.0/man/man3/Tcl_GetBoolean.3
@man lib/tcl8.0/man/man3/Tcl_GetBooleanFromObj.3
@man lib/tcl8.0/man/man3/Tcl_GetChannel.3
@man lib/tcl8.0/man/man3/Tcl_GetChannelBufferSize.3
@man lib/tcl8.0/man/man3/Tcl_GetChannelHandle.3
@man lib/tcl8.0/man/man3/Tcl_GetChannelInstanceData.3
@man lib/tcl8.0/man/man3/Tcl_GetChannelMode.3
@man lib/tcl8.0/man/man3/Tcl_GetChannelName.3
@man lib/tcl8.0/man/man3/Tcl_GetChannelOption.3
@man lib/tcl8.0/man/man3/Tcl_GetChannelType.3
@man lib/tcl8.0/man/man3/Tcl_GetCommandInfo.3
@man lib/tcl8.0/man/man3/Tcl_GetCommandName.3
@man lib/tcl8.0/man/man3/Tcl_GetDouble.3
@man lib/tcl8.0/man/man3/Tcl_GetDoubleFromObj.3
@man lib/tcl8.0/man/man3/Tcl_GetErrno.3
@man lib/tcl8.0/man/man3/Tcl_GetHashKey.3
@man lib/tcl8.0/man/man3/Tcl_GetHashValue.3
@man lib/tcl8.0/man/man3/Tcl_GetIndexFromObj.3
@man lib/tcl8.0/man/man3/Tcl_GetInt.3
@man lib/tcl8.0/man/man3/Tcl_GetIntFromObj.3
@man lib/tcl8.0/man/man3/Tcl_GetInterpPath.3
@man lib/tcl8.0/man/man3/Tcl_GetLongFromObj.3
@man lib/tcl8.0/man/man3/Tcl_GetMaster.3
@man lib/tcl8.0/man/man3/Tcl_GetNameOfExecutable.3
@man lib/tcl8.0/man/man3/Tcl_GetObjResult.3
@man lib/tcl8.0/man/man3/Tcl_GetObjType.3
@man lib/tcl8.0/man/man3/Tcl_GetOpenFile.3
@man lib/tcl8.0/man/man3/Tcl_GetPathType.3
@man lib/tcl8.0/man/man3/Tcl_GetServiceMode.3
@man lib/tcl8.0/man/man3/Tcl_GetSlave.3
@man lib/tcl8.0/man/man3/Tcl_GetStdChannel.3
@man lib/tcl8.0/man/man3/Tcl_GetStringFromObj.3
@man lib/tcl8.0/man/man3/Tcl_GetStringResult.3
@man lib/tcl8.0/man/man3/Tcl_GetVar.3
@man lib/tcl8.0/man/man3/Tcl_GetVar2.3
@man lib/tcl8.0/man/man3/Tcl_Gets.3
@man lib/tcl8.0/man/man3/Tcl_GlobalEval.3
@man lib/tcl8.0/man/man3/Tcl_GlobalEvalObj.3
@man lib/tcl8.0/man/man3/Tcl_HashStats.3
@man lib/tcl8.0/man/man3/Tcl_HideCommand.3
@man lib/tcl8.0/man/man3/Tcl_IncrRefCount.3
@man lib/tcl8.0/man/man3/Tcl_InitHashTable.3
@man lib/tcl8.0/man/man3/Tcl_InputBlocked.3
@man lib/tcl8.0/man/man3/Tcl_InputBuffered.3
@man lib/tcl8.0/man/man3/Tcl_Interp.3
@man lib/tcl8.0/man/man3/Tcl_InterpDeleted.3
@man lib/tcl8.0/man/man3/Tcl_IsSafe.3
@man lib/tcl8.0/man/man3/Tcl_IsShared.3
@man lib/tcl8.0/man/man3/Tcl_JoinPath.3
@man lib/tcl8.0/man/man3/Tcl_LinkVar.3
@man lib/tcl8.0/man/man3/Tcl_ListObjAppendElement.3
@man lib/tcl8.0/man/man3/Tcl_ListObjAppendList.3
@man lib/tcl8.0/man/man3/Tcl_ListObjGetElements.3
@man lib/tcl8.0/man/man3/Tcl_ListObjIndex.3
@man lib/tcl8.0/man/man3/Tcl_ListObjLength.3
@man lib/tcl8.0/man/man3/Tcl_ListObjReplace.3
@man lib/tcl8.0/man/man3/Tcl_Main.3
@man lib/tcl8.0/man/man3/Tcl_MakeFileChannel.3
@man lib/tcl8.0/man/man3/Tcl_MakeSafe.3
@man lib/tcl8.0/man/man3/Tcl_MakeTcpClientChannel.3
@man lib/tcl8.0/man/man3/Tcl_Merge.3
@man lib/tcl8.0/man/man3/Tcl_NewBooleanObj.3
@man lib/tcl8.0/man/man3/Tcl_NewDoubleObj.3
@man lib/tcl8.0/man/man3/Tcl_NewIntObj.3
@man lib/tcl8.0/man/man3/Tcl_NewListObj.3
@man lib/tcl8.0/man/man3/Tcl_NewLongObj.3
@man lib/tcl8.0/man/man3/Tcl_NewObj.3
@man lib/tcl8.0/man/man3/Tcl_NewStringObj.3
@man lib/tcl8.0/man/man3/Tcl_NextHashEntry.3
@man lib/tcl8.0/man/man3/Tcl_NotifyChannel.3
@man lib/tcl8.0/man/man3/Tcl_ObjGetVar2.3
@man lib/tcl8.0/man/man3/Tcl_ObjSetVar2.3
@man lib/tcl8.0/man/man3/Tcl_OpenCommandChannel.3
@man lib/tcl8.0/man/man3/Tcl_OpenFileChannel.3
@man lib/tcl8.0/man/man3/Tcl_OpenTcpClient.3
@man lib/tcl8.0/man/man3/Tcl_OpenTcpServer.3
@man lib/tcl8.0/man/man3/Tcl_PkgProvide.3
@man lib/tcl8.0/man/man3/Tcl_PkgRequire.3
@man lib/tcl8.0/man/man3/Tcl_PosixError.3
@man lib/tcl8.0/man/man3/Tcl_Preserve.3
@man lib/tcl8.0/man/man3/Tcl_PrintDouble.3
@man lib/tcl8.0/man/man3/Tcl_QueueEvent.3
@man lib/tcl8.0/man/man3/Tcl_Read.3
@man lib/tcl8.0/man/man3/Tcl_Realloc.3
@man lib/tcl8.0/man/man3/Tcl_ReapDetachedProcs.3
@man lib/tcl8.0/man/man3/Tcl_RecordAndEval.3
@man lib/tcl8.0/man/man3/Tcl_RecordAndEvalObj.3
@man lib/tcl8.0/man/man3/Tcl_RegExpCompile.3
@man lib/tcl8.0/man/man3/Tcl_RegExpExec.3
@man lib/tcl8.0/man/man3/Tcl_RegExpMatch.3
@man lib/tcl8.0/man/man3/Tcl_RegExpRange.3
@man lib/tcl8.0/man/man3/Tcl_RegisterChannel.3
@man lib/tcl8.0/man/man3/Tcl_RegisterObjType.3
@man lib/tcl8.0/man/man3/Tcl_Release.3
@man lib/tcl8.0/man/man3/Tcl_ResetResult.3
@man lib/tcl8.0/man/man3/Tcl_ScanElement.3
@man lib/tcl8.0/man/man3/Tcl_Seek.3
@man lib/tcl8.0/man/man3/Tcl_ServiceAll.3
@man lib/tcl8.0/man/man3/Tcl_ServiceEvent.3
@man lib/tcl8.0/man/man3/Tcl_SetAssocData.3
@man lib/tcl8.0/man/man3/Tcl_SetBooleanObj.3
@man lib/tcl8.0/man/man3/Tcl_SetChannelBufferSize.3
@man lib/tcl8.0/man/man3/Tcl_SetChannelOption.3
@man lib/tcl8.0/man/man3/Tcl_SetCommandInfo.3
@man lib/tcl8.0/man/man3/Tcl_SetDefaultTranslation.3
@man lib/tcl8.0/man/man3/Tcl_SetDoubleObj.3
@man lib/tcl8.0/man/man3/Tcl_SetErrno.3
@man lib/tcl8.0/man/man3/Tcl_SetErrorCode.3
@man lib/tcl8.0/man/man3/Tcl_SetHashValue.3
@man lib/tcl8.0/man/man3/Tcl_SetIntObj.3
@man lib/tcl8.0/man/man3/Tcl_SetListObj.3
@man lib/tcl8.0/man/man3/Tcl_SetLongObj.3
@man lib/tcl8.0/man/man3/Tcl_SetMaxBlockTime.3
@man lib/tcl8.0/man/man3/Tcl_SetObjLength.3
@man lib/tcl8.0/man/man3/Tcl_SetObjResult.3
@man lib/tcl8.0/man/man3/Tcl_SetRecursionLimit.3
@man lib/tcl8.0/man/man3/Tcl_SetResult.3
@man lib/tcl8.0/man/man3/Tcl_SetServiceMode.3
@man lib/tcl8.0/man/man3/Tcl_SetStdChannel.3
@man lib/tcl8.0/man/man3/Tcl_SetStringObj.3
@man lib/tcl8.0/man/man3/Tcl_SetTimer.3
@man lib/tcl8.0/man/man3/Tcl_SetVar.3
@man lib/tcl8.0/man/man3/Tcl_SetVar2.3
@man lib/tcl8.0/man/man3/Tcl_Sleep.3
@man lib/tcl8.0/man/man3/Tcl_SplitList.3
@man lib/tcl8.0/man/man3/Tcl_SplitPath.3
@man lib/tcl8.0/man/man3/Tcl_StaticPackage.3
@man lib/tcl8.0/man/man3/Tcl_StringMatch.3
@man lib/tcl8.0/man/man3/Tcl_Tell.3
@man lib/tcl8.0/man/man3/Tcl_TraceVar.3
@man lib/tcl8.0/man/man3/Tcl_TraceVar2.3
@man lib/tcl8.0/man/man3/Tcl_TranslateFileName.3
@man lib/tcl8.0/man/man3/Tcl_UnlinkVar.3
@man lib/tcl8.0/man/man3/Tcl_UnregisterChannel.3
@man lib/tcl8.0/man/man3/Tcl_UnsetVar.3
@man lib/tcl8.0/man/man3/Tcl_UnsetVar2.3
@man lib/tcl8.0/man/man3/Tcl_UntraceVar.3
@man lib/tcl8.0/man/man3/Tcl_UntraceVar2.3
@man lib/tcl8.0/man/man3/Tcl_UpVar.3
@man lib/tcl8.0/man/man3/Tcl_UpVar2.3
@man lib/tcl8.0/man/man3/Tcl_UpdateLinkedVar.3
@man lib/tcl8.0/man/man3/Tcl_VarEval.3
@man lib/tcl8.0/man/man3/Tcl_VarTraceInfo.3
@man lib/tcl8.0/man/man3/Tcl_VarTraceInfo2.3
@man lib/tcl8.0/man/man3/Tcl_WaitForEvent.3
@man lib/tcl8.0/man/man3/Tcl_Write.3
@man lib/tcl8.0/man/man3/Tcl_WrongNumArgs.3
@man lib/tcl8.0/man/man3/TraceVar.3
@man lib/tcl8.0/man/man3/Translate.3
@man lib/tcl8.0/man/man3/UpVar.3
@man lib/tcl8.0/man/man3/WrongNumArgs.3
lib/tcl8.0/man/mann/
@man lib/tcl8.0/man/mann/Http.n
@man lib/tcl8.0/man/mann/SafeBase.n
@man lib/tcl8.0/man/mann/Tcl.n
@man lib/tcl8.0/man/mann/after.n
@man lib/tcl8.0/man/mann/append.n
@man lib/tcl8.0/man/mann/array.n
@man lib/tcl8.0/man/mann/bgerror.n
@man lib/tcl8.0/man/mann/binary.n
@man lib/tcl8.0/man/mann/break.n
@man lib/tcl8.0/man/mann/case.n
@man lib/tcl8.0/man/mann/catch.n
@man lib/tcl8.0/man/mann/cd.n
@man lib/tcl8.0/man/mann/clock.n
@man lib/tcl8.0/man/mann/close.n
@man lib/tcl8.0/man/mann/concat.n
@man lib/tcl8.0/man/mann/continue.n
@man lib/tcl8.0/man/mann/eof.n
@man lib/tcl8.0/man/mann/error.n
@man lib/tcl8.0/man/mann/eval.n
@man lib/tcl8.0/man/mann/exec.n
@man lib/tcl8.0/man/mann/exit.n
@man lib/tcl8.0/man/mann/expr.n
@man lib/tcl8.0/man/mann/fblocked.n
@man lib/tcl8.0/man/mann/fconfigure.n
@man lib/tcl8.0/man/mann/fcopy.n
@man lib/tcl8.0/man/mann/file.n
@man lib/tcl8.0/man/mann/fileevent.n
@man lib/tcl8.0/man/mann/filename.n
@man lib/tcl8.0/man/mann/flush.n
@man lib/tcl8.0/man/mann/for.n
@man lib/tcl8.0/man/mann/foreach.n
@man lib/tcl8.0/man/mann/format.n
@man lib/tcl8.0/man/mann/gets.n
@man lib/tcl8.0/man/mann/glob.n
@man lib/tcl8.0/man/mann/global.n
@man lib/tcl8.0/man/mann/history.n
@man lib/tcl8.0/man/mann/http.n
@man lib/tcl8.0/man/mann/if.n
@man lib/tcl8.0/man/mann/incr.n
@man lib/tcl8.0/man/mann/info.n
@man lib/tcl8.0/man/mann/interp.n
@man lib/tcl8.0/man/mann/join.n
@man lib/tcl8.0/man/mann/lappend.n
@man lib/tcl8.0/man/mann/library.n
@man lib/tcl8.0/man/mann/lindex.n
@man lib/tcl8.0/man/mann/linsert.n
@man lib/tcl8.0/man/mann/list.n
@man lib/tcl8.0/man/mann/llength.n
@man lib/tcl8.0/man/mann/load.n
@man lib/tcl8.0/man/mann/lrange.n
@man lib/tcl8.0/man/mann/lreplace.n
@man lib/tcl8.0/man/mann/lsearch.n
@man lib/tcl8.0/man/mann/lsort.n
@man lib/tcl8.0/man/mann/namespace.n
@man lib/tcl8.0/man/mann/open.n
@man lib/tcl8.0/man/mann/package.n
@man lib/tcl8.0/man/mann/pid.n
@man lib/tcl8.0/man/mann/pkgMkIndex.n
@man lib/tcl8.0/man/mann/pkg_mkIndex.n
@man lib/tcl8.0/man/mann/proc.n
@man lib/tcl8.0/man/mann/puts.n
@man lib/tcl8.0/man/mann/pwd.n
@man lib/tcl8.0/man/mann/read.n
@man lib/tcl8.0/man/mann/regexp.n
@man lib/tcl8.0/man/mann/registry.n
@man lib/tcl8.0/man/mann/regsub.n
@man lib/tcl8.0/man/mann/rename.n
@man lib/tcl8.0/man/mann/resource.n
@man lib/tcl8.0/man/mann/return.n
@man lib/tcl8.0/man/mann/safe.n
@man lib/tcl8.0/man/mann/scan.n
@man lib/tcl8.0/man/mann/seek.n
@man lib/tcl8.0/man/mann/set.n
@man lib/tcl8.0/man/mann/socket.n
@man lib/tcl8.0/man/mann/source.n
@man lib/tcl8.0/man/mann/split.n
@man lib/tcl8.0/man/mann/string.n
@man lib/tcl8.0/man/mann/subst.n
@man lib/tcl8.0/man/mann/switch.n
@man lib/tcl8.0/man/mann/tclvars.n
@man lib/tcl8.0/man/mann/tell.n
@man lib/tcl8.0/man/mann/time.n
@man lib/tcl8.0/man/mann/trace.n
@man lib/tcl8.0/man/mann/unknown.n
@man lib/tcl8.0/man/mann/unset.n
@man lib/tcl8.0/man/mann/update.n
@man lib/tcl8.0/man/mann/uplevel.n
@man lib/tcl8.0/man/mann/upvar.n
@man lib/tcl8.0/man/mann/variable.n
@man lib/tcl8.0/man/mann/vwait.n
@man lib/tcl8.0/man/mann/while.n
lib/tcl8.0/opt0.1/
lib/tcl8.0/opt0.1/optparse.tcl
lib/tcl8.0/opt0.1/pkgIndex.tcl
lib/tcl8.0/parray.tcl
lib/tcl8.0/safe.tcl
lib/tcl8.0/tclAppInit.c
lib/tcl8.0/tclConfig.sh
lib/tcl8.0/tclIndex
lib/tcl8.0/word.tcl
%%SHARED%%

3
lang/tcl/Makefile
View File

@ -1,6 +1,5 @@
# $OpenBSD: Makefile,v 1.2 2003/11/19 15:47:46 jose Exp $
# $OpenBSD: Makefile,v 1.3 2007/07/30 16:59:54 steven Exp $
SUBDIR+= 8.0
SUBDIR+= 8.3
SUBDIR+= 8.4

51
x11/tk/8.0/Makefile
View File

@ -1,51 +0,0 @@
# $OpenBSD: Makefile,v 1.23 2006/09/18 10:21:49 espie Exp $
# $FreeBSD: Makefile,v 1.7 1997/12/01 16:50:58 pst Exp $
COMMENT= "graphical toolkit for Tcl"
DISTNAME= tk8.0.5
PKGNAME= tk-8.0.5
SHARED_LIBS= tk80 1.5
CATEGORIES= x11 x11/tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
HOMEPAGE= http://dev.scriptics.com/software/tcltk/
LIB_DEPENDS= tcl80.>=1.5:tcl-8.0.5:lang/tcl/8.0
# BSD-like
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 c m
MAKE_FLAGS= CFLAGS="${CFLAGS}"
FAKE_FLAGS= INSTALL="install -c" INSTALL_ROOT="${WRKINST}" \
BASE_INCLUDE_DIR='$$(prefix)/include/tk$$(VERSION)' \
INCLUDE_INSTALL_DIR='$$(INSTALL_ROOT)$$(BASE_INCLUDE_DIR)' \
GENERIC_INCLUDE_INSTALL_DIR='$$(BASE_INCLUDE_DIR)/generic' \
UNIX_INCLUDE_INSTALL_DIR='$$(BASE_INCLUDE_DIR)/unix' \
MAN_INSTALL_DIR='$${INSTALL_ROOT}$$(TK_LIBRARY)/man'
SEPARATE_BUILD= simple
USE_X11= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-tcl="${LOCALBASE}/lib/tcl8.0"
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}" \
LIBtk80_VERSION="${LIBtk80_VERSION}"
WRKSRC= ${WRKDIST}/unix
REGRESS_TARGET= test
REGRESS_DEPENDS=::lang/tcl/8.3:regress
REGRESS_FLAGS=TCL_BIN_DIR=`cd ${PORTSDIR}/lang/tcl/8.3 && ${MAKE} show=WRKBUILD`
# This regression test wants an X11 display
REGRESS_FLAGS+=DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY}
REGRESS_IS_INTERACTIVE=Yes
post-install:
@strip ${PREFIX}/bin/wish8.0
.include <bsd.port.mk>

5
x11/tk/8.0/distinfo
View File

@ -1,5 +0,0 @@
MD5 (tk8.0.5.tar.gz) = OukrhsAeyZoYcmlylIOeZA==
RMD160 (tk8.0.5.tar.gz) = w2T49bsm+W38T49l+ynteUIbSQs=
SHA1 (tk8.0.5.tar.gz) = 3RKo0h+n0VvehwXkwSLCB3Vf3Rg=
SHA256 (tk8.0.5.tar.gz) = WPrBZJXCEzMZmP6sROL1ohkR5rb0sA1vtL2sAISAnYw=
SIZE (tk8.0.5.tar.gz) = 2033223

136
x11/tk/8.0/patches/patch-generic_tkTextBTree_c
View File

@ -1,136 +0,0 @@
$OpenBSD: patch-generic_tkTextBTree_c,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- generic/tkTextBTree.c.orig Mon Sep 14 20:23:18 1998
+++ generic/tkTextBTree.c Sun Jan 8 18:09:42 2006
@@ -2427,6 +2427,132 @@ TkBTreeGetTags(indexPtr, numTagsPtr)
}
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;
+}
/*
*----------------------------------------------------------------------

430
x11/tk/8.0/patches/patch-generic_tkTextDisp_c
View File

@ -1,430 +0,0 @@
$OpenBSD: patch-generic_tkTextDisp_c,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- generic/tkTextDisp.c.orig Mon Sep 14 20:23:18 1998
+++ generic/tkTextDisp.c Sun Jan 8 18:09:42 2006
@@ -55,6 +55,7 @@ typedef struct StyleValues {
* 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 @@ static int CharMeasureProc _ANSI_ARGS_(
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 @@ GetStyle(textPtr, indexPtr)
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 @@ GetStyle(textPtr, indexPtr)
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 @@ GetStyle(textPtr, indexPtr)
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 @@ LayoutDLine(textPtr, indexPtr)
* 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,7 +807,35 @@ LayoutDLine(textPtr, indexPtr)
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
* chunk (for the newline character at the end, if there's nothing
@@ -797,6 +846,7 @@ LayoutDLine(textPtr, indexPtr)
lastChunkPtr = NULL;
chunkPtr = NULL;
noCharsYet = 1;
+ elide = 0;
breakChunkPtr = NULL;
breakCharOffset = 0;
justify = TK_JUSTIFY_LEFT;
@@ -821,6 +871,31 @@ LayoutDLine(textPtr, indexPtr)
}
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 @@ LayoutDLine(textPtr, indexPtr)
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 @@ LayoutDLine(textPtr, indexPtr)
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 @@ LayoutDLine(textPtr, indexPtr)
}
}
}
-
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 @@ LayoutDLine(textPtr, indexPtr)
offset = 0;
segPtr = segPtr->nextPtr;
}
+
chunkPtr = NULL;
}
if (noCharsYet) {
@@ -998,6 +1088,7 @@ LayoutDLine(textPtr, indexPtr)
wholeLine = 0;
}
+
/*
* Make tab adjustments for the last tab stop, if there is one.
*/
@@ -1321,6 +1412,7 @@ UpdateDisplayInfo(textPtr)
index.linePtr = TkBTreeFindLine(textPtr->tree, lineNum);
index.charIndex = 0;
lowestPtr = NULL;
+
do {
dlPtr = LayoutDLine(textPtr, &index);
dlPtr->nextPtr = lowestPtr;
@@ -1554,6 +1646,8 @@ DisplayDLine(textPtr, dlPtr, prevPtr, pi
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 @@ DisplayDLine(textPtr, dlPtr, prevPtr, pi
* 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 @@ DisplayLineBackground(textPtr, dlPtr, pr
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 @@ DisplayLineBackground(textPtr, dlPtr, pr
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 @@ DisplayLineBackground(textPtr, dlPtr, pr
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 @@ DisplayText(clientData)
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 @@ DisplayText(clientData)
dlPtr->oldY = dlPtr->y;
dlPtr->flags &= ~NEW_LAYOUT;
}
+ /*prevPtr = dlPtr;*/
}
Tk_FreePixmap(Tk_Display(textPtr->tkwin), pixmap);
}
@@ -3369,6 +3471,7 @@ ScrollByLines(textPtr, offset)
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 @@ ScrollByLines(textPtr, offset)
break;
}
}
-
+
/*
* Discard the display lines, then either return or prepare
* for the next display line to lay out.
@@ -3410,12 +3513,14 @@ ScrollByLines(textPtr, offset)
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 @@ TkTextPixelIndex(textPtr, x, y, indexPtr
* 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 @@ TkTextPixelIndex(textPtr, x, y, indexPtr
* 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,7 +4100,9 @@ TkTextPixelIndex(textPtr, x, y, indexPtr
break;
}
}
+ if (dlPtr->chunkPtr == NULL) dlPtr = validdlPtr;
+
/*
* Scan through the line's chunks to find the one that contains
* the desired x-coordinate. Before doing this, translate the
@@ -4005,12 +4113,12 @@ TkTextPixelIndex(textPtr, x, y, indexPtr
*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 @@ TkTextDLineInfo(textPtr, indexPtr, xPtr,
{
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 @@ TkTextDLineInfo(textPtr, indexPtr, xPtr,
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 @@ TkTextDLineInfo(textPtr, indexPtr, xPtr,
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 @@ CharDisplayProc(chunkPtr, x, y, height,
* 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;

53
x11/tk/8.0/patches/patch-generic_tkTextTag_c
View File

@ -1,53 +0,0 @@
$OpenBSD: patch-generic_tkTextTag_c,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- generic/tkTextTag.c.orig Mon Sep 14 20:23:19 1998
+++ generic/tkTextTag.c Sun Jan 8 18:09:42 2006
@@ -63,6 +63,9 @@ static Tk_ConfigSpec tagConfigSpecs[] =
{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 @@ TkTextTagCmd(textPtr, interp, argc, argv
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 @@ TkTextTagCmd(textPtr, interp, argc, argv
|| (tagPtr->spacing3String != NULL)
|| (tagPtr->tabString != NULL)
|| (tagPtr->underlineString != NULL)
+ || (tagPtr->elideString != NULL)
|| (tagPtr->wrapMode != NULL)) {
tagPtr->affectsDisplay = 1;
}
@@ -811,6 +821,8 @@ TkTextCreateTag(textPtr, tagName)
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 @@ TkTextFreeTag(textPtr, tagPtr)
}
if (tagPtr->underlineString != NULL) {
ckfree(tagPtr->underlineString);
+ }
+ if (tagPtr->elideString != NULL) {
+ ckfree(tagPtr->elideString);
}
ckfree((char *) tagPtr);
}

77
x11/tk/8.0/patches/patch-generic_tkText_c
View File

@ -1,77 +0,0 @@
$OpenBSD: patch-generic_tkText_c,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- generic/tkText.c.orig Mon Sep 14 20:23:17 1998
+++ generic/tkText.c Sun Jan 8 18:09:42 2006
@@ -866,6 +866,7 @@ ConfigureText(interp, textPtr, argc, arg
|| (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 @@ TextFetchSelection(clientData, offset, b
}
}
}
- 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 @@ TextSearchCmd(textPtr, interp, argc, arg
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 @@ TextSearchCmd(textPtr, interp, argc, arg
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 @@ TextSearchCmd(textPtr, interp, argc, arg
*/
exact = 1;
+ searchElide = 0;
+ curIndex.tree = textPtr->tree;
backwards = 0;
noCase = 0;
varName = NULL;
@@ -1586,7 +1590,7 @@ TextSearchCmd(textPtr, interp, argc, arg
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];
@@ -1601,6 +1605,8 @@ TextSearchCmd(textPtr, interp, argc, arg
varName = argv[i];
} else if ((c == 'e') && (strncmp(argv[i], "-exact", length) == 0)) {
exact = 1;
+ } else if ((c == 'e') && (strncmp(argv[i], "-elide", length) == 0)) {
+ searchElide = 1;
} else if ((c == 'f') && (strncmp(argv[i], "-forwards", length) == 0)) {
backwards = 0;
} else if ((c == 'n') && (strncmp(argv[i], "-nocase", length) == 0)) {
@@ -1702,9 +1708,10 @@ TextSearchCmd(textPtr, interp, argc, arg
*/
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);

23
x11/tk/8.0/patches/patch-generic_tkText_h
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-generic_tkText_h,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- generic/tkText.h.orig Mon Sep 14 20:23:18 1998
+++ generic/tkText.h Sun Jan 8 18:09:42 2006
@@ -370,6 +370,10 @@ typedef struct TkTextTag {
* 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 @@ extern void TkTextLostSelection _ANSI_A
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));

86
x11/tk/8.0/patches/patch-unix_Makefile_in
View File

@ -1,86 +0,0 @@
$OpenBSD: patch-unix_Makefile_in,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- unix/Makefile.in.orig Tue Mar 9 07:53:50 1999
+++ unix/Makefile.in Sun Jan 8 18:09:42 2006
@@ -112,7 +112,7 @@ X11_LIB_SWITCHES = @XLIBSW@
# 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 = @TCL_LIB_SPEC@ @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
@@ -302,15 +302,19 @@ HDRS = bltList.h \
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
-all: wish
+all: ${TK_LIB_FILE} libtk80.a wish
# 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}
+libtk80.a: ${OBJS}
+ rm -f libtk80.a
+ ar cr libtk80.a ${OBJS}
+ $(RANLIB) libtk80.a
+
# 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
# extensions. used for the Tcl Plugin. -- dl
@@ -365,7 +369,7 @@ install: install-binaries install-librar
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
-install-binaries: $(TK_LIB_FILE) wish
+install-binaries: $(TK_LIB_FILE) libtk80.a wish
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
@@ -377,15 +381,19 @@ install-binaries: $(TK_LIB_FILE) wish
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))
@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
+ @echo "Installing libtk80.a"
+ @$(INSTALL_DATA) libtk80.a $(LIB_INSTALL_DIR)/libtk80.a
+ @chmod 555 $(LIB_INSTALL_DIR)/libtk80.a
@echo "Installing wish"
@$(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) \
+ $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR) $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR) \
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
@@ -395,8 +403,18 @@ install-libraries:
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 $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR); \
+ done;
+ @for i in $(UNIX_DIR)/*.h ; \
+ do \
+ echo "Installing $$i"; \
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR); \
+ done;
+ @ln -sf $(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"; \

48
x11/tk/8.0/patches/patch-unix_configure
View File

@ -1,48 +0,0 @@
$OpenBSD: patch-unix_configure,v 1.2 2006/01/08 20:56:08 naddy Exp $
--- unix/configure.orig Tue Mar 9 07:53:50 1999
+++ unix/configure Sun Jan 8 21:51:05 2006
@@ -880,8 +880,8 @@ 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; }
+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
+ { echo "configure: error: There's no tclConfig.sh 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
#--------------------------------------------------------------------
@@ -922,6 +922,8 @@ CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG
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
@@ -2387,14 +2389,13 @@ fi
if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHARED_BUILD=1
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
- TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
+ TK_LIB_FILE="libtk`echo ${VERSION} | tr -d .`${DBGX}.so.${LIBtk80_VERSION}"
MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
- RANLIB=":"
else
TK_SHARED_BUILD=0
TK_SHLIB_CFLAGS=""
TK_LIB_FILE=libtk${TCL_UNSHARED_LIB_SUFFIX}
- MAKE_LIB="ar cr \${TK_LIB_FILE} \${OBJS}"
+ MAKE_LIB="ar cr \${TK_LIB_FILE} \${OBJS}; \${RANLIB} \${TK_LIB_FILE}"
fi
DBGX='${TK_DBGX}'
@@ -2600,6 +2601,7 @@ s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
s%@TCL_DBGX@%$TCL_DBGX%g
s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g
+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
s%@TCL_VERSION@%$TCL_VERSION%g
s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g

6
x11/tk/8.0/pkg/DESCR
View File

@ -1,6 +0,0 @@
This is 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.

2
x11/tk/8.0/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/08 20:56:08 naddy Exp $
@lib lib/libtk80.so.${LIBtk80_VERSION}

472
x11/tk/8.0/pkg/PLIST
View File

@ -1,472 +0,0 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/18 13:19:26 espie Exp $
@option no-default-conflict
@conflict tk->=8.0,<8.1
bin/wish8.0
include/tk8.0/
include/tk8.0/generic/
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
include/tk8.0/tk.h
include/tk8.0/unix/
include/tk8.0/unix/tkUnixDefault.h
include/tk8.0/unix/tkUnixInt.h
include/tk8.0/unix/tkUnixPort.h
lib/libtk80.a
lib/tk8.0/
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/demos/
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/images/
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/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/menubu.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/dialog.tcl
lib/tk8.0/entry.tcl
lib/tk8.0/focus.tcl
lib/tk8.0/images/
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/listbox.tcl
@mandir lib/tk8.0/man/
lib/tk8.0/man/man1/
@man lib/tk8.0/man/man1/wish.1
lib/tk8.0/man/man3/
@man lib/tk8.0/man/man3/3DBorder.3
@man lib/tk8.0/man/man3/BindTable.3
@man lib/tk8.0/man/man3/CanvPsY.3
@man lib/tk8.0/man/man3/CanvTkwin.3
@man lib/tk8.0/man/man3/CanvTxtInfo.3
@man lib/tk8.0/man/man3/Clipboard.3
@man lib/tk8.0/man/man3/ClrSelect.3
@man lib/tk8.0/man/man3/ConfigWidg.3
@man lib/tk8.0/man/man3/ConfigWind.3
@man lib/tk8.0/man/man3/CoordToWin.3
@man lib/tk8.0/man/man3/CrtErrHdlr.3
@man lib/tk8.0/man/man3/CrtGenHdlr.3
@man lib/tk8.0/man/man3/CrtImgType.3
@man lib/tk8.0/man/man3/CrtItemType.3
@man lib/tk8.0/man/man3/CrtPhImgFmt.3
@man lib/tk8.0/man/man3/CrtSelHdlr.3
@man lib/tk8.0/man/man3/CrtWindow.3
@man lib/tk8.0/man/man3/DeleteImg.3
@man lib/tk8.0/man/man3/DrawFocHlt.3
@man lib/tk8.0/man/man3/EventHndlr.3
@man lib/tk8.0/man/man3/FindPhoto.3
@man lib/tk8.0/man/man3/FontId.3
@man lib/tk8.0/man/man3/FreeXId.3
@man lib/tk8.0/man/man3/GeomReq.3
@man lib/tk8.0/man/man3/GetAnchor.3
@man lib/tk8.0/man/man3/GetBitmap.3
@man lib/tk8.0/man/man3/GetCapStyl.3
@man lib/tk8.0/man/man3/GetClrmap.3
@man lib/tk8.0/man/man3/GetColor.3
@man lib/tk8.0/man/man3/GetCursor.3
@man lib/tk8.0/man/man3/GetFont.3
@man lib/tk8.0/man/man3/GetGC.3
@man lib/tk8.0/man/man3/GetImage.3
@man lib/tk8.0/man/man3/GetJoinStl.3
@man lib/tk8.0/man/man3/GetJustify.3
@man lib/tk8.0/man/man3/GetOption.3
@man lib/tk8.0/man/man3/GetPixels.3
@man lib/tk8.0/man/man3/GetPixmap.3
@man lib/tk8.0/man/man3/GetRelief.3
@man lib/tk8.0/man/man3/GetRootCrd.3
@man lib/tk8.0/man/man3/GetScroll.3
@man lib/tk8.0/man/man3/GetSelect.3
@man lib/tk8.0/man/man3/GetUid.3
@man lib/tk8.0/man/man3/GetVRoot.3
@man lib/tk8.0/man/man3/GetVisual.3
@man lib/tk8.0/man/man3/HandleEvent.3
@man lib/tk8.0/man/man3/IdToWindow.3
@man lib/tk8.0/man/man3/ImgChanged.3
@man lib/tk8.0/man/man3/InternAtom.3
@man lib/tk8.0/man/man3/MainLoop.3
@man lib/tk8.0/man/man3/MainWin.3
@man lib/tk8.0/man/man3/MaintGeom.3
@man lib/tk8.0/man/man3/ManageGeom.3
@man lib/tk8.0/man/man3/MapWindow.3
@man lib/tk8.0/man/man3/MeasureChar.3
@man lib/tk8.0/man/man3/MoveToplev.3
@man lib/tk8.0/man/man3/Name.3
@man lib/tk8.0/man/man3/NameOfImg.3
@man lib/tk8.0/man/man3/OwnSelect.3
@man lib/tk8.0/man/man3/ParseArgv.3
@man lib/tk8.0/man/man3/QWinEvent.3
@man lib/tk8.0/man/man3/Restack.3
@man lib/tk8.0/man/man3/RestrictEv.3
@man lib/tk8.0/man/man3/SetAppName.3
@man lib/tk8.0/man/man3/SetClass.3
@man lib/tk8.0/man/man3/SetGrid.3
@man lib/tk8.0/man/man3/SetVisual.3
@man lib/tk8.0/man/man3/StrictMotif.3
@man lib/tk8.0/man/man3/TextLayout.3
@man lib/tk8.0/man/man3/Tk_3DBorderColor.3
@man lib/tk8.0/man/man3/Tk_3DBorderGC.3
@man lib/tk8.0/man/man3/Tk_3DHorizontalBevel.3
@man lib/tk8.0/man/man3/Tk_3DVerticalBevel.3
@man lib/tk8.0/man/man3/Tk_Attributes.3
@man lib/tk8.0/man/man3/Tk_BindEvent.3
@man lib/tk8.0/man/man3/Tk_CanvasDrawableCoords.3
@man lib/tk8.0/man/man3/Tk_CanvasEventuallyRedraw.3
@man lib/tk8.0/man/man3/Tk_CanvasGetCoord.3
@man lib/tk8.0/man/man3/Tk_CanvasPsBitmap.3
@man lib/tk8.0/man/man3/Tk_CanvasPsColor.3
@man lib/tk8.0/man/man3/Tk_CanvasPsFont.3
@man lib/tk8.0/man/man3/Tk_CanvasPsPath.3
@man lib/tk8.0/man/man3/Tk_CanvasPsStipple.3
@man lib/tk8.0/man/man3/Tk_CanvasPsY.3
@man lib/tk8.0/man/man3/Tk_CanvasSetStippleOrigin.3
@man lib/tk8.0/man/man3/Tk_CanvasTagsOption.3
@man lib/tk8.0/man/man3/Tk_CanvasTextInfo.3
@man lib/tk8.0/man/man3/Tk_CanvasTkwin.3
@man lib/tk8.0/man/man3/Tk_CanvasWindowCoords.3
@man lib/tk8.0/man/man3/Tk_ChangeWindowAttributes.3
@man lib/tk8.0/man/man3/Tk_Changes.3
@man lib/tk8.0/man/man3/Tk_CharBbox.3
@man lib/tk8.0/man/man3/Tk_Class.3
@man lib/tk8.0/man/man3/Tk_ClearSelection.3
@man lib/tk8.0/man/man3/Tk_ClipboardAppend.3
@man lib/tk8.0/man/man3/Tk_ClipboardClear.3
@man lib/tk8.0/man/man3/Tk_Colormap.3
@man lib/tk8.0/man/man3/Tk_ComputeTextLayout.3
@man lib/tk8.0/man/man3/Tk_ConfigureInfo.3
@man lib/tk8.0/man/man3/Tk_ConfigureValue.3
@man lib/tk8.0/man/man3/Tk_ConfigureWidget.3
@man lib/tk8.0/man/man3/Tk_ConfigureWindow.3
@man lib/tk8.0/man/man3/Tk_CoordsToWindow.3
@man lib/tk8.0/man/man3/Tk_CreateBinding.3
@man lib/tk8.0/man/man3/Tk_CreateBindingTable.3
@man lib/tk8.0/man/man3/Tk_CreateErrorHandler.3
@man lib/tk8.0/man/man3/Tk_CreateEventHandler.3
@man lib/tk8.0/man/man3/Tk_CreateGenericHandler.3
@man lib/tk8.0/man/man3/Tk_CreateImageType.3
@man lib/tk8.0/man/man3/Tk_CreateItemType.3
@man lib/tk8.0/man/man3/Tk_CreatePhotoImageFormat.3
@man lib/tk8.0/man/man3/Tk_CreateSelHandler.3
@man lib/tk8.0/man/man3/Tk_CreateWindow.3
@man lib/tk8.0/man/man3/Tk_CreateWindowFromPath.3
@man lib/tk8.0/man/man3/Tk_DefineBitmap.3
@man lib/tk8.0/man/man3/Tk_DefineCursor.3
@man lib/tk8.0/man/man3/Tk_DeleteAllBindings.3
@man lib/tk8.0/man/man3/Tk_DeleteBinding.3
@man lib/tk8.0/man/man3/Tk_DeleteBindingTable.3
@man lib/tk8.0/man/man3/Tk_DeleteErrorHandler.3
@man lib/tk8.0/man/man3/Tk_DeleteEventHandler.3
@man lib/tk8.0/man/man3/Tk_DeleteGenericHandler.3
@man lib/tk8.0/man/man3/Tk_DeleteImage.3
@man lib/tk8.0/man/man3/Tk_DeleteSelHandler.3
@man lib/tk8.0/man/man3/Tk_Depth.3
@man lib/tk8.0/man/man3/Tk_DestroyWindow.3
@man lib/tk8.0/man/man3/Tk_Display.3
@man lib/tk8.0/man/man3/Tk_DisplayName.3
@man lib/tk8.0/man/man3/Tk_DistanceToTextLayout.3
@man lib/tk8.0/man/man3/Tk_Draw3DPolygon.3
@man lib/tk8.0/man/man3/Tk_Draw3DRectangle.3
@man lib/tk8.0/man/man3/Tk_DrawChars.3
@man lib/tk8.0/man/man3/Tk_DrawFocusHighlight.3
@man lib/tk8.0/man/man3/Tk_DrawTextLayout.3
@man lib/tk8.0/man/man3/Tk_Fill3DPolygon.3
@man lib/tk8.0/man/man3/Tk_Fill3DRectangle.3
@man lib/tk8.0/man/man3/Tk_FindPhoto.3
@man lib/tk8.0/man/man3/Tk_FontId.3
@man lib/tk8.0/man/man3/Tk_FontMetrics.3
@man lib/tk8.0/man/man3/Tk_Free3DBorder.3
@man lib/tk8.0/man/man3/Tk_FreeBitmap.3
@man lib/tk8.0/man/man3/Tk_FreeColor.3
@man lib/tk8.0/man/man3/Tk_FreeColormap.3
@man lib/tk8.0/man/man3/Tk_FreeCursor.3
@man lib/tk8.0/man/man3/Tk_FreeFont.3
@man lib/tk8.0/man/man3/Tk_FreeGC.3
@man lib/tk8.0/man/man3/Tk_FreeImage.3
@man lib/tk8.0/man/man3/Tk_FreeOptions.3
@man lib/tk8.0/man/man3/Tk_FreePixmap.3
@man lib/tk8.0/man/man3/Tk_FreeTextLayout.3
@man lib/tk8.0/man/man3/Tk_FreeXId.3
@man lib/tk8.0/man/man3/Tk_GeometryRequest.3
@man lib/tk8.0/man/man3/Tk_Get3DBorder.3
@man lib/tk8.0/man/man3/Tk_GetAllBindings.3
@man lib/tk8.0/man/man3/Tk_GetAnchor.3
@man lib/tk8.0/man/man3/Tk_GetAtomName.3
@man lib/tk8.0/man/man3/Tk_GetBinding.3
@man lib/tk8.0/man/man3/Tk_GetBitmap.3
@man lib/tk8.0/man/man3/Tk_GetBitmapFromData.3
@man lib/tk8.0/man/man3/Tk_GetCapStyle.3
@man lib/tk8.0/man/man3/Tk_GetColor.3
@man lib/tk8.0/man/man3/Tk_GetColorByValue.3
@man lib/tk8.0/man/man3/Tk_GetColormap.3
@man lib/tk8.0/man/man3/Tk_GetCursor.3
@man lib/tk8.0/man/man3/Tk_GetCursorFromData.3
@man lib/tk8.0/man/man3/Tk_GetFont.3
@man lib/tk8.0/man/man3/Tk_GetGC.3
@man lib/tk8.0/man/man3/Tk_GetImage.3
@man lib/tk8.0/man/man3/Tk_GetImageMasterData.3
@man lib/tk8.0/man/man3/Tk_GetItemTypes.3
@man lib/tk8.0/man/man3/Tk_GetJoinStyle.3
@man lib/tk8.0/man/man3/Tk_GetJustify.3
@man lib/tk8.0/man/man3/Tk_GetOption.3
@man lib/tk8.0/man/man3/Tk_GetPixels.3
@man lib/tk8.0/man/man3/Tk_GetPixmap.3
@man lib/tk8.0/man/man3/Tk_GetRelief.3
@man lib/tk8.0/man/man3/Tk_GetRootCoords.3
@man lib/tk8.0/man/man3/Tk_GetScreenMM.3
@man lib/tk8.0/man/man3/Tk_GetScrollInfo.3
@man lib/tk8.0/man/man3/Tk_GetSelection.3
@man lib/tk8.0/man/man3/Tk_GetUid.3
@man lib/tk8.0/man/man3/Tk_GetVRootGeometry.3
@man lib/tk8.0/man/man3/Tk_GetVisual.3
@man lib/tk8.0/man/man3/Tk_HandleEvent.3
@man lib/tk8.0/man/man3/Tk_Height.3
@man lib/tk8.0/man/man3/Tk_IdToWindow.3
@man lib/tk8.0/man/man3/Tk_ImageChanged.3
@man lib/tk8.0/man/man3/Tk_Init.3
@man lib/tk8.0/man/man3/Tk_InternAtom.3
@man lib/tk8.0/man/man3/Tk_InternalBorderWidth.3
@man lib/tk8.0/man/man3/Tk_IntersectTextLayout.3
@man lib/tk8.0/man/man3/Tk_IsMapped.3
@man lib/tk8.0/man/man3/Tk_IsTopLevel.3
@man lib/tk8.0/man/man3/Tk_Main.3
@man lib/tk8.0/man/man3/Tk_MainLoop.3
@man lib/tk8.0/man/man3/Tk_MainWindow.3
@man lib/tk8.0/man/man3/Tk_MaintainGeometry.3
@man lib/tk8.0/man/man3/Tk_MakeWindowExist.3
@man lib/tk8.0/man/man3/Tk_ManageGeometry.3
@man lib/tk8.0/man/man3/Tk_MapWindow.3
@man lib/tk8.0/man/man3/Tk_MeasureChars.3
@man lib/tk8.0/man/man3/Tk_MoveResizeWindow.3
@man lib/tk8.0/man/man3/Tk_MoveToplevelWindow.3
@man lib/tk8.0/man/man3/Tk_MoveWindow.3
@man lib/tk8.0/man/man3/Tk_Name.3
@man lib/tk8.0/man/man3/Tk_NameOf3DBorder.3
@man lib/tk8.0/man/man3/Tk_NameOfAnchor.3
@man lib/tk8.0/man/man3/Tk_NameOfBitmap.3
@man lib/tk8.0/man/man3/Tk_NameOfCapStyle.3
@man lib/tk8.0/man/man3/Tk_NameOfColor.3
@man lib/tk8.0/man/man3/Tk_NameOfCursor.3
@man lib/tk8.0/man/man3/Tk_NameOfFont.3
@man lib/tk8.0/man/man3/Tk_NameOfImage.3
@man lib/tk8.0/man/man3/Tk_NameOfJoinStyle.3
@man lib/tk8.0/man/man3/Tk_NameOfJustify.3
@man lib/tk8.0/man/man3/Tk_NameOfRelief.3
@man lib/tk8.0/man/man3/Tk_NameToWindow.3
@man lib/tk8.0/man/man3/Tk_Offset.3
@man lib/tk8.0/man/man3/Tk_OwnSelection.3
@man lib/tk8.0/man/man3/Tk_Parent.3
@man lib/tk8.0/man/man3/Tk_ParseArgv.3
@man lib/tk8.0/man/man3/Tk_PathName.3
@man lib/tk8.0/man/man3/Tk_PhotoBlank.3
@man lib/tk8.0/man/man3/Tk_PhotoExpand.3
@man lib/tk8.0/man/man3/Tk_PhotoGetImage.3
@man lib/tk8.0/man/man3/Tk_PhotoGetSize.3
@man lib/tk8.0/man/man3/Tk_PhotoPutBlock.3
@man lib/tk8.0/man/man3/Tk_PhotoPutZoomedBlock.3
@man lib/tk8.0/man/man3/Tk_PhotoSetSize.3
@man lib/tk8.0/man/man3/Tk_PointToChar.3
@man lib/tk8.0/man/man3/Tk_PostscriptFontName.3
@man lib/tk8.0/man/man3/Tk_QueueWindowEvent.3
@man lib/tk8.0/man/man3/Tk_RedrawImage.3
@man lib/tk8.0/man/man3/Tk_ReqHeight.3
@man lib/tk8.0/man/man3/Tk_ReqWidth.3
@man lib/tk8.0/man/man3/Tk_ResizeWindow.3
@man lib/tk8.0/man/man3/Tk_RestackWindow.3
@man lib/tk8.0/man/man3/Tk_RestrictEvents.3
@man lib/tk8.0/man/man3/Tk_Screen.3
@man lib/tk8.0/man/man3/Tk_ScreenNumber.3
@man lib/tk8.0/man/man3/Tk_SetAppName.3
@man lib/tk8.0/man/man3/Tk_SetBackgroundFromBorder.3
@man lib/tk8.0/man/man3/Tk_SetClass.3
@man lib/tk8.0/man/man3/Tk_SetGrid.3
@man lib/tk8.0/man/man3/Tk_SetInternalBorder.3
@man lib/tk8.0/man/man3/Tk_SetWindowBackground.3
@man lib/tk8.0/man/man3/Tk_SetWindowBackgroundPixmap.3
@man lib/tk8.0/man/man3/Tk_SetWindowBorder.3
@man lib/tk8.0/man/man3/Tk_SetWindowBorderPixmap.3
@man lib/tk8.0/man/man3/Tk_SetWindowBorderWidth.3
@man lib/tk8.0/man/man3/Tk_SetWindowColormap.3
@man lib/tk8.0/man/man3/Tk_SetWindowVisual.3
@man lib/tk8.0/man/man3/Tk_SizeOfBitmap.3
@man lib/tk8.0/man/man3/Tk_SizeOfImage.3
@man lib/tk8.0/man/man3/Tk_StrictMotif.3
@man lib/tk8.0/man/man3/Tk_TextLayoutToPostscript.3
@man lib/tk8.0/man/man3/Tk_TextWidth.3
@man lib/tk8.0/man/man3/Tk_Uid.3
@man lib/tk8.0/man/man3/Tk_UndefineCursor.3
@man lib/tk8.0/man/man3/Tk_UnderlineChars.3
@man lib/tk8.0/man/man3/Tk_UnderlineTextLayout.3
@man lib/tk8.0/man/man3/Tk_UnmaintainGeometry.3
@man lib/tk8.0/man/man3/Tk_UnmapWindow.3
@man lib/tk8.0/man/man3/Tk_UnsetGrid.3
@man lib/tk8.0/man/man3/Tk_Visual.3
@man lib/tk8.0/man/man3/Tk_Width.3
@man lib/tk8.0/man/man3/Tk_WindowId.3
@man lib/tk8.0/man/man3/Tk_X.3
@man lib/tk8.0/man/man3/Tk_Y.3
@man lib/tk8.0/man/man3/WindowId.3
lib/tk8.0/man/mann/
@man lib/tk8.0/man/mann/bell.n
@man lib/tk8.0/man/mann/bind.n
@man lib/tk8.0/man/mann/bindtags.n
@man lib/tk8.0/man/mann/bitmap.n
@man lib/tk8.0/man/mann/button.n
@man lib/tk8.0/man/mann/canvas.n
@man lib/tk8.0/man/mann/checkbutton.n
@man lib/tk8.0/man/mann/chooseColor.n
@man lib/tk8.0/man/mann/clipboard.n
@man lib/tk8.0/man/mann/destroy.n
@man lib/tk8.0/man/mann/dialog.n
@man lib/tk8.0/man/mann/entry.n
@man lib/tk8.0/man/mann/event.n
@man lib/tk8.0/man/mann/focus.n
@man lib/tk8.0/man/mann/focusNext.n
@man lib/tk8.0/man/mann/font.n
@man lib/tk8.0/man/mann/frame.n
@man lib/tk8.0/man/mann/getOpenFile.n
@man lib/tk8.0/man/mann/grab.n
@man lib/tk8.0/man/mann/grid.n
@man lib/tk8.0/man/mann/image.n
@man lib/tk8.0/man/mann/label.n
@man lib/tk8.0/man/mann/listbox.n
@man lib/tk8.0/man/mann/loadTk.n
@man lib/tk8.0/man/mann/lower.n
@man lib/tk8.0/man/mann/menu.n
@man lib/tk8.0/man/mann/menubar.n
@man lib/tk8.0/man/mann/menubutton.n
@man lib/tk8.0/man/mann/message.n
@man lib/tk8.0/man/mann/messageBox.n
@man lib/tk8.0/man/mann/option.n
@man lib/tk8.0/man/mann/optionMenu.n
@man lib/tk8.0/man/mann/options.n
@man lib/tk8.0/man/mann/pack-old.n
@man lib/tk8.0/man/mann/pack.n
@man lib/tk8.0/man/mann/palette.n
@man lib/tk8.0/man/mann/photo.n
@man lib/tk8.0/man/mann/place.n
@man lib/tk8.0/man/mann/popup.n
@man lib/tk8.0/man/mann/radiobutton.n
@man lib/tk8.0/man/mann/raise.n
@man lib/tk8.0/man/mann/scale.n
@man lib/tk8.0/man/mann/scrollbar.n
@man lib/tk8.0/man/mann/selection.n
@man lib/tk8.0/man/mann/send.n
@man lib/tk8.0/man/mann/text.n
@man lib/tk8.0/man/mann/tk.n
@man lib/tk8.0/man/mann/tk_bindForTraversal.n
@man lib/tk8.0/man/mann/tk_bisque.n
@man lib/tk8.0/man/mann/tk_chooseColor.n
@man lib/tk8.0/man/mann/tk_dialog.n
@man lib/tk8.0/man/mann/tk_focusFollowsMouse.n
@man lib/tk8.0/man/mann/tk_focusNext.n
@man lib/tk8.0/man/mann/tk_focusPrev.n
@man lib/tk8.0/man/mann/tk_getOpenFile.n
@man lib/tk8.0/man/mann/tk_getSaveFile.n
@man lib/tk8.0/man/mann/tk_menuBar.n
@man lib/tk8.0/man/mann/tk_messageBox.n
@man lib/tk8.0/man/mann/tk_optionMenu.n
@man lib/tk8.0/man/mann/tk_popup.n
@man lib/tk8.0/man/mann/tk_setPalette.n
@man lib/tk8.0/man/mann/tkerror.n
@man lib/tk8.0/man/mann/tkvars.n
@man lib/tk8.0/man/mann/tkwait.n
@man lib/tk8.0/man/mann/toplevel.n
@man lib/tk8.0/man/mann/winfo.n
@man lib/tk8.0/man/mann/wm.n
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/prolog.ps
lib/tk8.0/safetk.tcl
lib/tk8.0/scale.tcl
lib/tk8.0/scrlbar.tcl
lib/tk8.0/tclIndex
lib/tk8.0/tearoff.tcl
lib/tk8.0/text.tcl
lib/tk8.0/tk.tcl
lib/tk8.0/tkAppInit.c
lib/tk8.0/tkConfig.sh
lib/tk8.0/tkfbox.tcl
lib/tk8.0/xmfbox.tcl
%%SHARED%%

3
x11/tk/Makefile
View File

@ -1,6 +1,5 @@
# $OpenBSD: Makefile,v 1.2 2003/11/19 15:48:06 jose Exp $
# $OpenBSD: Makefile,v 1.3 2007/07/30 16:59:54 steven Exp $
SUBDIR+= 8.0
SUBDIR+= 8.3
SUBDIR+= 8.4