lang/tcl-tclX: Remove package due to Tcl upgrade to v8.5

The TclX project is dead.  The homepage still works, but says the main
page for development is <http://www.neosoft.com/TclX/>, and it doesn't
resolve.  Additionally, the last release on Sourceforge was Nov 2005.

TclX does not build with the latest stable version of Tcl.  Rather than
keeping this package on life support, it's prudent to just remove it.

Discussed with wiz@ and he@

16 files changed, 0 insertions, 826 deletions

diff --git a/lang/tcl-tclX/DESCR b/lang/tcl-tclX/DESCR
deleted file mode 100644
index 15057d128bc..00000000000
--- a/lang/tcl-tclX/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Extended Tcl (TclX), is a set of extensions to Tcl, the Tool Command
-Language invented by Dr. John Ousterhout.  Tcl is a powerful, yet simple
-embeddable programming language.  Extended Tcl is oriented towards system
-programming tasks and large application development.  TclX provides additional
-interfaces to the operating system, and adds many new programming constructs,
-text manipulation tools, and debugging tools.
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
deleted file mode 100644
index a29c290ef8b..00000000000
--- a/lang/tcl-tclX/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# $NetBSD: Makefile,v 1.40 2012/08/21 23:49:23 marino Exp $
-#
-
-DISTNAME=	tclx8.3.5-src
-PKGNAME=	tcl-tclX-8.3.5
-PKGREVISION=	4
-CATEGORIES=	lang tcl
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tclx/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://tclx.sourceforge.net/
-COMMENT=	Extended Tcl (TclX), a set of Tcl extensions for system programming
-
-.include "../../lang/tcl/Makefile.version"
-
-CONFLICTS+=		tclX-[0-9]*
-BUILDLINK_API_DEPENDS.tcl+=	tcl>=8.4.7
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-MAKE_JOBS_SAFE=		no
-
-WRKSRC=			${WRKDIR}/${DISTNAME:S/-src//}/unix
-USE_LIBTOOL=		yes
-USE_TOOLS+=		pax
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-shared \
-			--with-tcl=${BUILDLINK_PREFIX.tcl}/lib \
-			--enable-tk=NO
-TEST_TARGET=		test
-
-.include "../../mk/bsd.prefs.mk"
-
-PKGSRCDIR.tcl=		${.CURDIR}/../../lang/tcl
-WRKSRC.tcl_cmd=		\
-	cd ${PKGSRCDIR.tcl} && ${MAKE} show-var VARNAME=WRKSRC
-
-PKGSRC_TCL_SRC_DIR=	${WRKSRC.tcl_cmd:sh}
-CONFIGURE_ENV+=		PKGSRC_TCL_SRC_DIR=${PKGSRC_TCL_SRC_DIR:Q}
-
-MAKE_ENV+=		CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} \
-			SHAREMODE=${SHAREMODE:Q} SHAREOWN=${SHAREOWN:Q} \
-			SHAREGRP=${SHAREGRP:Q} TCLX_PREFIX=${PREFIX:Q} \
-			INSTALL_ROOT=${DESTDIR}
-
-INSTALLATION_DIRS=	bin include
-
-.include "../../lang/tcl/buildlink3.mk"
-
-post-extract:
-	@${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n
-	@if [ ! -r ${PKGSRC_TCL_SRC_DIR} ]; then	\
-		cd ${PKGSRCDIR.tcl} && ${MAKE} extract;			\
-	fi
-
-post-build:
-	cd ${WRKSRC}/../tcl/unix && ${MAKE_ENV} ${MAKE} buildhelp
-
-post-install:
-	${FIND} ${DESTDIR}${PREFIX}/lib/tcl/tclX8.3/help -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-	${FIND} ${DESTDIR}${PREFIX}/lib/tcl/tclX8.3/help -type f -print | ${XARGS} ${CHMOD} ${DOCMODE}
-	@${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/TkX_Main.3
-	@${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/Tkx_Init.3
-# the above links are installed based on the contents of the man page.
-# we don't want to modify the man page, as it is also used by ../tk-tclX,
-# so...
-
-pre-clean:
-	@cd ${PKGSRCDIR.tcl} && ${MAKE} clean
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-tclX/PLIST b/lang/tcl-tclX/PLIST
deleted file mode 100644
index 00ac960d95b..00000000000
--- a/lang/tcl-tclX/PLIST
+++ /dev/null
@@ -1,230 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:03:43 joerg Exp $
-bin/tcl
-include/tclExtend.h
-lib/libtclx83.la
-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
-man/man3/TclX_KeyedListGet.3
-man/man3/TclX_KeyedListGetKeys.3
-man/man3/TclX_KeyedListSet.3
-man/man3/TclX_Main.3
-man/man3/TclX_NewKeyedListObj.3
-man/man3/Tcl_HandleAlloc.3
-man/man3/Tcl_HandleFree.3
-man/man3/Tcl_HandleTblInit.3
-man/man3/Tcl_HandleTblRelease.3
-man/man3/Tcl_HandleTblUseCount.3
-man/man3/Tcl_HandleWalk.3
-man/man3/Tcl_HandleXlate.3
-man/man3/Tclx_Init.3
-man/man3/Tclxcmd_Init.3
-man/mann/TclX.n
-man/mann/Tcl_DisplayMemory.n
-man/mann/Tcl_InitMemory.n
-man/mann/Tcl_ValidateAllMemory.n
-man/mann/ckalloc.n
-man/mann/ckfree.n
-man/mann/tclxmemory.n
diff --git a/lang/tcl-tclX/buildlink3.mk b/lang/tcl-tclX/buildlink3.mk
deleted file mode 100644
index 92ca0a6a874..00000000000
--- a/lang/tcl-tclX/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2012/08/21 23:49:23 marino Exp $
-
-BUILDLINK_TREE+=	tcl-tclX
-
-.if !defined(TCL_TCLX_BUILDLINK3_MK)
-TCL_TCLX_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.tcl-tclX+=	tcl-tclX>=8.3.5
-BUILDLINK_ABI_DEPENDS.tcl-tclX+=	tcl-tclX>=8.3.5nb4
-BUILDLINK_PKGSRCDIR.tcl-tclX?=	../../lang/tcl-tclX
-
-.include "../../lang/tcl/buildlink3.mk"
-.endif # TCL_TCLX_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-tcl-tclX
diff --git a/lang/tcl-tclX/distinfo b/lang/tcl-tclX/distinfo
deleted file mode 100644
index 6966f470744..00000000000
--- a/lang/tcl-tclX/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.15 2010/02/25 19:53:55 joerg Exp $
-
-SHA1 (tclx8.3.5-src.tar.gz) = 74092449684d11dd73a4cb91fa3e1442e9e21d47
-RMD160 (tclx8.3.5-src.tar.gz) = b501c1c48b54950ea7fb6d3d6d27ef3e7d58c5a5
-Size (tclx8.3.5-src.tar.gz) = 434281 bytes
-SHA1 (patch-aa) = a60aee24d56a1b46ecdc0767a788b4ce8d6dee6c
-SHA1 (patch-ab) = 2c319d289481b6d1d5262f39c630034c33b324ed
-SHA1 (patch-ac) = c42669fab43b253b6fb07b04e8fc41099062a014
-SHA1 (patch-ad) = 252a21da464267d7c7d45e168a89b29a40273359
-SHA1 (patch-ae) = a43144f37706245779362026073e09d8505a3d3f
-SHA1 (patch-af) = 7eb9dec7a938e62a5a06a5a37c5fa951912006cc
-SHA1 (patch-ag) = 6c8876699bfe325b3370bb554d4727e05fc64b8b
-SHA1 (patch-ah) = 37f883b17e3cec0266f9cd8c60cece521e59f56a
-SHA1 (patch-ai) = 07572c47a3ee375f89488dbbfe52697091beccfb
-SHA1 (patch-aj) = b9d52c2365f0a04bfa43cf4f101389814d42b467
-SHA1 (patch-ak) = 4756d27b71c05952e40ac38403be3e3f354fe50f
diff --git a/lang/tcl-tclX/patches/patch-aa b/lang/tcl-tclX/patches/patch-aa
deleted file mode 100644
index b52e3c3336b..00000000000
--- a/lang/tcl-tclX/patches/patch-aa
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2008/08/19 16:14:24 joerg Exp $
-
---- Common.mk.in.orig	2000-06-14 09:48:25.000000000 +0200
-+++ Common.mk.in
-@@ -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_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@
- SYSCFLAGS    = @SYSCFLAGS@
- RANLIB       = @RANLIB@
-@@ -64,8 +65,6 @@ XLDLIBS=
- # run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
- # when installing files.  This is normally passed on the command line.
- 
--INSTALL_ROOT =
--
- #------------------------------------------------------------------------------
- # Build and install directories.
- srcbasedir   = @srcbasedir@
-@@ -73,8 +72,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 +131,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 +159,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 +188,13 @@ COMPAT_DIR         = ${srcbasedir}/tcl/c
- #------------------------------------------------------------------------------
- # Installation directories.
- 
--TCLX_INST_RUNTIME  = ${TCLX_PREFIX}/lib/tclX${TCLX_VERSION}
--TKX_INST_RUNTIME   = ${TKX_PREFIX}/lib/tkX${TKX_VERSION}
-+TCLX_INST_RUNTIME  = ${TCLX_PREFIX}/lib/tcl/tclX${TCLX_VERSION}
-+TKX_INST_RUNTIME   = ${TKX_PREFIX}/lib/tcl/tkX${TKX_VERSION}
- TCLX_LIBRARY_PATH  = ${TCLX_INST_RUNTIME}
- TKX_LIBRARY_PATH   = ${TKX_INST_RUNTIME}
- 
--TCLX_EXEC_RUNTIME  = ${TCLX_EXEC_PREFIX}/lib/tclX${TCLX_VERSION}
--TKX_EXEC_RUNTIME   = ${TKX_EXEC_PREFIX}/lib/tkX${TKX_VERSION}
-+TCLX_EXEC_RUNTIME  = ${TCLX_EXEC_PREFIX}/lib/tcl/tclX${TCLX_VERSION}
-+TKX_EXEC_RUNTIME   = ${TKX_EXEC_PREFIX}/lib/tcl/tkX${TKX_VERSION}
- 
- TCLX_INST_BIN      = ${TCLX_EXEC_PREFIX}/bin
- TKX_INST_BIN       = ${TKX_EXEC_PREFIX}/bin
diff --git a/lang/tcl-tclX/patches/patch-ab b/lang/tcl-tclX/patches/patch-ab
deleted file mode 100644
index e2b698780c5..00000000000
--- a/lang/tcl-tclX/patches/patch-ab
+++ /dev/null
@@ -1,113 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2009/11/27 13:26:49 joerg Exp $
-
---- ../tcl/unix/Makefile.in.orig	2000-08-09 21:21:48.000000000 -0500
-+++ ../tcl/unix/Makefile.in
-@@ -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
--	${CC} ${LD_SWITCHES} tclXAppInit.o ${ALL_LIBS} \
--	    -o $@ || (rm -f $@; exit 1)
-+	${LD} tclXAppInit.o -o $@ ${TCLX_SHLIB_NAME:C/\.so.*/.la/} -L${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl -lm ${TCL_LIBS}
- 
- tcl.static: tclXAppInit.o @TCLX_STLIB_BUILD_REF@ Makefile
--	${CC} ${LD_SWITCHES} tclXAppInit.o ${STATIC_LIBS} \
--	    -o $@ || (rm -f $@; exit 1)
-+	${LD} ${LD_SWITCHES} tclXAppInit.o ${STATIC_LIBS} -o $@
- 
- tcl.standalone: tclXAppInitSA.o @TCLX_STLIB_BUILD_REF@ Makefile
--	${CC} ${LD_SWITCHES} tclXAppInitSA.o ${STATIC_LIBS} \
--	    -o $@ || (rm -f $@; exit 1)
-+	${LD} ${LD_SWITCHES} tclXAppInitSA.o ${STATIC_LIBS} -o $@
- 
- ${TCLX_STLIB_NAME}: ${OBJS}
--	${AR} cr ${TCLX_STLIB_NAME} ${OBJS}
--	${RANLIB} ${TCLX_STLIB_NAME}
-+#	${AR} cr ${TCLX_STLIB_NAME} ${OBJS}
-+#	${RANLIB} ${TCLX_STLIB_NAME}
- 
- @TCLX_SHLIB_BUILD_TARGET@: ${SOBJS}
--	rm -f ${TCLX_SHLIB_NAME}
--	PATH=${TCL_UNIX_DIR}:${PATH}; export PATH; \
--	TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \
--	LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
--	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS}
-+	${LIBTOOL} --mode=link @CC@ -o ${TCLX_SHLIB_NAME:C/\.so.*/.la/} ${SOBJS:.o=.lo} -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl -lm -version-info 1:0
- 
- hello:	hello.c
--	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
-+	${LD} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
- 
- #------------------------------------------------------------------------------
- # Do some special checks to make sure TclX is built ok.
-@@ -224,16 +217,13 @@ help.tmp:
- # Generate the test programs.
- #
- tclXtest: ${TEST_OBJS} ${TCLX_LIB_NAME}
--	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${ALL_LIBS} \
--	    -o $@ || (rm -f $@; exit 1)
-+	${LD} ${TEST_OBJS} -o $@ ${TCLX_SHLIB_NAME:C/\.so.*/.la/} -L${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl -lm ${TCL_LIBS}
- 
- tclXtest.static: ${TEST_OBJS} ${TCLX_STLIB_NAME}
--	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \
--	    -o $@ || (rm -f $@; exit 1)
-+	${LD} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} -o $@
- 
- tclXtest.standalone: ${TEST_SAOBJS} ${TCLX_STLIB_NAME}
--	${CC} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} \
--	    -o $@ || (rm -f $@; exit 1)
-+	${LD} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} -o $@
- 
- tclXtest.o: ${TCLX_GENERIC_DIR}/tclXtest.c
- 	${CC} -c ${CC_SWITCHES} ${TCLX_GENERIC_DIR}/tclXtest.c
-@@ -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}
--	${INSTCOPY} ${TCLX_GENERIC_DIR}/tclExtend.h \
--	    ${INSTALL_ROOT}${TCLX_INST_INCL}
--	${INSTCOPY} ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c \
--	    ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
-+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}
-+	${BSD_INSTALL_DATA_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
-+	cd ${HELP_DIR} && pax -r -w . ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
-+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
- 
- install-runtime:
--	${INSTCOPY} tclx.tcl tcl.tlib tcl.tndx buildidx.tcl autoload.tcl \
--	    ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
-+	-${BSD_INSTALL_DATA_DIR}  ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
-+	${BSD_INSTALL_DATA} tclx.tcl tcl.tlib tcl.tndx buildidx.tcl autoload.tcl ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
- 
- install-exec:
--	${INSTCOPY} tcl ${INSTALL_ROOT}${TCLX_INST_BIN}
--	${STRIP} ${INSTALL_ROOT}${TCLX_INST_BIN}/tcl
--	if test "X@TCLX_STLIB_BUILD_REF@" != "X"; then \
--	    ${INSTCOPY} ${TCLX_STLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB}; \
--	    ${RANLIB} ${INSTALL_ROOT}${TCLX_INST_LIB}/${TCLX_STLIB_NAME}; \
--	fi
--	${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB}
--	if test "@SHARED_BUILD@" = "1"; then \
--	    ${INSTCOPY} ${TCLX_SHLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
--	    ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\
--	fi
-+	-${BSD_INSTALL_DATA_DIR}  ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME}
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} tcl ${INSTALL_ROOT}${TCLX_INST_BIN}
-+	${BSD_INSTALL_SCRIPT} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB}
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${TCLX_SHLIB_NAME:C/\.so.*/.la/} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
-+	${BSD_INSTALL_DATA} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\
- 
- #------------------------------------------------------------------------------
- config:
diff --git a/lang/tcl-tclX/patches/patch-ac b/lang/tcl-tclX/patches/patch-ac
deleted file mode 100644
index 4b3d5ad8063..00000000000
--- a/lang/tcl-tclX/patches/patch-ac
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2008/08/19 16:14:24 joerg Exp $
-
---- configure.orig	2002-11-02 03:48:14.000000000 +0100
-+++ configure
-@@ -799,6 +799,7 @@ echo "configure:794: checking for existe
-         echo "$ac_t""file not found" 1>&6
-     fi
- 
-+TCL_SRC_DIR=${PKGSRC_TCL_SRC_DIR}
-     #
-     # The eval is required to do the TCL_DBGX substitution in the
-     # TCL_LIB_FILE variable
-@@ -955,6 +956,7 @@ fi
- 
- 
- 
-+TK_SRC_DIR=${PKGSRC_TK_SRC_DIR}
- 
- 
- # These are substituted into the run scripts
-@@ -1677,7 +1679,7 @@ echo "configure:1668: checking system ve
- 	    # results, and the version is kept in special file).
- 	
- 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--		system=MP-RAS-`awk '{print }' /etc/.relid'`
-+		system=MP-RAS-`awk '{print }' /etc/.relid`
- 	    fi
- 	    if test "`uname -s`" = "AIX" ; then
- 		system=AIX-`uname -v`.`uname -r`
-@@ -1894,7 +1896,7 @@ fi
- 	    DL_LIBS=""
- 	    LDFLAGS="-Wl,-D,08000000"
- 	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
--	    SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
- 	    ;;
- 	IRIX-5.*|IRIX-6.*|IRIX64-6.5*)
- 	    SHLIB_CFLAGS=""
-@@ -2541,10 +2543,10 @@ fi
-     fi
- 
-     if test "$SHARED_LIB_SUFFIX" = "" ; then
--	SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
-+	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}${SHLIB_SUFFIX}'
-     fi
-     if test "$UNSHARED_LIB_SUFFIX" = "" ; then
--	UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-+	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-     fi
- 
-     
-@@ -2630,11 +2632,7 @@ eval "TKX_SHLIB_NAME=${TKX_SHLIB_NAME}"
- #
- # Determine suffix to use for the object files for the shared library.
- #
--if test "x${TCL_SHLIB_CFLAGS}" != "x"; then
--    SHOBJ_SUFFIX="..o"
--else
-     SHOBJ_SUFFIX=".o"
--fi
- 
- #
- # Determine the arguments for specifying the prefered TclX libraries on the
diff --git a/lang/tcl-tclX/patches/patch-ad b/lang/tcl-tclX/patches/patch-ad
deleted file mode 100644
index 7c11b8b24fa..00000000000
--- a/lang/tcl-tclX/patches/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/09/06 16:40:07 jwise Exp $
---- ../tcl/unix/pkgIndex.tcl.in.orig	Tue Sep  5 16:47:01 2000
-+++ ../tcl/unix/pkgIndex.tcl.in	Tue Sep  5 16:47:17 2000
-@@ -3,6 +3,6 @@
- # Package index for TclX @TCLX_FULL_VERSION@.
- #
- if {[info tclversion] < @TCL_VERSION@} return
--package ifneeded Tclx @TCLX_VERSION@ "load [list $dir/../@TCLX_SHLIB_NAME@]"
-+package ifneeded Tclx @TCLX_VERSION@ "load [list $dir/../../@TCLX_SHLIB_NAME@]"
- 
- 
diff --git a/lang/tcl-tclX/patches/patch-ae b/lang/tcl-tclX/patches/patch-ae
deleted file mode 100644
index 7adb071176f..00000000000
--- a/lang/tcl-tclX/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/09/06 16:40:07 jwise Exp $
---- ../doc/TclXMemory.n.orig	Tue Sep  5 20:54:12 2000
-+++ ../doc/TclXMemory.n	Tue Sep  5 20:54:29 2000
-@@ -18,7 +18,7 @@
- .TH "Memory" TCL "" "Tcl"
- .BS
- .SH NAME
--ckalloc, memory, ckfree, Tcl_DisplayMemory, Tcl_InitMemory, Tcl_ValidateAllMemory - Validated memory allocation interface.
-+ckalloc, tclxmemory, ckfree, Tcl_DisplayMemory, Tcl_InitMemory, Tcl_ValidateAllMemory - Validated memory allocation interface.
- .SH SYNOPSIS
- .nf
- .B memory \fBinfo\fR
-@@ -276,6 +276,6 @@
- the calls after you find the problem.
- '
- .SH KEYWORDS
--ckalloc, ckfree, free, memory, malloc
-+ckalloc, ckfree, free, tclxmemory, malloc
- 
- 
diff --git a/lang/tcl-tclX/patches/patch-af b/lang/tcl-tclX/patches/patch-af
deleted file mode 100644
index 741bd00a580..00000000000
--- a/lang/tcl-tclX/patches/patch-af
+++ /dev/null
@@ -1,131 +0,0 @@
-$NetBSD: patch-af,v 1.8 2010/02/25 19:53:56 joerg Exp $
-
---- ../tk/unix/Makefile.in.orig	2000-08-09 21:21:48.000000000 -0500
-+++ ../tk/unix/Makefile.in
-@@ -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 = ${TCLX_EXEC_PREFIX}/bin/tcl
- 
- HELP_DIR = @HELP_DIR@/tk
- 
-@@ -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
--	${CC} ${LD_SWITCHES} tkXAppInit.o ${ALL_LIBS} \
--	    -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/} -ltclx83 -ltk -ltcl -lX11 -lm \
-+		${TCL_LIBS}
- 
- wishx.static: tkXAppInit.o ${TKX_STLIB_NAME} ${LIBTCLX} Makefile
--	${CC} ${LD_SWITCHES} tkXAppInit.o ${STATIC_LIBS} -o $@ || \
-+	${LD} ${LD_SWITCHES} tkXAppInit.o ${STATIC_LIBS} -o $@ || \
- 	    (rm -f $@; exit 1)
- 
- wishx.standalone: tkXAppInitSA.o ${TKX_STLIB_NAME} ${LIBTCLX} Makefile
--	${CC} ${LD_SWITCHES} tkXAppInitSA.o ${STATIC_LIBS} -o $@ || \
-+	${LD} ${LD_SWITCHES} tkXAppInitSA.o ${STATIC_LIBS} -o $@ || \
- 	    (rm -f $@; exit 1)
- 
- ${TKX_STLIB_NAME}: ${OBJS}
--	${AR} cr ${TKX_STLIB_NAME} ${OBJS}
--	${RANLIB} ${TKX_STLIB_NAME}
-+#	${AR} cr ${TKX_STLIB_NAME} ${OBJS}
-+#	${RANLIB} ${TKX_STLIB_NAME}
- 
- @TKX_SHLIB_BUILD_TARGET@: ${SOBJS}
--	rm -f ${TKX_SHLIB_NAME}
--	${TCL_SHLIB_LD} -o ${TKX_SHLIB_NAME} ${SOBJS} \
--	    ${TK_BUILD_STUB_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \
--	    ${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 -ltclx83 -ltk -ltcl -lX11 -lm -version-info 1:0
- 
- hello:	hello.c
--	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
-+	${LD} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
- 
- #------------------------------------------------------------------------------
- # We need the "help" directory here so that the help command will work before
-@@ -158,15 +159,17 @@ help.tmp:
- #
- 
- tktest: ${TEST_OBJS} @TKX_SHLIB_BUILD_REF@ @TKX_STLIB_BUILD_REF@ ${TCL}
--	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${ALL_LIBS} \
--	    -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/} -ltclx83 -ltk -ltcl -lX11 -lm \
-+		${TCL_LIBS}
- 
- tktest.static: ${TEST_OBJS} @TKX_STLIB_BUILD_REF@ ${TCL}
--	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \
-+	${LD} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \
- 	    -o $@ || (rm -f $@; exit 1)
- 
- tktest.standalone: ${TEST_SAOBJS} @TKX_STLIB_BUILD_REF@ ${TCL}
--	${CC} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} \
-+	${LD} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} \
- 	    -o $@ || (rm -f $@; exit 1)
- 
- tkTest.o: ${TK_SRC_DIR}/generic/tkTest.c
-@@ -207,9 +210,8 @@ buildhelp:
- 	    mkdir -p @HELP_DIR@ ;\
- 	fi
- 	mkdir -p ${HELP_DIR}
--	${BLDMANHELP} ${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
- 
- #------------------------------------------------------------------------------
- 
-@@ -221,26 +223,25 @@ install-libraries:  install-runtime inst
- 
- install-doc:
- 
--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}
-+	${BSD_INSTALL_DATA_DIR} ${INSTALL_ROOT}${TKX_INST_RUNTIME:S|/tkX|/tclX|}/help
-+	cd ${HELP_DIR} && pax -r -w . ${INSTALL_ROOT}${TKX_INST_RUNTIME:S|/tkX|/tclX|}/help
-+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTALL_ROOT}${TKX_INST_RUNTIME:S|/tkX|/tclX|}/help
- 
- install-runtime:
--	${INSTCOPY} tkx.tcl ${INSTALL_ROOT}${TKX_INST_RUNTIME}
-+	-${BSD_INSTALL_DATA_DIR}  ${INSTALL_ROOT}${TKX_INST_RUNTIME}
-+	${BSD_INSTALL_DATA} tkx.tcl ${INSTALL_ROOT}${TKX_INST_RUNTIME}
- 
- install-exec:
--	${INSTCOPY} wishx ${INSTALL_ROOT}${TKX_INST_BIN}
--	${STRIP} ${INSTALL_ROOT}${TKX_INST_BIN}/wishx
--	if test "X@TKX_STLIB_BUILD_REF@" != "X"; then \
--	    ${INSTCOPY} ${TKX_STLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB}; \
--	    ${RANLIB} ${INSTALL_ROOT}${TKX_INST_LIB}/${TKX_STLIB_NAME}; \
--	fi
--	${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_LIB}
--	if test "@SHARED_BUILD@" = "1"; then \
--	    ${INSTCOPY} ${TKX_SHLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB} ;\
--	    ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TKX_EXEC_RUNTIME} ;\
--	fi
--	${INSTCOPY} tclhelp ${INSTALL_ROOT}${TKX_INST_BIN}
-+	-${BSD_INSTALL_DATA_DIR}  ${INSTALL_ROOT}${TKX_INST_RUNTIME}
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} wishx ${INSTALL_ROOT}${TKX_INST_BIN}
-+	${BSD_INSTALL_DATA} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_LIB}
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${TKX_SHLIB_NAME:C/\.so.*/.la/} ${INSTALL_ROOT}${TKX_INST_LIB}
-+	${BSD_INSTALL_DATA} pkgIndex.tcl ${INSTALL_ROOT}${TKX_EXEC_RUNTIME}
-+	${BSD_INSTALL_SCRIPT} tclhelp ${INSTALL_ROOT}${TKX_INST_BIN}
- 
- #------------------------------------------------------------------------------
- config:
diff --git a/lang/tcl-tclX/patches/patch-ag b/lang/tcl-tclX/patches/patch-ag
deleted file mode 100644
index 5bcf59123f1..00000000000
--- a/lang/tcl-tclX/patches/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2000/09/06 16:47:32 jwise Exp $
---- ../tk/unix/pkgIndex.tcl.in.orig	Wed Sep  6 11:20:13 2000
-+++ ../tk/unix/pkgIndex.tcl.in	Wed Sep  6 11:20:40 2000
-@@ -3,6 +3,6 @@
- # Package index for TkX @TKX_FULL_VERSION@.
- #
- if {[info tclversion] < @TCL_VERSION@} return
--package ifneeded Tkx @TKX_VERSION@ "package require Tclx @TCLX_VERSION@; package require Tk @TK_VERSION@; load [list $dir/../@TKX_SHLIB_NAME@]"
-+package ifneeded Tkx @TKX_VERSION@ "package require Tclx @TCLX_VERSION@; package require Tk @TK_VERSION@; load [list $dir/../../@TKX_SHLIB_NAME@]"
- 
- 
diff --git a/lang/tcl-tclX/patches/patch-ah b/lang/tcl-tclX/patches/patch-ah
deleted file mode 100644
index 068cc65f4a7..00000000000
--- a/lang/tcl-tclX/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2006/01/11 21:05:24 joerg Exp $
-
---- ../tcl/unix/tclXAppInit.c.orig	2006-01-11 18:50:33.000000000 +0000
-+++ ../tcl/unix/tclXAppInit.c
-@@ -25,8 +25,10 @@
-  * Even if matherr is not used on this system, there is a dummy version
-  * in libtcl.
-  */
-+#if !defined(__DragonFly__)
- extern int matherr ();
- int (*tclDummyMathPtr)() = matherr;
-+#endif
- 
- 
- /*-----------------------------------------------------------------------------
diff --git a/lang/tcl-tclX/patches/patch-ai b/lang/tcl-tclX/patches/patch-ai
deleted file mode 100644
index ce4f974ab2d..00000000000
--- a/lang/tcl-tclX/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/01/11 21:05:24 joerg Exp $
-
---- ../tcl/unix/tclXunixTest.c.orig	2006-01-11 20:06:24.000000000 +0000
-+++ ../tcl/unix/tclXunixTest.c
-@@ -31,8 +31,10 @@ Tclxtest_Init _ANSI_ARGS_((Tcl_Interp *i
-  * Even if matherr is not used on this system, there is a dummy version
-  * in libtcl.
-  */
-+#if !defined(__DragonFly__)
- extern int matherr ();
- int (*tclDummyMathPtr)() = matherr;
-+#endif
- 
- /*-----------------------------------------------------------------------------
-  * main --
diff --git a/lang/tcl-tclX/patches/patch-aj b/lang/tcl-tclX/patches/patch-aj
deleted file mode 100644
index e3cdfdc37d3..00000000000
--- a/lang/tcl-tclX/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/01/11 21:32:02 joerg Exp $
-
---- ../tk/unix/tkXAppInit.c.orig	2006-01-11 21:17:53.000000000 +0000
-+++ ../tk/unix/tkXAppInit.c
-@@ -27,8 +27,10 @@
-  * Even if matherr is not used on this system, there is a dummy version
-  * in libtcl.
-  */
-+#if !defined(__DragonFly__)
- extern int matherr ();
- int (*tclDummyMathPtr)() = matherr;
-+#endif
- 
- 
- /*-----------------------------------------------------------------------------
diff --git a/lang/tcl-tclX/patches/patch-ak b/lang/tcl-tclX/patches/patch-ak
deleted file mode 100644
index 6efc937b757..00000000000
--- a/lang/tcl-tclX/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/01/11 21:32:02 joerg Exp $
-
---- ../tk/unix/tkXunixTest.c.orig	2006-01-11 21:18:21.000000000 +0000
-+++ ../tk/unix/tkXunixTest.c
-@@ -29,8 +29,10 @@ Tktest_Init _ANSI_ARGS_((Tcl_Interp *int
-  * Even if matherr is not used on this system, there is a dummy version
-  * in libtcl.
-  */
-+#if !defined(__DragonFly__)
- extern int matherr ();
- int (*tclDummyMathPtr)() = matherr;
-+#endif
- 
- 
- /*