summaryrefslogtreecommitdiff
path: root/lang/tcl-tclX
diff options
context:
space:
mode:
authorminskim <minskim>2004-05-13 22:06:03 +0000
committerminskim <minskim>2004-05-13 22:06:03 +0000
commit62348879155b48634561130906b91b1e90003eb0 (patch)
tree2b659ed00c472ac9d934a72e7f94fcca7862923d /lang/tcl-tclX
parente1cbbf5503ea5d7b57c425a512ef0837653a3f0c (diff)
downloadpkgsrc-62348879155b48634561130906b91b1e90003eb0.tar.gz
- Update {tcl,tk}-tclX to 8.3.5.
- Bl3ify. - Enable pkgviews installation. OK'ed by jwise@, the maintainer. Changes since 8.2: * got "make buildhelp" working * tcl/generic/tclXgeneral.c (TclX_EchoObjCmd): use encoding aware functions in 8.1+. [Bug #514053] * win/Makefile.in: * win/configure.in: * win/configure: Changed to use TCL_LIBS and TK_LIBS as the source for the list of Windows libraries to link against. Fixes #501990. * tcl/generic/tclXlib.c (MakeAbsFile): Replaced a call to the internal 'TclpGetCwd' with an access to the public API 'Tcl_GetCwd'. [457266]. Reported by Vincent Darley. * doc/TclX.n: * tcl/generic/tclXoscmds.c: allowed sleep to accept double values, to match the Expect sleep command. This prevents conflicts that depended on the order of package requires. [Patch #444332] * unix/tools/tclmanpages: Added "re_syntax.n" to the list of processed manpages [#405956]. * All of the changes below are there to fix bug [418295]. * tcl/generic/tclXoscmds.c (TclX_OsCmdsInit): "system" and "sleep" now use the new command creation procedure. * tcl/generic/tclXprocess.c (TclX_ProcessInit): "fork" and "wait" now use the new command creation procedure. * tcl/generic/tclXutil.c (TclX_CreateObjCommand): Added the implementation of this new procedure. * tcl/generic/tclExtdInt.h: Added TclX_CreateObjCommand to encapsulate the logic for the creation of commands FOO and tclx_FOO. * tcl/generic/tclXlist.c (TclX_LassignObjCmd): Added TCL_LEAVE_ERR_MSG to call of 'Tcl_SetVar2Ex'. This fixes the bug [227478]. * tcl/generic/tclXgeneral.c (TclX_LoopObjCmd): Changed 'Tcl_AppendStringsToObj' into 'Tcl_AddErrorInfo'. Fixes bug [226388]. Associated patch is [403050]. No need to extend the testsuite, it already contained a test exercising the bug. * tcl/unix/Makefile.in: * tk/unix/Makefile.in: Fixed bogus "test -f" on the new HELP_DIR directory, which should be "test -d". * win/Makefile.in - fixed because of new definition of TCL_SRC_DIR and TK_SRC_DIR * Changed the HELP_DIR to be configurable so I could have parallel builds not all trying to create the same help files. * tcl/win/configure.in, common.bc, common.vc Fixed version number to 8.3 * {tcl,tk}/unix/Makefile.in, tweaks to get references to LIB_RUNTIME_DIR properly expanded on irix builds. Also added BUILDHELP macro that is conditional on nroff being present so we don't try to build help files on systems with out nroff. * tcl/win/tclXAppInit.c, tk/generic/tkXshell.c, tk/win/tkXAppInit.c - turn off USE_TCL_STUBS * win/Makefile.in, win/configure.in: Cleanup use of stubs library. * tcl/win/tclXwinOS.c (TclXOSkill): Added support for "kill" command on Windows platforms.
Diffstat (limited to 'lang/tcl-tclX')
-rw-r--r--lang/tcl-tclX/Makefile29
-rw-r--r--lang/tcl-tclX/PLIST459
-rw-r--r--lang/tcl-tclX/buildlink2.mk21
-rw-r--r--lang/tcl-tclX/buildlink3.mk20
-rw-r--r--lang/tcl-tclX/distinfo15
-rw-r--r--lang/tcl-tclX/patches/patch-aa47
-rw-r--r--lang/tcl-tclX/patches/patch-ab23
-rw-r--r--lang/tcl-tclX/patches/patch-ac19
-rw-r--r--lang/tcl-tclX/patches/patch-af44
-rw-r--r--lang/tcl-tclX/patches/patch-ah15
10 files changed, 360 insertions, 332 deletions
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
index 603f298f77c..0d5caee7392 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -1,20 +1,22 @@
-# $NetBSD: Makefile,v 1.18 2004/05/12 17:56:45 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/13 22:06:03 minskim Exp $
#
-DISTNAME= tclX8.2.0
-PKGNAME= tcl-tclX-8.2.0
-PKGREVISION= 1
+DISTNAME= tclx8.3.5-src
+PKGNAME= tcl-tclX-8.3.5
CATEGORIES= lang tcl
-MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/TclX/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tclx/}
MAINTAINER= jwise@NetBSD.org
HOMEPAGE= http://tclx.sourceforge.net/
COMMENT= Extended Tcl (TclX), a set of Tcl extensions for system programming
-CONFLICTS+= tclX-[0-9]*
+CONFLICTS+= tclX-[0-9]*
+BUILDLINK_DEPENDS.tcl+= tcl>=8.4.6nb4
-WRKSRC= ${WRKDIR}/tclX8.2.0/unix
-USE_BUILDLINK2= yes
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix
+USE_BUILDLINK3= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared \
@@ -27,9 +29,12 @@ CONFIGURE_ENV+= PKGSRC_TCL_SRC_DIR="${PKGSRC_TCL_SRC_DIR}"
MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \
SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \
- SHAREGRP=${SHAREGRP}
+ SHAREGRP=${SHAREGRP} \
+ TCLX_PREFIX=${PREFIX}
+
+INSTALLATION_DIRS= bin include
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl/buildlink3.mk"
post-extract:
@${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n
@@ -41,8 +46,8 @@ post-build:
cd ${WRKSRC}/../tcl/unix && ${MAKE_ENV} ${MAKE} buildhelp
post-install:
- ${FIND} ${PREFIX}/lib/tcl/tclX8.2/help -type d -exec ${CHMOD} 555 '{}' \;
- ${FIND} ${PREFIX}/lib/tcl/tclX8.2/help -type f -exec ${CHMOD} 444 '{}' \;
+ ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type d -exec ${CHMOD} 555 '{}' \;
+ ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type f -exec ${CHMOD} 444 '{}' \;
@${RM} ${PREFIX}/man/man3/TkX_Main.3
@${RM} ${PREFIX}/man/man3/Tkx_Init.3
# the above links are installed based on the contents of the man page.
diff --git a/lang/tcl-tclX/PLIST b/lang/tcl-tclX/PLIST
index fc7d5d3baf7..1303027b0b0 100644
--- a/lang/tcl-tclX/PLIST
+++ b/lang/tcl-tclX/PLIST
@@ -1,212 +1,213 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:25:18 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/05/13 22:06:03 minskim Exp $
bin/tcl
include/tclExtend.h
-lib/libtclx82.a
-lib/libtclx82.la
-lib/libtclx82.so
-lib/libtclx82.so.1
-lib/libtclx82.so.1.0
-lib/tcl/tclX8.2/autoload.tcl
-lib/tcl/tclX8.2/buildidx.tcl
-lib/tcl/tclX8.2/help/Tcl.brf
-lib/tcl/tclX8.2/help/TclX.brf
-lib/tcl/tclX8.2/help/help
-lib/tcl/tclX8.2/help/tcl/control/break
-lib/tcl/tclX8.2/help/tcl/control/case
-lib/tcl/tclX8.2/help/tcl/control/catch
-lib/tcl/tclX8.2/help/tcl/control/commandloop
-lib/tcl/tclX8.2/help/tcl/control/continue
-lib/tcl/tclX8.2/help/tcl/control/dde
-lib/tcl/tclX8.2/help/tcl/control/error
-lib/tcl/tclX8.2/help/tcl/control/eval
-lib/tcl/tclX8.2/help/tcl/control/exit
-lib/tcl/tclX8.2/help/tcl/control/for
-lib/tcl/tclX8.2/help/tcl/control/foreach
-lib/tcl/tclX8.2/help/tcl/control/if
-lib/tcl/tclX8.2/help/tcl/control/interp
-lib/tcl/tclX8.2/help/tcl/control/loop
-lib/tcl/tclX8.2/help/tcl/control/proc
-lib/tcl/tclX8.2/help/tcl/control/rename
-lib/tcl/tclX8.2/help/tcl/control/return
-lib/tcl/tclX8.2/help/tcl/control/safe
-lib/tcl/tclX8.2/help/tcl/control/source
-lib/tcl/tclX8.2/help/tcl/control/switch
-lib/tcl/tclX8.2/help/tcl/control/tclx_errorHandler
-lib/tcl/tclX8.2/help/tcl/control/try_eval
-lib/tcl/tclX8.2/help/tcl/control/uplevel
-lib/tcl/tclX8.2/help/tcl/control/while
-lib/tcl/tclX8.2/help/tcl/debug/cmdtrace
-lib/tcl/tclX8.2/help/tcl/debug/edprocs
-lib/tcl/tclX8.2/help/tcl/debug/profile
-lib/tcl/tclX8.2/help/tcl/debug/profrep
-lib/tcl/tclX8.2/help/tcl/debug/saveprocs
-lib/tcl/tclX8.2/help/tcl/events/after
-lib/tcl/tclX8.2/help/tcl/events/background-error
-lib/tcl/tclX8.2/help/tcl/events/fileevent
-lib/tcl/tclX8.2/help/tcl/events/mainloop
-lib/tcl/tclX8.2/help/tcl/events/update
-lib/tcl/tclX8.2/help/tcl/events/vwait
-lib/tcl/tclX8.2/help/tcl/files/bsearch
-lib/tcl/tclX8.2/help/tcl/files/chgrp
-lib/tcl/tclX8.2/help/tcl/files/chmod
-lib/tcl/tclX8.2/help/tcl/files/chown
-lib/tcl/tclX8.2/help/tcl/files/chroot
-lib/tcl/tclX8.2/help/tcl/files/close
-lib/tcl/tclX8.2/help/tcl/files/dup
-lib/tcl/tclX8.2/help/tcl/files/echo
-lib/tcl/tclX8.2/help/tcl/files/eof
-lib/tcl/tclX8.2/help/tcl/files/fblocked
-lib/tcl/tclX8.2/help/tcl/files/fcntl
-lib/tcl/tclX8.2/help/tcl/files/fconfigure
-lib/tcl/tclX8.2/help/tcl/files/fcopy
-lib/tcl/tclX8.2/help/tcl/files/file
-lib/tcl/tclX8.2/help/tcl/files/filename
-lib/tcl/tclX8.2/help/tcl/files/flock
-lib/tcl/tclX8.2/help/tcl/files/flush
-lib/tcl/tclX8.2/help/tcl/files/for_file
-lib/tcl/tclX8.2/help/tcl/files/for_recursive_glob
-lib/tcl/tclX8.2/help/tcl/files/fstat
-lib/tcl/tclX8.2/help/tcl/files/ftruncate
-lib/tcl/tclX8.2/help/tcl/files/funlock
-lib/tcl/tclX8.2/help/tcl/files/gets
-lib/tcl/tclX8.2/help/tcl/files/glob
-lib/tcl/tclX8.2/help/tcl/files/lgets
-lib/tcl/tclX8.2/help/tcl/files/link
-lib/tcl/tclX8.2/help/tcl/files/open
-lib/tcl/tclX8.2/help/tcl/files/pipe
-lib/tcl/tclX8.2/help/tcl/files/puts
-lib/tcl/tclX8.2/help/tcl/files/read
-lib/tcl/tclX8.2/help/tcl/files/read_file
-lib/tcl/tclX8.2/help/tcl/files/readdir
-lib/tcl/tclX8.2/help/tcl/files/recursive_glob
-lib/tcl/tclX8.2/help/tcl/files/registry
-lib/tcl/tclX8.2/help/tcl/files/resource
-lib/tcl/tclX8.2/help/tcl/files/seek
-lib/tcl/tclX8.2/help/tcl/files/select
-lib/tcl/tclX8.2/help/tcl/files/sync
-lib/tcl/tclX8.2/help/tcl/files/tell
-lib/tcl/tclX8.2/help/tcl/files/write_file
-lib/tcl/tclX8.2/help/tcl/filescan/scancontext
-lib/tcl/tclX8.2/help/tcl/filescan/scanfile
-lib/tcl/tclX8.2/help/tcl/filescan/scanmatch
-lib/tcl/tclX8.2/help/tcl/intl/catclose
-lib/tcl/tclX8.2/help/tcl/intl/catgets
-lib/tcl/tclX8.2/help/tcl/intl/catopen
-lib/tcl/tclX8.2/help/tcl/intl/encoding
-lib/tcl/tclX8.2/help/tcl/intl/msgcat
-lib/tcl/tclX8.2/help/tcl/intro/keyedlists
-lib/tcl/tclX8.2/help/tcl/intro/syntax
-lib/tcl/tclX8.2/help/tcl/intro/tclsh
-lib/tcl/tclX8.2/help/tcl/keyedlists/keyldel
-lib/tcl/tclX8.2/help/tcl/keyedlists/keylget
-lib/tcl/tclX8.2/help/tcl/keyedlists/keylkeys
-lib/tcl/tclX8.2/help/tcl/keyedlists/keylset
-lib/tcl/tclX8.2/help/tcl/libraries/auto_commands
-lib/tcl/tclX8.2/help/tcl/libraries/auto_load_file
-lib/tcl/tclX8.2/help/tcl/libraries/auto_packages
-lib/tcl/tclX8.2/help/tcl/libraries/buildpackageindex
-lib/tcl/tclX8.2/help/tcl/libraries/convert_lib
-lib/tcl/tclX8.2/help/tcl/libraries/library
-lib/tcl/tclX8.2/help/tcl/libraries/load
-lib/tcl/tclX8.2/help/tcl/libraries/loadlibindex
-lib/tcl/tclX8.2/help/tcl/libraries/package
-lib/tcl/tclX8.2/help/tcl/libraries/packagelib
-lib/tcl/tclX8.2/help/tcl/libraries/pkgMkIndex
-lib/tcl/tclX8.2/help/tcl/libraries/searchpath
-lib/tcl/tclX8.2/help/tcl/libraries/unknown
-lib/tcl/tclX8.2/help/tcl/lists/concat
-lib/tcl/tclX8.2/help/tcl/lists/intersect
-lib/tcl/tclX8.2/help/tcl/lists/intersect3
-lib/tcl/tclX8.2/help/tcl/lists/join
-lib/tcl/tclX8.2/help/tcl/lists/lappend
-lib/tcl/tclX8.2/help/tcl/lists/lassign
-lib/tcl/tclX8.2/help/tcl/lists/lcontain
-lib/tcl/tclX8.2/help/tcl/lists/lempty
-lib/tcl/tclX8.2/help/tcl/lists/lindex
-lib/tcl/tclX8.2/help/tcl/lists/linsert
-lib/tcl/tclX8.2/help/tcl/lists/list
-lib/tcl/tclX8.2/help/tcl/lists/llength
-lib/tcl/tclX8.2/help/tcl/lists/lmatch
-lib/tcl/tclX8.2/help/tcl/lists/lrange
-lib/tcl/tclX8.2/help/tcl/lists/lreplace
-lib/tcl/tclX8.2/help/tcl/lists/lrmdups
-lib/tcl/tclX8.2/help/tcl/lists/lsearch
-lib/tcl/tclX8.2/help/tcl/lists/lsort
-lib/tcl/tclX8.2/help/tcl/lists/lvarcat
-lib/tcl/tclX8.2/help/tcl/lists/lvarpop
-lib/tcl/tclX8.2/help/tcl/lists/lvarpush
-lib/tcl/tclX8.2/help/tcl/lists/split
-lib/tcl/tclX8.2/help/tcl/lists/union
-lib/tcl/tclX8.2/help/tcl/math/expr
-lib/tcl/tclX8.2/help/tcl/math/fmathcmds
-lib/tcl/tclX8.2/help/tcl/math/incr
-lib/tcl/tclX8.2/help/tcl/math/max
-lib/tcl/tclX8.2/help/tcl/math/min
-lib/tcl/tclX8.2/help/tcl/math/random
-lib/tcl/tclX8.2/help/tcl/processes/exec
-lib/tcl/tclX8.2/help/tcl/processes/execl
-lib/tcl/tclX8.2/help/tcl/processes/fork
-lib/tcl/tclX8.2/help/tcl/processes/kill
-lib/tcl/tclX8.2/help/tcl/processes/nice
-lib/tcl/tclX8.2/help/tcl/processes/pid
-lib/tcl/tclX8.2/help/tcl/processes/system
-lib/tcl/tclX8.2/help/tcl/processes/wait
-lib/tcl/tclX8.2/help/tcl/signals/signal
-lib/tcl/tclX8.2/help/tcl/sockets/host_info
-lib/tcl/tclX8.2/help/tcl/sockets/http
-lib/tcl/tclX8.2/help/tcl/sockets/socket
-lib/tcl/tclX8.2/help/tcl/status/cd
-lib/tcl/tclX8.2/help/tcl/status/dirs
-lib/tcl/tclX8.2/help/tcl/status/history
-lib/tcl/tclX8.2/help/tcl/status/id
-lib/tcl/tclX8.2/help/tcl/status/info
-lib/tcl/tclX8.2/help/tcl/status/infox
-lib/tcl/tclX8.2/help/tcl/status/popd
-lib/tcl/tclX8.2/help/tcl/status/pushd
-lib/tcl/tclX8.2/help/tcl/status/pwd
-lib/tcl/tclX8.2/help/tcl/status/showproc
-lib/tcl/tclX8.2/help/tcl/status/umask
-lib/tcl/tclX8.2/help/tcl/strings/append
-lib/tcl/tclX8.2/help/tcl/strings/binary
-lib/tcl/tclX8.2/help/tcl/strings/ccollate
-lib/tcl/tclX8.2/help/tcl/strings/cconcat
-lib/tcl/tclX8.2/help/tcl/strings/cequal
-lib/tcl/tclX8.2/help/tcl/strings/cindex
-lib/tcl/tclX8.2/help/tcl/strings/clength
-lib/tcl/tclX8.2/help/tcl/strings/crange
-lib/tcl/tclX8.2/help/tcl/strings/csubstr
-lib/tcl/tclX8.2/help/tcl/strings/ctoken
-lib/tcl/tclX8.2/help/tcl/strings/ctype
-lib/tcl/tclX8.2/help/tcl/strings/format
-lib/tcl/tclX8.2/help/tcl/strings/regexp
-lib/tcl/tclX8.2/help/tcl/strings/regsub
-lib/tcl/tclX8.2/help/tcl/strings/replicate
-lib/tcl/tclX8.2/help/tcl/strings/scan
-lib/tcl/tclX8.2/help/tcl/strings/string
-lib/tcl/tclX8.2/help/tcl/strings/subst
-lib/tcl/tclX8.2/help/tcl/strings/translit
-lib/tcl/tclX8.2/help/tcl/tclshell/intro
-lib/tcl/tclX8.2/help/tcl/tclshell/variables
-lib/tcl/tclX8.2/help/tcl/time/alarm
-lib/tcl/tclX8.2/help/tcl/time/clock
-lib/tcl/tclX8.2/help/tcl/time/sleep
-lib/tcl/tclX8.2/help/tcl/time/time
-lib/tcl/tclX8.2/help/tcl/time/times
-lib/tcl/tclX8.2/help/tcl/variables/array
-lib/tcl/tclX8.2/help/tcl/variables/for_array_keys
-lib/tcl/tclX8.2/help/tcl/variables/global
-lib/tcl/tclX8.2/help/tcl/variables/namespace
-lib/tcl/tclX8.2/help/tcl/variables/set
-lib/tcl/tclX8.2/help/tcl/variables/stdvars
-lib/tcl/tclX8.2/help/tcl/variables/trace
-lib/tcl/tclX8.2/help/tcl/variables/unset
-lib/tcl/tclX8.2/help/tcl/variables/upvar
-lib/tcl/tclX8.2/help/tcl/variables/variable
-lib/tcl/tclX8.2/pkgIndex.tcl
-lib/tcl/tclX8.2/tcl.tlib
-lib/tcl/tclX8.2/tcl.tndx
-lib/tcl/tclX8.2/tclXAppInit.c
-lib/tcl/tclX8.2/tclx.tcl
+lib/libtclx83.a
+lib/libtclx83.la
+lib/libtclx83.so
+lib/libtclx83.so.1
+lib/libtclx83.so.1.0
+lib/tcl/tclX8.3/autoload.tcl
+lib/tcl/tclX8.3/buildidx.tcl
+lib/tcl/tclX8.3/help/Tcl.brf
+lib/tcl/tclX8.3/help/TclX.brf
+lib/tcl/tclX8.3/help/help
+lib/tcl/tclX8.3/help/tcl/control/break
+lib/tcl/tclX8.3/help/tcl/control/case
+lib/tcl/tclX8.3/help/tcl/control/catch
+lib/tcl/tclX8.3/help/tcl/control/commandloop
+lib/tcl/tclX8.3/help/tcl/control/continue
+lib/tcl/tclX8.3/help/tcl/control/dde
+lib/tcl/tclX8.3/help/tcl/control/error
+lib/tcl/tclX8.3/help/tcl/control/eval
+lib/tcl/tclX8.3/help/tcl/control/exit
+lib/tcl/tclX8.3/help/tcl/control/for
+lib/tcl/tclX8.3/help/tcl/control/foreach
+lib/tcl/tclX8.3/help/tcl/control/if
+lib/tcl/tclX8.3/help/tcl/control/interp
+lib/tcl/tclX8.3/help/tcl/control/loop
+lib/tcl/tclX8.3/help/tcl/control/proc
+lib/tcl/tclX8.3/help/tcl/control/rename
+lib/tcl/tclX8.3/help/tcl/control/return
+lib/tcl/tclX8.3/help/tcl/control/safe
+lib/tcl/tclX8.3/help/tcl/control/source
+lib/tcl/tclX8.3/help/tcl/control/switch
+lib/tcl/tclX8.3/help/tcl/control/tclx_errorHandler
+lib/tcl/tclX8.3/help/tcl/control/try_eval
+lib/tcl/tclX8.3/help/tcl/control/uplevel
+lib/tcl/tclX8.3/help/tcl/control/while
+lib/tcl/tclX8.3/help/tcl/debug/cmdtrace
+lib/tcl/tclX8.3/help/tcl/debug/edprocs
+lib/tcl/tclX8.3/help/tcl/debug/profile
+lib/tcl/tclX8.3/help/tcl/debug/profrep
+lib/tcl/tclX8.3/help/tcl/debug/saveprocs
+lib/tcl/tclX8.3/help/tcl/events/after
+lib/tcl/tclX8.3/help/tcl/events/background-error
+lib/tcl/tclX8.3/help/tcl/events/fileevent
+lib/tcl/tclX8.3/help/tcl/events/mainloop
+lib/tcl/tclX8.3/help/tcl/events/update
+lib/tcl/tclX8.3/help/tcl/events/vwait
+lib/tcl/tclX8.3/help/tcl/files/bsearch
+lib/tcl/tclX8.3/help/tcl/files/chgrp
+lib/tcl/tclX8.3/help/tcl/files/chmod
+lib/tcl/tclX8.3/help/tcl/files/chown
+lib/tcl/tclX8.3/help/tcl/files/chroot
+lib/tcl/tclX8.3/help/tcl/files/close
+lib/tcl/tclX8.3/help/tcl/files/dup
+lib/tcl/tclX8.3/help/tcl/files/echo
+lib/tcl/tclX8.3/help/tcl/files/eof
+lib/tcl/tclX8.3/help/tcl/files/fblocked
+lib/tcl/tclX8.3/help/tcl/files/fcntl
+lib/tcl/tclX8.3/help/tcl/files/fconfigure
+lib/tcl/tclX8.3/help/tcl/files/fcopy
+lib/tcl/tclX8.3/help/tcl/files/file
+lib/tcl/tclX8.3/help/tcl/files/filename
+lib/tcl/tclX8.3/help/tcl/files/flock
+lib/tcl/tclX8.3/help/tcl/files/flush
+lib/tcl/tclX8.3/help/tcl/files/for_file
+lib/tcl/tclX8.3/help/tcl/files/for_recursive_glob
+lib/tcl/tclX8.3/help/tcl/files/fstat
+lib/tcl/tclX8.3/help/tcl/files/ftruncate
+lib/tcl/tclX8.3/help/tcl/files/funlock
+lib/tcl/tclX8.3/help/tcl/files/gets
+lib/tcl/tclX8.3/help/tcl/files/glob
+lib/tcl/tclX8.3/help/tcl/files/lgets
+lib/tcl/tclX8.3/help/tcl/files/link
+lib/tcl/tclX8.3/help/tcl/files/open
+lib/tcl/tclX8.3/help/tcl/files/pipe
+lib/tcl/tclX8.3/help/tcl/files/puts
+lib/tcl/tclX8.3/help/tcl/files/read
+lib/tcl/tclX8.3/help/tcl/files/read_file
+lib/tcl/tclX8.3/help/tcl/files/readdir
+lib/tcl/tclX8.3/help/tcl/files/recursive_glob
+lib/tcl/tclX8.3/help/tcl/files/registry
+lib/tcl/tclX8.3/help/tcl/files/resource
+lib/tcl/tclX8.3/help/tcl/files/seek
+lib/tcl/tclX8.3/help/tcl/files/select
+lib/tcl/tclX8.3/help/tcl/files/sync
+lib/tcl/tclX8.3/help/tcl/files/tell
+lib/tcl/tclX8.3/help/tcl/files/write_file
+lib/tcl/tclX8.3/help/tcl/filescan/scancontext
+lib/tcl/tclX8.3/help/tcl/filescan/scanfile
+lib/tcl/tclX8.3/help/tcl/filescan/scanmatch
+lib/tcl/tclX8.3/help/tcl/intl/catclose
+lib/tcl/tclX8.3/help/tcl/intl/catgets
+lib/tcl/tclX8.3/help/tcl/intl/catopen
+lib/tcl/tclX8.3/help/tcl/intl/encoding
+lib/tcl/tclX8.3/help/tcl/intl/msgcat
+lib/tcl/tclX8.3/help/tcl/intro/keyedlists
+lib/tcl/tclX8.3/help/tcl/intro/syntax
+lib/tcl/tclX8.3/help/tcl/intro/tclsh
+lib/tcl/tclX8.3/help/tcl/keyedlists/keyldel
+lib/tcl/tclX8.3/help/tcl/keyedlists/keylget
+lib/tcl/tclX8.3/help/tcl/keyedlists/keylkeys
+lib/tcl/tclX8.3/help/tcl/keyedlists/keylset
+lib/tcl/tclX8.3/help/tcl/libraries/auto_commands
+lib/tcl/tclX8.3/help/tcl/libraries/auto_load_file
+lib/tcl/tclX8.3/help/tcl/libraries/auto_packages
+lib/tcl/tclX8.3/help/tcl/libraries/buildpackageindex
+lib/tcl/tclX8.3/help/tcl/libraries/convert_lib
+lib/tcl/tclX8.3/help/tcl/libraries/library
+lib/tcl/tclX8.3/help/tcl/libraries/load
+lib/tcl/tclX8.3/help/tcl/libraries/loadlibindex
+lib/tcl/tclX8.3/help/tcl/libraries/package
+lib/tcl/tclX8.3/help/tcl/libraries/packagelib
+lib/tcl/tclX8.3/help/tcl/libraries/pkgMkIndex
+lib/tcl/tclX8.3/help/tcl/libraries/searchpath
+lib/tcl/tclX8.3/help/tcl/libraries/unknown
+lib/tcl/tclX8.3/help/tcl/lists/concat
+lib/tcl/tclX8.3/help/tcl/lists/intersect
+lib/tcl/tclX8.3/help/tcl/lists/intersect3
+lib/tcl/tclX8.3/help/tcl/lists/join
+lib/tcl/tclX8.3/help/tcl/lists/lappend
+lib/tcl/tclX8.3/help/tcl/lists/lassign
+lib/tcl/tclX8.3/help/tcl/lists/lcontain
+lib/tcl/tclX8.3/help/tcl/lists/lempty
+lib/tcl/tclX8.3/help/tcl/lists/lindex
+lib/tcl/tclX8.3/help/tcl/lists/linsert
+lib/tcl/tclX8.3/help/tcl/lists/list
+lib/tcl/tclX8.3/help/tcl/lists/llength
+lib/tcl/tclX8.3/help/tcl/lists/lmatch
+lib/tcl/tclX8.3/help/tcl/lists/lrange
+lib/tcl/tclX8.3/help/tcl/lists/lreplace
+lib/tcl/tclX8.3/help/tcl/lists/lrmdups
+lib/tcl/tclX8.3/help/tcl/lists/lsearch
+lib/tcl/tclX8.3/help/tcl/lists/lsort
+lib/tcl/tclX8.3/help/tcl/lists/lvarcat
+lib/tcl/tclX8.3/help/tcl/lists/lvarpop
+lib/tcl/tclX8.3/help/tcl/lists/lvarpush
+lib/tcl/tclX8.3/help/tcl/lists/split
+lib/tcl/tclX8.3/help/tcl/lists/union
+lib/tcl/tclX8.3/help/tcl/math/expr
+lib/tcl/tclX8.3/help/tcl/math/fmathcmds
+lib/tcl/tclX8.3/help/tcl/math/incr
+lib/tcl/tclX8.3/help/tcl/math/max
+lib/tcl/tclX8.3/help/tcl/math/min
+lib/tcl/tclX8.3/help/tcl/math/random
+lib/tcl/tclX8.3/help/tcl/processes/exec
+lib/tcl/tclX8.3/help/tcl/processes/execl
+lib/tcl/tclX8.3/help/tcl/processes/fork
+lib/tcl/tclX8.3/help/tcl/processes/kill
+lib/tcl/tclX8.3/help/tcl/processes/nice
+lib/tcl/tclX8.3/help/tcl/processes/pid
+lib/tcl/tclX8.3/help/tcl/processes/system
+lib/tcl/tclX8.3/help/tcl/processes/wait
+lib/tcl/tclX8.3/help/tcl/signals/signal
+lib/tcl/tclX8.3/help/tcl/sockets/host_info
+lib/tcl/tclX8.3/help/tcl/sockets/http
+lib/tcl/tclX8.3/help/tcl/sockets/socket
+lib/tcl/tclX8.3/help/tcl/status/cd
+lib/tcl/tclX8.3/help/tcl/status/dirs
+lib/tcl/tclX8.3/help/tcl/status/history
+lib/tcl/tclX8.3/help/tcl/status/id
+lib/tcl/tclX8.3/help/tcl/status/info
+lib/tcl/tclX8.3/help/tcl/status/infox
+lib/tcl/tclX8.3/help/tcl/status/popd
+lib/tcl/tclX8.3/help/tcl/status/pushd
+lib/tcl/tclX8.3/help/tcl/status/pwd
+lib/tcl/tclX8.3/help/tcl/status/showproc
+lib/tcl/tclX8.3/help/tcl/status/umask
+lib/tcl/tclX8.3/help/tcl/strings/append
+lib/tcl/tclX8.3/help/tcl/strings/binary
+lib/tcl/tclX8.3/help/tcl/strings/ccollate
+lib/tcl/tclX8.3/help/tcl/strings/cconcat
+lib/tcl/tclX8.3/help/tcl/strings/cequal
+lib/tcl/tclX8.3/help/tcl/strings/cindex
+lib/tcl/tclX8.3/help/tcl/strings/clength
+lib/tcl/tclX8.3/help/tcl/strings/crange
+lib/tcl/tclX8.3/help/tcl/strings/csubstr
+lib/tcl/tclX8.3/help/tcl/strings/ctoken
+lib/tcl/tclX8.3/help/tcl/strings/ctype
+lib/tcl/tclX8.3/help/tcl/strings/format
+lib/tcl/tclX8.3/help/tcl/strings/re_syntax
+lib/tcl/tclX8.3/help/tcl/strings/regexp
+lib/tcl/tclX8.3/help/tcl/strings/regsub
+lib/tcl/tclX8.3/help/tcl/strings/replicate
+lib/tcl/tclX8.3/help/tcl/strings/scan
+lib/tcl/tclX8.3/help/tcl/strings/string
+lib/tcl/tclX8.3/help/tcl/strings/subst
+lib/tcl/tclX8.3/help/tcl/strings/translit
+lib/tcl/tclX8.3/help/tcl/tclshell/intro
+lib/tcl/tclX8.3/help/tcl/tclshell/variables
+lib/tcl/tclX8.3/help/tcl/time/alarm
+lib/tcl/tclX8.3/help/tcl/time/clock
+lib/tcl/tclX8.3/help/tcl/time/sleep
+lib/tcl/tclX8.3/help/tcl/time/time
+lib/tcl/tclX8.3/help/tcl/time/times
+lib/tcl/tclX8.3/help/tcl/variables/array
+lib/tcl/tclX8.3/help/tcl/variables/for_array_keys
+lib/tcl/tclX8.3/help/tcl/variables/global
+lib/tcl/tclX8.3/help/tcl/variables/namespace
+lib/tcl/tclX8.3/help/tcl/variables/set
+lib/tcl/tclX8.3/help/tcl/variables/stdvars
+lib/tcl/tclX8.3/help/tcl/variables/trace
+lib/tcl/tclX8.3/help/tcl/variables/unset
+lib/tcl/tclX8.3/help/tcl/variables/upvar
+lib/tcl/tclX8.3/help/tcl/variables/variable
+lib/tcl/tclX8.3/pkgIndex.tcl
+lib/tcl/tclX8.3/tcl.tlib
+lib/tcl/tclX8.3/tcl.tndx
+lib/tcl/tclX8.3/tclXAppInit.c
+lib/tcl/tclX8.3/tclx.tcl
lib/tclxConfig.sh
man/man3/TclCommandWriting.3
man/man3/TclX_KeyedListDelete.3
@@ -231,25 +232,25 @@ man/mann/Tcl_ValidateAllMemory.n
man/mann/ckalloc.n
man/mann/ckfree.n
man/mann/tclxmemory.n
-@dirrm lib/tcl/tclX8.2/help/tcl/variables
-@dirrm lib/tcl/tclX8.2/help/tcl/time
-@dirrm lib/tcl/tclX8.2/help/tcl/tclshell
-@dirrm lib/tcl/tclX8.2/help/tcl/strings
-@dirrm lib/tcl/tclX8.2/help/tcl/status
-@dirrm lib/tcl/tclX8.2/help/tcl/sockets
-@dirrm lib/tcl/tclX8.2/help/tcl/signals
-@dirrm lib/tcl/tclX8.2/help/tcl/processes
-@dirrm lib/tcl/tclX8.2/help/tcl/math
-@dirrm lib/tcl/tclX8.2/help/tcl/lists
-@dirrm lib/tcl/tclX8.2/help/tcl/libraries
-@dirrm lib/tcl/tclX8.2/help/tcl/keyedlists
-@dirrm lib/tcl/tclX8.2/help/tcl/intro
-@dirrm lib/tcl/tclX8.2/help/tcl/intl
-@dirrm lib/tcl/tclX8.2/help/tcl/filescan
-@dirrm lib/tcl/tclX8.2/help/tcl/files
-@dirrm lib/tcl/tclX8.2/help/tcl/events
-@dirrm lib/tcl/tclX8.2/help/tcl/debug
-@dirrm lib/tcl/tclX8.2/help/tcl/control
-@dirrm lib/tcl/tclX8.2/help/tcl
-@dirrm lib/tcl/tclX8.2/help
-@dirrm lib/tcl/tclX8.2
+@dirrm lib/tcl/tclX8.3/help/tcl/variables
+@dirrm lib/tcl/tclX8.3/help/tcl/time
+@dirrm lib/tcl/tclX8.3/help/tcl/tclshell
+@dirrm lib/tcl/tclX8.3/help/tcl/strings
+@dirrm lib/tcl/tclX8.3/help/tcl/status
+@dirrm lib/tcl/tclX8.3/help/tcl/sockets
+@dirrm lib/tcl/tclX8.3/help/tcl/signals
+@dirrm lib/tcl/tclX8.3/help/tcl/processes
+@dirrm lib/tcl/tclX8.3/help/tcl/math
+@dirrm lib/tcl/tclX8.3/help/tcl/lists
+@dirrm lib/tcl/tclX8.3/help/tcl/libraries
+@dirrm lib/tcl/tclX8.3/help/tcl/keyedlists
+@dirrm lib/tcl/tclX8.3/help/tcl/intro
+@dirrm lib/tcl/tclX8.3/help/tcl/intl
+@dirrm lib/tcl/tclX8.3/help/tcl/filescan
+@dirrm lib/tcl/tclX8.3/help/tcl/files
+@dirrm lib/tcl/tclX8.3/help/tcl/events
+@dirrm lib/tcl/tclX8.3/help/tcl/debug
+@dirrm lib/tcl/tclX8.3/help/tcl/control
+@dirrm lib/tcl/tclX8.3/help/tcl
+@dirrm lib/tcl/tclX8.3/help
+@dirrm lib/tcl/tclX8.3
diff --git a/lang/tcl-tclX/buildlink2.mk b/lang/tcl-tclX/buildlink2.mk
deleted file mode 100644
index 53c9f1424a9..00000000000
--- a/lang/tcl-tclX/buildlink2.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2004/03/20 19:28:52 minskim Exp $
-
-.if !defined(TCL_TCLX_BUILDLINK2_MK)
-TCL_TCLX_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= tcl-tclX
-BUILDLINK_DEPENDS.tcl-tclX?= tcl-tclX>=8.2.0nb1
-BUILDLINK_PKGSRCDIR.tcl-tclX?= ../../lang/tcl-tclX
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.tcl-tclX=tcl-tclX
-BUILDLINK_PREFIX.tcl-tclX_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.tcl-tclX+= include/*.h
-BUILDLINK_FILES.tcl-tclX+= lib/libtclx82.*
-
-.include "../../lang/tcl/buildlink2.mk"
-
-BUILDLINK_TARGETS+= tcl-tclX-buildlink
-
-tcl-tclX-buildlink: _BUILDLINK_USE
-
-.endif # TCL_TCLX_BUILDLINK2_MK
diff --git a/lang/tcl-tclX/buildlink3.mk b/lang/tcl-tclX/buildlink3.mk
new file mode 100644
index 00000000000..c89b942fe21
--- /dev/null
+++ b/lang/tcl-tclX/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/13 22:06:03 minskim Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+TCL_TCLX_BUILDLINK3_MK:= ${TCL_TCLX_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= tcl-tclX
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-tclX}
+BUILDLINK_PACKAGES+= tcl-tclX
+
+.if !empty(TCL_TCLX_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tcl-tclX+= tcl-tclX>=8.3.5
+BUILDLINK_PKGSRCDIR.tcl-tclX?= ../../lang/tcl-tclX
+.endif # TCL_TCLX_BUILDLINK3_MK
+
+.include "../../lang/tcl/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/tcl-tclX/distinfo b/lang/tcl-tclX/distinfo
index ef7fedf7e8c..bb955c98f49 100644
--- a/lang/tcl-tclX/distinfo
+++ b/lang/tcl-tclX/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.6 2004/05/12 17:56:45 minskim Exp $
+$NetBSD: distinfo,v 1.7 2004/05/13 22:06:03 minskim Exp $
-SHA1 (tclX8.2.0.tar.gz) = 51295ad001d9d057e4ec2f13016f6aa4111fdd28
-Size (tclX8.2.0.tar.gz) = 721198 bytes
-SHA1 (patch-aa) = 47eb7e69e714a8bccf862c5115f6694c3b213881
-SHA1 (patch-ab) = 70a0aa51cf1809ad00c15d9ad92179b8e6e745d6
-SHA1 (patch-ac) = 10f778e6a8336ff41164e2f089ac8ad7c8d5ccdb
+SHA1 (tclx8.3.5-src.tar.gz) = 74092449684d11dd73a4cb91fa3e1442e9e21d47
+Size (tclx8.3.5-src.tar.gz) = 434281 bytes
+SHA1 (patch-aa) = 76d55ef477bb12ec0d02dbf77a572e64de0f8be6
+SHA1 (patch-ab) = cd8a0cda70af84d3f283e96eb4f0b2c0ca102ede
+SHA1 (patch-ac) = 9773a588aa829b4236056fa9c9e4b9e16622d3d6
SHA1 (patch-ad) = 252a21da464267d7c7d45e168a89b29a40273359
SHA1 (patch-ae) = a43144f37706245779362026073e09d8505a3d3f
-SHA1 (patch-af) = 137d6c8e0ee88609763d638d32eac7f6b5747dcb
+SHA1 (patch-af) = 64810cf27a40dcc6f9c12b94295e0b61db2e24a3
SHA1 (patch-ag) = 6c8876699bfe325b3370bb554d4727e05fc64b8b
-SHA1 (patch-ah) = 8283f991ccc4f1cf35e9e100596bfbdf54157ad2
diff --git a/lang/tcl-tclX/patches/patch-aa b/lang/tcl-tclX/patches/patch-aa
index 71a05bc56e5..c2ff4f38f16 100644
--- a/lang/tcl-tclX/patches/patch-aa
+++ b/lang/tcl-tclX/patches/patch-aa
@@ -1,18 +1,55 @@
-$NetBSD: patch-aa,v 1.2 2001/04/26 07:17:41 skrll Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/13 22:06:03 minskim Exp $
---- Common.mk.in.orig Mon Feb 7 00:54:02 2000
+--- Common.mk.in.orig 2000-06-14 02:48:25.000000000 -0500
+++ Common.mk.in
-@@ -36,7 +36,8 @@
+@@ -36,7 +36,8 @@ TKX_FULL_VERSION = @TKX_FULL_VERSION@
#------------------------------------------------------------------------------
# Programs and options used by build
#
-CC = @CC@
+CC = ${LIBTOOL} --mode=compile @CC@
+LD = ${LIBTOOL} --mode=link @CC@
- CFLAGS = @CFLAGS@ @TCL_EXTRA_CFLAGS@
+ CFLAGS = @CFLAGS@ @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@
SYSCFLAGS = @SYSCFLAGS@
RANLIB = @RANLIB@
-@@ -191,13 +192,13 @@
+@@ -73,8 +74,7 @@ bldbasedir = @bldbasedir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+
+-TCLX_PREFIX="${prefix}"
+-TCLX_EXEC_PREFIX="${exec_prefix}"
++TCLX_EXEC_PREFIX=${TCLX_PREFIX}
+ TKX_PREFIX="${prefix}"
+ TKX_EXEC_PREFIX="${exec_prefix}"
+
+@@ -133,8 +133,8 @@ TCL_BUILD_STUB_LIB_SPEC = @TCL_BUILD_S
+ TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
+ TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
+
+-TCL_GENERIC_DIR = ${TCL_SRC_DIR}/generic
+-TCL_UNIX_DIR = ${TCL_SRC_DIR}/unix
++TCL_GENERIC_DIR = ${TCL_SRC_DIR}/include/tcl/generic
++TCL_UNIX_DIR = ${TCL_SRC_DIR}/include/tcl/unix
+
+ #------------------------------------------------------------------------------
+ # Configuration information from tkConfig.sh.
+@@ -161,11 +161,11 @@ TK_UNIX_DIR = ${TK_SRC_DIR}/unix
+ #------------------------------------------------------------------------------
+ # Location of directories in TclX source and build trees.
+ #
+-TCL_GENERIC_DIR = ${TCL_SRC_DIR}/generic
+-TCL_UNIX_DIR = ${TCL_SRC_DIR}/unix
++TCL_GENERIC_DIR = ${TCL_EXEC_PREFIX}/include/tcl/generic
++TCL_UNIX_DIR = ${TCL_EXEC_PREFIX}/include/tcl/unix
+ TCL_LIBRARY_DIR = ${TCL_SRC_DIR}/library
+-TK_GENERIC_DIR = ${TK_SRC_DIR}/generic
+-TK_UNIX_DIR = ${TK_SRC_DIR}/unix
++TK_GENERIC_DIR = ${TK_EXEC_PREFIX}/include/tk/generic
++TK_UNIX_DIR = ${TK_EXEC_PREFIX}/include/tk/unix
+
+ TCLX_GENERIC_DIR = ${srcbasedir}/tcl/generic
+ TCLX_UNIX_SRC_DIR = ${srcbasedir}/tcl/unix
+@@ -190,13 +190,13 @@ COMPAT_DIR = ${srcbasedir}/tcl/c
#------------------------------------------------------------------------------
# Installation directories.
diff --git a/lang/tcl-tclX/patches/patch-ab b/lang/tcl-tclX/patches/patch-ab
index 7ce8a0bfa28..8752d164d98 100644
--- a/lang/tcl-tclX/patches/patch-ab
+++ b/lang/tcl-tclX/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2004/05/12 17:56:45 minskim Exp $
+$NetBSD: patch-ab,v 1.4 2004/05/13 22:06:04 minskim Exp $
---- ../tcl/unix/Makefile.in.orig 2000-02-06 18:53:59.000000000 -0600
+--- ../tcl/unix/Makefile.in.orig 2000-08-09 21:21:48.000000000 -0500
+++ ../tcl/unix/Makefile.in
-@@ -142,30 +142,23 @@ static: tcl.static tclXtest.static
+@@ -147,30 +147,23 @@ static: tcl.static tclXtest.static
standalone: tcl.standalone tclXtest.standalone hello
tcl: tclXAppInit.o @TCLX_SHLIB_BUILD_REF@ @TCLX_STLIB_BUILD_REF@ Makefile
@@ -40,7 +40,7 @@ $NetBSD: patch-ab,v 1.3 2004/05/12 17:56:45 minskim Exp $
#------------------------------------------------------------------------------
# Do some special checks to make sure TclX is built ok.
-@@ -219,16 +212,13 @@ help.tmp:
+@@ -224,16 +217,13 @@ help.tmp:
# Generate the test programs.
#
tclXtest: ${TEST_OBJS} ${TCLX_LIB_NAME}
@@ -60,17 +60,24 @@ $NetBSD: patch-ab,v 1.3 2004/05/12 17:56:45 minskim Exp $
tclXtest.o: ${TCLX_GENERIC_DIR}/tclXtest.c
${CC} -c ${CC_SWITCHES} ${TCLX_GENERIC_DIR}/tclXtest.c
-@@ -320,29 +310,24 @@ install-libraries: install-runtime insta
+@@ -318,7 +308,6 @@ buildhelp: tcl tcl.tndx
+ ${BLDMANHELP} ${TCL_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tclmanpages \
+ ${HELP_DIR} Tcl.brf
+ ${RUNTCL} -c "buildhelp ${HELP_DIR} TclX.brf ${TCLX_DOC_DIR}/TclX.n"
+- ${INSTCOPY} ${HELP_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
+
+ #------------------------------------------------------------------------------
+
+@@ -330,28 +319,24 @@ install-libraries: install-runtime insta
install-doc:
--install-misc: buildhelp
+-install-misc: ${BUILDHELP}
- ${INSTCOPY} ${TCLX_GENERIC_DIR}/tclExtend.h \
- ${INSTALL_ROOT}${TCLX_INST_INCL}
- ${INSTCOPY} ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c \
- ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
-- ${INSTCOPY} ${HELP_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
-+install-misc:
++install-misc:
+ -${BSD_INSTALL_DATA_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
+ ${BSD_INSTALL_DATA} ${TCLX_GENERIC_DIR}/tclExtend.h ${INSTALL_ROOT}${TCLX_INST_INCL}
+ ${BSD_INSTALL_DATA} ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
diff --git a/lang/tcl-tclX/patches/patch-ac b/lang/tcl-tclX/patches/patch-ac
index 34f110f096c..16160109d53 100644
--- a/lang/tcl-tclX/patches/patch-ac
+++ b/lang/tcl-tclX/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2001/04/27 09:16:19 skrll Exp $
+$NetBSD: patch-ac,v 1.4 2004/05/13 22:06:04 minskim Exp $
---- configure.orig Mon Feb 7 00:54:02 2000
+--- configure.orig 2002-11-01 20:48:14.000000000 -0600
+++ configure
-@@ -784,6 +784,7 @@
+@@ -799,6 +799,7 @@ echo "configure:794: checking for existe
echo "$ac_t""file not found" 1>&6
fi
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.3 2001/04/27 09:16:19 skrll Exp $
#
# The eval is required to do the TCL_DBGX substitution in the
# TCL_LIB_FILE variable
-@@ -939,6 +940,7 @@
+@@ -955,6 +956,7 @@ fi
@@ -18,16 +18,7 @@ $NetBSD: patch-ac,v 1.3 2001/04/27 09:16:19 skrll Exp $
# These are substituted into the run scripts
-@@ -1984,7 +1986,7 @@
- DL_LIBS=""
- LDFLAGS=""
- LD_SEARCH_FLAGS=""
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-
- else
- echo "$ac_t""no" 1>&6
-@@ -2509,11 +2511,7 @@
+@@ -2630,11 +2632,7 @@ eval "TKX_SHLIB_NAME=${TKX_SHLIB_NAME}"
#
# Determine suffix to use for the object files for the shared library.
#
diff --git a/lang/tcl-tclX/patches/patch-af b/lang/tcl-tclX/patches/patch-af
index effdb9a8d96..0431ce08fea 100644
--- a/lang/tcl-tclX/patches/patch-af
+++ b/lang/tcl-tclX/patches/patch-af
@@ -1,19 +1,19 @@
-$NetBSD: patch-af,v 1.4 2004/05/12 17:56:45 minskim Exp $
+$NetBSD: patch-af,v 1.5 2004/05/13 22:06:04 minskim Exp $
---- ../tk/unix/Makefile.in.orig Mon Feb 7 00:54:01 2000
+--- ../tk/unix/Makefile.in.orig 2000-08-09 21:21:48.000000000 -0500
+++ ../tk/unix/Makefile.in
-@@ -65,8 +65,8 @@
+@@ -69,8 +69,8 @@ STANDALONE_SRCS = tkx.c
STANDALONE_OBJS = tkx.o
-LIBTCLX = ../../tcl/unix/${TCLX_STLIB_NAME}
-TCL = ../../tcl/unix/tcl
+LIBTCLX = ${PREFIX}/lib/${TCLX_STLIB_NAME}
-+TCL = ${PREFIX}/bin/tcl
++TCL = ${TCLX_EXEC_PREFIX}/bin/tcl
- HELP_DIR = ${srcbasedir}/tk/help
+ HELP_DIR = @HELP_DIR@/tk
-@@ -92,29 +92,29 @@
+@@ -96,29 +96,30 @@ static: wishx.static tktest.static
standalone: wishx.standalone tktest.standalone hello
wishx: tkXAppInit.o @TKX_SHLIB_BUILD_REF@ @TKX_STLIB_BUILD_REF@ ${TCL} Makefile
@@ -21,7 +21,8 @@ $NetBSD: patch-af,v 1.4 2004/05/12 17:56:45 minskim Exp $
- -o $@ || (rm -f $@; exit 1)
+ ${LD} tkXAppInit.o -o $@ -Wl,-R ${PREFIX}/lib -Wl,-R${X11BASE}/lib \
+ -L${PREFIX}/lib -L${X11BASE}/lib \
-+ ${TKX_SHLIB_NAME:C/\.so.*/.la/} -ltclx82 -ltk -ltcl -lX11 -lm
++ ${TKX_SHLIB_NAME:C/\.so.*/.la/} -ltclx83 -ltk -ltcl -lX11 -lm \
++ ${TCL_LIBS}
wishx.static: tkXAppInit.o ${TKX_STLIB_NAME} ${LIBTCLX} Makefile
- ${CC} ${LD_SWITCHES} tkXAppInit.o ${STATIC_LIBS} -o $@ || \
@@ -46,7 +47,7 @@ $NetBSD: patch-af,v 1.4 2004/05/12 17:56:45 minskim Exp $
- ${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS}
+ ${LIBTOOL} --mode=link @CC@ -o ${TKX_SHLIB_NAME:C/\.so.*/.la/} ${SOBJS:.o=.lo} \
+ -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib -rpath ${PREFIX}/lib \
-+ -L${PREFIX}/lib -L${X11BASE}/lib -ltclx82 -ltk -ltcl -lX11 -lm -version-info 1:0
++ -L${PREFIX}/lib -L${X11BASE}/lib -ltclx83 -ltk -ltcl -lX11 -lm -version-info 1:0
hello: hello.c
- ${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
@@ -54,7 +55,7 @@ $NetBSD: patch-af,v 1.4 2004/05/12 17:56:45 minskim Exp $
#------------------------------------------------------------------------------
# We need the "help" directory here so that the help command will work before
-@@ -154,15 +154,16 @@
+@@ -158,15 +159,17 @@ help.tmp:
#
tktest: ${TEST_OBJS} @TKX_SHLIB_BUILD_REF@ @TKX_STLIB_BUILD_REF@ ${TCL}
@@ -62,7 +63,8 @@ $NetBSD: patch-af,v 1.4 2004/05/12 17:56:45 minskim Exp $
- -o $@ || (rm -f $@; exit 1)
+ ${LD} ${TEST_OBJS} -o $@ -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib \
+ -L${PREFIX}/lib -L${X11BASE}/lib \
-+ ${TKX_SHLIB_NAME:C/\.so.*/.la/} -ltclx82 -ltk -ltcl -lX11 -lm
++ ${TKX_SHLIB_NAME:C/\.so.*/.la/} -ltclx83 -ltk -ltcl -lX11 -lm \
++ ${TCL_LIBS}
tktest.static: ${TEST_OBJS} @TKX_STLIB_BUILD_REF@ ${TCL}
- ${CC} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \
@@ -75,28 +77,30 @@ $NetBSD: patch-af,v 1.4 2004/05/12 17:56:45 minskim Exp $
-o $@ || (rm -f $@; exit 1)
tkTest.o: ${TK_SRC_DIR}/generic/tkTest.c
-@@ -199,7 +200,7 @@
- buildhelp:
- rm -rf ${HELP_DIR} help help.tmp
- mkdir ${HELP_DIR}
+@@ -207,9 +210,8 @@ buildhelp:
+ mkdir -p @HELP_DIR@ ;\
+ fi
+ mkdir -p ${HELP_DIR}
- ${BLDMANHELP} ${TK_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tkmanpages \
-+ ${PREFIX}/bin/tcl ../../unix/tools/bldmanhelp.tcl ${TK_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tkmanpages \
++ ${TCLX_EXEC_PREFIX}/bin/tcl ../../unix/tools/bldmanhelp.tcl ${TK_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tkmanpages \
${HELP_DIR} Tk.brf
+- ${INSTCOPY} ${HELP_DIR} ${INSTALL_ROOT}${TKX_INST_RUNTIME}/help
#------------------------------------------------------------------------------
-@@ -212,27 +213,24 @@
+
+@@ -221,26 +223,25 @@ install-libraries: install-runtime inst
install-doc:
--install-misc: buildhelp
+-install-misc: ${BUILDHELP}
- ${INSTCOPY} ${TKX_UNIX_SRC_DIR}/tkXAppInit.c \
+install-misc:
+ -${BSD_INSTALL_DATA_DIR} ${INSTALL_ROOT}${TKX_INST_RUNTIME}
+ ${BSD_INSTALL_DATA} ${TKX_UNIX_SRC_DIR}/tkXAppInit.c \
${INSTALL_ROOT}${TKX_INST_RUNTIME}
-- ${INSTCOPY} ${HELP_DIR} ${INSTALL_ROOT}${TKX_INST_RUNTIME}/help
-+ cd ${HELP_DIR} && ${GTAR} cf - . | (cd ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help && ${GTAR} xf -)
-+ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
++ ${BSD_INSTALL_DATA_DIR} ${INSTALL_ROOT}${TKX_INST_RUNTIME:S|/tkX|/tclX|}/help
++ cd ${HELP_DIR} && ${GTAR} cf - . | (cd ${INSTALL_ROOT}${TKX_INST_RUNTIME:S|/tkX|/tclX|}/help && ${GTAR} xf -)
++ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTALL_ROOT}${TKX_INST_RUNTIME:S|/tkX|/tclX|}/help
install-runtime:
- ${INSTCOPY} tkx.tcl ${INSTALL_ROOT}${TKX_INST_RUNTIME}
diff --git a/lang/tcl-tclX/patches/patch-ah b/lang/tcl-tclX/patches/patch-ah
deleted file mode 100644
index 492d62cc0b7..00000000000
--- a/lang/tcl-tclX/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/03/20 19:28:52 minskim Exp $
-
---- ../tk/generic/tkXshell.c.orig 2000-02-06 18:54:00.000000000 -0600
-+++ ../tk/generic/tkXshell.c
-@@ -84,8 +84,8 @@ Tcl_ThreadDataKey dataKey;
- extern int isatty _ANSI_ARGS_((int fd));
- extern char * strrchr _ANSI_ARGS_((CONST char *string, int c));
- #endif
--extern void TkpDisplayWarning _ANSI_ARGS_((char *msg,
-- char *title));
-+extern void TkpDisplayWarning _ANSI_ARGS_((CONST char *msg,
-+ CONST char *title));
-
- #ifndef TKX_SHELL
- /*